Changes to make the documentation work with the new litprog sources

diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile
index d2c0821e662cfe0c6fad3600f2c41819cc7f7e72..42b60e7decc0a8a356752985374be3298c2d2e25 100644 (file)
--- a/xsl/docsrc/Makefile
+++ b/xsl/docsrc/Makefile
@@ -1,4 +1,4 @@
-DIRS=common lib html fo template
+DIRS=common lib html fo template tools
 
 all:
        for i in $(DIRS) __bogus__; do \

diff --git a/xsl/docsrc/fo/Makefile b/xsl/docsrc/fo/Makefile
index b102e50147c18a6359522b12009083f24dfbf06f..9ab24607a3b40b80dd89f7a51e827e8ea5275231 100644 (file)
--- a/xsl/docsrc/fo/Makefile
+++ b/xsl/docsrc/fo/Makefile
@@ -14,3 +14,7 @@ clean:
 %.xml : %.xsl $(JSTYLE)
        $(XSLT) $< $(JSTYLE) /dev/null output-file=$@
        $(XJPARSE) $@
+
+param.xml: param.xweb
+       $(MAKE) -C ../../fo param.xml
+       cp ../../fo/param.xml .

diff --git a/xsl/docsrc/html/Makefile b/xsl/docsrc/html/Makefile
index 5acfb3d0307449f08feb600cfe849789a58a2ae9..204b8ed12d5930fe7d3401116d8024d77cc3dc76 100644 (file)
--- a/xsl/docsrc/html/Makefile
+++ b/xsl/docsrc/html/Makefile
@@ -4,7 +4,7 @@ XJPARSE=../../../cvstools/xjparse
 JSTYLE=../../docsrc/xsl2jref.xsl
 VPATH=../../html
 
-XMLFILES = param.xml ebnf.xml
+XMLFILES = param.xml
 
 all: $(XMLFILES)
 
@@ -14,3 +14,7 @@ clean:
 %.xml : %.xsl $(JSTYLE)
        $(XSLT) $< $(JSTYLE) /dev/null output-file=$@
        $(XJPARSE) $@
+
+param.xml: param.xweb
+       $(MAKE) -C ../../html param.xml
+       cp ../../html/param.xml .

diff --git a/xsl/docsrc/lrefentry.xsl b/xsl/docsrc/lrefentry.xsl
index 737f665acd29a8592e973a08836a75af8afd4687..641a6ed5ad6ba1c299fe7f772c88c8f7c0214282 100644 (file)
--- a/xsl/docsrc/lrefentry.xsl
+++ b/xsl/docsrc/lrefentry.xsl
@@ -7,6 +7,11 @@
 
 <xsl:import href="../../litprog/html/ldocbook.xsl"/>
 
+<xsl:template match="src:fragment" mode="label.markup">
+  <xsl:text>&#xA7;</xsl:text>
+  <xsl:number from="/" level="any" format="1"/>
+</xsl:template>
+
 <xsl:template match="src:fragment" mode="xref-to">
   <xsl:variable name="section" select="ancestor::refentry[1]"/>
 
@@ -32,7 +37,11 @@
 <xsl:template match="src:fragment">
   <xsl:param name="suppress-numbers" select="'0'"/>
   <xsl:param name="linenumbering" select="'numbered'"/>
+
   <xsl:variable name="section" select="ancestor::section[1]"/>
+  <xsl:variable name="id" select="@id"/>
+  <xsl:variable name="referents"
+                select="//src:fragment[.//src:fragref[@linkend=$id]]"/>
 
   <a name="{@id}"/>
   <table border="1" width="100%">
@@ -40,10 +49,17 @@
       <td>
         <p>
           <b>
-            <xsl:text>&#xA7;</xsl:text>
-            <xsl:apply-templates select="$section" mode="label.markup"/>
-            <xsl:number from="/" level="any"/>
+            <xsl:apply-templates select="." mode="label.markup"/>
           </b>
+          <xsl:if test="$referents">
+            <xsl:text>: </xsl:text>
+            <xsl:for-each select="$referents">
+              <xsl:if test="position() &gt; 1">, </xsl:if>
+              <a href="#{@id}">
+                <xsl:apply-templates select="." mode="label.markup"/>
+              </a>
+            </xsl:for-each>
+          </xsl:if>
         </p>
       </td>
     </tr>

diff --git a/xsl/docsrc/reference.xml b/xsl/docsrc/reference.xml
index 119e76b49e6364966234ffa1654f63e96c433ca1..8d4838d1bf171cc40c814b8d2f5c7f1379691e37 100644 (file)
--- a/xsl/docsrc/reference.xml
+++ b/xsl/docsrc/reference.xml
@@ -4,7 +4,6 @@
 <!ENTITY common.xml SYSTEM "common/common.xml" NDATA SGML>
 <!ENTITY lib.xml SYSTEM "lib/lib.xml" NDATA SGML>
 <!ENTITY html-param.xml SYSTEM "html/param.xml" NDATA SGML>
-<!ENTITY html-ebnf.xml SYSTEM "html/ebnf.xml" NDATA SGML>
 <!ENTITY fo-param.xml SYSTEM "fo/param.xml" NDATA SGML>
 <!ENTITY fo-table.xml SYSTEM "fo/table.xml" NDATA SGML>
 <!ENTITY titlepage.xml SYSTEM "template/titlepage.xml" NDATA SGML>
@@ -40,9 +39,6 @@ of references generated from the stylesheet sources:</para>
 <listitem><para><olink type="title" localinfo="html/param.html"
                        targetdocent="html-param.xml"/></para>
 </listitem>
-<listitem><para><olink type="title" localinfo="html/ebnf.html"
-                       targetdocent="html-ebnf.xml"/></para>
-</listitem>
 <listitem><para><olink type="title" localinfo="fo/param.html"
                        targetdocent="fo-param.xml"/></para>
 </listitem>

diff --git a/xsl/docsrc/tools/Makefile b/xsl/docsrc/tools/Makefile
index 12eda9616d463e0ad6a64b35aaaefb4f3e1600b0..b54bc7bebd208db85a529f21490a0f627b9448d0 100644 (file)
--- a/xsl/docsrc/tools/Makefile
+++ b/xsl/docsrc/tools/Makefile
@@ -9,7 +9,7 @@ XMLFILES = profiling.xml
 all: $(XMLFILES)
 
 clean:
-       rm -f $(XMLFILES)
+       -echo nop
 
 %.xml : %.xsl $(JSTYLE) ../../docsrc/legalnotice.xml
        $(XSLT) $< $(JSTYLE) /dev/null output-file=$@