[richfaces-svn-commits] JBoss Rich Faces SVN: r13511 - trunk/docs/common-resources/en/src/main/xslt.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Fri Apr 10 13:39:38 EDT 2009


Author: artdaw
Date: 2009-04-10 13:39:37 -0400 (Fri, 10 Apr 2009)
New Revision: 13511

Modified:
   trunk/docs/common-resources/en/src/main/xslt/xhtml-common-reldiffmk.xsl
   trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl
   trunk/docs/common-resources/en/src/main/xslt/xhtml-diffmk.xsl
   trunk/docs/common-resources/en/src/main/xslt/xhtml-release.xsl
   trunk/docs/common-resources/en/src/main/xslt/xhtml-single-diffmk.xsl
   trunk/docs/common-resources/en/src/main/xslt/xhtml-single-release.xsl
   trunk/docs/common-resources/en/src/main/xslt/xhtml-single.xsl
   trunk/docs/common-resources/en/src/main/xslt/xhtml.xsl
Log:
https://jira.jboss.org/jira/browse/RF-5655 - xsl refactoring 

Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-common-reldiffmk.xsl
===================================================================
--- trunk/docs/common-resources/en/src/main/xslt/xhtml-common-reldiffmk.xsl	2009-04-10 17:21:12 UTC (rev 13510)
+++ trunk/docs/common-resources/en/src/main/xslt/xhtml-common-reldiffmk.xsl	2009-04-10 17:39:37 UTC (rev 13511)
@@ -9,72 +9,17 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"  xmlns:diffmk="http://diffmk.sf.net/ns/diff" xmlns:date="http://exslt.org/dates-and-times" exclude-result-prefixes="date">
 
    <xsl:import href="collapsing-navigation.xsl"/>
+   <xsl:import href="xhtml-common.xsl"/>
    <xsl:param name="generate.toc" select="'book toc'"/>
    <xsl:param name="toc.section.depth" select="5"/>
-	<!--
+
+<!--
 From: xhtml/docbook.xsl
 Reason: Remove inline style for draft mode
 Version: 1.72.0
 -->
 	
-<xsl:template name="head.content">
-	<xsl:param name="node" select="."/>
-	<xsl:param name="title">
-		<xsl:apply-templates select="$node" mode="object.title.markup.textonly"/>
-	</xsl:param>
 
-	<title xmlns="http://www.w3.org/1999/xhtml" >
-		<xsl:copy-of select="$title"/>
-	</title>
-
-	<xsl:if test="$html.stylesheet != ''">
-		<xsl:call-template name="output.html.stylesheets">
-			<xsl:with-param name="stylesheets" select="normalize-space($html.stylesheet)"/>
-		</xsl:call-template>
-	</xsl:if>
-
-	<xsl:if test="$link.mailto.url != ''">
-		<link rev="made" href="{$link.mailto.url}"/>
-	</xsl:if>
-
-	<xsl:if test="$html.base != ''">
-		<base href="{$html.base}"/>
-	</xsl:if>
-
-	<meta xmlns="http://www.w3.org/1999/xhtml" name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/>
-
-	<xsl:if test="$generate.meta.abstract != 0">
-		<xsl:variable name="info" select="(articleinfo |bookinfo |prefaceinfo |chapterinfo |appendixinfo |sectioninfo |sect1info |sect2info |sect3info |sect4info |sect5info |referenceinfo |refentryinfo |partinfo |info |docinfo)[1]"/>
-		<xsl:if test="$info and $info/abstract">
-			<meta xmlns="http://www.w3.org/1999/xhtml" name="description">
-				<xsl:attribute name="content">
-					<xsl:for-each select="$info/abstract[1]/*">
-						<xsl:value-of select="normalize-space(.)"/>
-						<xsl:if test="position() &lt; last()">
-							<xsl:text> </xsl:text>
-						</xsl:if>
-					</xsl:for-each>
-				</xsl:attribute>
-			</meta>
-		</xsl:if>
-	</xsl:if>
-	
-	<link rel="shortcut icon"  type="image/vnd.microsoft.icon" href="images/favicon.ico" />
-
-	<xsl:apply-templates select="." mode="head.keywords.content"/>
-			<script type="text/javascript" src="script/prototype-1.6.0.2.js"><xsl:comment>If you see this message, your web browser doesn't support JavaScript or JavaScript is disabled.</xsl:comment></script>
-		<script type="text/javascript" src="script/effects.js"><xsl:comment>If you see this message, your web browser doesn't support JavaScript or JavaScript is disabled.</xsl:comment></script>
-		<script type="text/javascript" src="script/scriptaculous.js"><xsl:comment>If you see this message, your web browser doesn't support JavaScript or JavaScript is disabled.</xsl:comment></script>
-
-</xsl:template>
-
-<xsl:template match="abstract" mode="titlepage.mode">
-	<div>
-	    <xsl:apply-templates select="." mode="class.attribute"/>
-	    <xsl:apply-templates mode="titlepage.mode"/>
-	  </div>
-</xsl:template>
-
  <!--                 Overriding toc.line                          -->
   <xsl:template name="toc.line"> 
     <xsl:param name="toc-context" select="."/> 
