Merge branch 'lars/erl_docgen/code-tag-fix/OTP-14674' into maint

* lars/erl_docgen/code-tag-fix/OTP-14674:
  [erl_docgen] Fix spacing for code blocks
  [erl_docgen] Change pdf to have the same style as html for code,warning,note

4 files changed, 260 insertions, 101 deletions

diff --git a/lib/erl_docgen/priv/xsl/db_funcs.xsl b/lib/erl_docgen/priv/xsl/db_funcs.xsl
new file mode 100644
index 0000000000..8178ce44fb
--- /dev/null
+++ b/lib/erl_docgen/priv/xsl/db_funcs.xsl
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     #
+     # %CopyrightBegin%
+     #
+     # Copyright Ericsson AB 2009-2017. 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.
+     # You may obtain a copy of the License at
+     #
+     #     http://www.apache.org/licenses/LICENSE-2.0
+     #
+     # Unless required by applicable law or agreed to in writing, software
+     # distributed under the License is distributed on an "AS IS" BASIS,
+     # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     # See the License for the specific language governing permissions and
+     # limitations under the License.
+     #
+     # %CopyrightEnd%
+
+     -->
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:erl="http://erlang.org"
+  xmlns:func="http://exslt.org/functions"
+  extension-element-prefixes="func"
+  xmlns:fo="http://www.w3.org/1999/XSL/Format"
+  xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
+
+  <!-- Used from code template to trim the newline/cr after the tag
+       and spaces/tabs between them
+  -->
+  <xsl:variable name="newlinechars" select="'&#10;&#13;'" />
+  <xsl:variable name="spacechars" select="'&#09; '" />
+
+  <func:function name="erl:code_trim">
+    <xsl:param name="string" />
+
+    <xsl:variable name="leftresult" select="erl:code_ltrim($string, $string)"/>
+    <xsl:variable name="result" select="erl:code_rtrim($leftresult, $leftresult)"/>
+
+    <func:result select="$result"/>
+  </func:function>
+
+  <func:function name="erl:code_rtrim">
+    <xsl:param name="string" />
+    <xsl:param name="origstring" />
+    
+    <xsl:variable name="length" select="string-length($string)" />
+
+    <xsl:variable name="result">
+      <xsl:if test="$length &gt; 0">
+	<xsl:choose>
+          <xsl:when test="contains($spacechars, substring($string, $length, 1))">
+	    <xsl:value-of select="erl:code_rtrim(substring($string, 1, $length - 1), $origstring)" />
+          </xsl:when>
+          <xsl:when test="contains($newlinechars, substring($string, $length, 1))">
+	    <xsl:value-of select="erl:code_rtrim_1(substring($string, 1, $length - 1))" />
+          </xsl:when>	
+          <xsl:otherwise>
+            <xsl:value-of select="$origstring" />
+          </xsl:otherwise>
+	</xsl:choose>
+    </xsl:if>
+    </xsl:variable>
+
+    <func:result select="$result" />
+  </func:function>
+  
+  <func:function name="erl:code_rtrim_1">
+    <xsl:param name="string" />
+    
+    <xsl:variable name="length" select="string-length($string)" />
+
+    <xsl:variable name="result">
+      <xsl:if test="$length &gt; 0">
+	<xsl:choose>
+          <xsl:when test="contains($newlinechars, substring($string, $length, 1))">
+	    <xsl:value-of select="erl:code_rtrim_1(substring($string, 1, $length - 1))" />
+          </xsl:when>	
+          <xsl:otherwise>
+	    <xsl:value-of select="erl:code_rtrim($string, $string)" />	    
+            <!--xsl:value-of select="$string" /-->
+          </xsl:otherwise>
+	</xsl:choose>
+      </xsl:if>
+    </xsl:variable>
+
+    <func:result select="$result" />
+  </func:function>
+  
+  <func:function name="erl:code_ltrim">
+    <xsl:param name="string" />
+    <xsl:param name="origstring" />
+
+    <xsl:variable name="result">
+      <xsl:if test="string-length($string) &gt; 0">
+	<xsl:choose>
+          <xsl:when test="contains($spacechars, substring($string, 1, 1))">
+	    <xsl:value-of select="erl:code_ltrim(substring($string, 2), $origstring)" />
+          </xsl:when>
+          <xsl:when test="contains($newlinechars, substring($string, 1, 1))">
+	    <xsl:value-of select="erl:code_ltrim_1(substring($string, 2))" />
+          </xsl:when>	
+          <xsl:otherwise>
+            <xsl:value-of select="$origstring" />
+          </xsl:otherwise>
+	</xsl:choose>
+      </xsl:if>
+    </xsl:variable>
+
+    <func:result select="$result" />
+  </func:function>
+  
+  <func:function name="erl:code_ltrim_1">
+    <xsl:param name="string" />
+
+    <xsl:variable name="result">
+      <xsl:if test="string-length($string) &gt; 0">
+	<xsl:choose>
+          <xsl:when test="contains($newlinechars, substring($string, 1, 1))">
+	    <xsl:value-of select="erl:code_ltrim_1(substring($string, 2))" />
+          </xsl:when>	
+          <xsl:otherwise>
+	    <xsl:value-of select="erl:code_ltrim($string, $string)" />
+            <!--xsl:value-of select="$string" /-->
+          </xsl:otherwise>
+	</xsl:choose>
+      </xsl:if>
+    </xsl:variable>
+    
+    <func:result select="$result" />
+  </func:function>
+
+</xsl:stylesheet>
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index a5e277aece..75614392fb 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -30,6 +30,7 @@
   xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
 
   <xsl:include href="db_html_params.xsl"/>
