File 0365-Adjust-generated-XML-so-it-respects-curren... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0365-Adjust-generated-XML-so-it-respects-current-DTD.patch of Package erlang (Revision 897890b1221b732df696f0f61a5f8d5c)

Currently displaying revision 897890b1221b732df696f0f61a5f8d5c , Show latest

From 17c1d910cff8bc2a80753c417d2be36dd96ca5ff Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 26 Feb 2019 15:44:44 +0100
Subject: [PATCH] Adjust generated XML so it respects current DTD

---
 HOWTO/INSTALL-CROSS.md |  1 +
 HOWTO/INSTALL.md       |  1 +
 HOWTO/MARKDOWN.md      | 15 +++++++++------
 make/emd2exml.in       | 37 ++++++++++++++-----------------------
 4 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/HOWTO/INSTALL-CROSS.md b/HOWTO/INSTALL-CROSS.md
index 224f238fd0..1eab437918 100644
--- a/HOWTO/INSTALL-CROSS.md
+++ b/HOWTO/INSTALL-CROSS.md
@@ -286,6 +286,7 @@ document for information on how to build the documentation.
 
 Testing the cross compiled system
 ---------------------------------
+
 Some of the tests that come with erlang use native code to test. This means
 that when cross compiling erlang you also have to cross compile test suites
 in order to run tests on the target host. To do this you first have to release
diff --git a/HOWTO/INSTALL.md b/HOWTO/INSTALL.md
index 43bcdb3a9e..587f116252 100644
--- a/HOWTO/INSTALL.md
+++ b/HOWTO/INSTALL.md
@@ -826,6 +826,7 @@ Known platform issues
 
 Daily Build and Test
 --------------------
+
 At Ericsson we have a "Daily Build and Test" that runs on:
 
 * Solaris 8, 9
diff --git a/HOWTO/MARKDOWN.md b/HOWTO/MARKDOWN.md
index 2df0460dab..e6773a0a8e 100644
--- a/HOWTO/MARKDOWN.md
+++ b/HOWTO/MARKDOWN.md
@@ -70,6 +70,9 @@ in the future.
 
 * Lists aren't supported inside block quotes.
 
+* Nested block quotes can be generated, but current DTD does not
+ support it.
+
 * Link and image definition names *are* case sensitive.
 
 #### Additional Features ####