@@ -139,7 +84,8 @@
       </a> 
     </span> 
   </xsl:template> 
-  <!-- XHTML and PDF -->
+
+  <!-- XHTML  -->
   
   <xsl:template match="//diffmk:wrapper">
 	<xsl:choose>

Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl
===================================================================
--- trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl	2009-04-10 17:21:12 UTC (rev 13510)
+++ trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl	2009-04-10 17:39:37 UTC (rev 13511)
@@ -62,14 +62,8 @@
 			</meta>
 		</xsl:if>
 	</xsl:if>
-	
 	<link rel="shortcut icon"  type="image/vnd.microsoft.icon" href="images/favicon.ico" />
-
 	<xsl:apply-templates select="." mode="head.keywords.content"/>
-		<!--script type="text/javascript" src="script/prototype-1.6.0.2.js"><xsl:comment>If you see this message, your web browser doesn't support JavaScript or JavaScript is disabled.</xsl:comment></script>
-		<script type="text/javascript" src="script/effects.js"><xsl:comment>If you see this message, your web browser doesn't support JavaScript or JavaScript is disabled.</xsl:comment></script>
-		<script type="text/javascript" src="script/scriptaculous.js"><xsl:comment>If you see this message, your web browser doesn't support JavaScript or JavaScript is disabled.</xsl:comment></script-->
-
 </xsl:template>
 
 <xsl:template match="abstract" mode="titlepage.mode">
@@ -161,4 +155,306 @@
 		</a>
 	</div-->							
  </xsl:template>
