Bug 992905: fixed ugly interaction between bibliography.collection and bibliography...

diff --git a/xsl/fo/biblio.xsl b/xsl/fo/biblio.xsl
index 8a3c408cd1be6ccbea2481b57a049149e4496cd7..9d4e5b4e898ccc5dd817a4f7e874726d999b8571 100644 (file)
--- a/xsl/fo/biblio.xsl
+++ b/xsl/fo/biblio.xsl
@@ -135,14 +135,30 @@
 <!-- ==================================================================== -->
 
 <xsl:template match="biblioentry">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+  <xsl:param name="label">
+    <xsl:call-template name="biblioentry.label"/>
+  </xsl:param>
+
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id"/>
+  </xsl:variable>
+
   <xsl:choose>
     <xsl:when test="string(.) = ''">
       <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
       <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/>
       <xsl:choose>
         <xsl:when test="$entry">
-          <xsl:apply-templates select="$entry"/>
+         <xsl:choose>
+           <xsl:when test="$bibliography.numbered != 0">
+             <xsl:apply-templates select="$entry">
+               <xsl:with-param name="label" select="$label"/>
+             </xsl:apply-templates>
+           </xsl:when>
+           <xsl:otherwise>
+             <xsl:apply-templates select="$entry"/>
+           </xsl:otherwise>
+         </xsl:choose>
         </xsl:when>
         <xsl:otherwise>
           <xsl:message>
@@ -163,7 +179,7 @@
     <xsl:otherwise>
       <fo:block id="{$id}" xsl:use-attribute-sets="normal.para.spacing"
                 start-indent="0.5in" text-indent="-0.5in">
-        <xsl:call-template name="biblioentry.label"/>
+       <xsl:copy-of select="$label"/>
         <xsl:apply-templates mode="bibliography.mode"/>
       </fo:block>
     </xsl:otherwise>
@@ -171,14 +187,30 @@
 </xsl:template>
 
 <xsl:template match="bibliomixed">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+  <xsl:param name="label">
+    <xsl:call-template name="biblioentry.label"/>
+  </xsl:param>
+
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id"/>
+  </xsl:variable>
+
   <xsl:choose>
     <xsl:when test="string(.) = ''">
       <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
       <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/>
       <xsl:choose>
         <xsl:when test="$entry">
-          <xsl:apply-templates select="$entry"/>
+         <xsl:choose>
+           <xsl:when test="$bibliography.numbered != 0">
+             <xsl:apply-templates select="$entry">
+               <xsl:with-param name="label" select="$label"/>
+             </xsl:apply-templates>
+           </xsl:when>
+           <xsl:otherwise>
+             <xsl:apply-templates select="$entry"/>
+           </xsl:otherwise>
+         </xsl:choose>
         </xsl:when>
         <xsl:otherwise>
           <xsl:message>
@@ -199,7 +231,7 @@
     <xsl:otherwise>
       <fo:block id="{$id}" xsl:use-attribute-sets="normal.para.spacing"
                 start-indent="0.5in" text-indent="-0.5in">
-        <xsl:call-template name="biblioentry.label"/>
+       <xsl:copy-of select="$label"/>
         <xsl:apply-templates mode="bibliomixed.mode"/>
       </fo:block>
     </xsl:otherwise>

diff --git a/xsl/html/biblio.xsl b/xsl/html/biblio.xsl
index dcced59b5cb4561fdcd4f95dad4eb60b64c385c4..9ff9fa366a072207549134c244734cb2024521f5 100644 (file)
--- a/xsl/html/biblio.xsl
+++ b/xsl/html/biblio.xsl
@@ -76,6 +76,10 @@
 <!-- ==================================================================== -->
 
 <xsl:template match="biblioentry">
+  <xsl:param name="label">
+    <xsl:call-template name="biblioentry.label"/>
+  </xsl:param>
+
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
@@ -86,7 +90,16 @@
       <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/>
       <xsl:choose>
         <xsl:when test="$entry">
-          <xsl:apply-templates select="$entry"/>
+         <xsl:choose>
+           <xsl:when test="$bibliography.numbered != 0">
+             <xsl:apply-templates select="$entry">
+               <xsl:with-param name="label" select="$label"/>
+             </xsl:apply-templates>
+           </xsl:when>
+           <xsl:otherwise>
+             <xsl:apply-templates select="$entry"/>
+           </xsl:otherwise>
+         </xsl:choose>
         </xsl:when>
         <xsl:otherwise>
           <xsl:message>
@@ -98,7 +111,7 @@
           <div class="{name(.)}">
             <xsl:call-template name="anchor"/>
             <p>
-              <xsl:call-template name="biblioentry.label"/>
+             <xsl:copy-of select="$label"/>
               <xsl:text>Error: no bibliography entry: </xsl:text>
               <xsl:value-of select="$id"/>
               <xsl:text> found in </xsl:text>
@@ -112,7 +125,7 @@
       <div class="{name(.)}">
         <xsl:call-template name="anchor"/>
         <p>
-          <xsl:call-template name="biblioentry.label"/>
+         <xsl:copy-of select="$label"/>
           <xsl:apply-templates mode="bibliography.mode"/>
         </p>
       </div>
@@ -121,6 +134,10 @@
 </xsl:template>
 
 <xsl:template match="bibliomixed">
+  <xsl:param name="label">
+    <xsl:call-template name="biblioentry.label"/>
+  </xsl:param>
+
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
@@ -131,7 +148,16 @@
       <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/>
       <xsl:choose>
         <xsl:when test="$entry">
-          <xsl:apply-templates select="$entry"/>
+         <xsl:choose>
+           <xsl:when test="$bibliography.numbered != 0">
+             <xsl:apply-templates select="$entry">
+               <xsl:with-param name="label" select="$label"/>
+             </xsl:apply-templates>
+           </xsl:when>
+           <xsl:otherwise>
+             <xsl:apply-templates select="$entry"/>
+           </xsl:otherwise>
+         </xsl:choose>
         </xsl:when>
         <xsl:otherwise>
           <xsl:message>
@@ -143,7 +169,7 @@
           <div class="{name(.)}">
             <xsl:call-template name="anchor"/>
             <p>
-              <xsl:call-template name="biblioentry.label"/>
+             <xsl:copy-of select="$label"/>
               <xsl:text>Error: no bibliography entry: </xsl:text>
               <xsl:value-of select="$id"/>
               <xsl:text> found in </xsl:text>
@@ -157,7 +183,7 @@
       <div class="{name(.)}">
         <xsl:call-template name="anchor"/>
         <p class="{name(.)}">
-          <xsl:call-template name="biblioentry.label"/>
+         <xsl:copy-of select="$label"/>
           <xsl:apply-templates mode="bibliomixed.mode"/>
         </p>
       </div>