Use the new gentext scheme for component titles and running headers

diff --git a/xsl/fo/component.xsl b/xsl/fo/component.xsl
index 28ec90ab1b2b3887acaf192ea991f1ffa250eef0..2ae88c35a12ab6ac68276e15b35ad949e45c5427 100644 (file)
--- a/xsl/fo/component.xsl
+++ b/xsl/fo/component.xsl
@@ -23,7 +23,7 @@
     </xsl:call-template>
   </xsl:variable>
   <xsl:variable name="title">
-    <xsl:apply-templates select="$node" mode="title.markup"/>
+    <xsl:apply-templates select="$node" mode="object.title.markup"/>
   </xsl:variable>
 
   <xsl:if test="$passivetex.extensions != 0">

diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index 54dad59fe1b9aafb9ac52c9ba8689bb8d9fbf02b..82116e6e57523fc8465086baf0abe06ee4aa51ef 100644 (file)
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -324,9 +324,7 @@
   <xsl:param name="master-name" select="'unknown'"/>
   <xsl:variable name="head">
     <fo:block font-size="{$body.font.size}">
-      <xsl:apply-templates select="." mode="label.markup"/>
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="." mode="title.markup"/>
+      <xsl:apply-templates select="." mode="object.title.markup"/>
     </fo:block>
   </xsl:variable>