+
+<xsl:template name="navig.content">
+    <xsl:param name="direction" select="next"/>
+    <xsl:variable name="navtext">
+        <xsl:choose>
+            <xsl:when test="$direction = 'prev'">
+                <xsl:call-template name="gentext.nav.prev"/>
+            </xsl:when>
+            <xsl:when test="$direction = 'next'">
+                <xsl:call-template name="gentext.nav.next"/>
+            </xsl:when>
+            <xsl:when test="$direction = 'up'">
+                <xsl:call-template name="gentext.nav.up"/>
+            </xsl:when>
+            <xsl:when test="$direction = 'home'">
+                <xsl:call-template name="gentext.nav.home"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>xxx</xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:variable>
+
+    <xsl:choose>
+        <xsl:when test="$navig.graphics != 0">
+            <img>
+                <xsl:attribute name="src">
+                    <xsl:value-of select="$navig.graphics.path"/>
+                    <xsl:value-of select="$direction"/>
+                    <xsl:value-of select="$navig.graphics.extension"/>
+                </xsl:attribute>
+                <xsl:attribute name="alt">
+                    <xsl:value-of select="$navtext"/>
+                </xsl:attribute>
+            </img>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="$navtext"/>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="header.navigation.multiPage">
+	<xsl:param name="prev" select="/foo"/>
+	<xsl:param name="next" select="/foo"/>
+	<xsl:param name="nav.context"/>
+	<xsl:param name="nightly" select="0"/>
+	<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">
+				<xsl:if test="$nightly &gt; 0">
+					<div id="overlay">
+						<xsl:text> </xsl:text>
+					</div>
+				</xsl:if>
+				<!-- FEEDBACK -->
+				<xsl:call-template name="feedback" />
+
+				<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>
+
+ <xsl:template name="book.titlepage.recto.singlePage">
+	  <xsl:param name="nightly" select="0"/>
+			<xsl:if test="$nightly &gt; 0">
+				<div id="overlay">
+					<xsl:text> </xsl:text>
+				</div>
+			</xsl:if>
+				<!-- FEEDBACK -->
+				<xsl:call-template name="feedback" />
+				<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:template name="chunkerdoc">
+  <xsl:param name="node" select="."/>
+  
+  <xsl:choose>
+    <xsl:when test="not($node/parent::*)">1</xsl:when>
+    <xsl:when test="$node/parent::node()/processing-instruction('forseChanks') and local-name($node)!='title' and local-name($node)!='para' and local-name($node)='section'" >1</xsl:when>
+    <xsl:when test="local-name($node) = 'sect1'
+                    and $chunk.section.depth &gt;= 1
+                    and ($chunk.first.sections != 0
+                         or count($node/preceding-sibling::sect1) &gt; 0)">
+      <xsl:text>1</xsl:text>
+    </xsl:when>
+    <xsl:when test="local-name($node) = 'sect2'
+                    and $chunk.section.depth &gt;= 2
+                    and ($chunk.first.sections != 0
+                         or count($node/preceding-sibling::sect2) &gt; 0)">
+      <xsl:call-template name="chunk">
+        <xsl:with-param name="node" select="$node/parent::*"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="local-name($node) = 'sect3'
+                    and $chunk.section.depth &gt;= 3
+                    and ($chunk.first.sections != 0
+                         or count($node/preceding-sibling::sect3) &gt; 0)">
+      <xsl:call-template name="chunk">
+        <xsl:with-param name="node" select="$node/parent::*"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="local-name($node) = 'sect4'
+                    and $chunk.section.depth &gt;= 4
+                    and ($chunk.first.sections != 0
+                         or count($node/preceding-sibling::sect4) &gt; 0)">
+      <xsl:call-template name="chunk">
+        <xsl:with-param name="node" select="$node/parent::*"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="local-name($node) = 'sect5'
+                    and $chunk.section.depth &gt;= 5
+                    and ($chunk.first.sections != 0
+                         or count($node/preceding-sibling::sect5) &gt; 0)">
+      <xsl:call-template name="chunk">
+        <xsl:with-param name="node" select="$node/parent::*"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="local-name($node) = 'section'
+                    and $chunk.section.depth &gt;= count($node/ancestor::section)+1
+                    and ($chunk.first.sections != 0
+                         or count($node/preceding-sibling::section) &gt; 0)">
+      <xsl:call-template name="chunk">
+        <xsl:with-param name="node" select="$node/parent::*"/>
+      </xsl:call-template>
+    </xsl:when>
+
+    <xsl:when test="local-name($node)='preface'">1</xsl:when>
+    <xsl:when test="local-name($node)='chapter'">1</xsl:when>
+    <xsl:when test="local-name($node)='appendix'">1</xsl:when>
+    <xsl:when test="local-name($node)='article'">1</xsl:when>
+    <xsl:when test="local-name($node)='part'">1</xsl:when>
+    <xsl:when test="local-name($node)='reference'">1</xsl:when>
+    <xsl:when test="local-name($node)='refentry'">1</xsl:when>
+    <xsl:when test="local-name($node)='index' and ($generate.index != 0 or count($node/*) > 0)
+                    and (local-name($node/parent::*) = 'article'
+                    or local-name($node/parent::*) = 'book'
+                    or local-name($node/parent::*) = 'part'
+                    )">1</xsl:when>
+    <xsl:when test="local-name($node)='bibliography'
+                    and (local-name($node/parent::*) = 'article'
+                    or local-name($node/parent::*) = 'book'
+                    or local-name($node/parent::*) = 'part'
+                    )">1</xsl:when>
+    <xsl:when test="local-name($node)='glossary'
+                    and (local-name($node/parent::*) = 'article'
+                    or local-name($node/parent::*) = 'book'
+                    or local-name($node/parent::*) = 'part'
+                    )">1</xsl:when>
+    <xsl:when test="local-name($node)='colophon'">1</xsl:when>
+    <xsl:when test="local-name($node)='book'">1</xsl:when>
+    <xsl:when test="local-name($node)='set'">1</xsl:when>
+    <xsl:when test="local-name($node)='setindex'">1</xsl:when>
+    <xsl:when test="local-name($node)='legalnotice'
+                    and $generate.legalnotice.link != 0">1</xsl:when>
+    <xsl:otherwise>0</xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
 </xsl:stylesheet>

Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-diffmk.xsl
===================================================================
--- trunk/docs/common-resources/en/src/main/xslt/xhtml-diffmk.xsl	2009-04-10 17:21:12 UTC (rev 13510)
+++ trunk/docs/common-resources/en/src/main/xslt/xhtml-diffmk.xsl	2009-04-10 17:39:37 UTC (rev 13511)
@@ -8,182 +8,17 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-   <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/>
-   <xsl:import href="xhtml-common-reldiffmk.xsl"/>
-   
-<xsl:param name="chunk.fast" select="1"/>
- <xsl:param name="html.stylesheet" select="'css/html-release.css'"/>
-	
-<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">
-				<div id="overlay">
-					<xsl:text> </xsl:text>
-				</div>
-				<!-- FEEDBACK -->
-				<xsl:call-template name="feedback" />
+	<xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/>
+	<xsl:import href="xhtml-common-reldiffmk.xsl"/>
+	   
+	<xsl:param name="chunk.fast" select="1"/>
+	<xsl:param name="html.stylesheet" select="'css/html-release.css'"/>
+		
+	<xsl:template name="header.navigation">
+		<xsl:call-template name="header.navigation.multiPage" />
+	</xsl:template>
+	<xsl:template name="chunk">
+		<xsl:call-template name="chunkerdoc" />
+	</xsl:template>
 
