From cb431af03a56ac195862289da474947c2107cdde Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Mon, 5 Oct 2015 12:35:27 +0200
Subject: [erl_docgen] Update DTD for anno tag

---
 lib/erl_docgen/priv/dtd/common.dtd | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib/erl_docgen/priv/dtd/common.dtd')

diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd
index ded16d308f..5297b510ab 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -25,7 +25,7 @@
 <!ENTITY % block              "p|pre|code|list|taglist|codeinclude|
                                erleval" >
 <!ENTITY % inline             "#PCDATA|c|em|term|cite|br|path|seealso|
-                               url|marker" >
+                               url|marker|anno" >
 <!-- XXX --> 
 <!ELEMENT p                   (%inline;)* >
 <!ELEMENT pre                 (#PCDATA|seealso|url|input)* >
@@ -37,8 +37,9 @@
 <!ELEMENT note                (%block;|quote|br|marker)* >
 <!ELEMENT dont                (%block;|quote|br|marker)* >
 <!ELEMENT do                  (%block;|quote|br|marker)* >
-<!ELEMENT c                   (#PCDATA) >
+<!ELEMENT c                   (#PCDATA|anno)* >
 <!ELEMENT em                  (#PCDATA|c)* >
+<!ELEMENT anno                (#PCDATA) >
 
 <!-- XXX -->
 <!ELEMENT term                (termdef?) >
@@ -64,7 +65,7 @@
 
 <!ELEMENT list                (item+) >
 <!ATTLIST list                 type (ordered|bulleted) "bulleted" >
-<!ELEMENT taglist             (tag,item)+ >
+<!ELEMENT taglist             (tag,item+)+ >
 <!ELEMENT tag                 (#PCDATA|c|em|seealso|url|marker)* >
 <!ELEMENT item                (%inline;|%block;)* >
 
-- 
cgit v1.2.3


From 166706fbe4b9c32cd3360addfa4428bc06f78380 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Fri, 9 Oct 2015 09:19:06 +0200
Subject: [erl_docgen] Correct faults in the dtd

---
 lib/erl_docgen/priv/dtd/common.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/erl_docgen/priv/dtd/common.dtd')

diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd
index 5297b510ab..cfaf3ead3b 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -66,7 +66,7 @@
 <!ELEMENT list                (item+) >
 <!ATTLIST list                 type (ordered|bulleted) "bulleted" >
 <!ELEMENT taglist             (tag,item+)+ >
-<!ELEMENT tag                 (#PCDATA|c|em|seealso|url|marker)* >
+<!ELEMENT tag                 (#PCDATA|c|em|seealso|url|marker|anno)* >
 <!ELEMENT item                (%inline;|%block;)* >
 
 <!-- References -->
-- 
cgit v1.2.3


From 39f4c81043c00e2e1284855b07f5181b6ac28841 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Fri, 16 Oct 2015 12:57:24 +0200
Subject: [erl_docgen] Correct DTD for tags anno, fsummary and add an tag i
 (italic).

---
 lib/erl_docgen/priv/dtd/common.dtd | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'lib/erl_docgen/priv/dtd/common.dtd')

diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd
index cfaf3ead3b..0e7467da36 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -24,13 +24,13 @@
 
 <!ENTITY % block              "p|pre|code|list|taglist|codeinclude|
                                erleval" >
-<!ENTITY % inline             "#PCDATA|c|em|term|cite|br|path|seealso|
+<!ENTITY % inline             "#PCDATA|c|i|em|term|cite|br|path|seealso|
                                url|marker|anno" >
 <!-- XXX --> 
 <!ELEMENT p                   (%inline;)* >
-<!ELEMENT pre                 (#PCDATA|seealso|url|input)* >
-<!ELEMENT input               (#PCDATA|seealso|url)* >
-<!ELEMENT code                (#PCDATA) >
+<!ELEMENT pre                 (#PCDATA|seealso|url|input|anno)* >
+<!ELEMENT input               (#PCDATA|seealso|url|anno)* >
+<!ELEMENT code                (#PCDATA|anno)* >
 <!ATTLIST code                type (erl|c|none) "none" >
 <!ELEMENT quote               (p)* >
 <!ELEMENT warning             (%block;|quote|br|marker)* >
@@ -38,7 +38,8 @@
 <!ELEMENT dont                (%block;|quote|br|marker)* >
 <!ELEMENT do                  (%block;|quote|br|marker)* >
 <!ELEMENT c                   (#PCDATA|anno)* >
-<!ELEMENT em                  (#PCDATA|c)* >
+<!ELEMENT i                   (#PCDATA|c|anno)* >
+<!ELEMENT em                  (#PCDATA|c|anno)* >
 <!ELEMENT anno                (#PCDATA) >
 
 <!-- XXX -->
@@ -66,12 +67,12 @@
 <!ELEMENT list                (item+) >
 <!ATTLIST list                 type (ordered|bulleted) "bulleted" >
 <!ELEMENT taglist             (tag,item+)+ >
-<!ELEMENT tag                 (#PCDATA|c|em|seealso|url|marker|anno)* >
+<!ELEMENT tag                 (#PCDATA|c|i|em|seealso|url|marker|anno)* >
 <!ELEMENT item                (%inline;|%block;)* >
 
 <!-- References -->
 
-<!ELEMENT seealso             (#PCDATA|c|em)* >
+<!ELEMENT seealso             (#PCDATA|c|i|em|anno)* >
 <!ATTLIST seealso             marker CDATA #REQUIRED >
 <!ELEMENT url                 (#PCDATA) >
 <!ATTLIST url                 href CDATA #REQUIRED >
-- 
cgit v1.2.3


From 03dfbda168896807c75bd396262a3de060a91b13 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Thu, 19 Nov 2015 09:53:33 +0100
Subject: [erl_docgen] Allow br in the tag of tagged lists

---
 lib/erl_docgen/priv/dtd/common.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/erl_docgen/priv/dtd/common.dtd')

diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd
index 0e7467da36..a29fc233fa 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -67,7 +67,7 @@
 <!ELEMENT list                (item+) >
 <!ATTLIST list                 type (ordered|bulleted) "bulleted" >
 <!ELEMENT taglist             (tag,item+)+ >
-<!ELEMENT tag                 (#PCDATA|c|i|em|seealso|url|marker|anno)* >
+<!ELEMENT tag                 (#PCDATA|c|i|em|br|seealso|url|marker|anno)* >
 <!ELEMENT item                (%inline;|%block;)* >
 
 <!-- References -->
-- 
cgit v1.2.3