@@ -126,7 +129,7 @@ places. Appropriate attributes to the `X` tag will also be generated.
 <icaption>...</icaption> </image>` sequence where the "title" will be
 placed between `<icaption>` and `</icaption>`.
 
-* Block quotes generate `<blockquote>` tags.
+* Block quotes generate `<quote>` tags.
 
 * If the first line of a top level block quote begins with a `> *NOTE*:`
 character sequence, a `<note>` tag will be generated instead of a
@@ -152,7 +155,7 @@ places. Appropriate attributes to the `X` tag will also be generated.
 
 * Emphasis (single `*` or `_`) will generate `` tags.
 
-* Strong emphasis (double `*` or `_`) will generate `` tags.
+* Strong emphasis (double `*` or `_`) will generate `` tags.
 
 * The level 1 heading will cause the following to be generated:
 
@@ -180,11 +183,11 @@ places. Appropriate attributes to the `X` tag will also be generated.
 contain information from a \%CopyrightBegin\%, \%CopyrightEnd\% block
 if such exist (see below).
 
-* A level `X` heading where `1 < X <= 3` will cause the the following
+* A level `X` heading where `1 < X <= 6` will cause the the following
 to be generated:
 
- <marker id="..."/>
 <section>
+ <marker id="..."/>
 <title>...</title>
 ...
 </section>
@@ -206,11 +209,11 @@ places. Appropriate attributes to the `X` tag will also be generated.
 other documents. That is, *be careful* when changing headings in an
 existing document.
 
-* A level `X` heading where `3 < X` will cause the the following
+* A level `X` heading where `6 < X` will cause the the following
 to be generated:
 
 <marker id="..."/>
- ...
+ ...
 ...
 
 Current DTD:s used don't support deeper levels of sections, and we
diff --git a/make/emd2exml.in b/make/emd2exml.in
index d84b967e40..903d707716 100644
--- a/make/emd2exml.in
+++ b/make/emd2exml.in
@@ -39,7 +39,7 @@
 %%% Created : 25 Feb 2010 by Rickard Green
 %%%-------------------------------------------------------------------
 
--define(MAX_HEADING, 3).
+-define(MAX_HEADING, 6).
 
 -define(DELAYED_COPYRIGHT_IX, 0).
 -define(DELAYED_TOC_IX, 1).
@@ -80,7 +80,6 @@
 	 copyright = false,
 	 copyright_data = [],
 	 have_h1 = false,
-	 smarker_ix = false,
 	 toc = [],
 	 ifile,
 	 ofile}).
@@ -368,9 +367,9 @@ put_text(S, "%OTP-REL%"++Cs, CTag, EmTag, Acc) ->
 put_text(S, [$\\,C|Cs], no, EmTag, Acc) ->
 put_text(S, Cs, no, EmTag, [C|Acc]);
 put_text(S, [C,C|Cs], no, b, Acc) when C == $*; C == $_ ->
- put_text(S, Cs, no, no, [""|Acc]);
+ put_text(S, Cs, no, no, [""|Acc]);
 put_text(S, [C,C|Cs], no, no, Acc) when C == $*; C == $_ ->
- put_text(S, Cs, no, b, [""|Acc]);
+ put_text(S, Cs, no, b, [""|Acc]);
 put_text(S, [C|Cs], no, em, Acc) when C == $*; C == $_ ->
 put_text(S, Cs, no, no, [""|Acc]);
 put_text(S, [C|Cs], no, no, Acc) when C == $*; C == $_ ->
@@ -614,8 +613,7 @@ strip_lvls(_N, Str) ->
 put_title(S, 1, Title) ->
 header(chk_h1(1, S#state{h = 1, mlist = [top]}), Title);
 put_title(#state{mlist = MList0,
-		 toc = TOC,
-		 smarker_ix = SMarkerIX} = S0, H, Title) ->
+		 toc = TOC} = S0, H, Title) ->
 TitleStr = text(Title),
 MList1 = [mk_lvl_marker(Title) | MList0],
 Marker = mk_marker(MList1),
@@ -626,12 +624,10 @@ put_title(#state{mlist = MList0,
 				"<seealso marker=\"#",Marker,"\">",
 				TitleStr,"</seealso>",nl()],
 			 h = H,
-			 mlist = MList1,
-			 smarker_ix = false}),
- true = is_integer(SMarkerIX),
- S2 = write_delayed(S1, SMarkerIX, ["<marker id=\"", Marker, "\"/>",nl()]),
+			 mlist = MList1}),
+ S2 = put_chars(S1, ["<marker id=\"", Marker, "\"/>",nl()]),
 {STag, ETag} = case H > ?MAX_HEADING of
-		 true -> {"", ""};
+		 true -> {"", ""};
 		 false -> {"<title>", "</title>"}
 		 end,
 put_chars(S2, [STag, TitleStr, ETag, nl()]).
@@ -701,15 +697,10 @@ sections_change(H, OldH, #state{mlist = [_|ML], toc = TOC} = S0) ->
 
 begin_section(1, S) ->
 put_line(S, "<chapter>");
-begin_section(H, #state{delayed_array_ix = IX} = S0) when H > ?MAX_HEADING ->
- false = S0#state.smarker_ix,
- true = is_integer(IX),
- put_delayed(S0#state{smarker_ix = IX, delayed_array_ix = IX+1}, IX);
-begin_section(H, #state{delayed_array_ix = IX} = S0) when H > 1 ->
- false = S0#state.smarker_ix,
- true = is_integer(IX),
- S1 = put_delayed(S0#state{smarker_ix = IX, delayed_array_ix = IX+1}, IX),
- put_line(S1, "<section>");
+begin_section(H, S) when H > ?MAX_HEADING ->
+ S;
+begin_section(H, S0) when H > 1 ->
+ put_line(S0, "<section>");
 begin_section(_H, S) ->
 S.
 
@@ -779,7 +770,7 @@ create_toc(#state{toc = TOC} = S) ->
 	{value,{"true",[]}} ->
 	 write_delayed(S,
 			 ?DELAYED_TOC_IX,
-			 ["Table of Contents", nl(), TOC]);
+			 ["Table of Contents", nl(), TOC]);
 	_ ->
 	 write_delayed(S, ?DELAYED_TOC_IX, "")
 end.
@@ -986,10 +977,10 @@ chg_bq_lvl(Lvl, #state{bq_lvl = Lvl} = S) ->
 S;
 chg_bq_lvl(NewLvl, #state{bq_lvl = Lvl} = S) when NewLvl > Lvl ->
 chg_bq_lvl(NewLvl,
-	 put_line(end_p(end_code(S#state{bq_lvl = Lvl+1})), "<blockquote>"));
+	 put_line(end_p(end_code(S#state{bq_lvl = Lvl+1})), "<quote>"));
 chg_bq_lvl(NewLvl, #state{bq_lvl = Lvl} = S) ->
 chg_bq_lvl(NewLvl,
-	 put_line(end_p(end_code(S#state{bq_lvl = Lvl-1})), "</blockquote>")).
+	 put_line(end_p(end_code(S#state{bq_lvl = Lvl-1})), "</quote>")).
 
 %%
 %% Resolve link
-- 
2.16.4

Places

File 0365-Adjust-generated-XML-so-it-respects-current-DTD.patch of Package erlang (Revision 897890b1221b732df696f0f61a5f8d5c)

Places