-				<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>
-
-<xsl:template name="chunk">
-  <xsl:param name="node" select="."/>
-  
-  <xsl:choose>
-    <xsl:when test="not($node/parent::*)">1</xsl:when>
-    <xsl:when test="$node/parent::node()/processing-instruction('forseChanks') and local-name($node)!='title' and local-name($node)!='para' and local-name($node)='section'" >1</xsl:when>
-    <xsl:when test="local-name($node) = 'sect1'
-                    and $chunk.section.depth &gt;= 1
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect1) &gt; 0)">
-      <xsl:text>1</xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect2'
-                    and $chunk.section.depth &gt;= 2
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect2) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect3'
-                    and $chunk.section.depth &gt;= 3
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect3) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect4'
-                    and $chunk.section.depth &gt;= 4
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect4) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect5'
-                    and $chunk.section.depth &gt;= 5
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect5) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'section'
-                    and $chunk.section.depth &gt;= count($node/ancestor::section)+1
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::section) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="local-name($node)='preface'">1</xsl:when>
-    <xsl:when test="local-name($node)='chapter'">1</xsl:when>
-    <xsl:when test="local-name($node)='appendix'">1</xsl:when>
-    <xsl:when test="local-name($node)='article'">1</xsl:when>
-    <xsl:when test="local-name($node)='part'">1</xsl:when>
-    <xsl:when test="local-name($node)='reference'">1</xsl:when>
-    <xsl:when test="local-name($node)='refentry'">1</xsl:when>
-    <xsl:when test="local-name($node)='index' and ($generate.index != 0 or count($node/*) > 0)
-                    and (local-name($node/parent::*) = 'article'
-                    or local-name($node/parent::*) = 'book'
-                    or local-name($node/parent::*) = 'part'
-                    )">1</xsl:when>
-    <xsl:when test="local-name($node)='bibliography'
-                    and (local-name($node/parent::*) = 'article'
-                    or local-name($node/parent::*) = 'book'
-                    or local-name($node/parent::*) = 'part'
-                    )">1</xsl:when>
-    <xsl:when test="local-name($node)='glossary'
-                    and (local-name($node/parent::*) = 'article'
-                    or local-name($node/parent::*) = 'book'
-                    or local-name($node/parent::*) = 'part'
-                    )">1</xsl:when>
-    <xsl:when test="local-name($node)='colophon'">1</xsl:when>
-    <xsl:when test="local-name($node)='book'">1</xsl:when>
-    <xsl:when test="local-name($node)='set'">1</xsl:when>
-    <xsl:when test="local-name($node)='setindex'">1</xsl:when>
-    <xsl:when test="local-name($node)='legalnotice'
-                    and $generate.legalnotice.link != 0">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
 </xsl:stylesheet>

Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-release.xsl
===================================================================
--- trunk/docs/common-resources/en/src/main/xslt/xhtml-release.xsl	2009-04-10 17:21:12 UTC (rev 13510)
+++ trunk/docs/common-resources/en/src/main/xslt/xhtml-release.xsl	2009-04-10 17:39:37 UTC (rev 13511)
@@ -8,179 +8,17 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-   <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/>
-   <xsl:import href="xhtml-common-reldiffmk.xsl"/>
-   
-<xsl:param name="chunk.fast" select="1"/>
- <xsl:param name="html.stylesheet" select="'css/html-release.css'"/>
-	
-<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">
-				<!-- FEEDBACK -->
-				<xsl:call-template name="feedback" />
+	<xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/>
+	<xsl:import href="xhtml-common-reldiffmk.xsl"/>
+	  
+	<xsl:param name="chunk.fast" select="1"/>
+	<xsl:param name="html.stylesheet" select="'css/html-release.css'"/>
 
