[jboss-cvs] JBossAS SVN: r72430 - trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Apr 18 05:24:10 EDT 2008


Author: newtonm
Date: 2008-04-18 05:24:10 -0400 (Fri, 18 Apr 2008)
New Revision: 72430

Added:
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/eclipse.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/pdf.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-single.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml.xsl
Removed:
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight-pdf.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/jboss.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-eclipse.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl
Modified:
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/common.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-common.xsl
Log:
Renamed stylesheets and refactored contents for clarity and ease of maintenance.

Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/common.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/common.xsl	2008-04-18 09:15:53 UTC (rev 72429)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/common.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -1,29 +1,64 @@
 <?xml version='1.0'?>
 
 <!--
-   Copyright 2007 Red Hat, Inc.
-   License: GPL
-   Author: Pete Muir
-   Author: Mark Newton (mark.newton at jboss.org)
+    Copyright 2008 JBoss, a division of Red Hat
+    License: GPL
+    Author: Pete Muir
+    Author: Mark Newton (mark.newton at jboss.org)
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'
-   xmlns="http://www.w3.org/TR/xhtml1/transitional"
-   xmlns:fo="http://www.w3.org/1999/XSL/Format"
-   exclude-result-prefixes="#default">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-   <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/common/common.xsl"/>
+  <!-- We need to add this as it's needed later for a check -->
+  <xsl:param name="confidential" select="0"/>
+  
+  <!--  Enable extensions (needed for callouts) -->
+  <xsl:param name="use.extensions">1</xsl:param>
+ 
+  <!-- For backwards compatibility we want to use callouts specified using programlistingco elements -->
+  <xsl:param name="callouts.extension">1</xsl:param>
+ 
+  <!-- Use graphical callouts as they look nicer with highlighed code. -->
+  <xsl:param name="callout.graphics">1</xsl:param>
+  <xsl:param name="callout.graphics.number.limit">15</xsl:param>
+  <xsl:param name="callout.graphics.extension">.png</xsl:param>
+   
+  <xsl:param name="callout.graphics.path">
+    <xsl:if test="$img.src.path != ''">
+      <xsl:value-of select="$img.src.path"/>
+    </xsl:if>
+    <xsl:text>images/community/docbook/callouts/</xsl:text>
+  </xsl:param>
+      
+  <!-- Admonitions -->
+  <xsl:param name="admon.graphics" select="1"/>
+  <xsl:param name="admon.graphics.path">
+    <xsl:if test="$img.src.path != ''">
+      <xsl:value-of select="$img.src.path"/>
+    </xsl:if>
+    <xsl:text>images/community/docbook/</xsl:text>
+  </xsl:param>
+  
+  <!-- And disable these extensions -->
+  <xsl:param name="tablecolumns.extension">0</xsl:param>
+ 
+  <!-- TOC -->
+  <xsl:param name="section.autolabel" select="1"/>
 
+  <!-- Include the chapter no -->
+  <xsl:param name="section.label.includes.component.label" select="1" />
+
+  <xsl:param name="use.simplified.author.group" select="1"/>
+
    <xsl:template name="person.name.list">
-      <xsl:param name="person.list"
-         select="author|corpauthor|othercredit|editor" />
+      <xsl:param name="person.list" select="author|corpauthor|othercredit|editor" />
       <xsl:param name="person.count" select="count($person.list)" />
       <xsl:param name="person.type" select="'author'" />      
       <xsl:param name="count" select="1" />
 
-   <xsl:choose>
-   <xsl:when test="$use.simplified.author.group = 1">
       <xsl:choose>
+      <xsl:when test="$use.simplified.author.group = 1">
+      <xsl:choose>
          <!-- If there are no names in the list then don't do anything -->
          <xsl:when test="$count &gt; $person.count"></xsl:when>
          <xsl:otherwise>
@@ -110,5 +145,62 @@
       <xsl:text>and thanks to</xsl:text>
    </xsl:template>
 
+<!-- Modify the default navigation wording -->
+<xsl:param name="local.l10n.xml" select="document('')" />
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+ <l:l10n language="en">
+  <l:gentext key="nav-home" text="Front page"/>
+ </l:l10n>
+</l:i18n>
 
-</xsl:stylesheet>
\ No newline at end of file
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+ <l:l10n language="en">
+  <l:gentext key="nav-up" text="Top of page"/>
+ </l:l10n>
+</l:i18n>
+
+<!--
+Copied from fo/params.xsl
+-->
+<xsl:param name="l10n.gentext.default.language" select="'en'"/>
+
+<!-- This sets the filename based on the ID -->
+<xsl:param name="use.id.as.filename" select="'1'"/>
+
+<xsl:template match="command">
+  <xsl:call-template name="inline.monoseq"/>
+</xsl:template>
+
+<xsl:template match="application">
+  <xsl:call-template name="inline.boldseq"/>
+</xsl:template>
+
+<xsl:template match="guibutton">
+  <xsl:call-template name="inline.boldseq"/>
+</xsl:template>
+
+<xsl:template match="guiicon">
+  <xsl:call-template name="inline.boldseq"/>
+</xsl:template>
+
+<xsl:template match="guilabel">
+  <xsl:call-template name="inline.boldseq"/>
+</xsl:template>
+
+<xsl:template match="guimenu">
+  <xsl:call-template name="inline.boldseq"/>
+</xsl:template>
+
+<xsl:template match="guimenuitem">
+  <xsl:call-template name="inline.boldseq"/>
+</xsl:template>
+
+<xsl:template match="guisubmenu">
+  <xsl:call-template name="inline.boldseq"/>
+</xsl:template>
+
+<xsl:template match="filename">
+  <xsl:call-template name="inline.monoseq"/>
+</xsl:template>
+
+</xsl:stylesheet>

Copied: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/eclipse.xsl (from rev 72007, trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-eclipse.xsl)
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/eclipse.xsl	                        (rev 0)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/eclipse.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -0,0 +1,240 @@
+<?xml version='1.0'?>
+
+<!--
+    Copyright 2008 JBoss, a division of Red Hat
+    License: GPL
+    Author: Jeff Fearn <jfearn at redhat.com>
+    Author: Tammy Fox <tfox at redhat.com>
+    Author: Andy Fitzsimon <afitzsim at redhat.com>
+    Author: Mark Newton <mark.newton at jboss.org>
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/eclipse/eclipse.xsl"/>
+
+  <!-- We need to override the imported html/chunk.xsl from eclipse/eclipse.xsl to generate valid XHTML -->
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/chunk.xsl"/>
+
+  <xsl:include href="xhtml-common.xsl"/>
+
+  <!-- We don't want to display titles in the header navigation as there are already breadcrumbs -->
+  <xsl:param name="navig.showtitles" select="0"/>
+
+<!--
+From: xhtml/chunk-common.xsl
+Reason: need to add class attributes so we can style the pages using icons
+Version: 1.72.0
+-->
+<xsl:template name="header.navigation">
+  <xsl:param name="prev" select="/foo"/>
+  <xsl:param name="next" select="/foo"/>
+  <xsl:param name="nav.context"/>
+
+  <xsl:variable name="home" select="/*[1]"/>
+  <xsl:variable name="up" select="parent::*"/>
+
+  <xsl:variable name="row1" select="$navig.showtitles != 0"/>
+  <xsl:variable name="row2" select="count($prev) &gt; 0                                     or (count($up) &gt; 0                                          and generate-id($up) != generate-id($home)                                         and $navig.showtitles != 0)                                     or count($next) &gt; 0"/>
+
+  <xsl:if test="$suppress.navigation = '0' and $suppress.header.navigation = '0'">
+    <div class="navheader">
+      <xsl:if test="$row1 or $row2">
+        <table width="100%" summary="Navigation header">
+          <xsl:if test="$row1">
+            <tr>
+              <th colspan="3" align="center">
+                <xsl:apply-templates select="." mode="object.title.markup"/>
+              </th>
+            </tr>
+          </xsl:if>
+
+          <xsl:if test="$row2">
+            <tr>
+              <td width="20%" align="left" class="previous">
+                <xsl:if test="count($prev)&gt;0">
+                  <a accesskey="p">
+                    <xsl:attribute name="href">
+                      <xsl:call-template name="href.target">
+                        <xsl:with-param name="object" select="$prev"/>
+                      </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:call-template name="navig.content">
+                      <xsl:with-param name="direction" select="'prev'"/>
+                    </xsl:call-template>
+                  </a>
+                </xsl:if>
+                <xsl:text>&#160;</xsl:text>
+              </td>
+              <td width="60%" align="center">
+                <xsl:choose>
+                  <xsl:when test="count($up) &gt; 0                                   and generate-id($up) != generate-id($home)                                   and $navig.showtitles != 0">
+                    <xsl:apply-templates select="$up" mode="object.title.markup"/>
+                  </xsl:when>
+                  <xsl:otherwise>&#160;</xsl:otherwise>
+                </xsl:choose>
+              </td>
+              <td width="20%" align="right" class="next">
+                <xsl:text>&#160;</xsl:text>
+                <xsl:if test="count($next)&gt;0">
+                  <a accesskey="n">
+                    <xsl:attribute name="href">
+                      <xsl:call-template name="href.target">
+                        <xsl:with-param name="object" select="$next"/>
+                      </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:call-template name="navig.content">
+                      <xsl:with-param name="direction" select="'next'"/>
+                    </xsl:call-template>
+                  </a>
+                </xsl:if>
+              </td>
+            </tr>
+          </xsl:if>
+        </table>
+      </xsl:if>
+      <xsl:if test="$header.rule != 0">
+        <hr/>
+      </xsl:if>
+    </div>
+  </xsl:if>
+</xsl:template>
+
+<!--
+From: xhtml/chunk-common.xsl
+Reason: need to add class attributes so we can style the page using icons. Also changed the footer table to one row
+        so that the 'Top of page' and 'Front page' links are next to each other and correctly spaced.
+Version: 1.72.0
+-->
+<xsl:template name="footer.navigation">
+  <xsl:param name="prev" select="/foo"/>
+  <xsl:param name="next" select="/foo"/>
+  <xsl:param name="nav.context"/>
+
+  <xsl:variable name="home" select="/*[1]"/>
+  <xsl:variable name="up" select="parent::*"/>
+
+  <xsl:variable name="row1" select="count($prev) &gt; 0                                     or count($up) &gt; 0                                     or count($next) &gt; 0"/>
+
+  <xsl:variable name="row2" select="($prev and $navig.showtitles != 0)                                     or (generate-id($home) != generate-id(.)                                         or $nav.context = 'toc')                                     or ($chunk.tocs.and.lots != 0                                         and $nav.context != 'toc')                                     or ($next and $navig.showtitles != 0)"/>
+
+  <xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'">
+    <div class="navfooter">
+      <xsl:if test="$footer.rule != 0">
+        <hr/>
+      </xsl:if>
+
+      <xsl:if test="$row1 or $row2">
+        <table width="100%" summary="Navigation footer">
+          <xsl:if test="$row1">
+            <tr>
+              <td width="25%" align="left" class="previous">
+                <xsl:if test="count($prev)&gt;0">
+                  <a accesskey="p">
+                    <xsl:attribute name="href">
+                      <xsl:call-template name="href.target">
+                        <xsl:with-param name="object" select="$prev"/>
+                      </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:call-template name="navig.content">
+                      <xsl:with-param name="direction" select="'prev'"/>
+                    </xsl:call-template>
+                  </a>
+                </xsl:if>
+                <xsl:text>&#160;</xsl:text>
+              </td>
+              <td width="25%" align="right" class="up">
+                <xsl:choose>
+                  <xsl:when test="count($up)&gt;0                                   and generate-id($up) != generate-id($home)">
+                    <a accesskey="u">
+                      <xsl:attribute name="href">
+                        <xsl:text>#</xsl:text>
+                        <!--<xsl:call-template name="href.target">
+                          <xsl:with-param name="object" select="$up"/>
+                        </xsl:call-template>-->
+                      </xsl:attribute>
+                      <xsl:call-template name="navig.content">
+                        <xsl:with-param name="direction" select="'up'"/>
+                      </xsl:call-template>
+                    </a>
+                  </xsl:when>
+                  <xsl:otherwise>&#160;</xsl:otherwise>
+                </xsl:choose>
+              </td>
+              <td width="25%" align="left" class="home">
+                <xsl:choose>
+                  <xsl:when test="$home != . or $nav.context = 'toc'">
+                    <a accesskey="h">
+                      <xsl:attribute name="href">
+                        <xsl:call-template name="href.target">
+                          <xsl:with-param name="object" select="$home"/>
+                        </xsl:call-template>
+                      </xsl:attribute>
+                      <xsl:call-template name="navig.content">
+                        <xsl:with-param name="direction" select="'home'"/>
+                      </xsl:call-template>
+                    </a>
+                    <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
+                      <xsl:text>&#160;|&#160;</xsl:text>
+                    </xsl:if>
+                  </xsl:when>
+                  <xsl:otherwise>&#160;</xsl:otherwise>
+                </xsl:choose>
+
+                <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
+                  <a accesskey="t">
+                    <xsl:attribute name="href">
+                      <xsl:apply-templates select="/*[1]" mode="recursive-chunk-filename">
+                        <xsl:with-param name="recursive" select="true()"/>
+                      </xsl:apply-templates>
+                      <xsl:text>-toc</xsl:text>
+                      <xsl:value-of select="$html.ext"/>
+                    </xsl:attribute>
+                    <xsl:call-template name="gentext">
+                      <xsl:with-param name="key" select="'nav-toc'"/>
+                    </xsl:call-template>
+                  </a>
+                </xsl:if>
+              </td>
+              <td width="25%" align="right" class="next">
+                <xsl:text>&#160;</xsl:text>
+                <xsl:if test="count($next)&gt;0">
+                  <a accesskey="n">
+                    <xsl:attribute name="href">
+                      <xsl:call-template name="href.target">
+                        <xsl:with-param name="object" select="$next"/>
+                      </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:call-template name="navig.content">
+                      <xsl:with-param name="direction" select="'next'"/>
+                    </xsl:call-template>
+                  </a>
+                </xsl:if>
+              </td>
+            </tr>
+          </xsl:if>
+
+          <xsl:if test="$row2">
+            <tr>
+              <td align="left" valign="top">
+                <xsl:if test="$navig.showtitles != 0">
+                  <xsl:apply-templates select="$prev" mode="object.title.markup"/>
+                </xsl:if>
+                <xsl:text>&#160;</xsl:text>
+              </td>
+
+              <td align="right" valign="top">
+                <xsl:text>&#160;</xsl:text>
+                <xsl:if test="$navig.showtitles != 0">
+                  <xsl:apply-templates select="$next" mode="object.title.markup"/>
+                </xsl:if>
+              </td>
+            </tr>
+          </xsl:if>
+        </table>
+      </xsl:if>
+    </div>
+  </xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>

Deleted: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight-pdf.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight-pdf.xsl	2008-04-18 09:15:53 UTC (rev 72429)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight-pdf.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -1,112 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-        Copyright 2007 Red Hat, Inc.
-        License: GPL
-        Author: Mark Newton <mark.newton at jboss.org>
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0"
-                xmlns:jbh="java:org.jboss.highlight.renderer.FORenderer" 
-                exclude-result-prefixes="jbh">
-
-  <xsl:template match="programlisting|programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']|programlisting[@role='CSS']">
-		
-    <xsl:variable name="role">
-      <xsl:value-of select="s:toUpperCase(string(@role))" xmlns:s="java:java.lang.String"/>
-    </xsl:variable>
-
-    <xsl:variable name="hilighter" select="jbh:new()"/>
-    <xsl:variable name="parsable" select="jbh:isParsable($role)"/>
-    
-    <fo:block background-color="#F5F5F5"
-              border-style="solid"
-              border-width=".3mm"
-              border-color="#CCCCCC"
-              font-family="{$programlisting.font}"
-              font-size="{$programlisting.font.size}"
-              space-before="12pt"
-              space-after="12pt"
-              linefeed-treatment="preserve"
-              white-space-collapse="false"
-              white-space-treatment="preserve"
-              padding-bottom="12pt"
-              padding-top="12pt"
-              padding-right="12pt"
-              padding-left="12pt">
-
-    <xsl:choose>
-      <xsl:when test="$parsable = 'true'">
-        <xsl:for-each select="node()">
-          <xsl:choose>
-            <xsl:when test="self::text()">
-              <xsl:variable name="child.content" select="."/>
-      
-              <xsl:variable name="caller" select="jbh:parseText($hilighter, $role, string($child.content), 'UTF-8')"/>
-              <xsl:variable name="noOfTokens" select="jbh:getNoOfTokens($caller)"/>
-
-              <xsl:call-template name="iterator">
-                <xsl:with-param name="caller" select="$caller"/>
-                <xsl:with-param name="noOfTokens" select="$noOfTokens"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <fo:inline>
-              <xsl:call-template name="anchor"/>
-              <xsl:apply-templates select="." mode="callout-bug"/>
-              </fo:inline>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    </fo:block>
-  </xsl:template>
-
-
-  <xsl:template name="iterator">
-    <xsl:param name="caller"/>
-    <xsl:param name="noOfTokens"/>
-    <xsl:param name="i" select="0"/>
-
-    <xsl:variable name="style" select="jbh:getStyle($caller, $i)"/>
-    <xsl:variable name="token" select="jbh:getToken($caller, $i)"/>
-
-    <xsl:choose>
-      <xsl:when test="$style = 'java_keyword'"> <fo:inline color="#7F1B55" font-weight="bold"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'java_plain'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'java_type'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'java_separator'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'java_literal'"> <fo:inline color="#2A00FF"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'java_comment'"> <fo:inline color="#3F7F5F"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'java_javadoc_comment'"> <fo:inline color="#3F5FBF" font-style="italic"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'java_operator'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'java_javadoc_tag'"> <fo:inline color="#7F9FBF" font-weight="bold" font-style="italic"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'xml_plain'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'xml_char_data'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'xml_tag_symbols'"> <fo:inline color="#008080"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'xml_comment'"> <fo:inline color="#3F5FBF"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'xml_attribute_value'"> <fo:inline color="#2A00FF"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'xml_attribute_name'"> <fo:inline color="#7F007F" font-weight="bold"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'xml_processing_instruction'"> <fo:inline color="#000000" font-weight="bold" font-style="italic"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'xml_tag_name'"> <fo:inline color="#3F7F7F"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'xml_rife_tag'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:when test="$style = 'xml_rife_name'"> <fo:inline color="#008CCA"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
-      <xsl:otherwise> <fo:inline color="black"> <xsl:value-of select="$token"/> </fo:inline></xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="$i &lt; $noOfTokens - 1">
-      <xsl:call-template name="iterator">
-        <xsl:with-param name="caller" select="$caller"/>
-        <xsl:with-param name="noOfTokens" select="$noOfTokens"/>
-        <xsl:with-param name="i" select="$i + 1"/>
-      </xsl:call-template>  
-    </xsl:if>
-  </xsl:template>
-                
-</xsl:stylesheet>

Deleted: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight.xsl	2008-04-18 09:15:53 UTC (rev 72429)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -1,70 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-        Copyright 2007 Red Hat, Inc.
-        License: GPL
-        Author: Mark Newton <mark.newton at jboss.org>
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0"
-                xmlns:rf="java:org.jboss.highlight.XhtmlRendererFactory"
-                exclude-result-prefixes="#default">
-
-	<xsl:template match="programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']|programlisting[@role='CSS']">
-		
-		<xsl:variable name="role">
-			<xsl:value-of select="s:toUpperCase(string(@role))" xmlns:s="java:java.lang.String"/>
-		</xsl:variable>
-		
-		<xsl:variable name="factory" select="rf:instance()"/>
-		<xsl:variable name="hiliter" select="rf:getRenderer($factory, string($role))"/>
-
-		<pre class="{$role}">
-		<xsl:choose>
-		  <xsl:when test="$hiliter">
-            <xsl:for-each select="node()">
-              <xsl:choose>
-                <xsl:when test="self::text()">
-                  <xsl:variable name="child.content" select="."/>
-          
-          	      <xsl:value-of select="jhr:highlight($hiliter, $role, string($child.content), 'UTF-8', true())"
-						xmlns:jhr="com.uwyn.jhighlight.renderer.Renderer" disable-output-escaping="yes"/>
-			    </xsl:when>
-                <xsl:otherwise>
-                  <!-- Support a single linkend in HTML -->
-                  <xsl:variable name="targets" select="key('id', @linkends)"/>
-                  <xsl:variable name="target" select="$targets[1]"/>
-                  <xsl:choose>
-                  <xsl:when test="$target">
-                  <a>
-                    <xsl:if test="@id or @xml:id">
-                      <xsl:attribute name="id">
-                        <xsl:value-of select="(@id|@xml:id)[1]"/>
-                      </xsl:attribute>
-                    </xsl:if>
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$target"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:apply-templates select="." mode="callout-bug"/>
-                  </a>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:call-template name="anchor"/>
-                    <xsl:apply-templates select="." mode="callout-bug"/>
-                  </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:for-each>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </pre>
-		
-	</xsl:template>
-                
-</xsl:stylesheet>

