Merge branch 'master' into sverk/hipe-line-table-bug/master/OTP-13282

10 files changed, 47 insertions, 27 deletions

diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css
index 0b531db701..347782eb1e 100644
--- a/lib/erl_docgen/priv/css/otp_doc.css
+++ b/lib/erl_docgen/priv/css/otp_doc.css
@@ -37,7 +37,7 @@ a:visited      { color: blue; text-decoration: none }
   top: 0;
   bottom: 0;
   left: 0;
-  width: 200px;
+  width: 300px;
   overflow:auto;
   margin: 0;
   padding: 1px;
@@ -45,7 +45,7 @@ a:visited      { color: blue; text-decoration: none }
 }
 
 #content {
-  margin-left: 240px; /* set left value to WidthOfFrameDiv */
+  margin-left: 340px; /* set left value to WidthOfFrameDiv */
 }
 
 .frontpage 
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 ded16d308f..961bcd3fc2 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -24,21 +24,23 @@
 
 <!ENTITY % block              "p|pre|code|list|taglist|codeinclude|
                                erleval" >
-<!ENTITY % inline             "#PCDATA|c|em|term|cite|br|path|seealso|
-                               url|marker" >
+<!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)* >
 <!ELEMENT note                (%block;|quote|br|marker)* >
 <!ELEMENT dont                (%block;|quote|br|marker)* >
 <!ELEMENT do                  (%block;|quote|br|marker)* >
-<!ELEMENT c                   (#PCDATA) >
-<!ELEMENT em                  (#PCDATA|c)* >
+<!ELEMENT c                   (#PCDATA|anno)* >
+<!ELEMENT i                   (#PCDATA|c|anno)* >
+<!ELEMENT em                  (#PCDATA|c|anno)* >
+<!ELEMENT anno                (#PCDATA) >
 
 <!-- XXX -->
 <!ELEMENT term                (termdef?) >
@@ -64,13 +66,13 @@
 
 <!ELEMENT list                (item+) >
 <!ATTLIST list                 type (ordered|bulleted) "bulleted" >
-<!ELEMENT taglist             (tag,item)+ >
-<!ELEMENT tag                 (#PCDATA|c|em|seealso|url|marker)* >
-<!ELEMENT item                (%inline;|%block;)* >
+<!ELEMENT taglist             (tag,item+)+ >
+<!ELEMENT tag                 (#PCDATA|c|i|em|br|seealso|url|marker|anno)* >
+<!ELEMENT item                (%inline;|%block;|warning|note|dont|do)* >
 
 <!-- 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.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..4f87007a09 100644
--- a/lib/erl_docgen/priv/dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/dtd/common.refs.dtd
@@ -27,21 +27,23 @@
 
 <!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) >
-<!ELEMENT d                   (#PCDATA|c|em)* >
-<!ELEMENT desc                (%block;|quote|br|marker|warning|note|dont|do|anno)* >
+<!ELEMENT v                   (#PCDATA|seealso)* >
+<!ELEMENT d                   (#PCDATA|seealso|c|i|em)* >
+<!ELEMENT desc                (%block;|quote|br|marker|warning|note|dont|do)* >
 <!ELEMENT authors             (aname,email)+ >
 <!ELEMENT aname               (#PCDATA) >
 <!ELEMENT email               (#PCDATA) >
 <!ELEMENT section             (marker*,title,(%block;|quote|br|marker|
-                               warning|note|dont|do)*) >
+                               warning|note|dont|do|section)*) >
 <!ELEMENT datatypes           (datatype)+ >
 <!ELEMENT datatype            (name+,desc?) >
-<!ELEMENT type_desc           (#PCDATA) >
-<!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/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>