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 ++++---
 lib/erl_docgen/priv/dtd/common.header.dtd | 4 ++--
 lib/erl_docgen/priv/dtd/common.refs.dtd   | 6 +++---
 lib/erl_docgen/vsn.mk                     | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'lib')

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;)* >
 
diff --git a/lib/erl_docgen/priv/dtd/common.header.dtd b/lib/erl_docgen/priv/dtd/common.header.dtd
index 71a8662572..eb27dc8f97 100644
--- a/lib/erl_docgen/priv/dtd/common.header.dtd
+++ b/lib/erl_docgen/priv/dtd/common.header.dtd
@@ -18,8 +18,8 @@
      $Id$
 -->
 <!ELEMENT header              (copyright?,legalnotice?,title,shorttitle?,
-                               prepared,responsible?,docno,approved?,
-                               checked?,date,rev,file?) >
+                               prepared?,responsible?,docno?,approved?,
+                               checked?,date?,rev?,file?) >
 
 <!--
 The titlestyle attribute is only defined to make all the book.xml files
diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd
index f57e46a624..a59462bb3f 100644
--- a/lib/erl_docgen/priv/dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/dtd/common.refs.dtd
@@ -33,9 +33,9 @@
 <!ELEMENT type                (v,d?)* >
 <!ATTLIST type                 variable CDATA #IMPLIED
                                name_i CDATA #IMPLIED>