Deleted: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/jboss.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/jboss.xsl	2008-04-18 09:15:53 UTC (rev 72429)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/jboss.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -1,86 +0,0 @@
-<?xml version='1.0'?>
- 
-<!--
-	Copyright 2007 Red Hat, Inc.
-	License: GPL
-	Author: Jeff Fearn <jfearn at redhat.com>
-	Author: Tammy Fox <tfox at redhat.com>
-	Author: Andy Fitzsimon <afitzsim at redhat.com>
-        Author: Mark Newton <mark.newton at jboss.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-				xmlns:exsl="http://exslt.org/common"
-				version="1.0"
-				exclude-result-prefixes="exsl">
-
-<!-- Modify the default navigation wording -->
-<xsl:param name="local.l10n.xml" select="document('')" />
-<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
- <l:l10n language="en">
-  <l:gentext key="nav-home" text="Front page"/>
- </l:l10n>
-</l:i18n>
-
-<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
- <l:l10n language="en">
-  <l:gentext key="nav-up" text="Top of page"/>
- </l:l10n>
-</l:i18n>
-
-<!-- titles after all elements -->
-<!-- <xsl:param name="formal.title.placement">
-figure after
-example after
-equation after
-table after
-procedure before 
-</xsl:param> -->
-
-<!--
-Copied from fo/params.xsl
--->
-<xsl:param name="l10n.gentext.default.language" select="'en'"/>
-
-<!-- This sets the filename based on the ID.								-->
-<xsl:param name="use.id.as.filename" select="'1'"/>
-
-<xsl:template match="command">
-	<xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="application">
-	<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guibutton">
-	<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guiicon">
-	<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guilabel">
-	<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guimenu">
-	<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guimenuitem">
-	<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guisubmenu">
-	<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="filename">
-	<xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-</xsl:stylesheet>
-
-

Deleted: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-eclipse.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-eclipse.xsl	2008-04-18 09:15:53 UTC (rev 72429)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-eclipse.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -1,300 +0,0 @@
-<?xml version='1.0'?>
- 
-<!--
-	Copyright 2007 Red Hat, Inc.
-	License: GPL
-	Author: Jeff Fearn <jfearn at redhat.com>
-	Author: Tammy Fox <tfox at redhat.com>
-	Author: Andy Fitzsimon <afitzsim at redhat.com>
-        Author: Mark Newton <mark.newton at jboss.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-				xmlns:exsl="http://exslt.org/common"
-				version="1.0"
-				exclude-result-prefixes="exsl">
-
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/eclipse/eclipse.xsl"/>
-
-<!-- We need to override the imported html/chunk.xsl from eclipse/eclipse.xsl to generate valid XHTML -->
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/chunk.xsl"/>
-
-<xsl:include href="jboss.xsl"/>
-<xsl:include href="xhtml-common.xsl"/>
-<xsl:include href="highlight.xsl"/>
-
-<xsl:param name="use.simplified.author.group" select="1"/>
-
-<!-- This is needed to generate the correct xhtml-strict DOCTYPE on the front page.
-     We can't use indentation as the algorithm inserts linebreaks into the markup
-     created for callouts. This means that callouts appear on different lines than
-     the code they are supposed to refer to. -->
-<xsl:output method="xml"
-            encoding="UTF-8"
-            indent="no"
-            doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-            doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-            standalone="no"/>
-
-<!-- We need to add this as it's needed later for a check -->
-<xsl:param name="confidential" select="0"/>
-
-<xsl:param name="generate.legalnotice.link" select="1"/>
-<xsl:param name="generate.revhistory.link" select="0"/>
-
-<!-- Set chunk.section.depth to 0 to just chunk chapters. -->
-<xsl:param name="chunk.section.depth" select="0"/>
-<xsl:param name="chunk.first.sections" select="1"/>
-<xsl:param name="chunk.toc" select="''"/>
-
-<!-- We don't want to display titles in the header navigation as there are already breadcrumbs -->
-<xsl:param name="navig.showtitles" select="0"/>
-
-<!--
-From: xhtml/chunk-common.xsl
-Reason: need to add class attributes so we can style the pages using icons
-Version: 1.72.0
--->
-<xsl:template name="header.navigation">
-  <xsl:param name="prev" select="/foo"/>
-  <xsl:param name="next" select="/foo"/>
-  <xsl:param name="nav.context"/>
-
-  <xsl:variable name="home" select="/*[1]"/>
-  <xsl:variable name="up" select="parent::*"/>
-
-  <xsl:variable name="row1" select="$navig.showtitles != 0"/>
-  <xsl:variable name="row2" select="count($prev) &gt; 0                                     or (count($up) &gt; 0                                          and generate-id($up) != generate-id($home)                                         and $navig.showtitles != 0)                                     or count($next) &gt; 0"/>
-
-  <xsl:if test="$suppress.navigation = '0' and $suppress.header.navigation = '0'">
-    <div class="navheader">
-      <xsl:if test="$row1 or $row2">
-        <table width="100%" summary="Navigation header">
-          <xsl:if test="$row1">
-            <tr>
-              <th colspan="3" align="center">
-                <xsl:apply-templates select="." mode="object.title.markup"/>
-              </th>
-            </tr>
-          </xsl:if>
-
-          <xsl:if test="$row2">
-            <tr>
-              <td width="20%" align="left" class="previous">
-                <xsl:if test="count($prev)&gt;0">
-                  <a accesskey="p">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$prev"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'prev'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-                <xsl:text>&#160;</xsl:text>
-              </td>
-              <td width="60%" align="center">
-                <xsl:choose>
-                  <xsl:when test="count($up) &gt; 0                                   and generate-id($up) != generate-id($home)                                   and $navig.showtitles != 0">
-                    <xsl:apply-templates select="$up" mode="object.title.markup"/>
-                  </xsl:when>
-                  <xsl:otherwise>&#160;</xsl:otherwise>
-                </xsl:choose>
-              </td>
-              <td width="20%" align="right" class="next">
-                <xsl:text>&#160;</xsl:text>
-                <xsl:if test="count($next)&gt;0">
-                  <a accesskey="n">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$next"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'next'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-              </td>
-            </tr>
-          </xsl:if>
-        </table>
-      </xsl:if>
-      <xsl:if test="$header.rule != 0">
-        <hr/>
-      </xsl:if>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<!--
-From: xhtml/chunk-common.xsl
-Reason: need to add class attributes so we can style the page using icons. Also changed the footer table to one row
-        so that the 'Top of page' and 'Front page' links are next to each other and correctly spaced.
-Version: 1.72.0
--->
-<xsl:template name="footer.navigation">
-  <xsl:param name="prev" select="/foo"/>
-  <xsl:param name="next" select="/foo"/>
-  <xsl:param name="nav.context"/>
-
-  <xsl:variable name="home" select="/*[1]"/>
-  <xsl:variable name="up" select="parent::*"/>
-
-  <xsl:variable name="row1" select="count($prev) &gt; 0                                     or count($up) &gt; 0                                     or count($next) &gt; 0"/>
-
-  <xsl:variable name="row2" select="($prev and $navig.showtitles != 0)                                     or (generate-id($home) != generate-id(.)                                         or $nav.context = 'toc')                                     or ($chunk.tocs.and.lots != 0                                         and $nav.context != 'toc')                                     or ($next and $navig.showtitles != 0)"/>
-
-  <xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'">
-    <div class="navfooter">
-      <xsl:if test="$footer.rule != 0">
-        <hr/>
-      </xsl:if>
-
-      <xsl:if test="$row1 or $row2">
-        <table width="100%" summary="Navigation footer">
-          <xsl:if test="$row1">
-            <tr>
-              <td width="25%" align="left" class="previous">
-                <xsl:if test="count($prev)&gt;0">
-                  <a accesskey="p">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$prev"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'prev'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-                <xsl:text>&#160;</xsl:text>
-              </td>
-              <td width="25%" align="right" class="up">
-                <xsl:choose>
-                  <xsl:when test="count($up)&gt;0                                   and generate-id($up) != generate-id($home)">
-                    <a accesskey="u">
-                      <xsl:attribute name="href">
-                        <xsl:text>#</xsl:text>
-                        <!--<xsl:call-template name="href.target">
-                          <xsl:with-param name="object" select="$up"/>
-                        </xsl:call-template>-->
-                      </xsl:attribute>
-                      <xsl:call-template name="navig.content">
-                        <xsl:with-param name="direction" select="'up'"/>
-                      </xsl:call-template>
-                    </a>
-                  </xsl:when>
-                  <xsl:otherwise>&#160;</xsl:otherwise>
-                </xsl:choose>
-              </td>
-              <td width="25%" align="left" class="home">
-                <xsl:choose>
-                  <xsl:when test="$home != . or $nav.context = 'toc'">
-                    <a accesskey="h">
-                      <xsl:attribute name="href">
-                        <xsl:call-template name="href.target">
-                          <xsl:with-param name="object" select="$home"/>
-                        </xsl:call-template>
-                      </xsl:attribute>
-                      <xsl:call-template name="navig.content">
-                        <xsl:with-param name="direction" select="'home'"/>
-                      </xsl:call-template>
-                    </a>
-                    <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
-                      <xsl:text>&#160;|&#160;</xsl:text>
-                    </xsl:if>
-                  </xsl:when>
-                  <xsl:otherwise>&#160;</xsl:otherwise>
-                </xsl:choose>
-
-                <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
-                  <a accesskey="t">
-                    <xsl:attribute name="href">
-                      <xsl:apply-templates select="/*[1]" mode="recursive-chunk-filename">
-                        <xsl:with-param name="recursive" select="true()"/>
-                      </xsl:apply-templates>
-                      <xsl:text>-toc</xsl:text>
-                      <xsl:value-of select="$html.ext"/>
-                    </xsl:attribute>
-                    <xsl:call-template name="gentext">
-                      <xsl:with-param name="key" select="'nav-toc'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-              </td>
-              <td width="25%" align="right" class="next">
-                <xsl:text>&#160;</xsl:text>
-                <xsl:if test="count($next)&gt;0">
-                  <a accesskey="n">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$next"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'next'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-              </td>
-            </tr>
-          </xsl:if>
-
-          <xsl:if test="$row2">
-            <tr>
-              <td align="left" valign="top">
-                <xsl:if test="$navig.showtitles != 0">
-                  <xsl:apply-templates select="$prev" mode="object.title.markup"/>
-                </xsl:if>
-                <xsl:text>&#160;</xsl:text>
-              </td>
-
-              <td align="right" valign="top">
-                <xsl:text>&#160;</xsl:text>
-                <xsl:if test="$navig.showtitles != 0">
-                  <xsl:apply-templates select="$next" mode="object.title.markup"/>
-                </xsl:if>
-              </td>
-            </tr>
-          </xsl:if>
-        </table>
-      </xsl:if>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<!--
-From: xhtml/footnote.xsl
-Reason: remove inline css from hr
-Version: 1.72.0
--->
-<xsl:template name="process.footnotes">
-  <xsl:variable name="footnotes" select=".//footnote"/>
-  <xsl:variable name="table.footnotes" select=".//tgroup//footnote"/>
-
-  <!-- Only bother to do this if there's at least one non-table footnote -->
-  <xsl:if test="count($footnotes)&gt;count($table.footnotes)">
-    <div class="footnotes">
-      <br/>
-      <hr/>
-      <xsl:apply-templates select="$footnotes" mode="process.footnote.mode"/>
-    </div>
-  </xsl:if>
-
-  <xsl:if test="$annotation.support != 0 and //annotation">
-    <div class="annotation-list">
-      <div class="annotation-nocss">
-	<p>The following annotations are from this essay. You are seeing
-	them here because your browser doesn&#8217;t support the user-interface
-	techniques used to make them appear as &#8216;popups&#8217; on modern browsers.</p>
-      </div>
-
-      <xsl:apply-templates select="//annotation" mode="annotation-popup"/>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>

Deleted: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl	2008-04-18 09:15:53 UTC (rev 72429)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -1,288 +0,0 @@
-<?xml version='1.0'?>
- 
-<!--
-	Copyright 2007 Red Hat, Inc.
-	License: GPL
-	Author: Jeff Fearn <jfearn at redhat.com>
-	Author: Tammy Fox <tfox at redhat.com>
-	Author: Andy Fitzsimon <afitzsim at redhat.com>
-        Author: Mark Newton <mark.newton at jboss.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-				xmlns:exsl="http://exslt.org/common"
-				version="1.0"
-				exclude-result-prefixes="exsl">
-
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/docbook.xsl"/>
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/chunk-common.xsl"/>
-<xsl:include href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/manifest.xsl"/>
-<xsl:include href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/chunk-code.xsl"/>
-
-<xsl:include href="jboss.xsl"/>
-<xsl:include href="xhtml-common.xsl"/>
-<xsl:include href="highlight.xsl"/>
-
-<xsl:param name="use.simplified.author.group" select="1"/>
-
-<xsl:param name="siteHref" select="'http://www.jboss.org'" />
-<xsl:param name="docHref" select="'http://labs.jboss.com/projects/docs'" />
-<xsl:param name="siteLinkText" select="'JBoss.org'" />
-<xsl:param name="docLinkText" select="'Community Documentation'" />
-
-<xsl:param name="confidential" select="0"/>
-
-<xsl:param name="generate.legalnotice.link" select="1"/>
-<xsl:param name="generate.revhistory.link" select="0"/>
-
-<!-- Set chunk.section.depth to 0 to just chunk chapters. -->
-<xsl:param name="chunk.section.depth" select="0"/>
-<xsl:param name="chunk.first.sections" select="1"/>
-<xsl:param name="chunk.toc" select="''"/>
-
-<!-- Ignore image scaling in html version -->
-<xsl:param name="ignore.image.scaling" select="1"/> 
-
-<!-- This is needed to generate the correct xhtml-strict DOCTYPE on the front page.
-     We can't use indentation as the algorithm inserts linebreaks into the markup
-     created for callouts. This means that callouts appear on different lines than
-     the code they are supposed to refer to. -->
-<xsl:output method="xml"
-            encoding="UTF-8"
-            indent="no"
-            doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-            doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-            standalone="no"/>
-
-<!--
-From: xhtml/footnote.xsl
-Reason: remove inline css from hr
-Version: 1.72.0
--->
-<xsl:template name="process.footnotes">
-  <xsl:variable name="footnotes" select=".//footnote"/>
-  <xsl:variable name="table.footnotes" select=".//tgroup//footnote"/>
-
-  <!-- Only bother to do this if there's at least one non-table footnote -->
-  <xsl:if test="count($footnotes)&gt;count($table.footnotes)">
-    <div class="footnotes">
-      <br/>
-      <hr/>
-      <xsl:apply-templates select="$footnotes" mode="process.footnote.mode"/>
-    </div>
-  </xsl:if>
-
-  <xsl:if test="$annotation.support != 0 and //annotation">
-    <div class="annotation-list">
-      <div class="annotation-nocss">
-	<p>The following annotations are from this essay. You are seeing
-	them here because your browser doesn&#8217;t support the user-interface
-	techniques used to make them appear as &#8216;popups&#8217; on modern browsers.</p>
-      </div>
-
-      <xsl:apply-templates select="//annotation" mode="annotation-popup"/>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<!--
-From: xhtml/chunk-common.xsl
-Reason: remove tables, truncate link text
-Version:
--->
-<xsl:template name="header.navigation">
-	<xsl:param name="prev" select="/foo"/>
-	<xsl:param name="next" select="/foo"/>
-	<xsl:param name="nav.context"/>
-	<xsl:variable name="home" select="/*[1]"/>
-	<xsl:variable name="up" select="parent::*"/>
-	<xsl:variable name="row1" select="$navig.showtitles != 0"/>
-	<xsl:variable name="row2" select="count($prev) &gt; 0 or (count($up) &gt; 0 and generate-id($up) != generate-id($home) and $navig.showtitles != 0) or count($next) &gt; 0"/>
-	<xsl:if test="$suppress.navigation = '0' and $suppress.header.navigation = '0'">
-		<xsl:if test="$row1 or $row2">
-			<xsl:if test="$row1">
-				<p xmlns="http://www.w3.org/1999/xhtml">
-					<xsl:attribute name="id">
-						<xsl:text>title</xsl:text>
-					</xsl:attribute>
-					<a>
-						<xsl:attribute name="href">
-							<xsl:value-of select="$siteHref" />
-						</xsl:attribute>
-						<xsl:attribute name="class">
-							<xsl:text>site_href</xsl:text>
-						</xsl:attribute>
-						<strong>
-						        <xsl:value-of select="$siteLinkText"/>	
-						</strong>
-					</a>
-					<a>
-						<xsl:attribute name="href">
-							<xsl:value-of select="$docHref" />
-						</xsl:attribute>
-						<xsl:attribute name="class">
-							<xsl:text>doc_href</xsl:text>
-						</xsl:attribute>
-						<strong>
-						        <xsl:value-of select="$docLinkText"/>	
-						</strong>
-					</a>
-				</p>
-			</xsl:if>
-			<xsl:if test="$row2">
-				<ul class="docnav" xmlns="http://www.w3.org/1999/xhtml">
-					<li class="previous">
-						<xsl:if test="count($prev)&gt;0">
-							<a accesskey="p">
-								<xsl:attribute name="href">
-									<xsl:call-template name="href.target">
-										<xsl:with-param name="object" select="$prev"/>
-									</xsl:call-template>
-								</xsl:attribute>
-								<strong>
-									<xsl:call-template name="navig.content">
-										<xsl:with-param name="direction" select="'prev'"/>
-									</xsl:call-template>
-								</strong>
-							</a>
-						</xsl:if>
-					</li>
-					<li class="next">
-						<xsl:if test="count($next)&gt;0">
-							<a accesskey="n">
-								<xsl:attribute name="href">
-									<xsl:call-template name="href.target">
-										<xsl:with-param name="object" select="$next"/>
-									</xsl:call-template>
-								</xsl:attribute>
-								<strong>
-									<xsl:call-template name="navig.content">
-										<xsl:with-param name="direction" select="'next'"/>
-									</xsl:call-template>
-								</strong>
-							</a>
-						</xsl:if>
-					</li>
-				</ul>
-			</xsl:if>
-		</xsl:if>
-		<xsl:if test="$header.rule != 0">
-			<hr/>
-		</xsl:if>
-	</xsl:if>
-</xsl:template>
-
-<!--
-From: xhtml/chunk-common.xsl
-Reason: remove tables, truncate link text
-Version:
--->
-<xsl:template name="footer.navigation">
-	<xsl:param name="prev" select="/foo"/>
-	<xsl:param name="next" select="/foo"/>
-	<xsl:param name="nav.context"/>
-	<xsl:param name="title-limit" select="'50'"/>
-	<xsl:variable name="home" select="/*[1]"/>
-	<xsl:variable name="up" select="parent::*"/>
-	<xsl:variable name="row1" select="count($prev) &gt; 0 or count($up) &gt; 0 or count($next) &gt; 0"/>
-	<xsl:variable name="row2" select="($prev and $navig.showtitles != 0) or (generate-id($home) != generate-id(.) or $nav.context = 'toc') or ($chunk.tocs.and.lots != 0 and $nav.context != 'toc') or ($next and $navig.showtitles != 0)"/>
-
-	<xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'">
-		<xsl:if test="$footer.rule != 0">
-			<hr/>
-		</xsl:if>
-		<xsl:if test="$row1 or $row2">
-			<ul class="docnav" xmlns="http://www.w3.org/1999/xhtml">
-				<xsl:if test="$row1">
-					<li class="previous">
-						<xsl:if test="count($prev) &gt; 0">
-							<a accesskey="p">
-								<xsl:attribute name="href">
-									<xsl:call-template name="href.target">
-										<xsl:with-param name="object" select="$prev"/>
-									</xsl:call-template>
-								</xsl:attribute>
-								<strong>
-									<xsl:call-template name="navig.content">
-										<xsl:with-param name="direction" select="'prev'"/>
-									</xsl:call-template>
-								</strong>
-								<xsl:variable name="text">
-									<xsl:apply-templates select="$prev" mode="object.title.markup"/>
-								</xsl:variable>
-								<xsl:choose>
-									<xsl:when test="string-length($text) &gt; $title-limit">
-										<xsl:value-of select="concat(substring($text, 0, $title-limit), '...')"/>
-									</xsl:when>
-									<xsl:otherwise>
-										<xsl:value-of select="$text"/>
-									</xsl:otherwise>
-								</xsl:choose>
-							</a>
-						</xsl:if>
-					</li>
-					<xsl:if test="count($up) &gt; 0">
-						<li class="up">
-							<a accesskey="u">
-								<xsl:attribute name="href">
-									<xsl:text>#</xsl:text>
-								</xsl:attribute>
-								<strong>
-									<xsl:call-template name="navig.content">
-										<xsl:with-param name="direction" select="'up'"/>
-									</xsl:call-template>
-								</strong>
-							</a>
-						</li>
-					</xsl:if>
-					<xsl:if test="$home != . or $nav.context = 'toc'">
-						<li class="home">
-							<a accesskey="h">
-								<xsl:attribute name="href">
-									<xsl:call-template name="href.target">
-										<xsl:with-param name="object" select="$home"/>
-									</xsl:call-template>
-								</xsl:attribute>
-								<strong>
-									<xsl:call-template name="navig.content">
-										<xsl:with-param name="direction" select="'home'"/>
-									</xsl:call-template>
-								</strong>
-							</a>
-						</li>
-					</xsl:if>
-					<xsl:if test="count($next)&gt;0">
-						<li class="next">
-							<a accesskey="n">
-								<xsl:attribute name="href">
-									<xsl:call-template name="href.target">
-										<xsl:with-param name="object" select="$next"/>
-									</xsl:call-template>
-								</xsl:attribute>
-								<strong>
-									<xsl:call-template name="navig.content">
-										<xsl:with-param name="direction" select="'next'"/>
-									</xsl:call-template>
-								</strong>
-								<xsl:variable name="text">
-									<xsl:apply-templates select="$next" mode="object.title.markup"/>
-								</xsl:variable>
-								<xsl:choose>
-									<xsl:when test="string-length($text) &gt; $title-limit">
-										<xsl:value-of select="concat(substring($text, 0, $title-limit),'...')"/>
-									</xsl:when>
-									<xsl:otherwise>
-										<xsl:value-of select="$text"/>
-									</xsl:otherwise>
-								</xsl:choose>
-							</a>
-						</li>
-					</xsl:if>
-				</xsl:if>
-			</ul>
-		</xsl:if>
-	</xsl:if>
-</xsl:template>
-
-
-</xsl:stylesheet>