-				<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>
+	<xsl:template name="header.navigation">
+		<xsl:call-template name="header.navigation.multiPage" />
+	</xsl:template>
+	<xsl:template name="chunk">
+		<xsl:call-template name="chunkerdoc" />
+	</xsl:template>
 
-<xsl:template name="chunk">
-  <xsl:param name="node" select="."/>
-  
-  <xsl:choose>
-    <xsl:when test="not($node/parent::*)">1</xsl:when>
-    <xsl:when test="$node/parent::node()/processing-instruction('forseChanks') and local-name($node)!='title' and local-name($node)!='para' and local-name($node)='section'" >1</xsl:when>
-    <xsl:when test="local-name($node) = 'sect1'
-                    and $chunk.section.depth &gt;= 1
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect1) &gt; 0)">
-      <xsl:text>1</xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect2'
-                    and $chunk.section.depth &gt;= 2
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect2) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect3'
-                    and $chunk.section.depth &gt;= 3
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect3) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect4'
-                    and $chunk.section.depth &gt;= 4
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect4) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect5'
-                    and $chunk.section.depth &gt;= 5
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect5) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'section'
-                    and $chunk.section.depth &gt;= count($node/ancestor::section)+1
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::section) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="local-name($node)='preface'">1</xsl:when>
-    <xsl:when test="local-name($node)='chapter'">1</xsl:when>
-    <xsl:when test="local-name($node)='appendix'">1</xsl:when>
-    <xsl:when test="local-name($node)='article'">1</xsl:when>
-    <xsl:when test="local-name($node)='part'">1</xsl:when>
-    <xsl:when test="local-name($node)='reference'">1</xsl:when>
-    <xsl:when test="local-name($node)='refentry'">1</xsl:when>
-    <xsl:when test="local-name($node)='index' and ($generate.index != 0 or count($node/*) > 0)
-                    and (local-name($node/parent::*) = 'article'
-                    or local-name($node/parent::*) = 'book'
-                    or local-name($node/parent::*) = 'part'
-                    )">1</xsl:when>
-    <xsl:when test="local-name($node)='bibliography'
-                    and (local-name($node/parent::*) = 'article'
-                    or local-name($node/parent::*) = 'book'
-                    or local-name($node/parent::*) = 'part'
-                    )">1</xsl:when>
-    <xsl:when test="local-name($node)='glossary'
-                    and (local-name($node/parent::*) = 'article'
-                    or local-name($node/parent::*) = 'book'
-                    or local-name($node/parent::*) = 'part'
-                    )">1</xsl:when>
-    <xsl:when test="local-name($node)='colophon'">1</xsl:when>
-    <xsl:when test="local-name($node)='book'">1</xsl:when>
-    <xsl:when test="local-name($node)='set'">1</xsl:when>
-    <xsl:when test="local-name($node)='setindex'">1</xsl:when>
-    <xsl:when test="local-name($node)='legalnotice'
-                    and $generate.legalnotice.link != 0">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
 </xsl:stylesheet>

Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-single-diffmk.xsl
===================================================================
--- trunk/docs/common-resources/en/src/main/xslt/xhtml-single-diffmk.xsl	2009-04-10 17:21:12 UTC (rev 13510)
+++ trunk/docs/common-resources/en/src/main/xslt/xhtml-single-diffmk.xsl	2009-04-10 17:39:37 UTC (rev 13511)
@@ -7,89 +7,11 @@
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-   <xsl:import href="classpath:/xslt/org/jboss/xhtml-single.xsl"/>
-   <xsl:import href="xhtml-common-reldiffmk.xsl"/>
-    <xsl:param name="html.stylesheet" select="'css/html-release.css'"/>
-   <xsl:template name="book.titlepage.recto">
-				<div id="overlay">
-					<xsl:text> </xsl:text>
-				</div>
-				<!-- FEEDBACK -->
-				<xsl:call-template name="feedback" />
-				<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:import href="classpath:/xslt/org/jboss/xhtml-single.xsl"/>
+	<xsl:import href="xhtml-common-reldiffmk.xsl"/>
+	<xsl:param name="html.stylesheet" select="'css/html-release.css'"/>
+	
+	<xsl:template name="book.titlepage.recto">
+		<xsl:call-template name="book.titlepage.recto.singlePage" />
+	</xsl:template>
 </xsl:stylesheet>

Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-single-release.xsl
===================================================================
--- trunk/docs/common-resources/en/src/main/xslt/xhtml-single-release.xsl	2009-04-10 17:21:12 UTC (rev 13510)
+++ trunk/docs/common-resources/en/src/main/xslt/xhtml-single-release.xsl	2009-04-10 17:39:37 UTC (rev 13511)
@@ -8,85 +8,13 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-   <xsl:import href="classpath:/xslt/org/jboss/xhtml-single.xsl"/>
-   <xsl:import href="xhtml-common-reldiffmk.xsl"/>
-    <xsl:param name="html.stylesheet" select="'css/html-release.css'"/>
-   <xsl:template name="book.titlepage.recto">
-				<!-- FEEDBACK -->
-				<xsl:call-template name="feedback" />
-				<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:import href="classpath:/xslt/org/jboss/xhtml-single.xsl"/>
+	<xsl:import href="xhtml-common-reldiffmk.xsl"/>
 
