Fixed bug #875943 where programlisting and literallayout were not

getting an id attribute in the fo output.

diff --git a/xsl/fo/verbatim.xsl b/xsl/fo/verbatim.xsl
index 47eb6fa52180ae2347a8c82be4a775e5891ca1fa..ad6bcabaf47902abfef7f47b5b4286141c9a7965 100644 (file)
--- a/xsl/fo/verbatim.xsl
+++ b/xsl/fo/verbatim.xsl
@@ -44,8 +44,9 @@
 
   <xsl:choose>
     <xsl:when test="$shade.verbatim != 0">
-      <fo:block white-space-collapse='false'
-               white-space-treatment='preserve'
+      <fo:block id="{$id}"
+                white-space-collapse='false'
+                white-space-treatment='preserve'
                 linefeed-treatment='preserve'
                 xsl:use-attribute-sets="monospace.verbatim.properties shade.verbatim.style">
 
@@ -53,8 +54,9 @@
       </fo:block>
     </xsl:when>
     <xsl:otherwise>
-      <fo:block white-space-collapse='false'
-               white-space-treatment='preserve'
+      <fo:block id="{$id}"
+                white-space-collapse='false'
+                white-space-treatment='preserve'
                 linefeed-treatment="preserve"
                 xsl:use-attribute-sets="monospace.verbatim.properties">
         <xsl:copy-of select="$content"/>
@@ -66,6 +68,8 @@
 <xsl:template match="literallayout">
   <xsl:param name="suppress-numbers" select="'0'"/>
 
+  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+
   <xsl:variable name="content">
     <xsl:choose>
       <xsl:when test="$suppress-numbers = '0'
@@ -88,8 +92,9 @@
     <xsl:when test="@class='monospaced'">
       <xsl:choose>
         <xsl:when test="$shade.verbatim != 0">
-          <fo:block white-space-collapse='false'
-                   white-space-treatment='preserve'
+          <fo:block id="{$id}"
+                    white-space-collapse='false'
+                    white-space-treatment='preserve'
                     linefeed-treatment="preserve"
                     xsl:use-attribute-sets="monospace.verbatim.properties shade.verbatim.style">
 
@@ -97,8 +102,9 @@
           </fo:block>
         </xsl:when>
         <xsl:otherwise>
-          <fo:block white-space-collapse='false'
-                   white-space-treatment='preserve'
+          <fo:block id="{$id}"
+                    white-space-collapse='false'
+                    white-space-treatment='preserve'
                     linefeed-treatment="preserve"
                     xsl:use-attribute-sets="monospace.verbatim.properties">
             <xsl:copy-of select="$content"/>
@@ -109,9 +115,10 @@
     <xsl:otherwise>
       <xsl:choose>
         <xsl:when test="$shade.verbatim != 0">
-          <fo:block wrap-option='no-wrap'
+          <fo:block id="{$id}"
+                    wrap-option='no-wrap'
                     white-space-collapse='false'
-                   white-space-treatment='preserve'
+                    white-space-treatment='preserve'
                     text-align='start'
                     linefeed-treatment="preserve"
                     xsl:use-attribute-sets="verbatim.properties shade.verbatim.style">
@@ -119,9 +126,10 @@
           </fo:block>
         </xsl:when>
         <xsl:otherwise>
-          <fo:block wrap-option='no-wrap'
+          <fo:block id="{$id}"
+                    wrap-option='no-wrap'
                     white-space-collapse='false'
-                   white-space-treatment='preserve'
+                    white-space-treatment='preserve'
                     text-align='start'
                     linefeed-treatment="preserve"
                     xsl:use-attribute-sets="verbatim.properties">
@@ -156,7 +164,7 @@
 
   <fo:block wrap-option='no-wrap'
             white-space-collapse='false'
-           white-space-treatment='preserve'
+            white-space-treatment='preserve'
             linefeed-treatment="preserve"
             xsl:use-attribute-sets="verbatim.properties">
     <xsl:copy-of select="$content"/>