Deleted: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl	2008-04-18 09:15:53 UTC (rev 72429)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -1,1528 +0,0 @@
-<?xml version='1.0'?>
- 
-<!--
-	Copyright 2007 Red Hat, Inc.
-	License: GPL
-	Author: Jeff Fearn <jfearn at redhat.com>
-	Author: Tammy Fox <tfox at redhat.com>
-	Author: Andy Fitzsimon <afitzsim at redhat.com>
-	Author: Mark Newton <mark.newton at jboss.org>
-	Author: Pete Muir
--->
-
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'">
-<!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'">
- ]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		version='1.0'
-		xmlns="http://www.w3.org/TR/xhtml1/transitional"
-		xmlns:fo="http://www.w3.org/1999/XSL/Format"
-		exclude-result-prefixes="#default">
-
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/fo/docbook.xsl"/>
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/fo/graphics.xsl"/>
-<xsl:import href="jboss.xsl"/>
-<xsl:import href="highlight-pdf.xsl"/>
-<xsl:import href="common.xsl" />
-
-<xsl:param name="use.simplified.author.group" select="1"/>
-
-<xsl:param name="alignment">justify</xsl:param>
-<xsl:param name="use.extensions" select="1"/>
-<xsl:param name="tablecolumns.extensions" select="0"/>
-<xsl:param name="fop.extensions" select="1"/>
-<xsl:param name="fop1.extensions" select="0"/>
-<xsl:param name="img.src.path"/>
-<xsl:param name="confidential" select="0"/>
-<xsl:param name="qandadiv.autolabel" select="0"/>
-
-<xsl:param name="hyphenation-character">-</xsl:param>
-
-<!--xsl:param name="hyphenate.verbatim" select="0"/-->
-<xsl:param name="hyphenate">true</xsl:param>
-<!--xsl:param name="ulink.hyphenate" select="1"/-->
-
-<xsl:param name="line-height" select="1.5"/>
-
-   <!--###################################################
-      Callouts
-      ################################################### -->
-
-   <!-- For backwards compatibility we want to use callouts specified using programlistingco elements -->
-   <xsl:param name="callouts.extension">1</xsl:param>
-
-   <!-- Place callout bullets at this column in programlisting.-->
-   <xsl:param name="callout.defaultcolumn">80</xsl:param>
-
-   <!-- Use graphical callouts as they look nicer with highlighed code. -->
-   <xsl:param name="callout.graphics">1</xsl:param>
-   <xsl:param name="callout.graphics.number.limit">15</xsl:param>
-   <xsl:param name="callout.icon.size">10pt</xsl:param>
-   <xsl:param name="callout.graphics.extension">.png</xsl:param>
-   
-   <xsl:param name="callout.graphics.path">
-      <xsl:if test="$img.src.path != ''">
-         <xsl:value-of select="$img.src.path"/>
-      </xsl:if>
-      <xsl:text>images/community/docbook/callouts/</xsl:text>
-   </xsl:param>
-
-   <xsl:param name="programlisting.font" select="'verdana,helvetica,sans-serif'" />
-   <xsl:param name="programlisting.font.size" select="'100%'" />
-
-   <!-- Change to monospace font for programlisting, needed to workaround crappy callouts -->
-   <!-- <xsl:param name="programlisting.font" select="$monospace.font.family" /> -->
-
-   <!-- Make the font for programlisting slightly smaller -->
-   <!-- <xsl:param name="programlisting.font.size" select="'75%'" /> -->
-   
-<!-- 
-From: fo/callout.xsl
-Version: 1.73.2
-Reason: This includes the callout.icon.size attribute for SVGs, we also add padding to the graphics
-        (We can probably get rid of this if we upgrade to DocBook Stylesheets 1.73.2)
- -->
- <xsl:template name="callout-bug">
-  <xsl:param name="conum" select='1'/>
-
-  <xsl:choose>
-    <!-- Draw callouts as images -->
-    <xsl:when test="$callout.graphics != '0'
-                    and $conum &lt;= $callout.graphics.number.limit">
-      <xsl:variable name="filename"
-                    select="concat($callout.graphics.path, $conum,
-                                   $callout.graphics.extension)"/>
-
-      <fo:external-graphic content-width="{$callout.icon.size}"
-                           width="{$callout.icon.size}" padding="0.0em" margin="0.0em">
-        <xsl:attribute name="src">
-          <xsl:choose>
-            <xsl:when test="$passivetex.extensions != 0
-                            or $fop.extensions != 0
-                            or $arbortext.extensions != 0">
-              <xsl:value-of select="$filename"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>url(</xsl:text>
-              <xsl:value-of select="$filename"/>
-              <xsl:text>)</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </fo:external-graphic>
-    </xsl:when>
-
-    <xsl:when test="$callout.unicode != 0
-                    and $conum &lt;= $callout.unicode.number.limit">
-      <xsl:variable name="comarkup">
-        <xsl:choose>
-          <xsl:when test="$callout.unicode.start.character = 10102">
-            <xsl:choose>
-              <xsl:when test="$conum = 1">&#10102;</xsl:when>
-              <xsl:when test="$conum = 2">&#10103;</xsl:when>
-              <xsl:when test="$conum = 3">&#10104;</xsl:when>
-              <xsl:when test="$conum = 4">&#10105;</xsl:when>
-              <xsl:when test="$conum = 5">&#10106;</xsl:when>
-              <xsl:when test="$conum = 6">&#10107;</xsl:when>
-              <xsl:when test="$conum = 7">&#10108;</xsl:when>
-              <xsl:when test="$conum = 8">&#10109;</xsl:when>
-              <xsl:when test="$conum = 9">&#10110;</xsl:when>
-              <xsl:when test="$conum = 10">&#10111;</xsl:when>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message>
-              <xsl:text>Don't know how to generate Unicode callouts </xsl:text>
-              <xsl:text>when $callout.unicode.start.character is </xsl:text>
-              <xsl:value-of select="$callout.unicode.start.character"/>
-            </xsl:message>
-            <fo:inline background-color="#404040"
-                       color="white"
-                       padding-top="0.1em"
-                       padding-bottom="0.1em"
-                       padding-start="0.2em"
-                       padding-end="0.2em"
-                       baseline-shift="0.1em"
-                       font-family="{$body.fontset}"
-                       font-weight="bold"
-                       font-size="75%">
-              <xsl:value-of select="$conum"/>
-            </fo:inline>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$callout.unicode.font != ''">
-          <fo:inline font-family="{$callout.unicode.font}">
-            <xsl:copy-of select="$comarkup"/>
-          </fo:inline>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$comarkup"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <!-- Most safe: draw a dark gray square with a white number inside -->
-    <xsl:otherwise>
-      <fo:inline background-color="#404040"
-                 color="white"
-                 padding-top="0.1em"
-                 padding-bottom="0.1em"
-                 padding-start="0.2em"
-                 padding-end="0.2em"
-                 baseline-shift="0.1em"
-                 font-family="{$body.fontset}"
-                 font-weight="bold"
-                 font-size="75%">
-        <xsl:value-of select="$conum"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>   
-
-<xsl:attribute-set name="xref.properties">
-  <xsl:attribute name="font-style">italic</xsl:attribute>
-  <xsl:attribute name="color">
-	<xsl:choose>
-		<xsl:when test="ancestor::note or ancestor::caution or ancestor::important or ancestor::warning or ancestor::tip">
-			<xsl:text>#aee6ff</xsl:text>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:text>#0066cc</xsl:text>
-		</xsl:otherwise>
-	</xsl:choose>
-  </xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="monospace.properties">
-	<xsl:attribute name="font-size">9pt</xsl:attribute>
-	<xsl:attribute name="font-family">
-		<xsl:value-of select="$monospace.font.family"/>
-	</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="monospace.verbatim.properties" use-attribute-sets="verbatim.properties monospace.properties">
-	<xsl:attribute name="text-align">start</xsl:attribute>
-	<xsl:attribute name="wrap-option">wrap</xsl:attribute>
-	<xsl:attribute name="hyphenation-character">&#x25BA;</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:param name="shade.verbatim" select="1"/>
-<xsl:attribute-set name="shade.verbatim.style">
-  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
-  <xsl:attribute name="background-color">
-	<xsl:choose>
-		<xsl:when test="ancestor::note"> <xsl:text>#B5BCBD</xsl:text> </xsl:when>
-		<xsl:when test="ancestor::caution"> <xsl:text>#E3A835</xsl:text> </xsl:when>
-		<xsl:when test="ancestor::important"> <xsl:text>#4A5D75</xsl:text> </xsl:when>
-		<xsl:when test="ancestor::warning"> <xsl:text>#7B1E1E</xsl:text> </xsl:when>
-		<xsl:when test="ancestor::tip"> <xsl:text>#7E917F</xsl:text> </xsl:when>
-		<xsl:otherwise>
-			<xsl:text>black</xsl:text>
-		</xsl:otherwise>
-	</xsl:choose>
-  </xsl:attribute>
-  <xsl:attribute name="color">
-	<xsl:choose>
-		<xsl:when test="ancestor::note"> <xsl:text>#4C5253</xsl:text> </xsl:when>
-		<xsl:when test="ancestor::caution"> <xsl:text>#533500</xsl:text> </xsl:when>
-		<xsl:when test="ancestor::important"> <xsl:text>white</xsl:text> </xsl:when>
-		<xsl:when test="ancestor::warning"> <xsl:text>white</xsl:text> </xsl:when>
-		<xsl:when test="ancestor::tip"> <xsl:text>white</xsl:text> </xsl:when>
-		<xsl:otherwise>
-			<xsl:text>red</xsl:text>
-		</xsl:otherwise>
-	</xsl:choose>
-  </xsl:attribute>
-	<xsl:attribute name="padding-left">12pt</xsl:attribute>
-	<xsl:attribute name="padding-right">12pt</xsl:attribute>
-	<xsl:attribute name="padding-top">6pt</xsl:attribute>
-	<xsl:attribute name="padding-bottom">6pt</xsl:attribute>
-	<xsl:attribute name="margin-left">
-		<xsl:value-of select="$title.margin.left"/>
-	</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="verbatim.properties">
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
-  <xsl:attribute name="white-space-collapse">false</xsl:attribute>
-  <xsl:attribute name="white-space-treatment">preserve</xsl:attribute>
-  <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
-  <xsl:attribute name="text-align">start</xsl:attribute>
-</xsl:attribute-set>
-
-<!-- Admonitions -->
-<xsl:param name="admon.graphics" select="1"/>
-<xsl:param name="admon.graphics.path">
-	<xsl:if test="$img.src.path != ''"><xsl:value-of select="$img.src.path"/></xsl:if><xsl:text>images/community/docbook/</xsl:text>
-</xsl:param>
-<xsl:param name="admon.graphics.extension" select="'.svg'"/>
-<xsl:attribute-set name="admonition.title.properties">
-	<xsl:attribute name="font-size">13pt</xsl:attribute>
-	<xsl:attribute name="color">
-	<xsl:choose>
-		<xsl:when test="self::note">#4C5253</xsl:when>
-		<xsl:when test="self::caution">#533500</xsl:when>
-		<xsl:when test="self::important">white</xsl:when>
-		<xsl:when test="self::warning">white</xsl:when>
-		<xsl:when test="self::tip">white</xsl:when>
-		<xsl:otherwise>white</xsl:otherwise>
-	</xsl:choose>
-        </xsl:attribute>
-
-	<xsl:attribute name="font-weight">bold</xsl:attribute>
-	<xsl:attribute name="hyphenate">false</xsl:attribute>
-	<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-
-</xsl:attribute-set>
-
-<!--xsl:attribute-set name="admonition.properties"></xsl:attribute-set-->
-
-<xsl:attribute-set name="graphical.admonition.properties">
-
-	<xsl:attribute name="color">
-	<xsl:choose>
-		<xsl:when test="self::note">#4C5253</xsl:when>
-		<xsl:when test="self::caution">#533500</xsl:when>
-		<xsl:when test="self::important">white</xsl:when>
-		<xsl:when test="self::warning">white</xsl:when>
-		<xsl:when test="self::tip">white</xsl:when>
-		<xsl:otherwise>white</xsl:otherwise>
-	</xsl:choose>
-        </xsl:attribute>
-	<xsl:attribute name="background-color">
-	    <xsl:choose>
-		<xsl:when test="self::note">#B5BCBD</xsl:when>
-		<xsl:when test="self::caution">#E3A835</xsl:when>
-		<xsl:when test="self::important">#4A5D75</xsl:when>
-		<xsl:when test="self::warning">#7B1E1E</xsl:when>
-		<xsl:when test="self::tip">#7E917F</xsl:when>
-		<xsl:otherwise>#404040</xsl:otherwise>
-	    </xsl:choose>
-        </xsl:attribute>
-
-	<xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-	<xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-	<xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-	<xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-	<xsl:attribute name="space-after.minimum">0.8em</xsl:attribute>
-	<xsl:attribute name="space-after.maximum">1em</xsl:attribute>
-	<xsl:attribute name="padding-bottom">12pt</xsl:attribute>
-	<xsl:attribute name="padding-top">12pt</xsl:attribute>
-	<xsl:attribute name="padding-right">12pt</xsl:attribute>
-	<xsl:attribute name="padding-left">12pt</xsl:attribute>
-	<xsl:attribute name="margin-left">
-		<xsl:value-of select="$title.margin.left"/>
-	</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:param name="generate.toc">
-set toc
-book toc
-article toc
-</xsl:param>
-
-   <!--###################################################
-      Custom TOC (bold chapter titles)
-      ################################################### -->
-
-   <!-- Improve the TOC. -->
-   <xsl:template name="toc.line">
-      <xsl:variable name="id">
-         <xsl:call-template name="object.id" />
-      </xsl:variable>
-
-      <xsl:variable name="label">
-         <xsl:apply-templates select="." mode="label.markup" />
-      </xsl:variable>
-
-      <fo:block text-align-last="justify" end-indent="{$toc.indent.width}pt"
-         last-line-end-indent="-{$toc.indent.width}pt">
-         <fo:inline keep-with-next.within-line="always">
-            <fo:basic-link internal-destination="{$id}">
-
-               <!-- Chapter titles should be bold. -->
-               <xsl:choose>
-                  <xsl:when test="local-name(.) = 'chapter'">
-                     <xsl:attribute name="font-weight">bold</xsl:attribute>
-                  </xsl:when>
-               </xsl:choose>
-
-               <xsl:if test="$label != ''">
-                  <xsl:copy-of select="$label" />
-                  <xsl:value-of select="$autotoc.label.separator" />
-               </xsl:if>
-               <xsl:apply-templates select="." mode="titleabbrev.markup" />
-            </fo:basic-link>
-         </fo:inline>
-         <fo:inline keep-together.within-line="always">
-            <xsl:text> </xsl:text>
-            <fo:leader leader-pattern="dots" leader-pattern-width="3pt"
-               leader-alignment="reference-area"
-               keep-with-next.within-line="always" />
-            <xsl:text> </xsl:text>
-            <fo:basic-link internal-destination="{$id}">
-               <fo:page-number-citation ref-id="{$id}" />
-            </fo:basic-link>
-         </fo:inline>
-      </fo:block>
-   </xsl:template>
-
-<!-- Make the section depth in the TOC 2, same as html -->
-<xsl:param name="toc.section.depth">2</xsl:param>
-<xsl:param name="section.autolabel" select="1"/>
-
-   <!-- Include the chapter no -->
-   <xsl:param name="section.label.includes.component.label" select="1" />
-
-<!-- Format Variable Lists as Blocks (prevents horizontal overflow). -->
-<xsl:param name="variablelist.as.blocks">1</xsl:param>
-
-<!-- The horrible list spacing problems, this is much better. -->
-<xsl:attribute-set name="list.block.spacing">
-	<xsl:attribute name="space-before.optimum">2em</xsl:attribute>
-	<xsl:attribute name="space-before.minimum">1em</xsl:attribute>
-	<xsl:attribute name="space-before.maximum">3em</xsl:attribute>
-	<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-	<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-	<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-</xsl:attribute-set>
-
-<!-- Some padding inside tables -->
-<xsl:attribute-set name="table.cell.padding">
-<xsl:attribute name="padding-left">4pt</xsl:attribute>
-<xsl:attribute name="padding-right">4pt</xsl:attribute>
-<xsl:attribute name="padding-top">2pt</xsl:attribute>
-<xsl:attribute name="padding-bottom">2pt</xsl:attribute>
-</xsl:attribute-set>
-
-<!-- Only hairlines as frame and cell borders in tables -->
-<xsl:param name="table.frame.border.thickness">0.3pt</xsl:param>
-<xsl:param name="table.cell.border.thickness">0.15pt</xsl:param>
-<xsl:param name="table.cell.border.color">#5c5c4f</xsl:param>
-<xsl:param name="table.frame.border.color">#5c5c4f</xsl:param>
-<xsl:param name="table.cell.border.right.color">white</xsl:param>
-<xsl:param name="table.cell.border.left.color">white</xsl:param>
-<xsl:param name="table.frame.border.right.color">white</xsl:param>
-<xsl:param name="table.frame.border.left.color">white</xsl:param>
-<!-- Paper type, no headers on blank pages, no double sided printing -->
-<xsl:param name="paper.type" select="'A4'"/>
-<xsl:param name="double.sided">1</xsl:param>
-<xsl:param name="headers.on.blank.pages">1</xsl:param>
-<xsl:param name="footers.on.blank.pages">1</xsl:param>
-<!--xsl:param name="header.column.widths" select="'1 4 1'"/-->
-<xsl:param name="header.column.widths" select="'1 0 1'"/>
-<xsl:param name="footer.column.widths" select="'1 1 1'"/>
-<xsl:param name="header.rule" select="1"/>
-
-<!-- Space between paper border and content (chaotic stuff, don't touch) -->
-<xsl:param name="page.margin.top">15mm</xsl:param>
-<xsl:param name="region.before.extent">10mm</xsl:param>
-<xsl:param name="body.margin.top">15mm</xsl:param>
-
-<xsl:param name="body.margin.bottom">15mm</xsl:param>
-<xsl:param name="region.after.extent">10mm</xsl:param>
-<xsl:param name="page.margin.bottom">15mm</xsl:param>
-
-<xsl:param name="page.margin.outer">30mm</xsl:param>
-<xsl:param name="page.margin.inner">30mm</xsl:param>
-
-<!-- No intendation of Titles -->
-<!--<xsl:param name="title.margin.left">0pc</xsl:param>-->
-<xsl:param name="body.start.indent">0pt</xsl:param>
-
-<xsl:param name="title.color">#4a5d75</xsl:param>
-<xsl:param name="chapter.title.color" select="$title.color" />
-<xsl:param name="section.title.color" select="$title.color" />
-
-<xsl:attribute-set name="section.title.level1.properties">
-	<xsl:attribute name="color"><xsl:value-of select="$section.title.color"/></xsl:attribute>
-	<xsl:attribute name="font-size">
-		<xsl:value-of select="$body.font.master * 1.6"/>
-		<xsl:text>pt</xsl:text>
-	</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level2.properties">
-	<xsl:attribute name="color"><xsl:value-of select="$section.title.color"/></xsl:attribute>
-	<xsl:attribute name="font-size">
-		<xsl:value-of select="$body.font.master * 1.4"/>
-		<xsl:text>pt</xsl:text>
-	</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level3.properties">
-	<xsl:attribute name="color"><xsl:value-of select="$section.title.color"/></xsl:attribute>
-	<xsl:attribute name="font-size">
-		<xsl:value-of select="$body.font.master * 1.3"/>
-		<xsl:text>pt</xsl:text>
-	</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level4.properties">
-	<xsl:attribute name="color"><xsl:value-of select="$section.title.color"/></xsl:attribute>
-	<xsl:attribute name="font-size">
-		<xsl:value-of select="$body.font.master * 1.2"/>
-		<xsl:text>pt</xsl:text>
-	</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level5.properties">
-	<xsl:attribute name="color"><xsl:value-of select="$section.title.color"/></xsl:attribute>
-	<xsl:attribute name="font-size">
-		<xsl:value-of select="$body.font.master * 1.1"/>
-		<xsl:text>pt</xsl:text>
-	</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level6.properties">
-	<xsl:attribute name="color"><xsl:value-of select="$section.title.color"/></xsl:attribute>
-	<xsl:attribute name="font-size">
-		<xsl:value-of select="$body.font.master"/>
-		<xsl:text>pt</xsl:text>
-	</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="section.title.properties">
-	<xsl:attribute name="font-family">
-		<xsl:value-of select="$title.font.family"/>
-	</xsl:attribute>
-	<xsl:attribute name="font-weight">bold</xsl:attribute>
-	<!-- font size is calculated dynamically by section.heading template -->
-	<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-	<xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-	<xsl:attribute name="space-before.optimum">1.0em</xsl:attribute>
-	<xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-	<xsl:attribute name="text-align">left</xsl:attribute>
-	<xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:param name="titlepage.color" select="$title.color"/>
-
-<xsl:attribute-set name="book.titlepage.recto.style">
-	<xsl:attribute name="font-family">
-		<xsl:value-of select="$title.fontset"/>
-	</xsl:attribute>
-	<xsl:attribute name="color"><xsl:value-of select="$titlepage.color"/></xsl:attribute>
-	<xsl:attribute name="font-weight">bold</xsl:attribute>
-	<xsl:attribute name="font-size">12pt</xsl:attribute>
-	<xsl:attribute name="text-align">center</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="component.title.properties">
-	<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-	<xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
-	<xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
-	<xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
-	<xsl:attribute name="hyphenate">false</xsl:attribute>
-	<xsl:attribute name="color">
-		<xsl:choose>
-			<xsl:when test="not(parent::chapter | parent::article | parent::appendix)"><xsl:value-of select="$title.color"/></xsl:when>
-		</xsl:choose>
-	</xsl:attribute>
-	<xsl:attribute name="text-align">
-		<xsl:choose>
-			<xsl:when test="((parent::article | parent::articleinfo) and not(ancestor::book) and not(self::bibliography))				 or (parent::slides | parent::slidesinfo)">center</xsl:when>
-			<xsl:otherwise>left</xsl:otherwise>
-		</xsl:choose>
-	</xsl:attribute>
-	<xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="chapter.titlepage.recto.style">
-	<xsl:attribute name="color"><xsl:value-of select="$chapter.title.color"/></xsl:attribute>
-	<xsl:attribute name="background-color">white</xsl:attribute>
-	<xsl:attribute name="font-size">
-		<xsl:choose>
-			<xsl:when test="$l10n.gentext.language = 'ja-JP'">
-				<xsl:value-of select="$body.font.master * 1.7"/>
-				<xsl:text>pt</xsl:text>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:text>24pt</xsl:text>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:attribute>
-	<xsl:attribute name="font-weight">bold</xsl:attribute>
-	<xsl:attribute name="text-align">left</xsl:attribute>
-	<!--xsl:attribute name="wrap-option">no-wrap</xsl:attribute-->
-	<xsl:attribute name="padding-left">1em</xsl:attribute>
-	<xsl:attribute name="padding-right">1em</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="preface.titlepage.recto.style">
-	<xsl:attribute name="font-family">
-		<xsl:value-of select="$title.fontset"/>
-	</xsl:attribute>
-	<xsl:attribute name="color">#4a5d75</xsl:attribute>
-	<xsl:attribute name="font-size">12pt</xsl:attribute>
-	<xsl:attribute name="font-weight">bold</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="part.titlepage.recto.style">
-  <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute>
-  <xsl:attribute name="text-align">center</xsl:attribute>
-</xsl:attribute-set>
-
-
-<!--
-From: fo/table.xsl
-Reason: Table Header format
-Version:1.72
--->
-<xsl:template name="table.cell.block.properties">
-  <!-- highlight this entry? -->
-  <xsl:if test="ancestor::thead or ancestor::tfoot">
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-	<xsl:attribute name="background-color">#4a5d75</xsl:attribute>
-	<xsl:attribute name="color">white</xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<!--
-From: fo/table.xsl
-Reason: Table Header format
-Version:1.72
--->
-<!-- customize this template to add row properties -->
-<xsl:template name="table.row.properties">
-  <xsl:variable name="bgcolor">
-    <xsl:call-template name="dbfo-attribute">
-      <xsl:with-param name="pis" select="processing-instruction('dbfo')"/>
-      <xsl:with-param name="attribute" select="'bgcolor'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:if test="$bgcolor != ''">
-    <xsl:attribute name="background-color">
-      <xsl:value-of select="$bgcolor"/>
-    </xsl:attribute>
-  </xsl:if>
-  <xsl:if test="ancestor::thead or ancestor::tfoot">
-	<xsl:attribute name="background-color">#4a5d75</xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<!--
-From: fo/titlepage.templates.xsl
-Reason: Switch to using chapter.titlepage.recto.style
-Version:1.72
--->
-<xsl:template match="title" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:call-template name="component.title.nomarkup">
-<xsl:with-param name="node" select="ancestor-or-self::appendix[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<!--
-From: fo/titlepage.templates.xsl
-Reason: Remove font size and weight overrides
-Version:1.72
--->
-<xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:value-of select="."/>
-</fo:block>
-</xsl:template>
-
-<!--
-From: fo/titlepage.templates.xsl
-Reason: Remove font family, size and weight overrides
-Version:1.72
--->
-<xsl:template name="preface.titlepage.recto">
-	<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style" margin-left="{$title.margin.left}">
-<xsl:call-template name="component.title.nomarkup">
-<xsl:with-param name="node" select="ancestor-or-self::preface[1]"/>
-</xsl:call-template></fo:block>
-	<xsl:choose>
-		<xsl:when test="prefaceinfo/subtitle">
-			<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/subtitle"/>
-		</xsl:when>
-		<xsl:when test="docinfo/subtitle">
-			<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-		</xsl:when>
-		<xsl:when test="info/subtitle">
-			<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/subtitle"/>
-		</xsl:when>
-		<xsl:when test="subtitle">
-			<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="subtitle"/>
-		</xsl:when>
-	</xsl:choose>
-
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/corpauthor"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/authorgroup"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/author"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/author"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/othercredit"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/othercredit"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/copyright"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/legalnotice"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/pubdate"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revision"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revision"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revhistory"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-
-<xsl:template name="pickfont-sans">
-	<xsl:variable name="font">
-		<xsl:choose>
-			<xsl:when test="$l10n.gentext.language = 'ja-JP'">
-				<xsl:text>KochiMincho,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'ko-KR'">
-				<xsl:text>BaekmukBatang,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'zh-CN'">
-				<xsl:text>ARPLKaitiMGB,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'bn-IN'">
-				<xsl:text>LohitBengali,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'ta-IN'">
-				<xsl:text>LohitTamil,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'pa-IN'">
-				<xsl:text>LohitPunjabi,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'hi-IN'">
-				<xsl:text>LohitHindi,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'gu-IN'">
-				<xsl:text>LohitGujarati,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'zh-TW'">
-				<xsl:text>ARPLMingti2LBig5,</xsl:text>
-			</xsl:when>
-		</xsl:choose>
-	</xsl:variable>
-	<xsl:choose>
-		<xsl:when test="$fop1.extensions != 0">
-		  <xsl:copy-of select="$font"/><xsl:text>DejaVuLGCSans,sans-serif</xsl:text>
-		</xsl:when>
-		<xsl:otherwise>
-		  <xsl:copy-of select="$font"/><xsl:text>sans-serif</xsl:text>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:template>
-
-<xsl:template name="pickfont-serif">
-	<xsl:variable name="font">
-		<xsl:choose>
-			<xsl:when test="$l10n.gentext.language = 'ja-JP'">
-				<xsl:text>KochiMincho,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'ko-KR'">
-				<xsl:text>BaekmukBatang,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'zh-CN'">
-				<xsl:text>ARPLKaitiMGB,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'bn-IN'">
-				<xsl:text>LohitBengali,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'ta-IN'">
-				<xsl:text>LohitTamil,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'pa-IN'">
-				<xsl:text>LohitPunjabi,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'hi-IN'">
-				<xsl:text>LohitHindi,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'gu-IN'">
-				<xsl:text>LohitGujarati,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'zh-TW'">
-				<xsl:text>ARPLMingti2LBig5,</xsl:text>
-			</xsl:when>
-		</xsl:choose>
-	</xsl:variable>
-	<xsl:choose>
-		<xsl:when test="$fop1.extensions != 0">
-		  <xsl:copy-of select="$font"/><xsl:text>DejaVuLGCSans,serif</xsl:text>
-		</xsl:when>
-		<xsl:otherwise>
-		  <xsl:copy-of select="$font"/><xsl:text>serif</xsl:text>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:template>
-
-<xsl:template name="pickfont-mono">
-	<xsl:variable name="font">
-		<xsl:choose>
-			<xsl:when test="$l10n.gentext.language = 'ja-JP'">
-				<xsl:text>KochiMincho,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'ko-KR'">
-				<xsl:text>BaekmukBatang,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'zh-CN'">
-				<xsl:text>ARPLKaitiMGB,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'bn-IN'">
-				<xsl:text>LohitBengali,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'ta-IN'">
-				<xsl:text>LohitTamil,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'pa-IN'">
-				<xsl:text>LohitPunjabi,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'hi-IN'">
-				<xsl:text>LohitHindi,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'gu-IN'">
-				<xsl:text>LohitGujarati,</xsl:text>
-			</xsl:when>
-			<xsl:when test="$l10n.gentext.language = 'zh-TW'">
-				<xsl:text>ARPLMingti2LBig5,</xsl:text>
-			</xsl:when>
-		</xsl:choose>
-	</xsl:variable>
-	<xsl:choose>
-		<xsl:when test="$fop1.extensions != 0">
-		  <xsl:copy-of select="$font"/><xsl:text>DejaVuLGCSans,monospace</xsl:text>
-		</xsl:when>
-		<xsl:otherwise>
-		  <xsl:copy-of select="$font"/><xsl:text>monospace</xsl:text>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:template>
-
-<!--xsl:param name="symbol.font.family">
-	<xsl:choose>
-		<xsl:when test="$l10n.gentext.language = 'ja-JP'">
-			<xsl:text>Symbol,ZapfDingbats</xsl:text>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:text>Symbol,ZapfDingbats</xsl:text>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:param-->
-
-<xsl:param name="title.font.family">
-	<xsl:call-template name="pickfont-sans"/>
-</xsl:param>
-
-<xsl:param name="body.font.family">
-	<xsl:call-template name="pickfont-sans"/>
-</xsl:param>
-
-<xsl:param name="monospace.font.family">
-	<xsl:call-template name="pickfont-mono"/>
-</xsl:param>
-
-<xsl:param name="sans.font.family">
-	<xsl:call-template name="pickfont-sans"/>
-</xsl:param>
-
-<!--xsl:param name="callout.unicode.font">
-	<xsl:call-template name="pickfont-sans"/>
-</xsl:param-->
-
-<!--
-From: fo/verbatim.xsl
-Reason: Left align address
-Version: 1.72
--->
-
-<xsl:template match="address">
-	<xsl:param name="suppress-numbers" select="'0'"/>
-
-	<xsl:variable name="content">
-		<xsl:choose>
-			<xsl:when test="$suppress-numbers = '0'
-											and @linenumbering = 'numbered'
-											and $use.extensions != '0'
-											and $linenumbering.extension != '0'">
-				<xsl:call-template name="number.rtf.lines">
-					<xsl:with-param name="rtf">
-						<xsl:apply-templates/>
-					</xsl:with-param>
-				</xsl:call-template>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:apply-templates/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:variable>
-
-	<fo:block wrap-option='no-wrap'
-						white-space-collapse='false'
-			white-space-treatment='preserve'
-						linefeed-treatment="preserve"
-						text-align="start"
-						xsl:use-attribute-sets="verbatim.properties">
-		<xsl:copy-of select="$content"/>
-	</fo:block>
-</xsl:template>
-
-<xsl:template name="component.title.nomarkup">
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="title">
-    <xsl:apply-templates select="$node" mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-  </xsl:variable>
-  <xsl:copy-of select="$title"/>
-</xsl:template>
-
-<!--
-From: fo/pagesetup.xsl
-Reason: Custom Header
-Version: 1.72
--->
-<xsl:template name="header.content">
-  <xsl:param name="pageclass" select="''"/>
-  <xsl:param name="sequence" select="''"/>
-  <xsl:param name="position" select="''"/>
-  <xsl:param name="gentext-key" select="''"/>
-	<xsl:param name="title-limit" select="'30'"/>
-<!--
-  <fo:block>
-    <xsl:value-of select="$pageclass"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$sequence"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$position"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$gentext-key"/>
-  </fo:block>
-body, blank, left, chapter
--->
-    <!-- sequence can be odd, even, first, blank -->
-    <!-- position can be left, center, right -->
-    <xsl:choose>
-      <!--xsl:when test="($sequence='blank' and $position='left' and $gentext-key='chapter')">
-			<xsl:variable name="text">
-				<xsl:call-template name="component.title.nomarkup"/>
-			</xsl:variable>
-	      <fo:inline keep-together.within-line="always" font-weight="bold">
-  			  <xsl:choose>
-		  		<xsl:when test="string-length($text) &gt; '33'">
-					<xsl:value-of select="concat(substring($text, 0, $title-limit), '...')"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="$text"/>
-				</xsl:otherwise>
-			  </xsl:choose>
-		  </fo:inline>
-      </xsl:when-->
-	  <xsl:when test="$confidential = 1 and (($sequence='odd' and $position='left') or ($sequence='even' and $position='right'))">
-	      <fo:inline keep-together.within-line="always" font-weight="bold">
-			<xsl:text>RED HAT CONFIDENTIAL</xsl:text>
-		  </fo:inline>
-      </xsl:when>
-	  <xsl:when test="$sequence = 'blank'">
-        <!-- nothing -->
-      </xsl:when>
- 	  <!-- Extracting 'Chapter' + Chapter Number from the full Chapter title, with a dirty, dirty hack -->
-  		<xsl:when test="($sequence='first' and $position='left' and $gentext-key='chapter')">
-		<xsl:variable name="text">
-			<xsl:call-template name="component.title.nomarkup"/>
-		</xsl:variable>
-		<xsl:variable name="chapt">
-			<xsl:value-of select="substring-before($text, '&#xA0;')"/>
-		</xsl:variable>
-		<xsl:variable name="remainder">
-			<xsl:value-of select="substring-after($text, '&#xA0;')"/>
-		</xsl:variable>
-		<xsl:variable name="chapt-num">
-			<xsl:value-of select="substring-before($remainder, '&#xA0;')"/>
-		</xsl:variable>
-		<xsl:variable name="text1">
-			<xsl:value-of select="concat($chapt, '&#xA0;', $chapt-num)"/>
-		</xsl:variable>
-        <fo:inline keep-together.within-line="always" font-weight="bold">
- 		  <xsl:value-of select="$text1"/>
-		</fo:inline>
-      </xsl:when>
-     <!--xsl:when test="($sequence='odd' or $sequence='even') and $position='center'"-->
-      <xsl:when test="($sequence='even' and $position='left')">
-        <!--xsl:if test="$pageclass != 'titlepage'"-->
-			<xsl:variable name="text">
-				<xsl:call-template name="component.title.nomarkup"/>
-			</xsl:variable>
-	      <fo:inline keep-together.within-line="always" font-weight="bold">
-  			  <xsl:choose>
-		  		<xsl:when test="string-length($text) &gt; '33'">
-					<xsl:value-of select="concat(substring($text, 0, $title-limit), '...')"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="$text"/>
-				</xsl:otherwise>
-			  </xsl:choose>
-		  </fo:inline>
-        <!--xsl:if-->
-      </xsl:when>
-      <xsl:when test="($sequence='odd' and $position='right')">
-        <!--xsl:if test="$pageclass != 'titlepage'"-->
-	      <fo:inline keep-together.within-line="always"><fo:retrieve-marker retrieve-class-name="section.head.marker" retrieve-position="first-including-carryover" retrieve-boundary="page-sequence"/></fo:inline>
-        <!--/xsl:if-->
-      </xsl:when>
-	  <xsl:when test="$position='left'">
-        <!-- Same for odd, even, empty, and blank sequences -->
-        <xsl:call-template name="draft.text"/>
-      </xsl:when>
-      <xsl:when test="$position='center'">
-        <!-- nothing for empty and blank sequences -->
-      </xsl:when>
-      <xsl:when test="$position='right'">
-        <!-- Same for odd, even, empty, and blank sequences -->
-        <xsl:call-template name="draft.text"/>
-      </xsl:when>
-      <xsl:when test="$sequence = 'first'">
-        <!-- nothing for first pages -->
-      </xsl:when>
-      <xsl:when test="$sequence = 'blank'">
-        <!-- nothing for blank pages -->
-      </xsl:when>
-    </xsl:choose>
-</xsl:template>
-
-<!--
-From: fo/pagesetup.xsl
-Reason: Override colour
-Version: 1.72
--->
-<xsl:template name="head.sep.rule">
-	<xsl:param name="pageclass"/>
-	<xsl:param name="sequence"/>
-	<xsl:param name="gentext-key"/>
-
-	<xsl:if test="$header.rule != 0">
-		<xsl:attribute name="border-bottom-width">0.5pt</xsl:attribute>
-		<xsl:attribute name="border-bottom-style">solid</xsl:attribute>
-		<xsl:attribute name="border-bottom-color">#4a5d75</xsl:attribute>
-	</xsl:if>
-</xsl:template>
-
-<!--
-From: fo/pagesetup.xsl
-Reason: Override colour
-Version: 1.72
--->
-<xsl:template name="foot.sep.rule">
-	<xsl:param name="pageclass"/>
-	<xsl:param name="sequence"/>
-	<xsl:param name="gentext-key"/>
-
-	<xsl:if test="$footer.rule != 0">
-		<xsl:attribute name="border-top-width">0.5pt</xsl:attribute>
-		<xsl:attribute name="border-top-style">solid</xsl:attribute>
-		<xsl:attribute name="border-top-color">#4a5d75</xsl:attribute>
-	</xsl:if>
-</xsl:template>
-
-<xsl:param name="footnote.font.size">
-	<xsl:value-of select="$body.font.master * 0.8"/><xsl:text>pt</xsl:text>
-</xsl:param>
-<xsl:param name="footnote.number.format" select="'1'"/>
-<xsl:param name="footnote.number.symbols" select="''"/>
-<xsl:attribute-set name="footnote.mark.properties">
-	<xsl:attribute name="font-size">75%</xsl:attribute>
-	<xsl:attribute name="font-weight">normal</xsl:attribute>
-	<xsl:attribute name="font-style">normal</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="footnote.properties">
-	<xsl:attribute name="padding-top">48pt</xsl:attribute>
-	<xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"/></xsl:attribute>
-	<xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"/></xsl:attribute>
-	<xsl:attribute name="font-weight">normal</xsl:attribute>
-	<xsl:attribute name="font-style">normal</xsl:attribute>
-	<xsl:attribute name="text-align"><xsl:value-of select="$alignment"/></xsl:attribute>
-	<xsl:attribute name="start-indent">0pt</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="footnote.sep.leader.properties">
-	<xsl:attribute name="color">black</xsl:attribute>
-	<xsl:attribute name="leader-pattern">rule</xsl:attribute>
-	<xsl:attribute name="leader-length">1in</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:template match="author" mode="tablerow.titlepage.mode">
-  <fo:table-row>
-    <fo:table-cell>
-	  <fo:block>
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'Author'"/>
-        </xsl:call-template>
-	  </fo:block>
-    </fo:table-cell>
-    <fo:table-cell>
-	  <fo:block>
-	    <xsl:call-template name="person.name">
-          <xsl:with-param name="node" select="."/>
-        </xsl:call-template>
-	  </fo:block>
-    </fo:table-cell>
-    <fo:table-cell>
-	  <fo:block>
-	    <xsl:apply-templates select="email"/>
-	  </fo:block>
-    </fo:table-cell>
-  </fo:table-row>
-</xsl:template>
-
-<xsl:template match="author" mode="titlepage.mode">
-  <fo:block>
-    <xsl:call-template name="person.name">
-         <xsl:with-param name="node" select="."/>
-    </xsl:call-template>
-  </fo:block>
-</xsl:template>
-
-<xsl:param name="editedby.enabled">0</xsl:param>
-
-<xsl:template match="editor" mode="tablerow.titlepage.mode">
-  <fo:table-row>
-    <fo:table-cell>
-	  <fo:block>
-	    <xsl:call-template name="gentext">
-	      <xsl:with-param name="key" select="'Editor'"/>
-	    </xsl:call-template>
-	  </fo:block>
-    </fo:table-cell>
-    <fo:table-cell>
-	  <fo:block>
-        <xsl:call-template name="person.name">
-          <xsl:with-param name="node" select="."/>
-        </xsl:call-template>
-	  </fo:block>
-    </fo:table-cell>
-    <fo:table-cell>
-	  <fo:block>
-	    <xsl:apply-templates select="email"/>
-	  </fo:block>
-    </fo:table-cell>
-  </fo:table-row>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="tablerow.titlepage.mode">
-  <fo:table-row>
-    <fo:table-cell>
-	  <fo:block>
-	    <xsl:call-template name="gentext">
-	      <xsl:with-param name="key" select="'translator'"/>
-	    </xsl:call-template>
-	  </fo:block>
-    </fo:table-cell>
-    <fo:table-cell>
-	  <fo:block>
-        <xsl:call-template name="person.name">
-          <xsl:with-param name="node" select="."/>
-        </xsl:call-template>
-	  </fo:block>
-    </fo:table-cell>
-    <fo:table-cell>
-	  <fo:block>
-	    <xsl:apply-templates select="email"/>
-	  </fo:block>
-    </fo:table-cell>
-  </fo:table-row>
- </xsl:template>
-
-<!--
-From: fo/titlepage.xsl
-Reason: 
-Version:1.72
--->
-<!-- Omitted to get JBossOrg style working - TODO
-<xsl:template name="verso.authorgroup">
-  <fo:table table-layout="fixed" width="100%">
-    <fo:table-column column-number="1" column-width="proportional-column-width(1)"/>
-    <fo:table-column column-number="2" column-width="proportional-column-width(1)"/>
-    <fo:table-column column-number="3" column-width="proportional-column-width(1)"/>
-    <fo:table-body>
-      <xsl:apply-templates select="author" mode="tablerow.titlepage.mode"/>
-      <xsl:apply-templates select="editor" mode="tablerow.titlepage.mode"/>
-      <xsl:apply-templates select="othercredit" mode="tablerow.titlepage.mode"/>
-    </fo:table-body>
-  </fo:table>
-</xsl:template> -->
-
-<xsl:template match="title" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="20pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="division.title">
-<xsl:with-param name="node" select="ancestor-or-self::book[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="34pt" space-before="30pt" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="16pt" space-before="15.552pt" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="book.titlepage.recto.auto.mode">
-  <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" font-size="14pt" space-before="15.552pt">
-    <xsl:call-template name="person.name">
-         <xsl:with-param name="node" select="."/>
-    </xsl:call-template>
-  </fo:block>
-</xsl:template>
-
-<!-- <xsl:template name="book.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="bookinfo/title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/issuenum"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/issuenum"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="issuenum"/>
-
-  <xsl:choose>
-    <xsl:when test="bookinfo/subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/>
-
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup/author"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup/author"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/>
-
-  <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black">
-    <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/invpartnumber"/>
-    <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/invpartnumber"/>
-  </fo:block>
-  <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'isbn'"/>
-	</xsl:call-template>
-	<xsl:text>: </xsl:text>
-    <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/isbn"/>
-    <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/isbn"/>
-  </fo:block>
-  <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black"> 
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'pubdate'"/>
-	</xsl:call-template>
-	<xsl:text>: </xsl:text>
-    <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/>
-    <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/>
-  </fo:block>
-</xsl:template> -->
-
-   <!-- Use our own slightly simpler title page (just show title, version, authors) -->
-   <xsl:template name="book.titlepage.recto">
-      <xsl:choose>
-         <xsl:when test="bookinfo/title">
-            <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
-               select="bookinfo/title" />
-         </xsl:when>
-         <xsl:when test="info/title">
-            <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
-               select="info/title" />
-         </xsl:when>
-         <xsl:when test="title">
-            <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
-               select="title" />
-         </xsl:when>
-      </xsl:choose>
-
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
-         select="bookinfo/issuenum" />
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
-         select="info/issuenum" />
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
-         select="issuenum" />
-
-      <xsl:choose>
-         <xsl:when test="bookinfo/subtitle">
-            <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
-               select="bookinfo/subtitle" />
-         </xsl:when>
-         <xsl:when test="info/subtitle">
-            <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
-               select="info/subtitle" />
-         </xsl:when>
-         <xsl:when test="subtitle">
-            <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
-               select="subtitle" />
-         </xsl:when>
-      </xsl:choose>
-
-      <fo:block xsl:use-attribute-sets="book.titlepage.recto.style"
-         font-size="14pt" space-before="15.552pt">
-         <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
-            select="bookinfo/releaseinfo" />
-      </fo:block>
-
-      <fo:block text-align="center" space-before="15.552pt">
-         <xsl:call-template name="person.name.list">
-            <xsl:with-param name="person.list" select="bookinfo/authorgroup/author|bookinfo/authorgroup/corpauthor" />
-            <xsl:with-param name="person.type" select="'author'"/>
-         </xsl:call-template>
-      </fo:block>
-
-      <fo:block text-align="center" space-before="15.552pt">
-         <xsl:call-template name="person.name.list">
-            <xsl:with-param name="person.list" select="bookinfo/authorgroup/editor" />
-            <xsl:with-param name="person.type" select="'editor'"/>
-         </xsl:call-template>
-      </fo:block>
-
-      <fo:block text-align="center" space-before="15.552pt">
-         <xsl:call-template name="person.name.list">
-            <xsl:with-param name="person.list" select="bookinfo/authorgroup/othercredit" />
-            <xsl:with-param name="person.type" select="'othercredit'"/>
-         </xsl:call-template>
-      </fo:block>
-
-   </xsl:template>
-
-<!-- <xsl:template name="book.titlepage.verso">
-  <xsl:choose>
-    <xsl:when test="bookinfo/abstract">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/>
-    </xsl:when>
-    <xsl:when test="info/abstract">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template> -->
-
-   <xsl:template name="book.titlepage.verso"></xsl:template>
-
-
-<!-- <xsl:template name="book.titlepage3.recto">
-  <xsl:choose>
-    <xsl:when test="bookinfo/title">
-      <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose> 
-
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/author"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/othercredit"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/copyright"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/legalnotice"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/publisher"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/publisher"/>
-</xsl:template> -->
-
-   <xsl:template name="book.titlepage3.recto">
-
-   </xsl:template>
-   
-   <!-- Make examples, tables etc. break across pages -->
-   <xsl:attribute-set name="formal.object.properties">
-      <xsl:attribute name="keep-together.within-column">auto</xsl:attribute>
-   </xsl:attribute-set>
-
-   <!-- Correct placement of titles for figures and examples. -->
-   <xsl:param name="formal.title.placement">
-      figure after example before equation before table before procedure before
-   </xsl:param>
-
-   <!-- Prevent blank pages in output -->
-   <xsl:template name="book.titlepage.before.verso"></xsl:template>
-   <xsl:template name="book.titlepage.separator"></xsl:template>
-   
-<!-- <xsl:template name="book.titlepage.separator"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
-</xsl:template> -->
-
-<xsl:template name="book.titlepage.before.recto">
-</xsl:template>
-
-<!-- <xsl:template name="book.titlepage.before.verso"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
-</xsl:template> -->
-
-<xsl:template name="book.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:call-template name="book.titlepage.before.recto"/>
-    <fo:block><xsl:call-template name="book.titlepage.recto"/></fo:block>
-    <xsl:call-template name="book.titlepage.separator"/>
-    <fo:block><xsl:call-template name="book.titlepage.verso"/></fo:block>
-    <xsl:call-template name="book.titlepage.separator"/>
-    <fo:block><xsl:call-template name="book.titlepage3.recto"/></fo:block>
-    <xsl:call-template name="book.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<!--
-From: fo/qandaset.xsl
-Reason: Id in list-item-label causes fop crash
-Version:1.72
--->
-
-<xsl:template match="question">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="entry.id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="parent::*"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
-                              /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:list-item id="{$entry.id}" xsl:use-attribute-sets="list.item.spacing">
-    <fo:list-item-label end-indent="label-end()">
-      <xsl:choose>
-        <xsl:when test="$deflabel = 'none'">
-          <fo:block/>
-        </xsl:when>
-        <xsl:otherwise>
-          <fo:block>
-            <xsl:apply-templates select="." mode="label.markup"/>
-            <xsl:if test="$deflabel = 'number' and not(label)">
-              <xsl:apply-templates select="." mode="intralabel.punctuation"/>
-            </xsl:if>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <xsl:choose>
-        <xsl:when test="$deflabel = 'none'">
-          <fo:block font-weight="bold">
-            <xsl:apply-templates select="*[local-name(.)!='label']"/>
-          </fo:block>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="*[local-name(.)!='label']"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <!-- Uncomment this line to get revhistory output in the question -->
-      <!-- <xsl:apply-templates select="preceding-sibling::revhistory"/> -->
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<!--
-From: fo/qandaset.xsl
-Reason: Id in list-item-label causes fop crash
-Version:1.72
--->
-<xsl:template match="answer">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <xsl:variable name="entry.id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="parent::*"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
-                              /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:list-item xsl:use-attribute-sets="list.item.spacing">
-    <fo:list-item-label end-indent="label-end()">
-      <xsl:choose>
-        <xsl:when test="$deflabel = 'none'">
-          <fo:block/>
-        </xsl:when>
-        <xsl:otherwise>
-          <fo:block>
-            <xsl:variable name="answer.label">
-              <xsl:apply-templates select="." mode="label.markup"/>
-            </xsl:variable>
-            <xsl:copy-of select="$answer.label"/>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <xsl:apply-templates select="*[local-name(.)!='label']"/>
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-   <!-- Now, set enable scalefit for large images -->
-   <xsl:param name="graphicsize.extension" select="'1'" />
-
-   <xsl:param name="default.image.width">17.4cm</xsl:param>
-   
-</xsl:stylesheet>

Deleted: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl	2008-04-18 09:15:53 UTC (rev 72429)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -1,127 +0,0 @@
-<?xml version='1.0'?>
- 
-<!--
-	Copyright 2007 Red Hat, Inc.
-	License: GPL
-	Author: Jeff Fearn <jfearn at redhat.com>
-	Author: Tammy Fox <tfox at redhat.com>
-	Author: Andy Fitzsimon <afitzsim at redhat.com>
-    Author: Mark Newton <mark.newton at jboss.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-				xmlns:exsl="http://exslt.org/common"
-				version="1.0"
-				exclude-result-prefixes="exsl">
-
-	<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/docbook.xsl"/>
-
-	<xsl:include href="jboss.xsl"/>
-	<xsl:include href="xhtml-common.xsl"/>
-        <xsl:include href="highlight.xsl"/>
-        
-        <xsl:param name="use.simplified.author.group" select="1"/>
-        
-        <xsl:param name="confidential" select="0"/>
-        
-    <xsl:param name="siteHref" select="'http://www.jboss.org'" />
-    <xsl:param name="docHref" select="'http://labs.jboss.com/projects/docs'" />
-    <xsl:param name="siteLinkText" select="'JBoss.org'" />
-    <xsl:param name="docLinkText" select="'Community Documentation'" />
-
-<!-- Ignore image scaling in html version -->
-<xsl:param name="ignore.image.scaling" select="1"/> 
-
-<!-- This is needed to generate the correct xhtml-strict DOCTYPE on the front page.
-     We can't use indentation as the algorithm inserts linebreaks into the markup
-     created for callouts. This means that callouts appear on different lines than
-     the code they are supposed to refer to. -->
-<xsl:output method="xml"
-            encoding="UTF-8"
-            indent="no"
-            doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-            doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-            standalone="no"/>
-
-<!--
-From: xhtml/titlepage-templates.xsl
-Reason: Needed to add JBoss.org and Community Documentation graphics to header
-Version: 1.72.0
--->
-<xsl:template name="book.titlepage.recto">
-				<p xmlns="http://www.w3.org/1999/xhtml">
-					<xsl:attribute name="id">
-						<xsl:text>title</xsl:text>
-					</xsl:attribute>
-					<a>
-						<xsl:attribute name="href">
-							<xsl:value-of select="$siteHref" />
-						</xsl:attribute>
-						<xsl:attribute name="class">
-							<xsl:text>site_href</xsl:text>
-						</xsl:attribute>
-						<strong>
-						        <xsl:value-of select="$siteLinkText"/>	
-						</strong>
-					</a>
-					<a>
-						<xsl:attribute name="href">
-							<xsl:value-of select="$docHref" />
-						</xsl:attribute>
-						<xsl:attribute name="class">
-							<xsl:text>doc_href</xsl:text>
-						</xsl:attribute>
-						<strong>
-						        <xsl:value-of select="$docLinkText"/>	
-						</strong>
-					</a>
-				</p>
-  <xsl:choose>
-    <xsl:when test="bookinfo/title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="bookinfo/subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-</xsl:stylesheet>

Copied: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/pdf.xsl (from rev 72005, trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl)
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/pdf.xsl	                        (rev 0)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/pdf.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -0,0 +1,1590 @@
+<?xml version='1.0'?>
+ 
+<!--
+	Copyright 2007 Red Hat, Inc.
+	License: GPL
+	Author: Jeff Fearn <jfearn at redhat.com>
+	Author: Tammy Fox <tfox at redhat.com>
+	Author: Andy Fitzsimon <afitzsim at redhat.com>
+	Author: Mark Newton <mark.newton at jboss.org>
+	Author: Pete Muir
+-->
+
+<!DOCTYPE xsl:stylesheet [
+<!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'">
+<!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'">
+ ]>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		        version="1.0"
+		        xmlns="http://www.w3.org/TR/xhtml1/transitional"
+		        xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                xmlns:jbh="java:org.jboss.highlight.renderer.FORenderer"
+		        exclude-result-prefixes="jbh">
+
+<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/fo/docbook.xsl"/>
+
+<xsl:import href="common.xsl" />
+
+<xsl:param name="alignment">justify</xsl:param>
+<xsl:param name="fop.extensions" select="1"/>
+<xsl:param name="fop1.extensions" select="0"/>
+<xsl:param name="img.src.path"/>
+<xsl:param name="qandadiv.autolabel" select="0"/>
+
+<xsl:param name="hyphenation-character">-</xsl:param>
+<!--xsl:param name="hyphenate.verbatim" select="0"/-->
+<xsl:param name="hyphenate">true</xsl:param>
+<!--xsl:param name="ulink.hyphenate" select="1"/-->
+
+<xsl:param name="line-height" select="1.5"/>
+
+   <!-- Callouts -->
+   <!-- Place callout bullets at this column in programlisting.-->
+   <xsl:param name="callout.defaultcolumn">80</xsl:param>
+   <xsl:param name="callout.icon.size">10pt</xsl:param>
+
+  <!-- Admonitions -->
+  <xsl:param name="admon.graphics.extension" select="'.svg'"/>
+
+<xsl:attribute-set name="admonition.title.properties">
+  <xsl:attribute name="font-size">13pt</xsl:attribute>
+  <xsl:attribute name="color">
+  <xsl:choose>
+    <xsl:when test="self::note">#4C5253</xsl:when>
+    <xsl:when test="self::caution">#533500</xsl:when>
+    <xsl:when test="self::important">white</xsl:when>
+    <xsl:when test="self::warning">white</xsl:when>
+    <xsl:when test="self::tip">white</xsl:when>
+    <xsl:otherwise>white</xsl:otherwise>
+  </xsl:choose>
+        </xsl:attribute>
+
+  <xsl:attribute name="font-weight">bold</xsl:attribute>
+  <xsl:attribute name="hyphenate">false</xsl:attribute>
+  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+
+</xsl:attribute-set>
+
+<xsl:attribute-set name="graphical.admonition.properties">
+
+  <xsl:attribute name="color">
+  <xsl:choose>
+    <xsl:when test="self::note">#4C5253</xsl:when>
+    <xsl:when test="self::caution">#533500</xsl:when>
+    <xsl:when test="self::important">white</xsl:when>
+    <xsl:when test="self::warning">white</xsl:when>
+    <xsl:when test="self::tip">white</xsl:when>
+    <xsl:otherwise>white</xsl:otherwise>
+  </xsl:choose>
+        </xsl:attribute>
+  <xsl:attribute name="background-color">
+      <xsl:choose>
+    <xsl:when test="self::note">#B5BCBD</xsl:when>
+    <xsl:when test="self::caution">#E3A835</xsl:when>
+    <xsl:when test="self::important">#4A5D75</xsl:when>
+    <xsl:when test="self::warning">#7B1E1E</xsl:when>
+    <xsl:when test="self::tip">#7E917F</xsl:when>
+    <xsl:otherwise>#404040</xsl:otherwise>
+      </xsl:choose>
+        </xsl:attribute>
+
+  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
+  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
+  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
+  <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute>
+  <xsl:attribute name="space-after.maximum">1em</xsl:attribute>
+  <xsl:attribute name="padding-bottom">12pt</xsl:attribute>
+  <xsl:attribute name="padding-top">12pt</xsl:attribute>
+  <xsl:attribute name="padding-right">12pt</xsl:attribute>
+  <xsl:attribute name="padding-left">12pt</xsl:attribute>
+  <xsl:attribute name="margin-left">
+    <xsl:value-of select="$title.margin.left"/>
+  </xsl:attribute>
+</xsl:attribute-set>
+
+   <xsl:param name="programlisting.font" select="'verdana,helvetica,sans-serif'" />
+   <xsl:param name="programlisting.font.size" select="'100%'" />
+   
+   <!-- Change to monospace font for programlisting, needed to workaround crappy callouts -->
+   <!-- <xsl:param name="programlisting.font" select="$monospace.font.family" /> -->
+   <!-- Make the font for programlisting slightly smaller -->
+   <!-- <xsl:param name="programlisting.font.size" select="'75%'" /> -->
+
+  <!-- Make the section depth in the TOC 2, same as html -->
+  <xsl:param name="toc.section.depth">2</xsl:param>
+
+   <!-- Now, set enable scalefit for large images -->
+   <xsl:param name="graphicsize.extension" select="'1'" />
+   <xsl:param name="default.image.width">17.4cm</xsl:param>
+   
+<!-- 
+From: fo/callout.xsl
+Version: 1.73.2
+Reason: This includes the callout.icon.size attribute for SVGs, we also add padding to the graphics
+        (We can probably get rid of this if we upgrade to DocBook Stylesheets 1.73.2)
+ -->
+ <xsl:template name="callout-bug">
+  <xsl:param name="conum" select='1'/>
+
+  <xsl:choose>
+    <!-- Draw callouts as images -->
+    <xsl:when test="$callout.graphics != '0'
+                    and $conum &lt;= $callout.graphics.number.limit">
+      <xsl:variable name="filename"
+                    select="concat($callout.graphics.path, $conum,
+                                   $callout.graphics.extension)"/>
+
+      <fo:external-graphic content-width="{$callout.icon.size}"
+                           width="{$callout.icon.size}" padding="0.0em" margin="0.0em">
+        <xsl:attribute name="src">
+          <xsl:choose>
+            <xsl:when test="$passivetex.extensions != 0
+                            or $fop.extensions != 0
+                            or $arbortext.extensions != 0">
+              <xsl:value-of select="$filename"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>url(</xsl:text>
+              <xsl:value-of select="$filename"/>
+              <xsl:text>)</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:attribute>
+      </fo:external-graphic>
+    </xsl:when>
+
+    <xsl:when test="$callout.unicode != 0
+                    and $conum &lt;= $callout.unicode.number.limit">
+      <xsl:variable name="comarkup">
+        <xsl:choose>
+          <xsl:when test="$callout.unicode.start.character = 10102">
+            <xsl:choose>
+              <xsl:when test="$conum = 1">&#10102;</xsl:when>
+              <xsl:when test="$conum = 2">&#10103;</xsl:when>
+              <xsl:when test="$conum = 3">&#10104;</xsl:when>
+              <xsl:when test="$conum = 4">&#10105;</xsl:when>
+              <xsl:when test="$conum = 5">&#10106;</xsl:when>
+              <xsl:when test="$conum = 6">&#10107;</xsl:when>
+              <xsl:when test="$conum = 7">&#10108;</xsl:when>
+              <xsl:when test="$conum = 8">&#10109;</xsl:when>
+              <xsl:when test="$conum = 9">&#10110;</xsl:when>
+              <xsl:when test="$conum = 10">&#10111;</xsl:when>
+            </xsl:choose>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:message>
+              <xsl:text>Don't know how to generate Unicode callouts </xsl:text>
+              <xsl:text>when $callout.unicode.start.character is </xsl:text>
+              <xsl:value-of select="$callout.unicode.start.character"/>
+            </xsl:message>
+            <fo:inline background-color="#404040"
+                       color="white"
+                       padding-top="0.1em"
+                       padding-bottom="0.1em"
+                       padding-start="0.2em"
+                       padding-end="0.2em"
+                       baseline-shift="0.1em"
+                       font-family="{$body.fontset}"
+                       font-weight="bold"
+                       font-size="75%">
+              <xsl:value-of select="$conum"/>
+            </fo:inline>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+
+      <xsl:choose>
+        <xsl:when test="$callout.unicode.font != ''">
+          <fo:inline font-family="{$callout.unicode.font}">
+            <xsl:copy-of select="$comarkup"/>
+          </fo:inline>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:copy-of select="$comarkup"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+
+    <!-- Most safe: draw a dark gray square with a white number inside -->
+    <xsl:otherwise>
+      <fo:inline background-color="#404040"
+                 color="white"
+                 padding-top="0.1em"
+                 padding-bottom="0.1em"
+                 padding-start="0.2em"
+                 padding-end="0.2em"
+                 baseline-shift="0.1em"
+                 font-family="{$body.fontset}"
+                 font-weight="bold"
+                 font-size="75%">
+        <xsl:value-of select="$conum"/>
+      </fo:inline>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>   
+
+<xsl:attribute-set name="xref.properties">
+  <xsl:attribute name="font-style">italic</xsl:attribute>
+  <xsl:attribute name="color">
+	<xsl:choose>
+		<xsl:when test="ancestor::note or ancestor::caution or ancestor::important or ancestor::warning or ancestor::tip">
+			<xsl:text>#aee6ff</xsl:text>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:text>#0066cc</xsl:text>
+		</xsl:otherwise>
+	</xsl:choose>
+  </xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="monospace.properties">
+	<xsl:attribute name="font-size">9pt</xsl:attribute>
+	<xsl:attribute name="font-family">
+		<xsl:value-of select="$monospace.font.family"/>
+	</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="monospace.verbatim.properties" use-attribute-sets="verbatim.properties monospace.properties">
+	<xsl:attribute name="text-align">start</xsl:attribute>
+	<xsl:attribute name="wrap-option">wrap</xsl:attribute>
+	<xsl:attribute name="hyphenation-character">&#x25BA;</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:param name="shade.verbatim" select="1"/>
+<xsl:attribute-set name="shade.verbatim.style">
+  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
+  <xsl:attribute name="background-color">
+	<xsl:choose>
+		<xsl:when test="ancestor::note"> <xsl:text>#B5BCBD</xsl:text> </xsl:when>
+		<xsl:when test="ancestor::caution"> <xsl:text>#E3A835</xsl:text> </xsl:when>
+		<xsl:when test="ancestor::important"> <xsl:text>#4A5D75</xsl:text> </xsl:when>
+		<xsl:when test="ancestor::warning"> <xsl:text>#7B1E1E</xsl:text> </xsl:when>
+		<xsl:when test="ancestor::tip"> <xsl:text>#7E917F</xsl:text> </xsl:when>
+		<xsl:otherwise>
+			<xsl:text>black</xsl:text>
+		</xsl:otherwise>
+	</xsl:choose>
+  </xsl:attribute>
+  <xsl:attribute name="color">
+	<xsl:choose>
+		<xsl:when test="ancestor::note"> <xsl:text>#4C5253</xsl:text> </xsl:when>
+		<xsl:when test="ancestor::caution"> <xsl:text>#533500</xsl:text> </xsl:when>
+		<xsl:when test="ancestor::important"> <xsl:text>white</xsl:text> </xsl:when>
+		<xsl:when test="ancestor::warning"> <xsl:text>white</xsl:text> </xsl:when>
+		<xsl:when test="ancestor::tip"> <xsl:text>white</xsl:text> </xsl:when>
+		<xsl:otherwise>
+			<xsl:text>red</xsl:text>
+		</xsl:otherwise>
+	</xsl:choose>
+  </xsl:attribute>
+	<xsl:attribute name="padding-left">12pt</xsl:attribute>
+	<xsl:attribute name="padding-right">12pt</xsl:attribute>
+	<xsl:attribute name="padding-top">6pt</xsl:attribute>
+	<xsl:attribute name="padding-bottom">6pt</xsl:attribute>
+	<xsl:attribute name="margin-left">
+		<xsl:value-of select="$title.margin.left"/>
+	</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="verbatim.properties">
+  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
+  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
+  <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute>
+  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
+  <xsl:attribute name="space-after.maximum">1.2em</xsl:attribute>
+  <xsl:attribute name="hyphenate">false</xsl:attribute>
+  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
+  <xsl:attribute name="white-space-collapse">false</xsl:attribute>
+  <xsl:attribute name="white-space-treatment">preserve</xsl:attribute>
+  <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
+  <xsl:attribute name="text-align">start</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:param name="generate.toc">
+set toc
+book toc
+article toc
+</xsl:param>
+
+   <!--###################################################
+      Custom TOC (bold chapter titles)
+      ################################################### -->
+
+   <!-- Improve the TOC. -->
+   <xsl:template name="toc.line">
+      <xsl:variable name="id">
+         <xsl:call-template name="object.id" />
+      </xsl:variable>
+
+      <xsl:variable name="label">
+         <xsl:apply-templates select="." mode="label.markup" />
+      </xsl:variable>
+
+      <fo:block text-align-last="justify" end-indent="{$toc.indent.width}pt"
+         last-line-end-indent="-{$toc.indent.width}pt">
+         <fo:inline keep-with-next.within-line="always">
+            <fo:basic-link internal-destination="{$id}">
+
+               <!-- Chapter titles should be bold. -->
+               <xsl:choose>
+                  <xsl:when test="local-name(.) = 'chapter'">
+                     <xsl:attribute name="font-weight">bold</xsl:attribute>
+                  </xsl:when>
+               </xsl:choose>
+
+               <xsl:if test="$label != ''">
+                  <xsl:copy-of select="$label" />
+                  <xsl:value-of select="$autotoc.label.separator" />
+               </xsl:if>
+               <xsl:apply-templates select="." mode="titleabbrev.markup" />
+            </fo:basic-link>
+         </fo:inline>
+         <fo:inline keep-together.within-line="always">
+            <xsl:text> </xsl:text>
+            <fo:leader leader-pattern="dots" leader-pattern-width="3pt"
+               leader-alignment="reference-area"
+               keep-with-next.within-line="always" />
+            <xsl:text> </xsl:text>
+            <fo:basic-link internal-destination="{$id}">
+               <fo:page-number-citation ref-id="{$id}" />
+            </fo:basic-link>
+         </fo:inline>
+      </fo:block>
+   </xsl:template>
+
+<!-- Format Variable Lists as Blocks (prevents horizontal overflow). -->
+<xsl:param name="variablelist.as.blocks">1</xsl:param>
+
+<!-- The horrible list spacing problems, this is much better. -->
+<xsl:attribute-set name="list.block.spacing">
+	<xsl:attribute name="space-before.optimum">2em</xsl:attribute>
+	<xsl:attribute name="space-before.minimum">1em</xsl:attribute>
+	<xsl:attribute name="space-before.maximum">3em</xsl:attribute>
+	<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+	<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+	<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+</xsl:attribute-set>
+
+<!-- Some padding inside tables -->
+<xsl:attribute-set name="table.cell.padding">
+<xsl:attribute name="padding-left">4pt</xsl:attribute>
+<xsl:attribute name="padding-right">4pt</xsl:attribute>
+<xsl:attribute name="padding-top">2pt</xsl:attribute>
+<xsl:attribute name="padding-bottom">2pt</xsl:attribute>
+</xsl:attribute-set>
+
+<!-- Only hairlines as frame and cell borders in tables -->
+<xsl:param name="table.frame.border.thickness">0.3pt</xsl:param>
+<xsl:param name="table.cell.border.thickness">0.15pt</xsl:param>
+<xsl:param name="table.cell.border.color">#5c5c4f</xsl:param>
+<xsl:param name="table.frame.border.color">#5c5c4f</xsl:param>
+<xsl:param name="table.cell.border.right.color">white</xsl:param>
+<xsl:param name="table.cell.border.left.color">white</xsl:param>
+<xsl:param name="table.frame.border.right.color">white</xsl:param>
+<xsl:param name="table.frame.border.left.color">white</xsl:param>
+<!-- Paper type, no headers on blank pages, no double sided printing -->
+<xsl:param name="paper.type" select="'A4'"/>
+<xsl:param name="double.sided">1</xsl:param>
+<xsl:param name="headers.on.blank.pages">1</xsl:param>
+<xsl:param name="footers.on.blank.pages">1</xsl:param>
+<!--xsl:param name="header.column.widths" select="'1 4 1'"/-->
+<xsl:param name="header.column.widths" select="'1 0 1'"/>
+<xsl:param name="footer.column.widths" select="'1 1 1'"/>
+<xsl:param name="header.rule" select="1"/>
+
+<!-- Space between paper border and content (chaotic stuff, don't touch) -->
+<xsl:param name="page.margin.top">15mm</xsl:param>
+<xsl:param name="region.before.extent">10mm</xsl:param>
+<xsl:param name="body.margin.top">15mm</xsl:param>
+
+<xsl:param name="body.margin.bottom">15mm</xsl:param>
+<xsl:param name="region.after.extent">10mm</xsl:param>
+<xsl:param name="page.margin.bottom">15mm</xsl:param>
+
+<xsl:param name="page.margin.outer">30mm</xsl:param>
+<xsl:param name="page.margin.inner">30mm</xsl:param>
+
+<!-- No intendation of Titles -->
+<xsl:param name="body.start.indent">0pt</xsl:param>
+
+<xsl:param name="title.color">#4a5d75</xsl:param>
+<xsl:param name="chapter.title.color" select="$title.color" />
+<xsl:param name="section.title.color" select="$title.color" />
+
+<xsl:attribute-set name="section.title.level1.properties">
+	<xsl:attribute name="color"><xsl:value-of select="$section.title.color"/></xsl:attribute>
+	<xsl:attribute name="font-size">
+		<xsl:value-of select="$body.font.master * 1.6"/>
+		<xsl:text>pt</xsl:text>
+	</xsl:attribute>
+</xsl:attribute-set>
+<xsl:attribute-set name="section.title.level2.properties">
+	<xsl:attribute name="color"><xsl:value-of select="$section.title.color"/></xsl:attribute>
+	<xsl:attribute name="font-size">
+		<xsl:value-of select="$body.font.master * 1.4"/>
+		<xsl:text>pt</xsl:text>
+	</xsl:attribute>
+</xsl:attribute-set>
+<xsl:attribute-set name="section.title.level3.properties">
+	<xsl:attribute name="color"><xsl:value-of select="$section.title.color"/></xsl:attribute>
+	<xsl:attribute name="font-size">
+		<xsl:value-of select="$body.font.master * 1.3"/>
+		<xsl:text>pt</xsl:text>
+	</xsl:attribute>
+</xsl:attribute-set>
+<xsl:attribute-set name="section.title.level4.properties">
+	<xsl:attribute name="color"><xsl:value-of select="$section.title.color"/></xsl:attribute>
+	<xsl:attribute name="font-size">
+		<xsl:value-of select="$body.font.master * 1.2"/>
+		<xsl:text>pt</xsl:text>
+	</xsl:attribute>
+</xsl:attribute-set>
+<xsl:attribute-set name="section.title.level5.properties">
+	<xsl:attribute name="color"><xsl:value-of select="$section.title.color"/></xsl:attribute>
+	<xsl:attribute name="font-size">
+		<xsl:value-of select="$body.font.master * 1.1"/>
+		<xsl:text>pt</xsl:text>
+	</xsl:attribute>
+</xsl:attribute-set>
+<xsl:attribute-set name="section.title.level6.properties">
+	<xsl:attribute name="color"><xsl:value-of select="$section.title.color"/></xsl:attribute>
+	<xsl:attribute name="font-size">
+		<xsl:value-of select="$body.font.master"/>
+		<xsl:text>pt</xsl:text>
+	</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="section.title.properties">
+	<xsl:attribute name="font-family">
+		<xsl:value-of select="$title.font.family"/>
+	</xsl:attribute>
+	<xsl:attribute name="font-weight">bold</xsl:attribute>
+	<!-- font size is calculated dynamically by section.heading template -->
+	<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+	<xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
+	<xsl:attribute name="space-before.optimum">1.0em</xsl:attribute>
+	<xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
+	<xsl:attribute name="text-align">left</xsl:attribute>
+	<xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:param name="titlepage.color" select="$title.color"/>
+
+<xsl:attribute-set name="book.titlepage.recto.style">
+	<xsl:attribute name="font-family">
+		<xsl:value-of select="$title.fontset"/>
+	</xsl:attribute>
+	<xsl:attribute name="color"><xsl:value-of select="$titlepage.color"/></xsl:attribute>
+	<xsl:attribute name="font-weight">bold</xsl:attribute>
+	<xsl:attribute name="font-size">12pt</xsl:attribute>
+	<xsl:attribute name="text-align">center</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="component.title.properties">
+	<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+	<xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
+	<xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
+	<xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
+	<xsl:attribute name="hyphenate">false</xsl:attribute>
+	<xsl:attribute name="color">
+		<xsl:choose>
+			<xsl:when test="not(parent::chapter | parent::article | parent::appendix)"><xsl:value-of select="$title.color"/></xsl:when>
+		</xsl:choose>
+	</xsl:attribute>
+	<xsl:attribute name="text-align">
+		<xsl:choose>
+			<xsl:when test="((parent::article | parent::articleinfo) and not(ancestor::book) and not(self::bibliography))				 or (parent::slides | parent::slidesinfo)">center</xsl:when>
+			<xsl:otherwise>left</xsl:otherwise>
+		</xsl:choose>
+	</xsl:attribute>
+	<xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="chapter.titlepage.recto.style">
+	<xsl:attribute name="color"><xsl:value-of select="$chapter.title.color"/></xsl:attribute>
+	<xsl:attribute name="background-color">white</xsl:attribute>
+	<xsl:attribute name="font-size">
+		<xsl:choose>
+			<xsl:when test="$l10n.gentext.language = 'ja-JP'">
+				<xsl:value-of select="$body.font.master * 1.7"/>
+				<xsl:text>pt</xsl:text>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:text>24pt</xsl:text>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:attribute>
+	<xsl:attribute name="font-weight">bold</xsl:attribute>
+	<xsl:attribute name="text-align">left</xsl:attribute>
+	<!--xsl:attribute name="wrap-option">no-wrap</xsl:attribute-->
+	<xsl:attribute name="padding-left">1em</xsl:attribute>
+	<xsl:attribute name="padding-right">1em</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="preface.titlepage.recto.style">
+	<xsl:attribute name="font-family">
+		<xsl:value-of select="$title.fontset"/>
+	</xsl:attribute>
+	<xsl:attribute name="color">#4a5d75</xsl:attribute>
+	<xsl:attribute name="font-size">12pt</xsl:attribute>
+	<xsl:attribute name="font-weight">bold</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="part.titlepage.recto.style">
+  <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute>
+  <xsl:attribute name="text-align">center</xsl:attribute>
+</xsl:attribute-set>
+
+
+<!--
+From: fo/table.xsl
+Reason: Table Header format
+Version:1.72
+-->
+<xsl:template name="table.cell.block.properties">
+  <!-- highlight this entry? -->
+  <xsl:if test="ancestor::thead or ancestor::tfoot">
+    <xsl:attribute name="font-weight">bold</xsl:attribute>
+	<xsl:attribute name="background-color">#4a5d75</xsl:attribute>
+	<xsl:attribute name="color">white</xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!--
+From: fo/table.xsl
+Reason: Table Header format
+Version:1.72
+-->
+<!-- customize this template to add row properties -->
+<xsl:template name="table.row.properties">
+  <xsl:variable name="bgcolor">
+    <xsl:call-template name="dbfo-attribute">
+      <xsl:with-param name="pis" select="processing-instruction('dbfo')"/>
+      <xsl:with-param name="attribute" select="'bgcolor'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:if test="$bgcolor != ''">
+    <xsl:attribute name="background-color">
+      <xsl:value-of select="$bgcolor"/>
+    </xsl:attribute>
+  </xsl:if>
+  <xsl:if test="ancestor::thead or ancestor::tfoot">
+	<xsl:attribute name="background-color">#4a5d75</xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!--
+From: fo/titlepage.templates.xsl
+Reason: Switch to using chapter.titlepage.recto.style
+Version:1.72
+-->
+<xsl:template match="title" mode="appendix.titlepage.recto.auto.mode">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:call-template name="component.title.nomarkup">
+<xsl:with-param name="node" select="ancestor-or-self::appendix[1]"/>
+</xsl:call-template>
+</fo:block>
+</xsl:template>
+
+<!--
+From: fo/titlepage.templates.xsl
+Reason: Remove font size and weight overrides
+Version:1.72
+-->
+<xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:value-of select="."/>
+</fo:block>
+</xsl:template>
+
+<!--
+From: fo/titlepage.templates.xsl
+Reason: Remove font family, size and weight overrides
+Version:1.72
+-->
+<xsl:template name="preface.titlepage.recto">
+	<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style" margin-left="{$title.margin.left}">
+<xsl:call-template name="component.title.nomarkup">
+<xsl:with-param name="node" select="ancestor-or-self::preface[1]"/>
+</xsl:call-template></fo:block>
+	<xsl:choose>
+		<xsl:when test="prefaceinfo/subtitle">
+			<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/subtitle"/>
+		</xsl:when>
+		<xsl:when test="docinfo/subtitle">
+			<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+		</xsl:when>
+		<xsl:when test="info/subtitle">
+			<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/subtitle"/>
+		</xsl:when>
+		<xsl:when test="subtitle">
+			<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="subtitle"/>
+		</xsl:when>
+	</xsl:choose>
+
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/corpauthor"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/authorgroup"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/author"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/author"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/othercredit"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/othercredit"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/copyright"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/legalnotice"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/pubdate"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revision"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revision"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revhistory"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+	<xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+
+<xsl:template name="pickfont-sans">
+	<xsl:variable name="font">
+		<xsl:choose>
+			<xsl:when test="$l10n.gentext.language = 'ja-JP'">
+				<xsl:text>KochiMincho,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'ko-KR'">
+				<xsl:text>BaekmukBatang,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'zh-CN'">
+				<xsl:text>ARPLKaitiMGB,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'bn-IN'">
+				<xsl:text>LohitBengali,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'ta-IN'">
+				<xsl:text>LohitTamil,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'pa-IN'">
+				<xsl:text>LohitPunjabi,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'hi-IN'">
+				<xsl:text>LohitHindi,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'gu-IN'">
+				<xsl:text>LohitGujarati,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'zh-TW'">
+				<xsl:text>ARPLMingti2LBig5,</xsl:text>
+			</xsl:when>
+		</xsl:choose>
+	</xsl:variable>
+	<xsl:choose>
+		<xsl:when test="$fop1.extensions != 0">
+		  <xsl:copy-of select="$font"/><xsl:text>DejaVuLGCSans,sans-serif</xsl:text>
+		</xsl:when>
+		<xsl:otherwise>
+		  <xsl:copy-of select="$font"/><xsl:text>sans-serif</xsl:text>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+<xsl:template name="pickfont-serif">
+	<xsl:variable name="font">
+		<xsl:choose>
+			<xsl:when test="$l10n.gentext.language = 'ja-JP'">
+				<xsl:text>KochiMincho,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'ko-KR'">
+				<xsl:text>BaekmukBatang,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'zh-CN'">
+				<xsl:text>ARPLKaitiMGB,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'bn-IN'">
+				<xsl:text>LohitBengali,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'ta-IN'">
+				<xsl:text>LohitTamil,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'pa-IN'">
+				<xsl:text>LohitPunjabi,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'hi-IN'">
+				<xsl:text>LohitHindi,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'gu-IN'">
+				<xsl:text>LohitGujarati,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'zh-TW'">
+				<xsl:text>ARPLMingti2LBig5,</xsl:text>
+			</xsl:when>
+		</xsl:choose>
+	</xsl:variable>
+	<xsl:choose>
+		<xsl:when test="$fop1.extensions != 0">
+		  <xsl:copy-of select="$font"/><xsl:text>DejaVuLGCSans,serif</xsl:text>
+		</xsl:when>
+		<xsl:otherwise>
+		  <xsl:copy-of select="$font"/><xsl:text>serif</xsl:text>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+<xsl:template name="pickfont-mono">
+	<xsl:variable name="font">
+		<xsl:choose>
+			<xsl:when test="$l10n.gentext.language = 'ja-JP'">
+				<xsl:text>KochiMincho,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'ko-KR'">
+				<xsl:text>BaekmukBatang,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'zh-CN'">
+				<xsl:text>ARPLKaitiMGB,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'bn-IN'">
+				<xsl:text>LohitBengali,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'ta-IN'">
+				<xsl:text>LohitTamil,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'pa-IN'">
+				<xsl:text>LohitPunjabi,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'hi-IN'">
+				<xsl:text>LohitHindi,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'gu-IN'">
+				<xsl:text>LohitGujarati,</xsl:text>
+			</xsl:when>
+			<xsl:when test="$l10n.gentext.language = 'zh-TW'">
+				<xsl:text>ARPLMingti2LBig5,</xsl:text>
+			</xsl:when>
+		</xsl:choose>
+	</xsl:variable>
+	<xsl:choose>
+		<xsl:when test="$fop1.extensions != 0">
+		  <xsl:copy-of select="$font"/><xsl:text>DejaVuLGCSans,monospace</xsl:text>
+		</xsl:when>
+		<xsl:otherwise>
+		  <xsl:copy-of select="$font"/><xsl:text>monospace</xsl:text>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+<!--xsl:param name="symbol.font.family">
+	<xsl:choose>
+		<xsl:when test="$l10n.gentext.language = 'ja-JP'">
+			<xsl:text>Symbol,ZapfDingbats</xsl:text>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:text>Symbol,ZapfDingbats</xsl:text>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:param-->
+
+<xsl:param name="title.font.family">
+	<xsl:call-template name="pickfont-sans"/>
+</xsl:param>
+
+<xsl:param name="body.font.family">
+	<xsl:call-template name="pickfont-sans"/>
+</xsl:param>
+
+<xsl:param name="monospace.font.family">
+	<xsl:call-template name="pickfont-mono"/>
+</xsl:param>
+
+<xsl:param name="sans.font.family">
+	<xsl:call-template name="pickfont-sans"/>
+</xsl:param>
+
+<!--xsl:param name="callout.unicode.font">
+	<xsl:call-template name="pickfont-sans"/>
+</xsl:param-->
+
+<!--
+From: fo/verbatim.xsl
+Reason: Left align address
+Version: 1.72
+-->
+
+<xsl:template match="address">
+	<xsl:param name="suppress-numbers" select="'0'"/>
+
+	<xsl:variable name="content">
+		<xsl:choose>
+			<xsl:when test="$suppress-numbers = '0'
+											and @linenumbering = 'numbered'
+											and $use.extensions != '0'
+											and $linenumbering.extension != '0'">
+				<xsl:call-template name="number.rtf.lines">
+					<xsl:with-param name="rtf">
+						<xsl:apply-templates/>
+					</xsl:with-param>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<fo:block wrap-option='no-wrap'
+						white-space-collapse='false'
+			white-space-treatment='preserve'
+						linefeed-treatment="preserve"
+						text-align="start"
+						xsl:use-attribute-sets="verbatim.properties">
+		<xsl:copy-of select="$content"/>
+	</fo:block>
+</xsl:template>
+
+<xsl:template name="component.title.nomarkup">
+  <xsl:param name="node" select="."/>
+
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id">
+      <xsl:with-param name="object" select="$node"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="title">
+    <xsl:apply-templates select="$node" mode="object.title.markup">
+      <xsl:with-param name="allow-anchors" select="1"/>
+    </xsl:apply-templates>
+  </xsl:variable>
+  <xsl:copy-of select="$title"/>
+</xsl:template>
+
+<!--
+From: fo/pagesetup.xsl
+Reason: Custom Header
+Version: 1.72
+-->
+<xsl:template name="header.content">
+  <xsl:param name="pageclass" select="''"/>
+  <xsl:param name="sequence" select="''"/>
+  <xsl:param name="position" select="''"/>
+  <xsl:param name="gentext-key" select="''"/>
+	<xsl:param name="title-limit" select="'30'"/>
+<!--
+  <fo:block>
+    <xsl:value-of select="$pageclass"/>
+    <xsl:text>, </xsl:text>
+    <xsl:value-of select="$sequence"/>
+    <xsl:text>, </xsl:text>
+    <xsl:value-of select="$position"/>
+    <xsl:text>, </xsl:text>
+    <xsl:value-of select="$gentext-key"/>
+  </fo:block>
+body, blank, left, chapter
+-->
+    <!-- sequence can be odd, even, first, blank -->
+    <!-- position can be left, center, right -->
+    <xsl:choose>
+      <!--xsl:when test="($sequence='blank' and $position='left' and $gentext-key='chapter')">
+			<xsl:variable name="text">
+				<xsl:call-template name="component.title.nomarkup"/>
+			</xsl:variable>
+	      <fo:inline keep-together.within-line="always" font-weight="bold">
+  			  <xsl:choose>
+		  		<xsl:when test="string-length($text) &gt; '33'">
+					<xsl:value-of select="concat(substring($text, 0, $title-limit), '...')"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="$text"/>
+				</xsl:otherwise>
+			  </xsl:choose>
+		  </fo:inline>
+      </xsl:when-->
+	  <xsl:when test="$confidential = 1 and (($sequence='odd' and $position='left') or ($sequence='even' and $position='right'))">
+	      <fo:inline keep-together.within-line="always" font-weight="bold">
+			<xsl:text>RED HAT CONFIDENTIAL</xsl:text>
+		  </fo:inline>
+      </xsl:when>
+	  <xsl:when test="$sequence = 'blank'">
+        <!-- nothing -->
+      </xsl:when>
+ 	  <!-- Extracting 'Chapter' + Chapter Number from the full Chapter title, with a dirty, dirty hack -->
+  		<xsl:when test="($sequence='first' and $position='left' and $gentext-key='chapter')">
+		<xsl:variable name="text">
+			<xsl:call-template name="component.title.nomarkup"/>
+		</xsl:variable>
+		<xsl:variable name="chapt">
+			<xsl:value-of select="substring-before($text, '&#xA0;')"/>
+		</xsl:variable>
+		<xsl:variable name="remainder">
+			<xsl:value-of select="substring-after($text, '&#xA0;')"/>
+		</xsl:variable>
+		<xsl:variable name="chapt-num">
+			<xsl:value-of select="substring-before($remainder, '&#xA0;')"/>
+		</xsl:variable>
+		<xsl:variable name="text1">
+			<xsl:value-of select="concat($chapt, '&#xA0;', $chapt-num)"/>
+		</xsl:variable>
+        <fo:inline keep-together.within-line="always" font-weight="bold">
+ 		  <xsl:value-of select="$text1"/>
+		</fo:inline>
+      </xsl:when>
+     <!--xsl:when test="($sequence='odd' or $sequence='even') and $position='center'"-->
+      <xsl:when test="($sequence='even' and $position='left')">
+        <!--xsl:if test="$pageclass != 'titlepage'"-->
+			<xsl:variable name="text">
+				<xsl:call-template name="component.title.nomarkup"/>
+			</xsl:variable>
+	      <fo:inline keep-together.within-line="always" font-weight="bold">
+  			  <xsl:choose>
+		  		<xsl:when test="string-length($text) &gt; '33'">
+					<xsl:value-of select="concat(substring($text, 0, $title-limit), '...')"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="$text"/>
+				</xsl:otherwise>
+			  </xsl:choose>
+		  </fo:inline>
+        <!--xsl:if-->
+      </xsl:when>
+      <xsl:when test="($sequence='odd' and $position='right')">
+        <!--xsl:if test="$pageclass != 'titlepage'"-->
+	      <fo:inline keep-together.within-line="always"><fo:retrieve-marker retrieve-class-name="section.head.marker" retrieve-position="first-including-carryover" retrieve-boundary="page-sequence"/></fo:inline>
+        <!--/xsl:if-->
+      </xsl:when>
+	  <xsl:when test="$position='left'">
+        <!-- Same for odd, even, empty, and blank sequences -->
+        <xsl:call-template name="draft.text"/>
+      </xsl:when>
+      <xsl:when test="$position='center'">
+        <!-- nothing for empty and blank sequences -->
+      </xsl:when>
+      <xsl:when test="$position='right'">
+        <!-- Same for odd, even, empty, and blank sequences -->
+        <xsl:call-template name="draft.text"/>
+      </xsl:when>
+      <xsl:when test="$sequence = 'first'">
+        <!-- nothing for first pages -->
+      </xsl:when>
+      <xsl:when test="$sequence = 'blank'">
+        <!-- nothing for blank pages -->
+      </xsl:when>
+    </xsl:choose>
+</xsl:template>
+
+<!--
+From: fo/pagesetup.xsl
+Reason: Override colour
+Version: 1.72
+-->
+<xsl:template name="head.sep.rule">
+	<xsl:param name="pageclass"/>
+	<xsl:param name="sequence"/>
+	<xsl:param name="gentext-key"/>
+
+	<xsl:if test="$header.rule != 0">
+		<xsl:attribute name="border-bottom-width">0.5pt</xsl:attribute>
+		<xsl:attribute name="border-bottom-style">solid</xsl:attribute>
+		<xsl:attribute name="border-bottom-color">#4a5d75</xsl:attribute>
+	</xsl:if>
+</xsl:template>
+
+<!--
+From: fo/pagesetup.xsl
+Reason: Override colour
+Version: 1.72
+-->
+<xsl:template name="foot.sep.rule">
+	<xsl:param name="pageclass"/>
+	<xsl:param name="sequence"/>
+	<xsl:param name="gentext-key"/>
+
+	<xsl:if test="$footer.rule != 0">
+		<xsl:attribute name="border-top-width">0.5pt</xsl:attribute>
+		<xsl:attribute name="border-top-style">solid</xsl:attribute>
+		<xsl:attribute name="border-top-color">#4a5d75</xsl:attribute>
+	</xsl:if>
+</xsl:template>
+
+<xsl:param name="footnote.font.size">
+	<xsl:value-of select="$body.font.master * 0.8"/><xsl:text>pt</xsl:text>
+</xsl:param>
+<xsl:param name="footnote.number.format" select="'1'"/>
+<xsl:param name="footnote.number.symbols" select="''"/>
+<xsl:attribute-set name="footnote.mark.properties">
+	<xsl:attribute name="font-size">75%</xsl:attribute>
+	<xsl:attribute name="font-weight">normal</xsl:attribute>
+	<xsl:attribute name="font-style">normal</xsl:attribute>
+</xsl:attribute-set>
+<xsl:attribute-set name="footnote.properties">
+	<xsl:attribute name="padding-top">48pt</xsl:attribute>
+	<xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"/></xsl:attribute>
+	<xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"/></xsl:attribute>
+	<xsl:attribute name="font-weight">normal</xsl:attribute>
+	<xsl:attribute name="font-style">normal</xsl:attribute>
+	<xsl:attribute name="text-align"><xsl:value-of select="$alignment"/></xsl:attribute>
+	<xsl:attribute name="start-indent">0pt</xsl:attribute>
+</xsl:attribute-set>
+<xsl:attribute-set name="footnote.sep.leader.properties">
+	<xsl:attribute name="color">black</xsl:attribute>
+	<xsl:attribute name="leader-pattern">rule</xsl:attribute>
+	<xsl:attribute name="leader-length">1in</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:template match="author" mode="tablerow.titlepage.mode">
+  <fo:table-row>
+    <fo:table-cell>
+	  <fo:block>
+        <xsl:call-template name="gentext">
+          <xsl:with-param name="key" select="'Author'"/>
+        </xsl:call-template>
+	  </fo:block>
+    </fo:table-cell>
+    <fo:table-cell>
+	  <fo:block>
+	    <xsl:call-template name="person.name">
+          <xsl:with-param name="node" select="."/>
+        </xsl:call-template>
+	  </fo:block>
+    </fo:table-cell>
+    <fo:table-cell>
+	  <fo:block>
+	    <xsl:apply-templates select="email"/>
+	  </fo:block>
+    </fo:table-cell>
+  </fo:table-row>
+</xsl:template>
+
+<xsl:template match="author" mode="titlepage.mode">
+  <fo:block>
+    <xsl:call-template name="person.name">
+         <xsl:with-param name="node" select="."/>
+    </xsl:call-template>
+  </fo:block>
+</xsl:template>
+
+<xsl:param name="editedby.enabled">0</xsl:param>
+
+<xsl:template match="editor" mode="tablerow.titlepage.mode">
+  <fo:table-row>
+    <fo:table-cell>
+	  <fo:block>
+	    <xsl:call-template name="gentext">
+	      <xsl:with-param name="key" select="'Editor'"/>
+	    </xsl:call-template>
+	  </fo:block>
+    </fo:table-cell>
+    <fo:table-cell>
+	  <fo:block>
+        <xsl:call-template name="person.name">
+          <xsl:with-param name="node" select="."/>
+        </xsl:call-template>
+	  </fo:block>
+    </fo:table-cell>
+    <fo:table-cell>
+	  <fo:block>
+	    <xsl:apply-templates select="email"/>
+	  </fo:block>
+    </fo:table-cell>
+  </fo:table-row>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="tablerow.titlepage.mode">
+  <fo:table-row>
+    <fo:table-cell>
+	  <fo:block>
+	    <xsl:call-template name="gentext">
+	      <xsl:with-param name="key" select="'translator'"/>
+	    </xsl:call-template>
+	  </fo:block>
+    </fo:table-cell>
+    <fo:table-cell>
+	  <fo:block>
+        <xsl:call-template name="person.name">
+          <xsl:with-param name="node" select="."/>
+        </xsl:call-template>
+	  </fo:block>
+    </fo:table-cell>
+    <fo:table-cell>
+	  <fo:block>
+	    <xsl:apply-templates select="email"/>
+	  </fo:block>
+    </fo:table-cell>
+  </fo:table-row>
+ </xsl:template>
+
+<!--
+From: fo/titlepage.xsl
+Reason: 
+Version:1.72
+-->
+<!-- Omitted to get JBossOrg style working - TODO
+<xsl:template name="verso.authorgroup">
+  <fo:table table-layout="fixed" width="100%">
+    <fo:table-column column-number="1" column-width="proportional-column-width(1)"/>
+    <fo:table-column column-number="2" column-width="proportional-column-width(1)"/>
+    <fo:table-column column-number="3" column-width="proportional-column-width(1)"/>
+    <fo:table-body>
+      <xsl:apply-templates select="author" mode="tablerow.titlepage.mode"/>
+      <xsl:apply-templates select="editor" mode="tablerow.titlepage.mode"/>
+      <xsl:apply-templates select="othercredit" mode="tablerow.titlepage.mode"/>
+    </fo:table-body>
+  </fo:table>
+</xsl:template> -->
+
+<xsl:template match="title" mode="book.titlepage.recto.auto.mode">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="20pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
+<xsl:call-template name="division.title">
+<xsl:with-param name="node" select="ancestor-or-self::book[1]"/>
+</xsl:call-template>
+</fo:block>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="34pt" space-before="30pt" font-family="{$title.fontset}">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</fo:block>
+</xsl:template>
+
+<xsl:template match="issuenum" mode="book.titlepage.recto.auto.mode">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="16pt" space-before="15.552pt" font-family="{$title.fontset}">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</fo:block>
+</xsl:template>
+
+<xsl:template match="author" mode="book.titlepage.recto.auto.mode">
+  <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" font-size="14pt" space-before="15.552pt">
+    <xsl:call-template name="person.name">
+         <xsl:with-param name="node" select="."/>
+    </xsl:call-template>
+  </fo:block>
+</xsl:template>
+
+<!-- <xsl:template name="book.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="bookinfo/title">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/issuenum"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/issuenum"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="issuenum"/>
+
+  <xsl:choose>
+    <xsl:when test="bookinfo/subtitle">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/>
+
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup/author"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup/author"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/>
+
+  <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black">
+    <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/invpartnumber"/>
+    <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/invpartnumber"/>
+  </fo:block>
+  <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black">
+    <xsl:call-template name="gentext">
+      <xsl:with-param name="key" select="'isbn'"/>
+	</xsl:call-template>
+	<xsl:text>: </xsl:text>
+    <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/isbn"/>
+    <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/isbn"/>
+  </fo:block>
+  <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black"> 
+    <xsl:call-template name="gentext">
+      <xsl:with-param name="key" select="'pubdate'"/>
+	</xsl:call-template>
+	<xsl:text>: </xsl:text>
+    <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/>
+    <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/>
+  </fo:block>
+</xsl:template> -->
+
+   <!-- Use our own slightly simpler title page (just show title, version, authors) -->
+   <xsl:template name="book.titlepage.recto">
+      <xsl:choose>
+         <xsl:when test="bookinfo/title">
+            <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+               select="bookinfo/title" />
+         </xsl:when>
+         <xsl:when test="info/title">
+            <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+               select="info/title" />
+         </xsl:when>
+         <xsl:when test="title">
+            <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+               select="title" />
+         </xsl:when>
+      </xsl:choose>
+
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+         select="bookinfo/issuenum" />
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+         select="info/issuenum" />
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+         select="issuenum" />
+
+      <xsl:choose>
+         <xsl:when test="bookinfo/subtitle">
+            <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+               select="bookinfo/subtitle" />
+         </xsl:when>
+         <xsl:when test="info/subtitle">
+            <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+               select="info/subtitle" />
+         </xsl:when>
+         <xsl:when test="subtitle">
+            <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+               select="subtitle" />
+         </xsl:when>
+      </xsl:choose>
+
+      <fo:block xsl:use-attribute-sets="book.titlepage.recto.style"
+         font-size="14pt" space-before="15.552pt">
+         <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+            select="bookinfo/releaseinfo" />
+      </fo:block>
+
+      <fo:block text-align="center" space-before="15.552pt">
+         <xsl:call-template name="person.name.list">
+            <xsl:with-param name="person.list" select="bookinfo/authorgroup/author|bookinfo/authorgroup/corpauthor" />
+            <xsl:with-param name="person.type" select="'author'"/>
+         </xsl:call-template>
+      </fo:block>
+
+      <fo:block text-align="center" space-before="15.552pt">
+         <xsl:call-template name="person.name.list">
+            <xsl:with-param name="person.list" select="bookinfo/authorgroup/editor" />
+            <xsl:with-param name="person.type" select="'editor'"/>
+         </xsl:call-template>
+      </fo:block>
+
+      <fo:block text-align="center" space-before="15.552pt">
+         <xsl:call-template name="person.name.list">
+            <xsl:with-param name="person.list" select="bookinfo/authorgroup/othercredit" />
+            <xsl:with-param name="person.type" select="'othercredit'"/>
+         </xsl:call-template>
+      </fo:block>
+
+   </xsl:template>
+
+<!-- <xsl:template name="book.titlepage.verso">
+  <xsl:choose>
+    <xsl:when test="bookinfo/abstract">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/>
+    </xsl:when>
+    <xsl:when test="info/abstract">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/>
+    </xsl:when>
+  </xsl:choose>
+
+</xsl:template> -->
+
+   <xsl:template name="book.titlepage.verso"></xsl:template>
+
+
+<!-- <xsl:template name="book.titlepage3.recto">
+  <xsl:choose>
+    <xsl:when test="bookinfo/title">
+      <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose> 
+
+  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/authorgroup"/>
+  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/author"/>
+  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/othercredit"/>
+  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/copyright"/>
+  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/legalnotice"/>
+  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/publisher"/>
+  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/publisher"/>
+</xsl:template> -->
+
+   <xsl:template name="book.titlepage3.recto">
+
+   </xsl:template>
+   
+   <!-- Make examples, tables etc. break across pages -->
+   <xsl:attribute-set name="formal.object.properties">
+      <xsl:attribute name="keep-together.within-column">auto</xsl:attribute>
+   </xsl:attribute-set>
+
+   <!-- Correct placement of titles for figures and examples. -->
+   <xsl:param name="formal.title.placement">
+      figure after example before equation before table before procedure before
+   </xsl:param>
+
+   <!-- Prevent blank pages in output -->
+   <xsl:template name="book.titlepage.before.verso"></xsl:template>
+   <xsl:template name="book.titlepage.separator"></xsl:template>
+   
+<!-- <xsl:template name="book.titlepage.separator"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
+</xsl:template> -->
+
+<xsl:template name="book.titlepage.before.recto">
+</xsl:template>
+
+<!-- <xsl:template name="book.titlepage.before.verso"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
+</xsl:template> -->
+
+<xsl:template name="book.titlepage">
+  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
+    <xsl:call-template name="book.titlepage.before.recto"/>
+    <fo:block><xsl:call-template name="book.titlepage.recto"/></fo:block>
+    <xsl:call-template name="book.titlepage.separator"/>
+    <fo:block><xsl:call-template name="book.titlepage.verso"/></fo:block>
+    <xsl:call-template name="book.titlepage.separator"/>
+    <fo:block><xsl:call-template name="book.titlepage3.recto"/></fo:block>
+    <xsl:call-template name="book.titlepage.separator"/>
+  </fo:block>
+</xsl:template>
+
+<!--
+From: fo/qandaset.xsl
+Reason: Id in list-item-label causes fop crash
+Version:1.72
+-->
+
+<xsl:template match="question">
+  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+
+  <xsl:variable name="entry.id">
+    <xsl:call-template name="object.id">
+      <xsl:with-param name="object" select="parent::*"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="deflabel">
+    <xsl:choose>
+      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
+        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
+                              /@defaultlabel"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$qanda.defaultlabel"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <fo:list-item id="{$entry.id}" xsl:use-attribute-sets="list.item.spacing">
+    <fo:list-item-label end-indent="label-end()">
+      <xsl:choose>
+        <xsl:when test="$deflabel = 'none'">
+          <fo:block/>
+        </xsl:when>
+        <xsl:otherwise>
+          <fo:block>
+            <xsl:apply-templates select="." mode="label.markup"/>
+            <xsl:if test="$deflabel = 'number' and not(label)">
+              <xsl:apply-templates select="." mode="intralabel.punctuation"/>
+            </xsl:if>
+          </fo:block>
+        </xsl:otherwise>
+      </xsl:choose>
+    </fo:list-item-label>
+    <fo:list-item-body start-indent="body-start()">
+      <xsl:choose>
+        <xsl:when test="$deflabel = 'none'">
+          <fo:block font-weight="bold">
+            <xsl:apply-templates select="*[local-name(.)!='label']"/>
+          </fo:block>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="*[local-name(.)!='label']"/>
+        </xsl:otherwise>
+      </xsl:choose>
+      <!-- Uncomment this line to get revhistory output in the question -->
+      <!-- <xsl:apply-templates select="preceding-sibling::revhistory"/> -->
+    </fo:list-item-body>
+  </fo:list-item>
+</xsl:template>
+
+<!--
+From: fo/qandaset.xsl
+Reason: Id in list-item-label causes fop crash
+Version:1.72
+-->
+<xsl:template match="answer">
+  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+  <xsl:variable name="entry.id">
+    <xsl:call-template name="object.id">
+      <xsl:with-param name="object" select="parent::*"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="deflabel">
+    <xsl:choose>
+      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
+        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
+                              /@defaultlabel"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$qanda.defaultlabel"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <fo:list-item xsl:use-attribute-sets="list.item.spacing">
+    <fo:list-item-label end-indent="label-end()">
+      <xsl:choose>
+        <xsl:when test="$deflabel = 'none'">
+          <fo:block/>
+        </xsl:when>
+        <xsl:otherwise>
+          <fo:block>
+            <xsl:variable name="answer.label">
+              <xsl:apply-templates select="." mode="label.markup"/>
+            </xsl:variable>
+            <xsl:copy-of select="$answer.label"/>
+          </fo:block>
+        </xsl:otherwise>
+      </xsl:choose>
+    </fo:list-item-label>
+    <fo:list-item-body start-indent="body-start()">
+      <xsl:apply-templates select="*[local-name(.)!='label']"/>
+    </fo:list-item-body>
+  </fo:list-item>
+</xsl:template>
+
+   
+  <xsl:template match="programlisting|programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']|programlisting[@role='CSS']">
+    
+    <xsl:variable name="role">
+      <xsl:value-of select="s:toUpperCase(string(@role))" xmlns:s="java:java.lang.String"/>
+    </xsl:variable>
+
+    <xsl:variable name="hilighter" select="jbh:new()"/>
+    <xsl:variable name="parsable" select="jbh:isParsable($role)"/>
+    
+    <fo:block background-color="#F5F5F5"
+              border-style="solid"
+              border-width=".3mm"
+              border-color="#CCCCCC"
+              font-family="{$programlisting.font}"
+              font-size="{$programlisting.font.size}"
+              space-before="12pt"
+              space-after="12pt"
+              linefeed-treatment="preserve"
+              white-space-collapse="false"
+              white-space-treatment="preserve"
+              padding-bottom="12pt"
+              padding-top="12pt"
+              padding-right="12pt"
+              padding-left="12pt">
+
+    <xsl:choose>
+      <xsl:when test="$parsable = 'true'">
+        <xsl:for-each select="node()">
+          <xsl:choose>
+            <xsl:when test="self::text()">
+              <xsl:variable name="child.content" select="."/>
+      
+              <xsl:variable name="caller" select="jbh:parseText($hilighter, $role, string($child.content), 'UTF-8')"/>
+              <xsl:variable name="noOfTokens" select="jbh:getNoOfTokens($caller)"/>
+
+              <xsl:call-template name="iterator">
+                <xsl:with-param name="caller" select="$caller"/>
+                <xsl:with-param name="noOfTokens" select="$noOfTokens"/>
+              </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+              <fo:inline>
+              <xsl:call-template name="anchor"/>
+              <xsl:apply-templates select="." mode="callout-bug"/>
+              </fo:inline>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:for-each>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates/>
+      </xsl:otherwise>
+    </xsl:choose>
+
+    </fo:block>
+  </xsl:template>
+
+
+  <xsl:template name="iterator">
+    <xsl:param name="caller"/>
+    <xsl:param name="noOfTokens"/>
+    <xsl:param name="i" select="0"/>
+
+    <xsl:variable name="style" select="jbh:getStyle($caller, $i)"/>
+    <xsl:variable name="token" select="jbh:getToken($caller, $i)"/>
+
+    <xsl:choose>
+      <xsl:when test="$style = 'java_keyword'"> <fo:inline color="#7F1B55" font-weight="bold"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'java_plain'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'java_type'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'java_separator'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'java_literal'"> <fo:inline color="#2A00FF"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'java_comment'"> <fo:inline color="#3F7F5F"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'java_javadoc_comment'"> <fo:inline color="#3F5FBF" font-style="italic"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'java_operator'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'java_javadoc_tag'"> <fo:inline color="#7F9FBF" font-weight="bold" font-style="italic"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'xml_plain'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'xml_char_data'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'xml_tag_symbols'"> <fo:inline color="#008080"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'xml_comment'"> <fo:inline color="#3F5FBF"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'xml_attribute_value'"> <fo:inline color="#2A00FF"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'xml_attribute_name'"> <fo:inline color="#7F007F" font-weight="bold"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'xml_processing_instruction'"> <fo:inline color="#000000" font-weight="bold" font-style="italic"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'xml_tag_name'"> <fo:inline color="#3F7F7F"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'xml_rife_tag'"> <fo:inline color="#000000"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:when test="$style = 'xml_rife_name'"> <fo:inline color="#008CCA"> <xsl:value-of select="$token"/> </fo:inline></xsl:when>
+      <xsl:otherwise> <fo:inline color="black"> <xsl:value-of select="$token"/> </fo:inline></xsl:otherwise>
+    </xsl:choose>
+
+    <xsl:if test="$i &lt; $noOfTokens - 1">
+      <xsl:call-template name="iterator">
+        <xsl:with-param name="caller" select="$caller"/>
+        <xsl:with-param name="noOfTokens" select="$noOfTokens"/>
+        <xsl:with-param name="i" select="$i + 1"/>
+      </xsl:call-template>  
+    </xsl:if>
+  </xsl:template>
+
+</xsl:stylesheet>

Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-common.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-common.xsl	2008-04-18 09:15:53 UTC (rev 72429)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-common.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -1,54 +1,82 @@
 <?xml version='1.0'?>
- 
+
 <!--
-	Copyright 2007 Red Hat, Inc.
-	License: GPL
-	Author: Jeff Fearn <jfearn at redhat.com>
-	Author: Tammy Fox <tfox at redhat.com>
-	Author: Andy Fitzsimon <afitzsim at redhat.com>
+    Copyright 2007 Red Hat, Inc.
+    License: GPL
+    Author: Jeff Fearn <jfearn at redhat.com>
+    Author: Tammy Fox <tfox at redhat.com>
+    Author: Andy Fitzsimon <afitzsim at redhat.com>
     Author: Mark Newton <mark.newton at jboss.org>
     Author: Pete Muir    
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-								xmlns:exsl="http://exslt.org/common"
 				version="1.0"
-								exclude-result-prefixes="exsl">
+                xmlns:rf="java:org.jboss.highlight.XhtmlRendererFactory"
+                exclude-result-prefixes="#default">
 
    <xsl:import href="common.xsl" />
-   
-   <!--  Enable extensions (needed for callouts) -->
-   <xsl:param name="use.extensions">1</xsl:param>
+  
+  <!-- Ignore image scaling in html version -->
+  <xsl:param name="ignore.image.scaling" select="1"/>
+  
+  <xsl:param name="generate.legalnotice.link" select="1"/>
+  <xsl:param name="generate.revhistory.link" select="0"/>
+  
+  <!-- This is needed to generate the correct xhtml-strict DOCTYPE on the front page.
+      We can't use indentation as the algorithm inserts linebreaks into the markup
+      created for callouts. This means that callouts appear on different lines than
+      the code they are supposed to refer to. -->
+  <xsl:output method="xml"
+              encoding="UTF-8"
+              indent="no"
+              doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+              doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+              standalone="no"/>
 
-   <!-- Enable callouts -->
-   <xsl:param name="callouts.extension">1</xsl:param>
+  <xsl:param name="siteHref" select="'http://www.jboss.org'"/>
+  <xsl:param name="docHref" select="'http://www.jboss.org/projects/docs'"/>
+  <xsl:param name="siteLinkText" select="'JBoss.org'"/>
+  <xsl:param name="docLinkText" select="'Community Documentation'"/>
 
-   <!-- And disable these extensions -->
-   <xsl:param name="tablecolumns.extension">0</xsl:param>
    <xsl:param name="graphicsize.extension">0</xsl:param>
    
-   <!-- Placement of titles (Seam specific) -->
+   <!-- Placement of titles -->
    <xsl:param name="formal.title.placement">
       figure after example before equation before table before procedure before
    </xsl:param>
    
    <!-- Callouts -->
-
-   <!-- Use graphics as they look better with highlighted code -->
-   <xsl:param name="callout.graphics">1</xsl:param>
-   <xsl:param name="callout.graphics.number.limit">15</xsl:param>
-   <xsl:param name="callout.icon.size">17px</xsl:param>
-   <xsl:param name="callout.graphics.extension">.png</xsl:param>
-   <xsl:param name="callout.graphics.path">images/community/docbook/callouts/</xsl:param>
-   
    <!-- Place callout marks at this column in annotated areas. The algorithm using this number doesn't
         know about highlighted code with extra span elements so we need to pad each line at the start
         with an XML comment and a line break. The callout marks must then be placed immediately afterwards.
         This ensures that the callouts appear on the same line as the code it relates to and we can position
         them using CSS so that they all appear in a column on the right. -->
    <xsl:param name="callout.defaultcolumn">15</xsl:param>
+   <xsl:param name="callout.icon.size">17px</xsl:param>
+      
+  <!-- Admonitions -->
+  <xsl:param name="admon.style" select="''"/>
 
-      <xsl:template match="authorgroup" mode="titlepage.mode">
+  <!-- Set chunk.section.depth to 0 to just chunk chapters. -->
+  <xsl:param name="chunk.section.depth" select="0"/>
+  <xsl:param name="chunk.first.sections" select="1"/>
+  <xsl:param name="chunk.toc" select="''"/>
+  <xsl:param name="chunker.output.doctype-public" select="'-//W3C//DTD XHTML 1.0 Strict//EN'"/>
+  <xsl:param name="chunker.output.doctype-system" select="'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'"/>
+  <xsl:param name="chunker.output.encoding" select="'UTF-8'"/>
+
+  <!-- We must turn off indenting as the algorithm inserts linebreaks into the callout markup that is added by the
+      code highlighting routine. This causes the callouts to appear on different lines from the code they relate to. -->
+  <xsl:param name="chunker.output.indent" select="'no'"/>
+
+  <xsl:param name="html.stylesheet" select="'css/jbossorg.css'"/>
+  <xsl:param name="html.stylesheet.type" select="'text/css'"/>
+  <xsl:param name="html.cleanup" select="1"/>
+  <xsl:param name="html.ext" select="'.html'"/>
+
+
+  <xsl:template match="authorgroup" mode="titlepage.mode">
    <xsl:choose>
    <xsl:when test="$use.simplified.author.group = 1">
       <div class="authorgroup">
@@ -80,26 +108,7 @@
       </xsl:choose>
       
    </xsl:template>     
-   
-<!-- Admonition Graphics -->
-<xsl:param name="admon.graphics" select="1"/>
-<xsl:param name="admon.style" select="''"/>
-<xsl:param name="admon.graphics.path">images/community/docbook/</xsl:param>
 
-<xsl:param name="chunker.output.doctype-public" select="'-//W3C//DTD XHTML 1.0 Strict//EN'"/>
-<xsl:param name="chunker.output.doctype-system" select="'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'"/>
-<xsl:param name="chunker.output.encoding" select="'UTF-8'"/>
-
-<!-- We must turn off indenting as the algorithm inserts linebreaks into the callout markup that is added by the
-     code highlighting routine. This causes the callouts to appear on different lines from the code they relate to. -->
-<xsl:param name="chunker.output.indent" select="'no'"/>
-
-<xsl:param name="html.stylesheet" select="'css/jbossorg.css'"/>
-<xsl:param name="html.stylesheet.type" select="'text/css'"/>
-<xsl:param name="html.cleanup" select="1"/>
-<xsl:param name="html.ext" select="'.html'"/>
-<!-- <xsl:output method="html" indent="no"/> -->
-
 <!-- 
 From: fo/callout.xsl
 Version: 1.73.2
@@ -150,9 +159,6 @@
 </xsl:template>
 
 <!-- TOC -->
-<xsl:param name="section.autolabel" select="1"/>
-<xsl:param name="section.label.includes.component.label" select="1"/>
-
 <xsl:param name="generate.toc">
 set toc
 book toc
@@ -187,6 +193,10 @@
 		xmlns="http://www.w3.org/1999/xhtml"
 	to the outer most tag. This gets stripped by the parser, resulting
 	in valid xhtml ... go figure.
+  
+    This sounds like the system used by the stylesheets to process
+    DocBook 5 docs by stripping out the XML namespace before processing
+    the node set as normal: http://lists.oasis-open.org/archives/docbook-apps/200701/msg00184.html
 -->
 
 <!--
@@ -470,4 +480,92 @@
 	</h5>
 </xsl:template>
 
+<!--
+From: xhtml/footnote.xsl
+Reason: remove inline css from hr
+Version: 1.72.0
+-->
+<xsl:template name="process.footnotes">
+  <xsl:variable name="footnotes" select=".//footnote"/>
+  <xsl:variable name="table.footnotes" select=".//tgroup//footnote"/>
+
+  <!-- Only bother to do this if there's at least one non-table footnote -->
+  <xsl:if test="count($footnotes)&gt;count($table.footnotes)">
+    <div class="footnotes">
+      <br/>
+      <hr/>
+      <xsl:apply-templates select="$footnotes" mode="process.footnote.mode"/>
+    </div>
+  </xsl:if>
+
+  <xsl:if test="$annotation.support != 0 and //annotation">
+    <div class="annotation-list">
+      <div class="annotation-nocss">
+  <p>The following annotations are from this essay. You are seeing
+  them here because your browser doesn&#8217;t support the user-interface
+  techniques used to make them appear as &#8216;popups&#8217; on modern browsers.</p>
+      </div>
+
+      <xsl:apply-templates select="//annotation" mode="annotation-popup"/>
+    </div>
+  </xsl:if>
+</xsl:template>
+
+  <xsl:template match="programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']|programlisting[@role='CSS']">
+    
+    <xsl:variable name="role">
+      <xsl:value-of select="s:toUpperCase(string(@role))" xmlns:s="java:java.lang.String"/>
+    </xsl:variable>
+    
+    <xsl:variable name="factory" select="rf:instance()"/>
+    <xsl:variable name="hiliter" select="rf:getRenderer($factory, string($role))"/>
+
+    <pre class="{$role}">
+    <xsl:choose>
+      <xsl:when test="$hiliter">
+            <xsl:for-each select="node()">
+              <xsl:choose>
+                <xsl:when test="self::text()">
+                  <xsl:variable name="child.content" select="."/>
+          
+                  <xsl:value-of select="jhr:highlight($hiliter, $role, string($child.content), 'UTF-8', true())"
+            xmlns:jhr="com.uwyn.jhighlight.renderer.Renderer" disable-output-escaping="yes"/>
+          </xsl:when>
+                <xsl:otherwise>
+                  <!-- Support a single linkend in HTML -->
+                  <xsl:variable name="targets" select="key('id', @linkends)"/>
+                  <xsl:variable name="target" select="$targets[1]"/>
+                  <xsl:choose>
+                  <xsl:when test="$target">
+                  <a>
+                    <xsl:if test="@id or @xml:id">
+                      <xsl:attribute name="id">
+                        <xsl:value-of select="(@id|@xml:id)[1]"/>
+                      </xsl:attribute>
+                    </xsl:if>
+                    <xsl:attribute name="href">
+                      <xsl:call-template name="href.target">
+                        <xsl:with-param name="object" select="$target"/>
+                      </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:apply-templates select="." mode="callout-bug"/>
+                  </a>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:call-template name="anchor"/>
+                    <xsl:apply-templates select="." mode="callout-bug"/>
+                  </xsl:otherwise>
+                  </xsl:choose>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:for-each>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:apply-templates/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </pre>
+    
+  </xsl:template>
+
 </xsl:stylesheet>

Copied: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-single.xsl (from rev 72005, trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl)
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-single.xsl	                        (rev 0)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-single.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -0,0 +1,99 @@
+<?xml version='1.0'?>
+
+<!--
+    Copyright 2008 JBoss, a division of Red Hat
+    License: GPL
+    Author: Jeff Fearn <jfearn at redhat.com>
+    Author: Tammy Fox <tfox at redhat.com>
+    Author: Andy Fitzsimon <afitzsim at redhat.com>
+    Author: Mark Newton <mark.newton at jboss.org>
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/docbook.xsl"/>
+
+  <xsl:include href="xhtml-common.xsl"/>
+
+<!--
+From: xhtml/titlepage-templates.xsl
+Reason: Needed to add JBoss.org and Community Documentation graphics to header
+Version: 1.72.0
+-->
+<xsl:template name="book.titlepage.recto">
+				<p xmlns="http://www.w3.org/1999/xhtml">
+					<xsl:attribute name="id">
+						<xsl:text>title</xsl:text>
+					</xsl:attribute>
+					<a>
+						<xsl:attribute name="href">
+							<xsl:value-of select="$siteHref" />
+						</xsl:attribute>
+						<xsl:attribute name="class">
+							<xsl:text>site_href</xsl:text>
+						</xsl:attribute>
+						<strong>
+						        <xsl:value-of select="$siteLinkText"/>	
+						</strong>
+					</a>
+					<a>
+						<xsl:attribute name="href">
+							<xsl:value-of select="$docHref" />
+						</xsl:attribute>
+						<xsl:attribute name="class">
+							<xsl:text>doc_href</xsl:text>
+						</xsl:attribute>
+						<strong>
+						        <xsl:value-of select="$docLinkText"/>	
+						</strong>
+					</a>
+				</p>
+  <xsl:choose>
+    <xsl:when test="bookinfo/title">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="bookinfo/subtitle">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+</xsl:stylesheet>

Copied: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml.xsl (from rev 72005, trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl)
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml.xsl	                        (rev 0)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml.xsl	2008-04-18 09:24:10 UTC (rev 72430)
@@ -0,0 +1,217 @@
+<?xml version='1.0'?>
+
+<!--
+    Copyright 2008 JBoss, a division of Red Hat
+    License: GPL
+    Author: Jeff Fearn <jfearn at redhat.com>
+    Author: Tammy Fox <tfox at redhat.com>
+    Author: Andy Fitzsimon <afitzsim at redhat.com>
+    Author: Mark Newton <mark.newton at jboss.org>
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/chunk.xsl"/>
+
+  <xsl:include href="xhtml-common.xsl"/>
+
+<!--
+From: xhtml/chunk-common.xsl
+Reason: remove tables, truncate link text
+Version:
+-->
+<xsl:template name="header.navigation">
+	<xsl:param name="prev" select="/foo"/>
+	<xsl:param name="next" select="/foo"/>
+	<xsl:param name="nav.context"/>
+	<xsl:variable name="home" select="/*[1]"/>
+	<xsl:variable name="up" select="parent::*"/>
+	<xsl:variable name="row1" select="$navig.showtitles != 0"/>
+	<xsl:variable name="row2" select="count($prev) &gt; 0 or (count($up) &gt; 0 and generate-id($up) != generate-id($home) and $navig.showtitles != 0) or count($next) &gt; 0"/>
+	<xsl:if test="$suppress.navigation = '0' and $suppress.header.navigation = '0'">
+		<xsl:if test="$row1 or $row2">
+			<xsl:if test="$row1">
+				<p xmlns="http://www.w3.org/1999/xhtml">
+					<xsl:attribute name="id">
+						<xsl:text>title</xsl:text>
+					</xsl:attribute>
+					<a>
+						<xsl:attribute name="href">
+							<xsl:value-of select="$siteHref" />
+						</xsl:attribute>
+						<xsl:attribute name="class">
+							<xsl:text>site_href</xsl:text>
+						</xsl:attribute>
+						<strong>
+						        <xsl:value-of select="$siteLinkText"/>	
+						</strong>
+					</a>
+					<a>
+						<xsl:attribute name="href">
+							<xsl:value-of select="$docHref" />
+						</xsl:attribute>
+						<xsl:attribute name="class">
+							<xsl:text>doc_href</xsl:text>
+						</xsl:attribute>
+						<strong>
+						        <xsl:value-of select="$docLinkText"/>	
+						</strong>
+					</a>
+				</p>
+			</xsl:if>
+			<xsl:if test="$row2">
+				<ul class="docnav" xmlns="http://www.w3.org/1999/xhtml">
+					<li class="previous">
+						<xsl:if test="count($prev)&gt;0">
+							<a accesskey="p">
+								<xsl:attribute name="href">
+									<xsl:call-template name="href.target">
+										<xsl:with-param name="object" select="$prev"/>
+									</xsl:call-template>
+								</xsl:attribute>
+								<strong>
+									<xsl:call-template name="navig.content">
+										<xsl:with-param name="direction" select="'prev'"/>
+									</xsl:call-template>
+								</strong>
+							</a>
+						</xsl:if>
+					</li>
+					<li class="next">
+						<xsl:if test="count($next)&gt;0">
+							<a accesskey="n">
+								<xsl:attribute name="href">
+									<xsl:call-template name="href.target">
+										<xsl:with-param name="object" select="$next"/>
+									</xsl:call-template>
+								</xsl:attribute>
+								<strong>
+									<xsl:call-template name="navig.content">
+										<xsl:with-param name="direction" select="'next'"/>
+									</xsl:call-template>
+								</strong>
+							</a>
+						</xsl:if>
+					</li>
+				</ul>
+			</xsl:if>
+		</xsl:if>
+		<xsl:if test="$header.rule != 0">
+			<hr/>
+		</xsl:if>
+	</xsl:if>
+</xsl:template>
+
+<!--
+From: xhtml/chunk-common.xsl
+Reason: remove tables, truncate link text
+Version:
+-->
+<xsl:template name="footer.navigation">
+	<xsl:param name="prev" select="/foo"/>
+	<xsl:param name="next" select="/foo"/>
+	<xsl:param name="nav.context"/>
+	<xsl:param name="title-limit" select="'50'"/>
+	<xsl:variable name="home" select="/*[1]"/>
+	<xsl:variable name="up" select="parent::*"/>
+	<xsl:variable name="row1" select="count($prev) &gt; 0 or count($up) &gt; 0 or count($next) &gt; 0"/>
+	<xsl:variable name="row2" select="($prev and $navig.showtitles != 0) or (generate-id($home) != generate-id(.) or $nav.context = 'toc') or ($chunk.tocs.and.lots != 0 and $nav.context != 'toc') or ($next and $navig.showtitles != 0)"/>
+
+	<xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'">
+		<xsl:if test="$footer.rule != 0">
+			<hr/>
+		</xsl:if>
+		<xsl:if test="$row1 or $row2">
+			<ul class="docnav" xmlns="http://www.w3.org/1999/xhtml">
+				<xsl:if test="$row1">
+					<li class="previous">
+						<xsl:if test="count($prev) &gt; 0">
+							<a accesskey="p">
+								<xsl:attribute name="href">
+									<xsl:call-template name="href.target">
+										<xsl:with-param name="object" select="$prev"/>
+									</xsl:call-template>
+								</xsl:attribute>
+								<strong>
+									<xsl:call-template name="navig.content">
+										<xsl:with-param name="direction" select="'prev'"/>
+									</xsl:call-template>
+								</strong>
+								<xsl:variable name="text">
+									<xsl:apply-templates select="$prev" mode="object.title.markup"/>
+								</xsl:variable>
+								<xsl:choose>
+									<xsl:when test="string-length($text) &gt; $title-limit">
+										<xsl:value-of select="concat(substring($text, 0, $title-limit), '...')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$text"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</a>
+						</xsl:if>
+					</li>
+					<xsl:if test="count($up) &gt; 0">
+						<li class="up">
+							<a accesskey="u">
+								<xsl:attribute name="href">
+									<xsl:text>#</xsl:text>
+								</xsl:attribute>
+								<strong>
+									<xsl:call-template name="navig.content">
+										<xsl:with-param name="direction" select="'up'"/>
+									</xsl:call-template>
+								</strong>
+							</a>
+						</li>
+					</xsl:if>
+					<xsl:if test="$home != . or $nav.context = 'toc'">
+						<li class="home">
+							<a accesskey="h">
+								<xsl:attribute name="href">
+									<xsl:call-template name="href.target">
+										<xsl:with-param name="object" select="$home"/>
+									</xsl:call-template>
+								</xsl:attribute>
+								<strong>
+									<xsl:call-template name="navig.content">
+										<xsl:with-param name="direction" select="'home'"/>
+									</xsl:call-template>
+								</strong>
+							</a>
+						</li>
+					</xsl:if>
+					<xsl:if test="count($next)&gt;0">
+						<li class="next">
+							<a accesskey="n">
+								<xsl:attribute name="href">
+									<xsl:call-template name="href.target">
+										<xsl:with-param name="object" select="$next"/>
+									</xsl:call-template>
+								</xsl:attribute>
+								<strong>
+									<xsl:call-template name="navig.content">
+										<xsl:with-param name="direction" select="'next'"/>
+									</xsl:call-template>
+								</strong>
+								<xsl:variable name="text">
+									<xsl:apply-templates select="$next" mode="object.title.markup"/>
+								</xsl:variable>
+								<xsl:choose>
+									<xsl:when test="string-length($text) &gt; $title-limit">
+										<xsl:value-of select="concat(substring($text, 0, $title-limit),'...')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$text"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</a>
+						</li>
+					</xsl:if>
+				</xsl:if>
+			</ul>
+		</xsl:if>
+	</xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>




More information about the jboss-cvs-commits mailing list