-  <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:param name="html.stylesheet" select="'css/html-release.css'"/>
+	  
+	<xsl:template name="book.titlepage.recto">
+		<xsl:call-template name="book.titlepage.recto.singlePage" />
+	</xsl:template>
 
-  <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>

Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-single.xsl
===================================================================
--- trunk/docs/common-resources/en/src/main/xslt/xhtml-single.xsl	2009-04-10 17:21:12 UTC (rev 13510)
+++ trunk/docs/common-resources/en/src/main/xslt/xhtml-single.xsl	2009-04-10 17:39:37 UTC (rev 13511)
@@ -13,84 +13,9 @@
 <xsl:param name="html.stylesheet" select="'css/html.css'"/>
 
 <xsl:template name="book.titlepage.recto">
-				<div id="overlay">
-					<xsl:text> </xsl:text>
-				</div>
-				<!-- FEEDBACK -->
-				<xsl:call-template name="feedback" />
-				<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:call-template name="book.titlepage.recto.singlePage">
+		 <xsl:with-param name="nightly" select="1" />
+	</xsl:call-template>
 </xsl:template>
 
 </xsl:stylesheet>

Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml.xsl
===================================================================
--- trunk/docs/common-resources/en/src/main/xslt/xhtml.xsl	2009-04-10 17:21:12 UTC (rev 13510)
+++ trunk/docs/common-resources/en/src/main/xslt/xhtml.xsl	2009-04-10 17:39:37 UTC (rev 13511)
@@ -8,182 +8,19 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-   <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/>
-   <xsl:import href="xhtml-common.xsl"/>
-   
-<xsl:param name="chunk.fast" select="1"/>
-<xsl:param name="html.stylesheet" select="'css/html.css'"/>
-	
-<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">
-				<div id="overlay">
-					<xsl:text> </xsl:text>
-				</div>
-				<!-- FEEDBACK -->
-				<xsl:call-template name="feedback" />
+	<xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/>
+	<xsl:import href="xhtml-common.xsl"/>
+	   
+	<xsl:param name="chunk.fast" select="1"/>
+	<xsl:param name="html.stylesheet" select="'css/html.css'"/>
+		
+	<xsl:template name="header.navigation">
+		<xsl:call-template name="header.navigation.multiPage">
+			 <xsl:with-param name="nightly" select="1" />
+		</xsl:call-template>
+	</xsl:template>
+	<xsl:template name="chunk">
+		<xsl:call-template name="chunkerdoc" />
+	</xsl:template>
 
