Support bibliography.numbered

diff --git a/xsl/fo/biblio.xsl b/xsl/fo/biblio.xsl
index d050dd266abd24f634b3fb3200c0897e61a6a98e..49e03576b822440d4d41dbc4d211bed7bf3358c3 100644 (file)
--- a/xsl/fo/biblio.xsl
+++ b/xsl/fo/biblio.xsl
@@ -181,6 +181,11 @@
   <xsl:param name="node" select="."/>
 
   <xsl:choose>
+    <xsl:when test="$bibliography.numbered != 0">
+      <xsl:text>[</xsl:text>
+      <xsl:number from="bibliography" count="biblioentry|bibliomixed" format="1"/>
+      <xsl:text>] </xsl:text>
+    </xsl:when>
     <xsl:when test="local-name($node/child::*[1]) = 'abbrev'">
       <xsl:text>[</xsl:text>
       <xsl:apply-templates select="$node/abbrev[1]"/>
@@ -605,10 +610,9 @@
 </xsl:template>
 
 <xsl:template match="revhistory" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
+  <fo:block>
+    <xsl:apply-templates select="."/> <!-- use normal mode -->
+  </fo:block>
 </xsl:template>
 
 <xsl:template match="seriesinfo" mode="bibliography.mode">

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index 5ceba1534408095448bf4a075dbd78d9ed4b29e6..3b37d48cc87f8d53a8c480162fb2eeaeb14547d8 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -161,3 +161,4 @@
 <!ENTITY sidebar.properties SYSTEM "../params/sidebar.properties.xml">
 <!ENTITY menuchoice.separator SYSTEM "../params/menuchoice.separator.xml">
 <!ENTITY menuchoice.menu.separator SYSTEM "../params/menuchoice.menu.separator.xml">
+<!ENTITY bibliography.numbered SYSTEM "../params/bibliography.numbered.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 222ae1394c6e4c4418f4e12b9937f15c7bd52fb4..bde197c0ff636ce40691cf8fe28414a77c4a56f9 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -174,6 +174,7 @@ generate.section.toc.level;
 <reference><title>Bibliography</title>
 &biblioentry.item.separator;
 &bibliography.collection;
+&bibliography.numbered;
 </reference>
 
 <reference><title>Glossary</title>
@@ -408,6 +409,7 @@ around all these parameters.</para>
 <src:fragref linkend="autotoc.label.separator.frag"/>
 <src:fragref linkend="biblioentry.item.separator.frag"/>
 <src:fragref linkend="bibliography.collection.frag"/>
+<src:fragref linkend="bibliography.numbered.frag"/>
 <src:fragref linkend="blockquote.properties.frag"/>
 <src:fragref linkend="body.font.family.frag"/>
 <src:fragref linkend="body.font.master.frag"/>