Author: artdaw Date: 2009-03-09 09:28:41 -0400 (Mon, 09 Mar 2009) New Revision: 14108 Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-release-nomarker.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release-nomarker.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release-nomarker.xsl Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common-diff.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl Log: https://jira.jboss.org/jira/browse/JBDS-489 - new 'releaseTest' profile was created Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common-diff.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common-diff.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common-diff.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -1,6 +1,97 @@ <?xml version='1.0'?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:diffmk="http://diffmk.sf.net/ns/diff" version="1.0"> + <!-- Overriding toc.line --> + <xsl:template name="toc.line"> + <xsl:param name="toc-context" select="."/> + <xsl:param name="depth" select="1"/> + <xsl:param name="depth.from.context" select="8"/> + + <xsl:param name="min-diff" select="10"/> + <xsl:param name="pos" select="position()"/> + <span> + <xsl:attribute name="class"><xsl:value-of select="local-name(.)"/></xsl:attribute> + + <!-- * if $autotoc.label.in.hyperlink is zero, then output the label --> + <!-- * before the hyperlinked title (as the DSSSL stylesheet does) --> + <xsl:if test="$autotoc.label.in.hyperlink = 0"> + <xsl:variable name="label"> + <xsl:apply-templates select="." mode="label.markup"/> + </xsl:variable> + <xsl:copy-of select="$label"/> + <xsl:if test="$label != ''"> + <xsl:value-of select="$autotoc.label.separator"/> + </xsl:if> + </xsl:if> + + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="context" select="$toc-context"/> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:choose> + <xsl:when test="local-name(.)='section' and current()/@diffmk:change='added'"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="local-name(.)='chapter' and current()/@diffmk:change='added'"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="local-name(.)='section' and current()//diffmk:wrapper"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">updated</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + + + <!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label --> + <!-- * as part of the hyperlinked title --> + <xsl:if test="not($autotoc.label.in.hyperlink = 0)"> + <xsl:variable name="label"> + <xsl:apply-templates select="." mode="label.markup"/> + </xsl:variable> + <xsl:copy-of select="$label"/> + <xsl:if test="$label != ''"> + <xsl:value-of select="$autotoc.label.separator"/> + </xsl:if> + </xsl:if> + + <xsl:apply-templates select="." mode="titleabbrev.markup"/> + </a> + </span> + </xsl:template> + <!-- This template adds proper markers to the titles of guide --> + <xsl:template name="markerTypes"> + <xsl:param name="marker-type" /> + <xsl:param name="marker-value" /> + <xsl:choose> + <xsl:when test="$marker-type = 'attribute'"> + <xsl:attribute name="class"> + <xsl:value-of select="$marker-value" /> + </xsl:attribute> + </xsl:when> + <xsl:when test="$marker-type = 'image'"> + <xsl:choose> + <xsl:when test="$marker-value='changed'"> + <img src="images/updated.png" alt="updated" class="img_marker" /> + </xsl:when> + <xsl:when test="$marker-value='added'"> + <img src="images/new.png" alt="updated" class="img_marker" /> + </xsl:when> + </xsl:choose> + </xsl:when> + </xsl:choose> + </xsl:template> <!-- This template is used for the diffmk build --> <xsl:template match="//diffmk:wrapper"> <xsl:choose> @@ -17,5 +108,141 @@ </xsl:otherwise> </xsl:choose> </xsl:template> + <!-- THERE ARE 2 TEMPLATES FOR ADDING 'ADDED', 'CHANGED' ICONS TO ALL OF THE TITLES--> + +<xsl:template name="component.title"> + <xsl:param name="node" select="."/> + <xsl:param name="pos" select="position()"/> + <xsl:param name="min-diff" select="10"/> + + <xsl:variable name="level"> + <xsl:choose> + <xsl:when test="ancestor::section"> + <xsl:value-of select="count(ancestor::section)+1"/> + </xsl:when> + <xsl:when test="ancestor::sect5">6</xsl:when> + <xsl:when test="ancestor::sect4">5</xsl:when> + <xsl:when test="ancestor::sect3">4</xsl:when> + <xsl:when test="ancestor::sect2">3</xsl:when> + <xsl:when test="ancestor::sect1">2</xsl:when> + <xsl:otherwise>1</xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <!-- Let's handle the case where a component (bibliography, for example) + occurs inside a section; will we need parameters for this? --> + + <xsl:element name="h{$level+1}"> + <xsl:attribute name="class"> + title + </xsl:attribute> + <xsl:if test="$generate.id.attributes = 0"> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="$node"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:if> + <xsl:apply-templates select="$node" mode="object.title.markup"> + <xsl:with-param name="allow-anchors" select="1"/> + </xsl:apply-templates> + </xsl:element> + + <!-- These rules add markers to the title of chapter --> + <xsl:choose> + <xsl:when test="current()/parent::node()[@diffmk:change='added']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="current()/following-sibling::node()[name(.)!='section']/descendant-or-self::node()[name()='diffmk:wrapper']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">changed</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + +</xsl:template> + +<!-- ===================== Rules for title of section ====================================== --> + +<xsl:template name="section.heading"> + <xsl:param name="section" select="."/> + <xsl:param name="level" select="1"/> + <xsl:param name="allow-anchors" select="1"/> + <xsl:param name="title"/> + <xsl:param name="class" select="'title'"/> + <xsl:param name="pos" select="position()"/> + <xsl:param name="min-diff" select="10"/> + + <xsl:variable name="id"> + <xsl:choose> + <!-- if title is in an *info wrapper, get the grandparent --> + <xsl:when test="contains(local-name(..), 'info')"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="../.."/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select=".."/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <!-- HTML H level is one higher than section level --> + <xsl:variable name="hlevel"> + <xsl:choose> + <!-- highest valid HTML H level is H6; so anything nested deeper + than 5 levels down just becomes H6 --> + <xsl:when test="$level &gt; 5">6</xsl:when> + <xsl:otherwise> + <xsl:value-of select="$level + 1"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:element name="h{$hlevel}"> + <xsl:attribute name="class"> + <xsl:value-of select="$class"/> + </xsl:attribute> + <xsl:if test="$css.decoration != '0'"> + <xsl:if test="$hlevel&lt;3"> + <xsl:attribute name="style">clear: both</xsl:attribute> + </xsl:if> + </xsl:if> + <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0"> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="$section"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:if> + <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')"> + <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute> + </xsl:if> + <xsl:copy-of select="$title"/> + </xsl:element> + + <!-- These rules add markers to the title of section --> + <xsl:choose> + <xsl:when test="current()/parent::node()[@diffmk:change='added']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="current()/following-sibling::*/descendant-or-self::node()[name()='diffmk:wrapper']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">changed</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + +</xsl:template> + +<!-- ==================================================================== --> </xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -61,28 +61,7 @@ </xsl:template> - <!-- This template adds proper markers to the titles of guide --> - <xsl:template name="markerTypes"> - <xsl:param name="marker-type" /> - <xsl:param name="marker-value" /> - <xsl:choose> - <xsl:when test="$marker-type = 'attribute'"> - <xsl:attribute name="class"> - <xsl:value-of select="$marker-value" /> - </xsl:attribute> - </xsl:when> - <xsl:when test="$marker-type = 'image'"> - <xsl:choose> - <xsl:when test="$marker-value='changed'"> - <img src="images/updated.png" alt="updated" class="img_marker" /> - </xsl:when> - <xsl:when test="$marker-value='added'"> - <img src="images/new.png" alt="updated" class="img_marker" /> - </xsl:when> - </xsl:choose> - </xsl:when> - </xsl:choose> - </xsl:template> + @@ -117,28 +96,7 @@ <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:call-template> </xsl:attribute> - - <xsl:choose> - <xsl:when test="local-name(.)='section' and current()/@diffmk:change='added'"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">attribute</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="local-name(.)='chapter' and current()/@diffmk:change='added'"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">attribute</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="local-name(.)='section' and current()//diffmk:wrapper"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">attribute</xsl:with-param> - <xsl:with-param name="marker-value">updated</xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> - + <!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label --> <!-- * as part of the hyperlinked title --> @@ -168,23 +126,6 @@ <!-- XHTML and PDF --> - - <!-- This template is used for the release build --> - <xsl:template match="//diffmk:wrapper"> - <xsl:choose> - <xsl:when test="@diffmk:change='deleted'"> - <xsl:text> </xsl:text> - </xsl:when> - <xsl:when test="parent::node()[local-name()='title']"> - <xsl:value-of select="."/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="."/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template match="abstract" mode="titlepage.mode"> @@ -196,142 +137,7 @@ </xsl:call-template> </xsl:template> -<!-- THERE ARE 2 TEMPLATES FOR ADDING 'ADDED', 'CHANGED' ICONS TO ALL OF THE TITLES--> -<xsl:template name="component.title"> - <xsl:param name="node" select="."/> - <xsl:param name="pos" select="position()"/> - <xsl:param name="min-diff" select="10"/> - <xsl:variable name="level"> - <xsl:choose> - <xsl:when test="ancestor::section"> - <xsl:value-of select="count(ancestor::section)+1"/> - </xsl:when> - <xsl:when test="ancestor::sect5">6</xsl:when> - <xsl:when test="ancestor::sect4">5</xsl:when> - <xsl:when test="ancestor::sect3">4</xsl:when> - <xsl:when test="ancestor::sect2">3</xsl:when> - <xsl:when test="ancestor::sect1">2</xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <!-- Let's handle the case where a component (bibliography, for example) - occurs inside a section; will we need parameters for this? --> - - <xsl:element name="h{$level+1}"> - <xsl:attribute name="class"> - title - </xsl:attribute> - <xsl:if test="$generate.id.attributes = 0"> - <xsl:call-template name="anchor"> - <xsl:with-param name="node" select="$node"/> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - </xsl:if> - <xsl:apply-templates select="$node" mode="object.title.markup"> - <xsl:with-param name="allow-anchors" select="1"/> - </xsl:apply-templates> - </xsl:element> - - <!-- These rules add markers to the title of chapter --> - <xsl:choose> - <xsl:when test="current()/parent::node()[@diffmk:change='added']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="current()/following-sibling::node()[name(.)!='section']/descendant-or-self::node()[name()='diffmk:wrapper']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">changed</xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<!-- ===================== Rules for title of section ====================================== --> - -<xsl:template name="section.heading"> - <xsl:param name="section" select="."/> - <xsl:param name="level" select="1"/> - <xsl:param name="allow-anchors" select="1"/> - <xsl:param name="title"/> - <xsl:param name="class" select="'title'"/> - <xsl:param name="pos" select="position()"/> - <xsl:param name="min-diff" select="10"/> - - <xsl:variable name="id"> - <xsl:choose> - <!-- if title is in an *info wrapper, get the grandparent --> - <xsl:when test="contains(local-name(..), 'info')"> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select="../.."/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select=".."/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <!-- HTML H level is one higher than section level --> - <xsl:variable name="hlevel"> - <xsl:choose> - <!-- highest valid HTML H level is H6; so anything nested deeper - than 5 levels down just becomes H6 --> - <xsl:when test="$level &gt; 5">6</xsl:when> - <xsl:otherwise> - <xsl:value-of select="$level + 1"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:element name="h{$hlevel}"> - <xsl:attribute name="class"> - <xsl:value-of select="$class"/> - </xsl:attribute> - <xsl:if test="$css.decoration != '0'"> - <xsl:if test="$hlevel&lt;3"> - <xsl:attribute name="style">clear: both</xsl:attribute> - </xsl:if> - </xsl:if> - <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0"> - <xsl:call-template name="anchor"> - <xsl:with-param name="node" select="$section"/> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - </xsl:if> - <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')"> - <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute> - </xsl:if> - <xsl:copy-of select="$title"/> - </xsl:element> - - <!-- These rules add markers to the title of section --> - <xsl:choose> - <xsl:when test="current()/parent::node()[@diffmk:change='added']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="current()/following-sibling::*/descendant-or-self::node()[name()='diffmk:wrapper']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">changed</xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<!-- ==================================================================== --> - - </xsl:stylesheet> Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-release-nomarker.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-release-nomarker.xsl (rev 0) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-release-nomarker.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -0,0 +1,17 @@ +<?xml version='1.0'?> + +<!-- + Copyright 2008 JBoss, a division of Red Hat + License: LGPL + Author: Mark Newton <mark.newton(a)jboss.org&gt; +--> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:diffmk="http://diffmk.sf.net/ns/diff"> + <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> + <xsl:import href="common.xsl"/> + <xsl:import href="xhtml.xsl"/> + <xsl:param name="html.stylesheet" select="'css/tools_release.css'"/> + <xsl:template match="//diffmk:wrapper"> + <xsl:value-of select="."/> + </xsl:template> +</xsl:stylesheet> Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl (rev 0) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -0,0 +1,17 @@ +<?xml version='1.0'?> + +<!-- + Copyright 2008 JBoss, a division of Red Hat + License: LGPL + Author: Mark Newton <mark.newton(a)jboss.org&gt; +--> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:diffmk="http://diffmk.sf.net/ns/diff"> + <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> + <xsl:import href="common.xsl"/> + <xsl:import href="xhtml-single.xsl"/> + <xsl:param name="html.stylesheet" select="'css/tools_release.css'"/> + <xsl:template match="//diffmk:wrapper"> + <xsl:value-of select="."/> + </xsl:template> +</xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -1,6 +1,98 @@ <?xml version='1.0'?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:diffmk="http://diffmk.sf.net/ns/diff" version="1.0"> + <!-- Overriding toc.line --> + <xsl:template name="toc.line"> + <xsl:param name="toc-context" select="."/> + <xsl:param name="depth" select="1"/> + <xsl:param name="depth.from.context" select="8"/> + <xsl:param name="min-diff" select="10"/> + <xsl:param name="pos" select="position()"/> + + <span> + <xsl:attribute name="class"><xsl:value-of select="local-name(.)"/></xsl:attribute> + + <!-- * if $autotoc.label.in.hyperlink is zero, then output the label --> + <!-- * before the hyperlinked title (as the DSSSL stylesheet does) --> + <xsl:if test="$autotoc.label.in.hyperlink = 0"> + <xsl:variable name="label"> + <xsl:apply-templates select="." mode="label.markup"/> + </xsl:variable> + <xsl:copy-of select="$label"/> + <xsl:if test="$label != ''"> + <xsl:value-of select="$autotoc.label.separator"/> + </xsl:if> + </xsl:if> + + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="context" select="$toc-context"/> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:choose> + <xsl:when test="local-name(.)='section' and current()/@diffmk:change='added'"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="local-name(.)='chapter' and current()/@diffmk:change='added'"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="local-name(.)='section' and current()//diffmk:wrapper"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">updated</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + + + <!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label --> + <!-- * as part of the hyperlinked title --> + <xsl:if test="not($autotoc.label.in.hyperlink = 0)"> + <xsl:variable name="label"> + <xsl:apply-templates select="." mode="label.markup"/> + </xsl:variable> + <xsl:copy-of select="$label"/> + <xsl:if test="$label != ''"> + <xsl:value-of select="$autotoc.label.separator"/> + </xsl:if> + </xsl:if> + + <xsl:apply-templates select="." mode="titleabbrev.markup"/> + </a> + </span> + </xsl:template> + <!-- This template adds proper markers to the titles of guide --> + <xsl:template name="markerTypes"> + <xsl:param name="marker-type" /> + <xsl:param name="marker-value" /> + <xsl:choose> + <xsl:when test="$marker-type = 'attribute'"> + <xsl:attribute name="class"> + <xsl:value-of select="$marker-value" /> + </xsl:attribute> + </xsl:when> + <xsl:when test="$marker-type = 'image'"> + <xsl:choose> + <xsl:when test="$marker-value='changed'"> + <img src="images/updated.png" alt="updated" class="img_marker" /> + </xsl:when> + <xsl:when test="$marker-value='added'"> + <img src="images/new.png" alt="updated" class="img_marker" /> + </xsl:when> + </xsl:choose> + </xsl:when> + </xsl:choose> + </xsl:template> + <!-- This template is used for the diffmk build --> <xsl:template match="//diffmk:wrapper"> <xsl:choose> @@ -17,5 +109,142 @@ </xsl:otherwise> </xsl:choose> </xsl:template> + <!-- THERE ARE 2 TEMPLATES FOR ADDING 'ADDED', 'CHANGED' ICONS TO ALL OF THE TITLES--> + +<xsl:template name="component.title"> + <xsl:param name="node" select="."/> + <xsl:param name="pos" select="position()"/> + <xsl:param name="min-diff" select="10"/> + + <xsl:variable name="level"> + <xsl:choose> + <xsl:when test="ancestor::section"> + <xsl:value-of select="count(ancestor::section)+1"/> + </xsl:when> + <xsl:when test="ancestor::sect5">6</xsl:when> + <xsl:when test="ancestor::sect4">5</xsl:when> + <xsl:when test="ancestor::sect3">4</xsl:when> + <xsl:when test="ancestor::sect2">3</xsl:when> + <xsl:when test="ancestor::sect1">2</xsl:when> + <xsl:otherwise>1</xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <!-- Let's handle the case where a component (bibliography, for example) + occurs inside a section; will we need parameters for this? --> + + <xsl:element name="h{$level+1}"> + <xsl:attribute name="class"> + title + </xsl:attribute> + <xsl:if test="$generate.id.attributes = 0"> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="$node"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:if> + <xsl:apply-templates select="$node" mode="object.title.markup"> + <xsl:with-param name="allow-anchors" select="1"/> + </xsl:apply-templates> + </xsl:element> + + <!-- These rules add markers to the title of chapter --> + <xsl:choose> + <xsl:when test="current()/parent::node()[@diffmk:change='added']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="current()/following-sibling::node()[name(.)!='section']/descendant-or-self::node()[name()='diffmk:wrapper']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">changed</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + +</xsl:template> + +<!-- ===================== Rules for title of section ====================================== --> + +<xsl:template name="section.heading"> + <xsl:param name="section" select="."/> + <xsl:param name="level" select="1"/> + <xsl:param name="allow-anchors" select="1"/> + <xsl:param name="title"/> + <xsl:param name="class" select="'title'"/> + <xsl:param name="pos" select="position()"/> + <xsl:param name="min-diff" select="10"/> + + <xsl:variable name="id"> + <xsl:choose> + <!-- if title is in an *info wrapper, get the grandparent --> + <xsl:when test="contains(local-name(..), 'info')"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="../.."/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select=".."/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <!-- HTML H level is one higher than section level --> + <xsl:variable name="hlevel"> + <xsl:choose> + <!-- highest valid HTML H level is H6; so anything nested deeper + than 5 levels down just becomes H6 --> + <xsl:when test="$level &gt; 5">6</xsl:when> + <xsl:otherwise> + <xsl:value-of select="$level + 1"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:element name="h{$hlevel}"> + <xsl:attribute name="class"> + <xsl:value-of select="$class"/> + </xsl:attribute> + <xsl:if test="$css.decoration != '0'"> + <xsl:if test="$hlevel&lt;3"> + <xsl:attribute name="style">clear: both</xsl:attribute> + </xsl:if> + </xsl:if> + <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0"> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="$section"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:if> + <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')"> + <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute> + </xsl:if> + <xsl:copy-of select="$title"/> + </xsl:element> + + <!-- These rules add markers to the title of section --> + <xsl:choose> + <xsl:when test="current()/parent::node()[@diffmk:change='added']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="current()/following-sibling::*/descendant-or-self::node()[name()='diffmk:wrapper']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">changed</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + +</xsl:template> + +<!-- ==================================================================== --> + </xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -61,28 +61,6 @@ </xsl:template> - <!-- This template adds proper markers to the titles of guide --> - <xsl:template name="markerTypes"> - <xsl:param name="marker-type" /> - <xsl:param name="marker-value" /> - <xsl:choose> - <xsl:when test="$marker-type = 'attribute'"> - <xsl:attribute name="class"> - <xsl:value-of select="$marker-value" /> - </xsl:attribute> - </xsl:when> - <xsl:when test="$marker-type = 'image'"> - <xsl:choose> - <xsl:when test="$marker-value='changed'"> - <img src="images/updated.png" alt="updated" class="img_marker" /> - </xsl:when> - <xsl:when test="$marker-value='added'"> - <img src="images/new.png" alt="updated" class="img_marker" /> - </xsl:when> - </xsl:choose> - </xsl:when> - </xsl:choose> - </xsl:template> @@ -116,30 +94,7 @@ <xsl:with-param name="context" select="$toc-context"/> <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:call-template> - </xsl:attribute> - - <xsl:choose> - <xsl:when test="local-name(.)='section' and current()/@diffmk:change='added'"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">attribute</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="local-name(.)='chapter' and current()/@diffmk:change='added'"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">attribute</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="local-name(.)='section' and current()//diffmk:wrapper"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">attribute</xsl:with-param> - <xsl:with-param name="marker-value">updated</xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> - - + </xsl:attribute> <!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label --> <!-- * as part of the hyperlinked title --> <xsl:if test="not($autotoc.label.in.hyperlink = 0)"> @@ -160,7 +115,7 @@ <!-- This template is used for the release build --> - <xsl:template match="//diffmk:wrapper"> + <!--xsl:template match="//diffmk:wrapper"> <xsl:choose> <xsl:when test="@diffmk:change='deleted'"> <xsl:text> </xsl:text> @@ -172,7 +127,7 @@ <xsl:value-of select="."/> </xsl:otherwise> </xsl:choose> - </xsl:template> + </xsl:template--> @@ -186,142 +141,6 @@ </xsl:call-template> </xsl:template> -<!-- THERE ARE 2 TEMPLATES FOR ADDING 'ADDED', 'CHANGED' ICONS TO ALL OF THE TITLES--> -<xsl:template name="component.title"> - <xsl:param name="node" select="."/> - <xsl:param name="pos" select="position()"/> - <xsl:param name="min-diff" select="10"/> - <xsl:variable name="level"> - <xsl:choose> - <xsl:when test="ancestor::section"> - <xsl:value-of select="count(ancestor::section)+1"/> - </xsl:when> - <xsl:when test="ancestor::sect5">6</xsl:when> - <xsl:when test="ancestor::sect4">5</xsl:when> - <xsl:when test="ancestor::sect3">4</xsl:when> - <xsl:when test="ancestor::sect2">3</xsl:when> - <xsl:when test="ancestor::sect1">2</xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <!-- Let's handle the case where a component (bibliography, for example) - occurs inside a section; will we need parameters for this? --> - - <xsl:element name="h{$level+1}"> - <xsl:attribute name="class"> - title - </xsl:attribute> - <xsl:if test="$generate.id.attributes = 0"> - <xsl:call-template name="anchor"> - <xsl:with-param name="node" select="$node"/> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - </xsl:if> - <xsl:apply-templates select="$node" mode="object.title.markup"> - <xsl:with-param name="allow-anchors" select="1"/> - </xsl:apply-templates> - </xsl:element> - - <!-- These rules add markers to the title of chapter --> - <xsl:choose> - <xsl:when test="current()/parent::node()[@diffmk:change='added']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="current()/following-sibling::node()[name(.)!='section']/descendant-or-self::node()[name()='diffmk:wrapper']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">changed</xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<!-- ===================== Rules for title of section ====================================== --> - -<xsl:template name="section.heading"> - <xsl:param name="section" select="."/> - <xsl:param name="level" select="1"/> - <xsl:param name="allow-anchors" select="1"/> - <xsl:param name="title"/> - <xsl:param name="class" select="'title'"/> - <xsl:param name="pos" select="position()"/> - <xsl:param name="min-diff" select="10"/> - - <xsl:variable name="id"> - <xsl:choose> - <!-- if title is in an *info wrapper, get the grandparent --> - <xsl:when test="contains(local-name(..), 'info')"> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select="../.."/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select=".."/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <!-- HTML H level is one higher than section level --> - <xsl:variable name="hlevel"> - <xsl:choose> - <!-- highest valid HTML H level is H6; so anything nested deeper - than 5 levels down just becomes H6 --> - <xsl:when test="$level &gt; 5">6</xsl:when> - <xsl:otherwise> - <xsl:value-of select="$level + 1"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:element name="h{$hlevel}"> - <xsl:attribute name="class"> - <xsl:value-of select="$class"/> - </xsl:attribute> - <xsl:if test="$css.decoration != '0'"> - <xsl:if test="$hlevel&lt;3"> - <xsl:attribute name="style">clear: both</xsl:attribute> - </xsl:if> - </xsl:if> - <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0"> - <xsl:call-template name="anchor"> - <xsl:with-param name="node" select="$section"/> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - </xsl:if> - <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')"> - <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute> - </xsl:if> - <xsl:copy-of select="$title"/> - </xsl:element> - - <!-- These rules add markers to the title of section --> - <xsl:choose> - <xsl:when test="current()/parent::node()[@diffmk:change='added']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="current()/following-sibling::*/descendant-or-self::node()[name()='diffmk:wrapper']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">changed</xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<!-- ==================================================================== --> - - </xsl:stylesheet> Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release-nomarker.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release-nomarker.xsl (rev 0) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release-nomarker.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -0,0 +1,17 @@ +<?xml version='1.0'?> + +<!-- + Copyright 2008 JBoss, a division of Red Hat + License: LGPL + Author: Mark Newton <mark.newton(a)jboss.org&gt; +--> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:diffmk="http://diffmk.sf.net/ns/diff"> + <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> + <xsl:import href="common.xsl"/> + <xsl:import href="xhtml.xsl"/> + <xsl:param name="html.stylesheet" select="'css/tools_release.css'"/> + <xsl:template match="//diffmk:wrapper"> + <xsl:value-of select="."/> + </xsl:template> +</xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -8,7 +8,7 @@ <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="common.xsl"/> + <xsl:import href="common_diff.xsl"/> <xsl:import href="xhtml.xsl"/> <xsl:param name="html.stylesheet" select="'css/tools_release.css'"/> </xsl:stylesheet> Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release-nomarker.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release-nomarker.xsl (rev 0) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release-nomarker.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -0,0 +1,17 @@ +<?xml version='1.0'?> + +<!-- + Copyright 2008 JBoss, a division of Red Hat + License: LGPL + Author: Mark Newton <mark.newton(a)jboss.org&gt; +--> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:diffmk="http://diffmk.sf.net/ns/diff"> + <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> + <xsl:import href="common.xsl"/> + <xsl:import href="xhtml-single.xsl"/> + <xsl:param name="html.stylesheet" select="'css/tools_release.css'"/> + <xsl:template match="//diffmk:wrapper"> + <xsl:value-of select="."/> + </xsl:template> +</xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -8,7 +8,7 @@ <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="common.xsl"/> + <xsl:import href="common_diff.xsl"/> <xsl:import href="xhtml-single.xsl"/> <xsl:param name="html.stylesheet" select="'css/tools_release.css'"/> </xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -88,5 +88,4 @@ <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>