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)
          - Moved some man pages to more apropriate sections, pages in
            section 4 moved to 5 and pages in 6 moved to 7.
          - 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, 59 insertions, 9 deletions

diff --git a/lib/erl_docgen/priv/xsl/db_eix.xsl b/lib/erl_docgen/priv/xsl/db_eix.xsl
index 929272256a..970b85ccb9 100644
--- a/lib/erl_docgen/priv/xsl/db_eix.xsl
+++ b/lib/erl_docgen/priv/xsl/db_eix.xsl
@@ -137,7 +137,20 @@
           <xsl:value-of select="substring-before(nametext, '(')"/>
         </xsl:when>
         <xsl:when test="ancestor::erlref">
-          <xsl:value-of select="substring-before(., '(')"/>
+          <xsl:variable name="fname1">
+            <xsl:value-of select="substring-before(., '(')"/>
+          </xsl:variable>
+          <xsl:variable name="fname2">
+            <xsl:value-of select="substring-after($fname1, 'erlang:')"/>
+          </xsl:variable>
+          <xsl:choose>
+            <xsl:when test="string-length($fname2) > 0">   
+              <xsl:value-of select="$fname2"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="$fname1"/>
+            </xsl:otherwise>
+          </xsl:choose>
         </xsl:when>
       </xsl:choose>
     </xsl:variable>     
@@ -178,26 +191,63 @@
   </xsl:template>
 
   <xsl:template name="remove-paren">
-    <xsl:param name="string"/>  
-    <xsl:variable name="bstring">
-      <xsl:value-of select="substring-before($string, '(')"/>
+    <xsl:param name="string"/>
+
+    <xsl:variable name="str1">
+      <xsl:call-template name="remove-paren-1">
+        <xsl:with-param name="string" select="$string"/>
+        <xsl:with-param name="start">(</xsl:with-param> 
+        <xsl:with-param name="end">)</xsl:with-param> 
+      </xsl:call-template>    
+    </xsl:variable>
+
+    <xsl:variable name="str2">
+      <xsl:call-template name="remove-paren-1">
+        <xsl:with-param name="string" select="$str1"/>
+        <xsl:with-param name="start">{</xsl:with-param>
+        <xsl:with-param name="end">}</xsl:with-param>
+      </xsl:call-template>    
     </xsl:variable>
+
+    <xsl:variable name="str3">
+      <xsl:call-template name="remove-paren-1">
+        <xsl:with-param name="string" select="$str2"/>
+        <xsl:with-param name="start">[</xsl:with-param>
+        <xsl:with-param name="end">]</xsl:with-param>
+      </xsl:call-template>    
+    </xsl:variable>
+
+    <xsl:value-of select="$str3"/>
+
+  </xsl:template>
+
+
+  <xsl:template name="remove-paren-1">
+    <xsl:param name="string"/>
+    <xsl:param name="start"/>
+    <xsl:param name="end"/>
+   
+    <xsl:variable name="tmp1">
+      <xsl:value-of select="substring-before($string, $start)"/>
+    </xsl:variable>
+
     <xsl:choose>
-      <xsl:when test="string-length($bstring) > 0">
-        <xsl:variable name="astring">
-          <xsl:value-of select="substring-after($string, ')')"/>
+      <xsl:when test="string-length($tmp1) > 0 or starts-with($string, $start)">
+        <xsl:variable name="tmp2">
+          <xsl:value-of select="substring-after($string, $end)"/>
         </xsl:variable>
         <xsl:variable name="retstring">
           <xsl:call-template name="remove-paren">
-            <xsl:with-param name="string" select="$astring"/>
+            <xsl:with-param name="string" select="$tmp2"/>
           </xsl:call-template>        
         </xsl:variable>
-        <xsl:value-of select="concat($bstring, $retstring)"/>
+        <xsl:value-of select="concat(concat($tmp1, 'x'), $retstring)"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="$string"/>
       </xsl:otherwise>
     </xsl:choose>
+
   </xsl:template>
 
   <!-- default content handling -->