-				<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>
-
-<xsl:template name="chunk">
-  <xsl:param name="node" select="."/>
-  
-  <xsl:choose>
-    <xsl:when test="not($node/parent::*)">1</xsl:when>
-    <xsl:when test="$node/parent::node()/processing-instruction('forseChanks') and local-name($node)!='title' and local-name($node)!='para' and local-name($node)='section'" >1</xsl:when>
-    <xsl:when test="local-name($node) = 'sect1'
-                    and $chunk.section.depth &gt;= 1
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect1) &gt; 0)">
-      <xsl:text>1</xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect2'
-                    and $chunk.section.depth &gt;= 2
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect2) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect3'
-                    and $chunk.section.depth &gt;= 3
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect3) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect4'
-                    and $chunk.section.depth &gt;= 4
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect4) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect5'
-                    and $chunk.section.depth &gt;= 5
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::sect5) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'section'
-                    and $chunk.section.depth &gt;= count($node/ancestor::section)+1
-                    and ($chunk.first.sections != 0
-                         or count($node/preceding-sibling::section) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="local-name($node)='preface'">1</xsl:when>
-    <xsl:when test="local-name($node)='chapter'">1</xsl:when>
-    <xsl:when test="local-name($node)='appendix'">1</xsl:when>
-    <xsl:when test="local-name($node)='article'">1</xsl:when>
-    <xsl:when test="local-name($node)='part'">1</xsl:when>
-    <xsl:when test="local-name($node)='reference'">1</xsl:when>
-    <xsl:when test="local-name($node)='refentry'">1</xsl:when>
-    <xsl:when test="local-name($node)='index' and ($generate.index != 0 or count($node/*) > 0)
-                    and (local-name($node/parent::*) = 'article'
-                    or local-name($node/parent::*) = 'book'
-                    or local-name($node/parent::*) = 'part'
-                    )">1</xsl:when>
-    <xsl:when test="local-name($node)='bibliography'
-                    and (local-name($node/parent::*) = 'article'
-                    or local-name($node/parent::*) = 'book'
-                    or local-name($node/parent::*) = 'part'
-                    )">1</xsl:when>
-    <xsl:when test="local-name($node)='glossary'
-                    and (local-name($node/parent::*) = 'article'
-                    or local-name($node/parent::*) = 'book'
-                    or local-name($node/parent::*) = 'part'
-                    )">1</xsl:when>
-    <xsl:when test="local-name($node)='colophon'">1</xsl:when>
-    <xsl:when test="local-name($node)='book'">1</xsl:when>
-    <xsl:when test="local-name($node)='set'">1</xsl:when>
-    <xsl:when test="local-name($node)='setindex'">1</xsl:when>
-    <xsl:when test="local-name($node)='legalnotice'
-                    and $generate.legalnotice.link != 0">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
 </xsl:stylesheet>




More information about the richfaces-svn-commits mailing list