Support bibliosource; improve numbered bibliography entries and cross-references...

diff --git a/xsl/fo/biblio.xsl b/xsl/fo/biblio.xsl
index 89aae9b98fe06dfa12dd020dfefe8c8c5b8c20e0..fa4930f1bae6617ae40c4af9d357823158224f5c 100644 (file)
--- a/xsl/fo/biblio.xsl
+++ b/xsl/fo/biblio.xsl
@@ -183,7 +183,8 @@
   <xsl:choose>
     <xsl:when test="$bibliography.numbered != 0">
       <xsl:text>[</xsl:text>
-      <xsl:number from="bibliography" count="biblioentry|bibliomixed" format="1"/>
+      <xsl:number from="bibliography" count="biblioentry|bibliomixed"
+                  level="any" format="1"/>
       <xsl:text>] </xsl:text>
     </xsl:when>
     <xsl:when test="local-name($node/child::*[1]) = 'abbrev'">
@@ -1076,4 +1077,11 @@
 
 <!-- ==================================================================== -->
 
+<xsl:template match="bibliosource">
+  <!-- FIXME: is this right? -->
+  <xsl:apply-templates/>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
 </xsl:stylesheet>

diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index 8941e3ed8c1138f9380a7ab17ef300c8d76e8d87..740ab47289bdbdd6d26551436204be10d88286e6 100644 (file)
--- a/xsl/fo/xref.xsl
+++ b/xsl/fo/xref.xsl
@@ -248,6 +248,10 @@
       <xsl:choose>
         <xsl:when test="$entry">
           <xsl:choose>
+            <xsl:when test="$bibliography.numbered != 0">
+              <xsl:number from="bibliography" count="biblioentry|bibliomixed"
+                          level="any" format="1"/>
+            </xsl:when>
             <xsl:when test="local-name($entry/*[1]) = 'abbrev'">
               <xsl:apply-templates select="$entry/*[1]"/>
             </xsl:when>
@@ -269,6 +273,10 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:choose>
+        <xsl:when test="$bibliography.numbered != 0">
+          <xsl:number from="bibliography" count="biblioentry|bibliomixed"
+                      level="any" format="1"/>
+        </xsl:when>
         <xsl:when test="local-name(*[1]) = 'abbrev'">
           <xsl:apply-templates select="*[1]"/>
         </xsl:when>

diff --git a/xsl/html/biblio.xsl b/xsl/html/biblio.xsl
index ecf466dffb4bc027abcb010d7d340ba0f61524d2..358a0c15f43ac374bf42c7de01a63fd12f4d03cc 100644 (file)
--- a/xsl/html/biblio.xsl
+++ b/xsl/html/biblio.xsl
@@ -167,7 +167,8 @@
   <xsl:choose>
     <xsl:when test="$bibliography.numbered != 0">
       <xsl:text>[</xsl:text>
-      <xsl:number from="bibliography" count="biblioentry|bibliomixed" format="1"/>
+      <xsl:number from="bibliography" count="biblioentry|bibliomixed"
+                  level="any" format="1"/>
       <xsl:text>] </xsl:text>
     </xsl:when>
     <xsl:when test="local-name($node/child::*[1]) = 'abbrev'">
@@ -1036,4 +1037,11 @@
 
 <!-- ==================================================================== -->
 
+<xsl:template match="bibliosource">
+  <!-- FIXME: is this right? -->
+  <xsl:apply-templates/>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
 </xsl:stylesheet>

diff --git a/xsl/html/xref.xsl b/xsl/html/xref.xsl
index 52ea184c581a6626db9936181bc70c71affa9e81..7292da7379aa3b3264a7f84bd965a8ef00fb1652 100644 (file)
--- a/xsl/html/xref.xsl
+++ b/xsl/html/xref.xsl
@@ -276,6 +276,10 @@
       <xsl:choose>
         <xsl:when test="$entry">
           <xsl:choose>
+            <xsl:when test="$bibliography.numbered != 0">
+              <xsl:number from="bibliography" count="biblioentry|bibliomixed"
+                          level="any" format="1"/>
+            </xsl:when>
             <xsl:when test="local-name($entry/*[1]) = 'abbrev'">
               <xsl:apply-templates select="$entry/*[1]"/>
             </xsl:when>
@@ -297,6 +301,10 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:choose>
+        <xsl:when test="$bibliography.numbered != 0">
+          <xsl:number from="bibliography" count="biblioentry|bibliomixed"
+                      level="any" format="1"/>
+        </xsl:when>
         <xsl:when test="local-name(*[1]) = 'abbrev'">
           <xsl:apply-templates select="*[1]"/>
         </xsl:when>