+  <xsl:include href="db_funcs.xsl"/>
 
   <func:function name="erl:flip_first_char">
     <xsl:param name="in"/>
@@ -1132,7 +1133,14 @@
     <xsl:variable name="codenum">
       <xsl:number level="any" from="chapter" count="code"/>
     </xsl:variable>
-    <div class="example"><pre><xsl:apply-templates/></pre></div>
+      <xsl:choose> 
+	<xsl:when test="not(descendant::anno)">
+ 	   <div class="example"><pre><xsl:value-of select="erl:code_trim(text())"/></pre></div>
+ 	</xsl:when>
+	<xsl:otherwise>    
+	   <div class="example"><pre><xsl:apply-templates/></pre></div>
+	</xsl:otherwise>
+      </xsl:choose>	
   </xsl:template>
 
   <!-- Pre -->
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index 99263847fb..46de66bcd8 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -23,12 +23,16 @@
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:exsl="http://exslt.org/common"
-  extension-element-prefixes="exsl"
-  xmlns:fo="http://www.w3.org/1999/XSL/Format">
+  xmlns:func="http://exslt.org/functions"
+  xmlns:erl="http://erlang.org"
+  extension-element-prefixes="exsl func"
+  xmlns:fo="http://www.w3.org/1999/XSL/Format"
+  xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
 
   <xsl:output method="xml" indent="yes"/>
 
   <xsl:include href="db_pdf_params.xsl"/>
+  <xsl:include href="db_funcs.xsl"/>
 
   <!-- Start of Dialyzer type/spec tags.
        See also the templates matching "name" and "seealso" as well as
@@ -687,7 +691,7 @@
         <fo:block xsl:use-attribute-sets="cover.inner.copyrightnotice">
           <xsl:value-of select="/book/header/legalnotice"/>
 
-        <!--   
+        <!--
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
@@ -744,12 +748,12 @@
         <fo:bookmark internal-destination="{generate-id(header/title)}"
           starting-state="hide">
           <fo:bookmark-title><xsl:value-of select="header/title"/></fo:bookmark-title>
-          
+
           <xsl:call-template name="bookmarks2">
             <xsl:with-param name="entries"
               select="chapter[header/title]"/>
           </xsl:call-template>
-          
+
         </fo:bookmark>
       </xsl:for-each>
     </xsl:if>
@@ -1122,52 +1126,60 @@
   <!-- Note -->
   <xsl:template match="note">
     <xsl:param name="partnum"/>
-    <fo:block xsl:use-attribute-sets="note">
-        <fo:block xsl:use-attribute-sets="note-warning-title">
-            <xsl:text>Note:</xsl:text>
-        </fo:block>
-      <xsl:apply-templates>
-        <xsl:with-param name="partnum" select="$partnum"/>
-      </xsl:apply-templates>
+    <fo:block xsl:use-attribute-sets="note-warning">
+      <fo:block xsl:use-attribute-sets="note-title">
+	<xsl:text>Note:</xsl:text>
+      </fo:block>
+      <fo:block xsl:use-attribute-sets="note-warning-content">
+	<xsl:apply-templates>
+          <xsl:with-param name="partnum" select="$partnum"/>
+	</xsl:apply-templates>
+      </fo:block>
     </fo:block>
   </xsl:template>
 
   <!-- Warning -->
   <xsl:template match="warning">
     <xsl:param name="partnum"/>