-<!ELEMENT v                   (#PCDATA) >
+<!ELEMENT v                   (#PCDATA|seealso)* >
 <!ELEMENT d                   (#PCDATA|c|em)* >
-<!ELEMENT desc                (%block;|quote|br|marker|warning|note|dont|do|anno)* >
+<!ELEMENT desc                (%block;|quote|br|marker|warning|note|dont|do)* >
 <!ELEMENT authors             (aname,email)+ >
 <!ELEMENT aname               (#PCDATA) >
 <!ELEMENT email               (#PCDATA) >
@@ -43,5 +43,5 @@
                                warning|note|dont|do)*) >
 <!ELEMENT datatypes           (datatype)+ >
 <!ELEMENT datatype            (name+,desc?) >
-<!ELEMENT type_desc           (#PCDATA) >
+<!ELEMENT type_desc           (#PCDATA|anno)* >
 <!ATTLIST type_desc            variable CDATA #REQUIRED>
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 2abd3d2b7e..43f5a570d7 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 0.4
+ERL_DOCGEN_VSN = 0.4.1
-- 
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 +-
 lib/erl_docgen/priv/dtd/common.refs.dtd | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

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 -->
diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd
index a59462bb3f..a32c34536d 100644
--- a/lib/erl_docgen/priv/dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/dtd/common.refs.dtd
@@ -27,11 +27,12 @@
 
 <!ELEMENT description         (%block;|quote|br|marker|warning|note|dont|do)* >
 <!ELEMENT funcs               (func)+ >
-<!ELEMENT func                (name+,type_desc*,fsummary,type?,desc?) >
+<!ELEMENT func                (name+,type_desc*,fsummary,type*,desc?) >
 <!-- ELEMENT name is defined in each ref dtd -->
 <!ELEMENT fsummary            (#PCDATA|c|em)* >
 <!ELEMENT type                (v,d?)* >
 <!ATTLIST type                 variable CDATA #IMPLIED
+                               name CDATA #IMPLIED
                                name_i CDATA #IMPLIED>
 <!ELEMENT v                   (#PCDATA|seealso)* >
 <!ELEMENT d                   (#PCDATA|c|em)* >
-- 
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/cites.dtd         |  2 +-
 lib/erl_docgen/priv/dtd/common.dtd        | 15 ++++++++-------
 lib/erl_docgen/priv/dtd/common.refs.dtd   | 11 ++++++-----
 lib/erl_docgen/priv/dtd/erlref.dtd        |  3 ++-
 lib/erl_docgen/priv/dtd/terms.dtd         |  2 +-
 lib/erl_docgen/src/docgen_edoc_xml_cb.erl | 24 ++++++++++--------------
 6 files changed, 28 insertions(+), 29 deletions(-)

(limited to 'lib')

diff --git a/lib/erl_docgen/priv/dtd/cites.dtd b/lib/erl_docgen/priv/dtd/cites.dtd
index 73931af009..4558947db0 100644
--- a/lib/erl_docgen/priv/dtd/cites.dtd
+++ b/lib/erl_docgen/priv/dtd/cites.dtd
@@ -30,7 +30,7 @@
 <!ELEMENT cite                (id, shortdef, def, resp?) >
 <!ELEMENT id                  (#PCDATA) >
 <!ELEMENT shortdef            (#PCDATA) >
-<!ELEMENT def                 (#PCDATA|c|em)* >
+<!ELEMENT def                 (#PCDATA|c|i|em)* >
 <!ELEMENT resp                (#PCDATA) >
 <!ELEMENT c                   (#PCDATA) >
 <!ELEMENT em                  (#PCDATA|c)* >
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 >
diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd
index a32c34536d..6889e990de 100644
--- a/lib/erl_docgen/priv/dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/dtd/common.refs.dtd
@@ -27,15 +27,15 @@
 
 <!ELEMENT description         (%block;|quote|br|marker|warning|note|dont|do)* >
 <!ELEMENT funcs               (func)+ >
-<!ELEMENT func                (name+,type_desc*,fsummary,type*,desc?) >
+<!ELEMENT func                (name+,fsummary,(type|type_desc)*,desc?) >
 <!-- ELEMENT name is defined in each ref dtd -->
-<!ELEMENT fsummary            (#PCDATA|c|em)* >
+<!ELEMENT fsummary            (#PCDATA|c|i|em|anno)* >
 <!ELEMENT type                (v,d?)* >
 <!ATTLIST type                 variable CDATA #IMPLIED
                                name CDATA #IMPLIED
                                name_i CDATA #IMPLIED>
 <!ELEMENT v                   (#PCDATA|seealso)* >
-<!ELEMENT d                   (#PCDATA|c|em)* >
+<!ELEMENT d                   (#PCDATA|c|i|em)* >
 <!ELEMENT desc                (%block;|quote|br|marker|warning|note|dont|do)* >
 <!ELEMENT authors             (aname,email)+ >
 <!ELEMENT aname               (#PCDATA) >
@@ -44,5 +44,6 @@
                                warning|note|dont|do)*) >
 <!ELEMENT datatypes           (datatype)+ >
 <!ELEMENT datatype            (name+,desc?) >
-<!ELEMENT type_desc           (#PCDATA|anno)* >
-<!ATTLIST type_desc            variable CDATA #REQUIRED>
+<!ELEMENT type_desc           (#PCDATA|anno|c|seealso)* >
+<!ATTLIST type_desc            variable CDATA #IMPLIED
+                               name CDATA #IMPLIED>
diff --git a/lib/erl_docgen/priv/dtd/erlref.dtd b/lib/erl_docgen/priv/dtd/erlref.dtd
index d62e2a5fcb..835407520a 100644
--- a/lib/erl_docgen/priv/dtd/erlref.dtd
+++ b/lib/erl_docgen/priv/dtd/erlref.dtd
@@ -32,4 +32,5 @@
 <!ELEMENT name                (#PCDATA) >
 <!ATTLIST name                 name CDATA #IMPLIED
                                arity CDATA #IMPLIED
-	                       clause_i CDATA #IMPLIED>
+	                       clause_i CDATA #IMPLIED
+                               n_vars CDATA #IMPLIED>
diff --git a/lib/erl_docgen/priv/dtd/terms.dtd b/lib/erl_docgen/priv/dtd/terms.dtd
index fd160b5c02..c2965eb61c 100644
--- a/lib/erl_docgen/priv/dtd/terms.dtd
+++ b/lib/erl_docgen/priv/dtd/terms.dtd
@@ -30,7 +30,7 @@
 <!ELEMENT term                (id, shortdef, def, resp?) >
 <!ELEMENT id                  (#PCDATA) >
 <!ELEMENT shortdef            (#PCDATA) >
-<!ELEMENT def                 (#PCDATA|c|em)* >
+<!ELEMENT def                 (#PCDATA|c|i|em)* >
 <!ELEMENT resp                (#PCDATA) >
 <!ELEMENT c                   (#PCDATA) >
 <!ELEMENT em                  (#PCDATA|c)* >
diff --git a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
index 03fc161c5a..0ac7985a48 100644
--- a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2015. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -352,8 +352,8 @@ otp_xmlify_e(#xmlElement{name=code} = E) ->    % 4)
     end;
 otp_xmlify_e(#xmlElement{name=Tag} = E)        % 5a
   when Tag==h1; Tag==h2; Tag==h3; Tag==h4; Tag==h5 ->
-    Content = text_and_a_name_only(E#xmlElement.content),
-    [E#xmlElement{name=b, content=Content}];
+     {Name, Text} = text_and_a_name_only(E#xmlElement.content),
+     [Name, E#xmlElement{name=b, content=Text}];
 otp_xmlify_e(#xmlElement{name=Tag} = E)        % 5b-c)
   when Tag==center;
        Tag==font ->
@@ -1190,17 +1190,13 @@ get_text(#xmlElement{content=[#xmlText{value=Text}]}) ->
 get_text(#xmlElement{content=[E]}) ->
     get_text(E).
 
-%% text_and_name_only(Es) -> Ts
-text_and_a_name_only([#xmlElement{
-		       name = a, 
-		       attributes = [#xmlAttribute{name=name}]} = Name|Es]) ->
-    [Name|text_and_a_name_only(Es)];
-text_and_a_name_only([#xmlElement{content = Content}|Es]) ->
-    text_and_a_name_only(Content) ++ text_and_a_name_only(Es);
-text_and_a_name_only([#xmlText{} = E |Es]) ->
-    [E | text_and_a_name_only(Es)];
-text_and_a_name_only([]) ->
-    [].
+%% text_and_name_only(Es) -> {N, Ts}
+text_and_a_name_only(Es) ->
+    [Name|_] = [Name ||
+                   #xmlElement{
+                      name = a,
+                      attributes = [#xmlAttribute{name=name}]}=Name <- Es],
+    {Name#xmlElement{content = []}, text_only(Es)}.
 
 %% text_only(Es) -> Ts
 %% Takes a list of xmlElement and xmlText and return a lists of xmlText.
-- 
cgit v1.2.3


From dd521867851c169fbab15465e9d137eb515a5ed5 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Fri, 16 Oct 2015 13:04:33 +0200
Subject: [erl_docgen] Add conversion of the i tag in the XSL specs

---
 lib/erl_docgen/priv/xsl/db_html.xsl | 5 ++++-
 lib/erl_docgen/priv/xsl/db_man.xsl  | 6 ++++++
 lib/erl_docgen/priv/xsl/db_pdf.xsl  | 6 ++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index f5ddd364d3..c2325fbee9 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -990,12 +990,15 @@
     </p>
   </xsl:template>
 
-
   <!-- Inline elements -->
   <xsl:template match="b">
     <strong><xsl:apply-templates/></strong>
   </xsl:template>
 
+  <xsl:template match="i">
+    <i><xsl:apply-templates/></i>
+  </xsl:template>
+
   <xsl:template match="br">
     <br/>
   </xsl:template>
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index 120bf9880d..5201465e42 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -595,6 +595,12 @@
     <xsl:text>\fR\&amp; </xsl:text>
   </xsl:template>
 
+  <xsl:template match="i">
+    <xsl:text>\fI</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>\fR\&amp; </xsl:text>
+  </xsl:template>
+
   <xsl:template match="br">
     <xsl:choose>
       <xsl:when test="ancestor::head">
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index 53e202d52c..37a2d55274 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -1186,6 +1186,12 @@
     </fo:inline>
   </xsl:template>
 
+  <xsl:template match="i">
+    <fo:inline font-weight="italic">
+      <xsl:apply-templates/>
+    </fo:inline>
+  </xsl:template>
+
   <xsl:template match="br">
     <fo:block/>
   </xsl:template>
-- 
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')

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