From a3afcff92485b6a696e40359a7d0300d4661e9c1 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Fri, 13 May 2016 08:04:51 +0200
Subject: Make it possible to run xmllint target in system documentation

---
 lib/erl_docgen/priv/dtd/common.dtd  |  5 +++--
 lib/erl_docgen/priv/xsl/db_html.xsl | 12 ++++++------
 lib/erl_docgen/priv/xsl/db_man.xsl  | 12 ++++++------
 lib/erl_docgen/priv/xsl/db_pdf.xsl  | 12 ++++++------
 4 files changed, 21 insertions(+), 20 deletions(-)

(limited to 'lib')

diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd
index 961bcd3fc2..945924fe79 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -12,7 +12,7 @@
  limitations under the License.
  
  The Initial Developer of the Original Code is Ericsson AB.
- Portions created by Ericsson are Copyright 1999-2007, Ericsson AB.
+ Portions created by Ericsson are Copyright 1999-2016, Ericsson AB.
  All Rights Reserved.''
  
      $Id$
@@ -24,7 +24,7 @@
 
 <!ENTITY % block              "p|pre|code|list|taglist|codeinclude|
                                erleval" >
-<!ENTITY % inline             "#PCDATA|c|i|em|term|cite|br|path|seealso|
+<!ENTITY % inline             "#PCDATA|c|i|em|strong|term|cite|br|path|seealso|
                                url|marker|anno" >
 <!-- XXX --> 
 <!ELEMENT p                   (%inline;)* >