-    <fo:block xsl:use-attribute-sets="warning">
-        <fo:block xsl:use-attribute-sets="note-warning-title">
-            <xsl:text>Warning:</xsl:text>
-        </fo:block>
-      <xsl:apply-templates>
-        <xsl:with-param name="partnum" select="$partnum"/>
-      </xsl:apply-templates>
+    <fo:block xsl:use-attribute-sets="note-warning">
+      <fo:block xsl:use-attribute-sets="warning-title">
+	<xsl:text>Warning:</xsl:text>
+      </fo:block>
+      <fo:block xsl:use-attribute-sets="note-warning-content">
+	<xsl:apply-templates>
+          <xsl:with-param name="partnum" select="$partnum"/>
+	</xsl:apply-templates>
+      </fo:block>
     </fo:block>
   </xsl:template>
 
   <!-- Do -->
   <xsl:template match="do">
     <xsl:param name="partnum"/>
-    <fo:block xsl:use-attribute-sets="do">
-        <fo:block xsl:use-attribute-sets="note-warning-title">
-            <xsl:text>Do:</xsl:text>
-        </fo:block>
-      <xsl:apply-templates>
-        <xsl:with-param name="partnum" select="$partnum"/>
-      </xsl:apply-templates>
+    <fo:block xsl:use-attribute-sets="note-warning">
+      <fo:block xsl:use-attribute-sets="note-title">
+	<xsl:text>Do:</xsl:text>
+      </fo:block>
+      <fo:block xsl:use-attribute-sets="note-warning-content">
+	<xsl:apply-templates>
+          <xsl:with-param name="partnum" select="$partnum"/>
+	</xsl:apply-templates>
+      </fo:block>
     </fo:block>
   </xsl:template>
 
   <!-- Dont -->
   <xsl:template match="dont">
     <xsl:param name="partnum"/>
-    <fo:block xsl:use-attribute-sets="dont">
-        <fo:block xsl:use-attribute-sets="note-warning-title">
-            <xsl:text>Don't:</xsl:text>
-        </fo:block>
-      <xsl:apply-templates>
-        <xsl:with-param name="partnum" select="$partnum"/>
-      </xsl:apply-templates>
+    <fo:block xsl:use-attribute-sets="note-warning">
+      <fo:block xsl:use-attribute-sets="warning-title">
+	<xsl:text>Don't:</xsl:text>
+      </fo:block>
+      <fo:block xsl:use-attribute-sets="note-warning-content">
+	<xsl:apply-templates>
+          <xsl:with-param name="partnum" select="$partnum"/>
+	</xsl:apply-templates>
+      </fo:block>
     </fo:block>
   </xsl:template>
 
@@ -1226,7 +1238,14 @@
     </xsl:variable>
 
     <fo:block xsl:use-attribute-sets="code">
-      <xsl:apply-templates select="text()"/>
+      <xsl:choose> 
+	<xsl:when test="not(descendant::anno)">
+	  <xsl:value-of select="erl:code_trim(text())"/>
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:apply-templates/>
+	</xsl:otherwise>
+      </xsl:choose>	
     </fo:block>
 
     <xsl:if test="@caption">
diff --git a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
index d9a150d2d9..99da29c2ac 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--      
+<!--
      #
      # %CopyrightBegin%
      #
-     # Copyright Ericsson AB 2009-2016. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2017. 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.
@@ -18,7 +18,7 @@
      # limitations under the License.
      #
      # %CopyrightEnd%
-     
+
      -->
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -45,7 +45,7 @@
   <xsl:param name="page-width">210mm</xsl:param>
 
   <!-- Paper size: US Letter (279x216 mm) -->
-  <!-- 
+  <!--
   <xsl:param name="page-height">11in</xsl:param>
   <xsl:param name="page-width">8.5in</xsl:param>
   -->
@@ -248,86 +248,82 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="code">
-    <xsl:attribute name="background-color">#e0e0ff</xsl:attribute>
+    <xsl:attribute name="background-color">#f1f3f5</xsl:attribute>
+    <xsl:attribute name="border-style">solid</xsl:attribute>
+    <xsl:attribute name="border-color">#dee2e6</xsl:attribute><!-- dee2e6-->
+    <xsl:attribute name="border-width">0.3mm</xsl:attribute>
     <xsl:attribute name="font-family">DejaVuSansMono, monospace</xsl:attribute>
     <xsl:attribute name="font-size">0.8em</xsl:attribute>
-    <xsl:attribute name="keep-together.within-page">auto</xsl:attribute>
+    <xsl:attribute name="keep-together.within-page">3</xsl:attribute>
     <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
