X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=doclib%2Fhtml-munge.xsl;h=5b35045596d40de74a9ef46cf80785f38120639d;hb=25976ed67c66d30811fa0a01043e50347e9d1e69;hp=09c5bed54a37895e06346b1fb2d72f05ebd67256;hpb=4a4f4bc831ed87b566e1fe6325bee29c97ea176c;p=senf.git

diff --git a/doclib/html-munge.xsl b/doclib/html-munge.xsl
index 09c5bed..5b35045 100644
--- a/doclib/html-munge.xsl
+++ b/doclib/html-munge.xsl
@@ -2,6 +2,8 @@
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:str="http://exslt.org/strings"
+  xmlns:set="http://exslt.org/sets"
+  xmlns:exslt="http://exslt.org/common"
   extension-element-prefixes="str">
 
   <xsl:output 
@@ -205,9 +207,15 @@
 
   <!-- Reformat detailed member documentation -->
 
-  <xsl:template match="table[@class='memname'][contains(preceding::h1[1],' Class ')][contains(preceding::h1[1],' Reference')]">
-    <xsl:variable name="name"><xsl:value-of select="str:split(tr/td[@class='memname'],'::')[position()=last()]"/></xsl:variable>
-    <table class="memname">
+  <xsl:template match="table[@class='memname']">
+    <xsl:variable name="name1"><xsl:value-of select="str:split(tr/td[@class='memname'],'::')[position()=last()]"/></xsl:variable>
+    <xsl:variable name="name2"><xsl:value-of select="str:split(tr/td[@class='memname'],' ')[position()=last()]"/></xsl:variable>
+    <xsl:variable name="name"><xsl:value-of select="substring($name1,string-length($name1)-string-length($name2))"/></xsl:variable>
+    <xsl:element name="table">
+      <xsl:attribute name="class">
+        <xsl:text>memname</xsl:text>
+        <xsl:if test="contains(tr/td[@class='memname'],'#define')"><xsl:text> macro</xsl:text></xsl:if>
+      </xsl:attribute>
       <tr>
         <td class="memtype" colspan="5">
           <xsl:for-each select="tr/td[@class='memname']/*|tr/td[@class='memname']/text()">
@@ -254,9 +262,13 @@
         </xsl:otherwise>
       </xsl:choose>
       <tr>
-        <td colspan="5" class="memattrs"><xsl:copy-of select="tr/td[@width='100%']/code"/></td>
+        <td colspan="5" class="memattrs"><xsl:copy-of select="tr/td[@width='100%']/*|tr/td[@width='100%']/text()"/></td>
       </tr>
-    </table>
+    </xsl:element>
+  </xsl:template>
+
+  <!-- no idea, where these &nbsp;'s come frome ... -->
+  <xsl:template match="div[@class='memproto']/text()[.='&#160;&#x0a;']">
   </xsl:template>
 
   <!-- Add grouping to all-members page -->
@@ -307,7 +319,7 @@
       </xsl:variable>
       <xsl:if test="string($public-memfn)">
         <tr><td colspan="3"><h2>Public Member Functions</h2></td></tr>
-        <xsl:copy-of select="$public-memfn"/>
+        <xsl:copy-of select="set:distinct(exslt:node-set($public-memfn)/tr)"/>
       </xsl:if>
 
       <xsl:variable name="public-var">
@@ -480,7 +492,7 @@
   </xsl:template>
 
   <!-- Add CSS class to the brief documentation paragraph of the member documentation -->
-  <xsl:template match="div[@class='memdoc']/p[1]">
+  <xsl:template match="div[@class='memdoc']/p[1][not(contains(.,'Definition at line'))]">
     <xsl:call-template name="add-class">
       <xsl:with-param name="class">memtitle</xsl:with-param>
     </xsl:call-template>
@@ -494,13 +506,4 @@
   <xsl:template match="div[@id='content2']/ul/li[a/@class='elRef'][a/@doxygen][code/text()='[external]'][not(ul)]">
   </xsl:template>
 
-  <!-- Insert 'senf/'  into include paths -->
-  <xsl:template match="code[starts-with(text(),'#include &lt;')]/a">
-    <xsl:copy>
-      <xsl:call-template name="copy-attributes"/>
-      <xsl:text>senf/</xsl:text>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>