@@ -40,6 +40,7 @@
 <!ELEMENT c                   (#PCDATA|anno)* >
 <!ELEMENT i                   (#PCDATA|c|anno)* >
 <!ELEMENT em                  (#PCDATA|c|anno)* >
+<!ELEMENT strong              (#PCDATA|c|anno)* >
 <!ELEMENT anno                (#PCDATA) >
 
 <!-- XXX -->
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index c2d7d40446..fa5c15cfa8 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -989,10 +989,6 @@
   </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>
@@ -1009,6 +1005,10 @@
     <strong><xsl:apply-templates/></strong>
   </xsl:template>
 
+  <xsl:template match="strong">
+    <strong><xsl:apply-templates/></strong>
+  </xsl:template>
+
   <!-- Code -->
   <xsl:template match="code">
     <xsl:param name="chapnum"/>
@@ -1095,11 +1095,11 @@
     <xsl:param name="chapnum"/>
     <xsl:param name="fignum"/>
 
-      <em>Figure
+      <p><em>Figure
         <xsl:value-of select="$chapnum"/>.<xsl:value-of select="$fignum"/>:
         &#160;
         <xsl:apply-templates/>
-      </em>
+      </em></p>
 
   </xsl:template>
 
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index f75615c105..03b6b0691d 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -589,12 +589,6 @@
   </xsl:template>
 
   <!-- Inline elements -->
-  <xsl:template match="b">
-    <xsl:text>\fB</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>\fR\&amp; </xsl:text>
-  </xsl:template>
-
   <xsl:template match="i">
     <xsl:text>\fI</xsl:text>
     <xsl:apply-templates/>
@@ -622,6 +616,12 @@
     <xsl:text>\fI</xsl:text> <xsl:apply-templates/><xsl:text>\fR\&amp;</xsl:text>
   </xsl:template>
 
+  <xsl:template match="strong">
+    <xsl:text>\fB</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>\fR\&amp; </xsl:text>
+  </xsl:template>
+
   <xsl:template match="seealso">
     <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 e5e624ac4c..2f7b363b67 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -1180,12 +1180,6 @@
 
 
   <!-- Inline elements -->
-  <xsl:template match="b">
-    <fo:inline font-weight="bold">
-      <xsl:apply-templates/>
-    </fo:inline>
-  </xsl:template>
-
   <xsl:template match="i">
     <fo:inline font-weight="italic">
       <xsl:apply-templates/>
@@ -1208,6 +1202,12 @@
     </fo:inline>
   </xsl:template>
 
+  <xsl:template match="strong">
+    <fo:inline font-weight="bold">
+      <xsl:apply-templates/>
+    </fo:inline>
+  </xsl:template>
+
   <!-- Code -->
   <xsl:template match="code">
     <xsl:param name="partnum"/>
-- 
cgit v1.2.3


From 50f0293a843872b7982ad7631ac07fa652f4d16c Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Fri, 13 May 2016 14:29:14 +0200
Subject: [erl_docgen] Add new formatting for header level 4 and below

---
 lib/erl_docgen/priv/xsl/db_html.xsl | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index fa5c15cfa8..c7fdabfcf1 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -829,7 +829,7 @@
     </xsl:apply-templates>
   </xsl:template>
 
-  <!-- Subsections lvl 3 and ... -->
+  <!-- Subsections lvl 3 -->
   <xsl:template match="section/section">
     <xsl:param name="chapnum"/>
     <xsl:param name="sectnum"/>
@@ -842,6 +842,19 @@
     </xsl:apply-templates>
   </xsl:template>
 
+  <!-- Subsections lvl 4 and ... -->
+  <xsl:template match="section/section/section">
+    <xsl:param name="chapnum"/>
+    <xsl:param name="sectnum"/>
+    <h5>
+      <!-- xsl:value-of select="$partnum"/>.<xsl:value-of select="$chapnum"/>.<xsl:value-of select="$sectnum"/>.<xsl:number/ -->
+      <xsl:value-of select="title"/>
+    </h5>
+    <xsl:apply-templates>
+      <xsl:with-param name="chapnum" select="$chapnum"/>
+    </xsl:apply-templates>
+  </xsl:template>
+
   <!-- *ref/Section -->
   <xsl:template match="erlref/section|cref/section|comref/section|fileref/section|appref/section">
     <xsl:param name="chapnum"/>
@@ -873,7 +886,6 @@
 
 
   <!-- Lists -->
-
   <xsl:template match="list">
     <xsl:param name="chapnum"/>
     <ul>
-- 
cgit v1.2.3


From edec337e3c4361d87efdd48bcfe10ac382a7837c Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Tue, 17 May 2016 08:41:19 +0200
Subject: [erl_docgen] Correct the handling of marker tags

Corrected how the generated html anchor is placed so
the section title is visible after jump to the anchor.
---
 lib/erl_docgen/priv/xsl/db_html.xsl | 60 ++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 24 deletions(-)

(limited to 'lib')

diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index c7fdabfcf1..57913e7168 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -785,39 +785,36 @@
 
   <!-- Book -->
   <xsl:template match="/book">
-
-    <xsl:apply-templates name="parts"/>
-    <xsl:apply-templates name="applications"/>
-
+    <xsl:apply-templates select="parts"/>
+    <xsl:apply-templates select="applications"/>
+    <xsl:apply-templates select="releasenotes"/>
   </xsl:template>
 
   <!-- Parts -->
   <xsl:template match="parts">
-    <xsl:apply-templates name="part"/>
+    <xsl:apply-templates select="part"/>
   </xsl:template>
 
   <!-- Applications -->
   <xsl:template match="applications">
-    <xsl:apply-templates name="application"/>
+    <xsl:apply-templates select="application"/>
   </xsl:template>
 
-
  <!-- Header -->
-  <xsl:template match="header">
-  </xsl:template>
-
-  <!-- Section/Title -->
-  <xsl:template match="section/title">
- </xsl:template>
-
- <xsl:template match="pagetext">
- </xsl:template>
+ <xsl:template match="header"/>
+  
+ <!-- Section/Title -->
+ <xsl:template match="section/title"/>
 
+ <xsl:template match="pagetext"/>
 
-  <!-- Chapter/Section -->
+  <!-- Chapter/Section, subsection level 1-->
   <xsl:template match="chapter/section">
     <xsl:param name="chapnum"/>
     <h3>
+      <xsl:for-each select="marker">
+	<xsl:call-template name="marker-before-title"/>
+      </xsl:for-each>
       <a name="{generate-id(title)}">
         <xsl:value-of select="$chapnum"/>.<xsl:number/>&#160;
         <xsl:value-of select="title"/>
@@ -829,11 +826,14 @@
     </xsl:apply-templates>
   </xsl:template>
 
-  <!-- Subsections lvl 3 -->
+  <!-- Subsections lvl 2 -->
   <xsl:template match="section/section">
     <xsl:param name="chapnum"/>
     <xsl:param name="sectnum"/>
     <h4>
+      <xsl:for-each select="marker">
+	<xsl:call-template name="marker-before-title"/>
+      </xsl:for-each>
       <!-- xsl:value-of select="$partnum"/>.<xsl:value-of select="$chapnum"/>.<xsl:value-of select="$sectnum"/>.<xsl:number/ -->
       <xsl:value-of select="title"/>
     </h4>
@@ -842,11 +842,14 @@
     </xsl:apply-templates>
   </xsl:template>
 
-  <!-- Subsections lvl 4 and ... -->
+  <!-- Subsections lvl 3 and ... -->
   <xsl:template match="section/section/section">
     <xsl:param name="chapnum"/>
     <xsl:param name="sectnum"/>
     <h5>
+      <xsl:for-each select="marker">
+	<xsl:call-template name="marker-before-title"/>
+      </xsl:for-each>
       <!-- xsl:value-of select="$partnum"/>.<xsl:value-of select="$chapnum"/>.<xsl:value-of select="$sectnum"/>.<xsl:number/ -->
       <xsl:value-of select="title"/>
     </h5>
@@ -1298,9 +1301,7 @@
       <xsl:with-param name="type">ref_man</xsl:with-param>
     </xsl:call-template-->
 
-
     <xsl:document href="{$outdir}/index.html" method="html" encoding="UTF-8" indent="yes" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN">
-
       <xsl:call-template name="pagelayout"/>
     </xsl:document>
   </xsl:template>
@@ -2097,16 +2098,27 @@
 
   </xsl:template>
 
-
   <xsl:template match="url">
     <span class="bold_code"><a href="{@href}"><xsl:apply-templates/></a></span>
   </xsl:template>
 
-
   <xsl:template match="marker">
-    <a name="{@id}"><xsl:apply-templates/></a>
+    <xsl:choose>
+      <xsl:when test="not(parent::section and following-sibling::title)">
+        <a name="{@id}"><xsl:apply-templates/></a>
+      </xsl:when>
+    </xsl:choose>
   </xsl:template>
 
+  <xsl:template name="marker-before-title">
+    <xsl:choose>
+      <xsl:when test="self::marker and parent::section and following-sibling::title">
+	 <a name="{@id}"><xsl:apply-templates/></a>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+
   <xsl:template match="term">
     <xsl:value-of select="@id"/>
     <!-- xsl:choose>
-- 
cgit v1.2.3


From 801e99b298fd292037256db945b5daaa99cdf655 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Wed, 25 May 2016 13:13:15 +0200
Subject: [erl_docgen] Fix support for quote tag

---
 lib/erl_docgen/priv/css/otp_doc.css |  5 +++++
 lib/erl_docgen/priv/dtd/common.dtd  |  2 +-
 lib/erl_docgen/priv/xsl/db_html.xsl | 12 ++++++++++++
 lib/erl_docgen/priv/xsl/db_pdf.xsl  | 14 ++++++++++++--
 4 files changed, 30 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css
index 347782eb1e..219740a557 100644
--- a/lib/erl_docgen/priv/css/otp_doc.css
+++ b/lib/erl_docgen/priv/css/otp_doc.css
@@ -122,6 +122,11 @@ span.code        { font-family: Courier, monospace; font-weight: normal }
   font-size: 90%;
   padding: 5px 10px;
 }
+
+.quote {
+    font-style: italic
+}
+
 .example {
   background-color:#eeeeff;
   padding: 0px 10px;
diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd
index 945924fe79..b1578ad9d4 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -69,7 +69,7 @@
 <!ATTLIST list                 type (ordered|bulleted) "bulleted" >
 <!ELEMENT taglist             (tag,item+)+ >
 <!ELEMENT tag                 (#PCDATA|c|i|em|br|seealso|url|marker|anno)* >
-<!ELEMENT item                (%inline;|%block;|warning|note|dont|do)* >
+<!ELEMENT item                (%inline;|%block;|warning|note|dont|do|quote)* >
 
 <!-- References -->
 
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index 57913e7168..2f8fb05da6 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -996,6 +996,18 @@
     </div>
   </xsl:template>
 
+  <!-- Quote -->
+  <xsl:template match="quote">
+    <xsl:param name="chapnum"/>
+    <div class="quote">
+      <p>
+        <xsl:apply-templates>
+          <xsl:with-param name="chapnum" select="$chapnum"/>
+        </xsl:apply-templates>
+      </p>
+    </div>
+  </xsl:template>
+
  <!-- Paragraph -->
   <xsl:template match="p">
     <p>
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index 2f7b363b67..99263847fb 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -1171,6 +1171,16 @@
     </fo:block>
   </xsl:template>
 
+  <!-- Quote -->
+  <xsl:template match="quote">
+    <xsl:param name="chapnum"/>
+    <fo:block font-style="italic">
+      <xsl:apply-templates>
+        <xsl:with-param name="chapnum" select="$chapnum"/>
+      </xsl:apply-templates>
+    </fo:block>
+  </xsl:template>
+
  <!-- Paragraph -->
   <xsl:template match="p">
     <fo:block xsl:use-attribute-sets="p">
@@ -1181,7 +1191,7 @@
 
   <!-- Inline elements -->
   <xsl:template match="i">
-    <fo:inline font-weight="italic">
+    <fo:inline font-style="italic">
       <xsl:apply-templates/>
     </fo:inline>
   </xsl:template>
@@ -1197,7 +1207,7 @@
   </xsl:template>
 
   <xsl:template match="em">
-    <fo:inline font-style="italic">
+    <fo:inline font-weight="bold">
       <xsl:apply-templates/>
     </fo:inline>
   </xsl:template>
-- 
cgit v1.2.3


From bd52bd5e8082f358b84694ef45a8f44358d1a35c Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Mon, 30 May 2016 10:27:50 +0200
Subject: [erl_docgen] Fix anchor bug for sections in ref manuals

---
 lib/erl_docgen/priv/xsl/db_html.xsl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib')

diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index 2f8fb05da6..89f743a90b 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -862,6 +862,9 @@
   <xsl:template match="erlref/section|cref/section|comref/section|fileref/section|appref/section">
     <xsl:param name="chapnum"/>
     <h3>
+      <xsl:for-each select="marker">
+	<xsl:call-template name="marker-before-title"/>
+      </xsl:for-each>
       <a name="{generate-id(title)}">
         <xsl:value-of select="title"/>
       </a>
-- 
cgit v1.2.3