-    <xsl:attribute name="padding-before">0em</xsl:attribute>
-    <xsl:attribute name="padding-after">1em</xsl:attribute>
-    <xsl:attribute name="space-after">1em</xsl:attribute>
-    <xsl:attribute name="space-before">2em</xsl:attribute>
-    <xsl:attribute name="margin-left">0.5em</xsl:attribute>
-    <xsl:attribute name="margin-right">0.5em</xsl:attribute>
+    <xsl:attribute name="padding-before">1.5mm</xsl:attribute>
+    <xsl:attribute name="padding-after">1mm</xsl:attribute>
+    <xsl:attribute name="padding-left">1mm</xsl:attribute>
+    <xsl:attribute name="padding-right">1mm</xsl:attribute>
+    <xsl:attribute name="margin-left">1mm</xsl:attribute>
+    <xsl:attribute name="margin-right">1mm</xsl:attribute>
     <xsl:attribute name="white-space-collapse">false</xsl:attribute>
     <xsl:attribute name="white-space-treatment">preserve</xsl:attribute>
     <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
+    <xsl:attribute name="space-after">0.5em</xsl:attribute>
+    <xsl:attribute name="space-before">0.5em</xsl:attribute>
   </xsl:attribute-set>
 
-
-
   <xsl:attribute-set name="toc.level1">
     <xsl:attribute name="space-before">1em</xsl:attribute>
-  </xsl:attribute-set> 
-
-<xsl:attribute-set name="note">
-    <xsl:attribute name="background-color">#d0fed0</xsl:attribute>
-    <xsl:attribute name="space-after">1em</xsl:attribute>
-    <xsl:attribute name="space-before">2em</xsl:attribute>
-    <xsl:attribute name="text-align">justify</xsl:attribute>
-    <xsl:attribute name="padding-before">1em</xsl:attribute>
-    <xsl:attribute name="padding-after">0.3em</xsl:attribute>
-    <xsl:attribute name="padding-left">0.5em</xsl:attribute>
-    <xsl:attribute name="padding-right">0.5em</xsl:attribute>
-    <xsl:attribute name="margin-left">0.5em</xsl:attribute>
-    <xsl:attribute name="margin-right">0.5em</xsl:attribute>
-    <xsl:attribute name="keep-together.within-page">always</xsl:attribute>
   </xsl:attribute-set>
 
-<xsl:attribute-set name="warning">
-  <xsl:attribute name="background-color">#ffd6d6</xsl:attribute> 
-    <xsl:attribute name="space-after">1em</xsl:attribute>
-    <xsl:attribute name="space-before">2em</xsl:attribute>
-    <xsl:attribute name="text-align">justify</xsl:attribute>
-    <xsl:attribute name="padding-before">1em</xsl:attribute>
-    <xsl:attribute name="padding-after">0.3em</xsl:attribute>
-    <xsl:attribute name="padding-left">0.5em</xsl:attribute>
-    <xsl:attribute name="padding-right">0.5em</xsl:attribute>
-    <xsl:attribute name="margin-left">0.5em</xsl:attribute>
-    <xsl:attribute name="margin-right">0.5em</xsl:attribute>
-    <xsl:attribute name="keep-together.within-page">always</xsl:attribute>
+  <xsl:attribute-set name="note-title">
+    <xsl:attribute name="space-before">0.5em</xsl:attribute>
+    <xsl:attribute name="border-style">solid</xsl:attribute>
+    <xsl:attribute name="border-bottom-width">0mm</xsl:attribute>
+    <xsl:attribute name="border-color">#495057</xsl:attribute>
+    <xsl:attribute name="background-color">#2b8a3e</xsl:attribute>
+    <xsl:attribute name="font-weight">bold</xsl:attribute>
+    <xsl:attribute name="color">#fefefe</xsl:attribute>
+    <xsl:attribute name="padding-before">1mm</xsl:attribute>
+    <xsl:attribute name="padding-after">0.5mm</xsl:attribute>
+    <xsl:attribute name="padding-left">1mm</xsl:attribute>
+    <xsl:attribute name="padding-right">1mm</xsl:attribute>
+    <xsl:attribute name="margin-left">1mm</xsl:attribute>
+    <xsl:attribute name="margin-right">1mm</xsl:attribute>
+    <xsl:attribute name="font-size">1.33em</xsl:attribute>
   </xsl:attribute-set>
 
