OTP-8343 The documentation is now possible to build in an open source

          environment after a number of bugs are fixed and some features
          are added in the documentation build process.

          - The arity calculation is updated.

          - The module prefix used in the function names for bif's are
          removed in the generated links so the links will look like
          "http://www.erlang.org/doc/man/erlang.html#append_element-2"
          instead of
          "http://www.erlang.org/doc/man/erlang.html#erlang:append_element-
          2".

          - Enhanced the menu positioning in the html documentation when a
          new page is loaded.

          - A number of corrections in the generation of man pages (thanks
          to Sergei Golovan)

          - The legal notice is taken from the xml book file so OTP's build
          process can be used for non OTP applications.

1 files changed, 17 insertions, 11 deletions

diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index a9a2781a8a..a2b1e755e2 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -176,10 +176,12 @@
   <xsl:template match="/erlref">
     <xsl:variable name="companyname">
       <xsl:choose>
-        <xsl:when test="$company = ''"><xsl:value-of select="header/holder"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="$company"/></xsl:otherwise>
+        <!-- Workaround until all of OTP's .../holder contents are correct.  -->
+        <xsl:when test="starts-with(header/copyright/holder,'Ericsson AB')"><xsl:text>Ericsson AB</xsl:text></xsl:when>
+        <xsl:otherwise><xsl:value-of select="header/copyright/holder"/></xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
+
     <xsl:text>.TH </xsl:text><xsl:value-of select="module"/><xsl:text> 3 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "</xsl:text><xsl:value-of select="$companyname"/><xsl:text>" "Erlang Module Definition"&#10;</xsl:text>
     <xsl:text>.SH NAME&#10;</xsl:text>
     <xsl:value-of select="module"/><xsl:text> \- </xsl:text><xsl:value-of select="modulesummary"/><xsl:text>&#10;</xsl:text>  
@@ -190,11 +192,12 @@
   <xsl:template match="/comref">
     <xsl:variable name="companyname">
       <xsl:choose>
-        <xsl:when test="$company = ''"><xsl:value-of select="header/holder"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="$company"/></xsl:otherwise>
+        <!-- Workaround until all of OTP's .../holder contents are correct.  -->
+        <xsl:when test="starts-with(header/copyright/holder,'Ericsson AB')"><xsl:text>Ericsson AB</xsl:text></xsl:when>
+        <xsl:otherwise><xsl:value-of select="header/copyright/holder"/></xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    <xsl:text>.TH </xsl:text><xsl:value-of select="com"/><xsl:text> 1 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "</xsl:text><xsl:value-of select="$companyname"/><xsl:text>" "User Commands"&#10;</xsl:text>
+   <xsl:text>.TH </xsl:text><xsl:value-of select="com"/><xsl:text> 1 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "</xsl:text><xsl:value-of select="$companyname"/><xsl:text>" "User Commands"&#10;</xsl:text>
     <xsl:text>.SH NAME&#10;</xsl:text>
     <xsl:value-of select="com"/><xsl:text> \- </xsl:text><xsl:value-of select="comsummary"/><xsl:text>&#10;</xsl:text>  
     <xsl:apply-templates/>
@@ -204,8 +207,9 @@
   <xsl:template match="/cref">
     <xsl:variable name="companyname">
       <xsl:choose>
-        <xsl:when test="$company = ''"><xsl:value-of select="header/holder"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="$company"/></xsl:otherwise>
+        <!-- Workaround until all of OTP's .../holder contents are correct.  -->
+        <xsl:when test="starts-with(header/copyright/holder,'Ericsson AB')"><xsl:text>Ericsson AB</xsl:text></xsl:when>
+        <xsl:otherwise><xsl:value-of select="header/copyright/holder"/></xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
     <xsl:text>.TH </xsl:text><xsl:value-of select="lib"/><xsl:text> 3 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "</xsl:text><xsl:value-of select="$companyname"/><xsl:text>" "C Library Functions"&#10;</xsl:text>
@@ -218,8 +222,9 @@
   <xsl:template match="/fileref">
     <xsl:variable name="companyname">
       <xsl:choose>
-        <xsl:when test="$company = ''"><xsl:value-of select="header/holder"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="$company"/></xsl:otherwise>
+        <!-- Workaround until all of OTP's .../holder contents are correct.  -->
+        <xsl:when test="starts-with(header/copyright/holder,'Ericsson AB')"><xsl:text>Ericsson AB</xsl:text></xsl:when>
+        <xsl:otherwise><xsl:value-of select="header/copyright/holder"/></xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
     <xsl:text>.TH </xsl:text><xsl:value-of select="file"/><xsl:text> 5 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "</xsl:text><xsl:value-of select="$companyname"/><xsl:text>" "Files"&#10;</xsl:text>
@@ -232,8 +237,9 @@
   <xsl:template match="/appref">
     <xsl:variable name="companyname">
       <xsl:choose>
-        <xsl:when test="$company = ''"><xsl:value-of select="header/holder"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="$company"/></xsl:otherwise>
+        <!-- Workaround until all of OTP's .../holder contents are correct.  -->
+        <xsl:when test="starts-with(header/copyright/holder,'Ericsson AB')"><xsl:text>Ericsson AB</xsl:text></xsl:when>
+        <xsl:otherwise><xsl:value-of select="header/copyright/holder"/></xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
     <xsl:text>.TH </xsl:text><xsl:value-of select="app"/><xsl:text> 7 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "</xsl:text><xsl:value-of select="$companyname"/><xsl:text>" "Erlang Application Definition"&#10;</xsl:text>