-<xsl:attribute-set name="do">
-    <xsl:attribute name="background-color">#d0fed0</xsl:attribute>
-    <xsl:attribute name="space-after">1em</xsl:attribute>
-    <xsl:attribute name="space-before">2em</xsl:attribute>
-    <xsl:attribute name="text-align">justify</xsl:attribute>
-    <xsl:attribute name="padding-before">1em</xsl:attribute>
-    <xsl:attribute name="padding-after">0.3em</xsl:attribute>
-    <xsl:attribute name="padding-left">0.5em</xsl:attribute>
-    <xsl:attribute name="padding-right">0.5em</xsl:attribute>
-    <xsl:attribute name="margin-left">0.5em</xsl:attribute>
-    <xsl:attribute name="margin-right">0.5em</xsl:attribute>
+  <xsl:attribute-set name="note-warning">
     <xsl:attribute name="keep-together.within-page">always</xsl:attribute>
   </xsl:attribute-set>
 
-<xsl:attribute-set name="dont">
-  <xsl:attribute name="background-color">#ffd6d6</xsl:attribute> 
-    <xsl:attribute name="space-after">1em</xsl:attribute>
-    <xsl:attribute name="space-before">2em</xsl:attribute>
-    <xsl:attribute name="text-align">justify</xsl:attribute>
-    <xsl:attribute name="padding-before">1em</xsl:attribute>
-    <xsl:attribute name="padding-after">0.3em</xsl:attribute>
-    <xsl:attribute name="padding-left">0.5em</xsl:attribute>
-    <xsl:attribute name="padding-right">0.5em</xsl:attribute>
-    <xsl:attribute name="margin-left">0.5em</xsl:attribute>
-    <xsl:attribute name="margin-right">0.5em</xsl:attribute>
-    <xsl:attribute name="keep-together.within-page">always</xsl:attribute>
+  <xsl:attribute-set name="warning-title">
+    <xsl:attribute name="space-before">0.5em</xsl:attribute>
+    <xsl:attribute name="border-style">solid</xsl:attribute>
+    <xsl:attribute name="border-bottom-width">0mm</xsl:attribute>
+    <xsl:attribute name="border-color">#495057</xsl:attribute>
+    <xsl:attribute name="background-color">#c92a2a</xsl:attribute>
+    <xsl:attribute name="font-weight">bold</xsl:attribute>
+    <xsl:attribute name="color">#fefefe</xsl:attribute>
+    <xsl:attribute name="padding-before">1mm</xsl:attribute>
+    <xsl:attribute name="padding-after">0.5mm</xsl:attribute>
+    <xsl:attribute name="padding-left">1mm</xsl:attribute>
+    <xsl:attribute name="padding-right">1mm</xsl:attribute>
+    <xsl:attribute name="margin-left">1mm</xsl:attribute>
+    <xsl:attribute name="margin-right">1mm</xsl:attribute>
+    <xsl:attribute name="font-size">1.33em</xsl:attribute>
   </xsl:attribute-set>
 
-  <xsl:attribute-set name="note-warning-title">
-    <xsl:attribute name="font-size">1.33em</xsl:attribute>
+  <xsl:attribute-set name="note-warning-content">
+    <xsl:attribute name="space-after">0.5em</xsl:attribute>
+    <xsl:attribute name="border-style">solid</xsl:attribute>
+    <xsl:attribute name="border-top-width">0mm</xsl:attribute>
+    <xsl:attribute name="border-color">#495057</xsl:attribute>
+    <xsl:attribute name="background-color">#f8f9fa</xsl:attribute>
+    <xsl:attribute name="text-align">justify</xsl:attribute>
+    <xsl:attribute name="padding-before">1mm</xsl:attribute>
+    <xsl:attribute name="padding-after">0.5mm</xsl:attribute>
+    <xsl:attribute name="padding-left">1mm</xsl:attribute>
+    <xsl:attribute name="padding-right">1mm</xsl:attribute>
+    <xsl:attribute name="margin-left">1mm</xsl:attribute>
+    <xsl:attribute name="margin-right">1mm</xsl:attribute>
   </xsl:attribute-set>
 
   <xsl:attribute-set name="module-header">
@@ -354,7 +350,7 @@
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
     <xsl:attribute name="space-after">0.25em</xsl:attribute>
     <!-- xsl:attribute name="space-before">1.5em</xsl:attribute -->
-  </xsl:attribute-set> 
+  </xsl:attribute-set>
 
   <xsl:attribute-set name="type-listblock">
     <xsl:attribute name="provisional-distance-between-starts">1.8em</xsl:attribute>