Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/common/xslt/html/tab-to-menu.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/common/xslt/html/tab-to-menu.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/common/xslt/html/tab-to-menu.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/common/xslt/html/tab-to-menu.xsl Mon Apr 9 22:33:31 2007 @@ -37,94 +37,68 @@ which is then merged by site2xhtml.xsl --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - - <!-- ================================================================ --> - <!-- These templates SHOULD be overridden --> - <!-- ================================================================ --> - - <!-- Called before first level 1 tag --> - <xsl:template name="pre-separator"> - </xsl:template> - - <!-- Called after last level 1 tag --> - <xsl:template name="post-separator"> - </xsl:template> - - <!-- Called between level 1 tags --> +<!-- ================================================================ --> +<!-- These templates SHOULD be overridden --> +<!-- ================================================================ --> +<!-- Called before first level 1 tag --> + <xsl:template name="pre-separator"></xsl:template> +<!-- Called after last level 1 tag --> + <xsl:template name="post-separator"></xsl:template> +<!-- Called between level 1 tags --> <xsl:template name="separator"> - <xsl:text> | </xsl:text> - </xsl:template> - - <!-- Called before first level 2 tag --> - <xsl:template name="level2-pre-separator"> - </xsl:template> - - <!-- Called after last level 2 tag --> - <xsl:template name="level2-post-separator"> +<xsl:text> | </xsl:text> </xsl:template> - - <!-- Called between level 2 tags --> +<!-- Called before first level 2 tag --> + <xsl:template name="level2-pre-separator"></xsl:template> +<!-- Called after last level 2 tag --> + <xsl:template name="level2-post-separator"></xsl:template> +<!-- Called between level 2 tags --> <xsl:template name="level2-separator"> - <xsl:text> | </xsl:text> - </xsl:template> - - <!-- +<xsl:text> | </xsl:text> + </xsl:template> +<!-- Note: sub-stylesheets can't do apply-imports here, because it would choose the 'tags' template and infinitely recurse. Hence call-template used instead. --> - - <!-- Display a selected level 1 tab node --> +<!-- Display a selected level 1 tab node --> <xsl:template name="selected"> <xsl:call-template name="base-selected"/> </xsl:template> - - <!-- Display an unselected level 1 tab node --> +<!-- Display an unselected level 1 tab node --> <xsl:template name="not-selected"> <xsl:call-template name="base-not-selected"/> </xsl:template> - - <!-- Display a selected second level tab node --> +<!-- Display a selected second level tab node --> <xsl:template name="level2-selected"> <xsl:call-template name="base-selected"/> </xsl:template> - - <!-- Display an unselected second level tab node --> +<!-- Display an unselected second level tab node --> <xsl:template name="level2-not-selected"> <xsl:call-template name="base-not-selected"/> </xsl:template> - - <!-- ================================================================ --> - <!-- These templates CAN be overridden --> - <!-- ================================================================ --> - +<!-- ================================================================ --> +<!-- These templates CAN be overridden --> +<!-- ================================================================ --> <xsl:template match="tabs"> <div class="tab"> <xsl:call-template name="base-tabs"/> </div> </xsl:template> - - - <!-- ================================================================ --> - <!-- These templates SHOULD NOT be overridden --> - <!-- ================================================================ --> - +<!-- ================================================================ --> +<!-- These templates SHOULD NOT be overridden --> +<!-- ================================================================ --> <xsl:param name="path"/> - <xsl:include href="dotdots.xsl"/> <xsl:include href="tabutils.xsl"/> - - <!-- NOTE: Xalan has a bug (race condition?) where sometimes $root is only half-evaluated --> +<!-- NOTE: Xalan has a bug (race condition?) where sometimes $root is only half-evaluated --> <xsl:variable name="root"> <xsl:call-template name="dotdots"> <xsl:with-param name="path" select="$path"/> </xsl:call-template> </xsl:variable> - <xsl:variable name="skin-img-dir" select="concat(string($root), 'themes/images')"/> - - <!-- +<!-- The longest path of any level 1 tab, whose path is a subset of the current URL. Ie, the path of the 'current' level 1 tab. --> @@ -133,8 +107,7 @@ <xsl:with-param name="tabfile" select="/"/> </xsl:call-template> </xsl:variable> - - <!-- +<!-- The longest path of any level 2 tab, whose path is a subset of the current URL. Ie, the path of the 'current' level 2 tab. --> @@ -143,33 +116,33 @@ <xsl:with-param name="tabfile" select="/"/> </xsl:call-template> </xsl:variable> - <xsl:variable name="matching-id"> <xsl:call-template name="matching-id"/> </xsl:variable> - - <!-- Called from tabs, after it has written the outer 'div class=tabs' and +<!-- Called from tabs, after it has written the outer 'div class=tabs' and any other HTML --> <xsl:template name="base-tabs"> <xsl:call-template name="pre-separator"/> <xsl:for-each select="tab"> - <xsl:if test="position()!=1"><xsl:call-template name="separator"/></xsl:if> + <xsl:if test="position()!=1"> + <xsl:call-template name="separator"/> + </xsl:if> <xsl:apply-templates select="." mode="level1"/> </xsl:for-each> <xsl:call-template name="post-separator"/> </xsl:template> - - <!-- Called from tabs, after it has written the outer 'div class=tabs' and +<!-- Called from tabs, after it has written the outer 'div class=tabs' and any other HTML --> <xsl:template name="level2tabs"> <xsl:call-template name="level2-pre-separator"/> <xsl:for-each select="[EMAIL PROTECTED]/tab|[EMAIL PROTECTED]/tab"> - <xsl:if test="position()!=1"><xsl:call-template name="level2-separator"/></xsl:if> + <xsl:if test="position()!=1"> + <xsl:call-template name="level2-separator"/> + </xsl:if> <xsl:apply-templates select="." mode="level2"/> </xsl:for-each> <xsl:call-template name="level2-post-separator"/> </xsl:template> - <xsl:template match="tab" mode="level1"> <xsl:choose> <xsl:when test="@id and @id = $matching-id"> @@ -183,7 +156,6 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template match="tab" mode="level2"> <xsl:choose> <xsl:when test="@id and @id = $matching-id"> @@ -197,31 +169,24 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - - <!-- Called from 'selected' --> - <xsl:template name="base-selected"> - <a class="base-selected"> - <xsl:attribute name="href"> - <xsl:call-template name="calculate-tab-href"> - <xsl:with-param name="tab" select="."/> - <xsl:with-param name="path" select="$path"/> - </xsl:call-template> - </xsl:attribute> - <xsl:value-of select="@label"/> - </a> - </xsl:template> - - <!-- Called from 'not-selected' --> - <xsl:template name="base-not-selected"> - <a class="base-not-selected"> - <xsl:attribute name="href"> - <xsl:call-template name="calculate-tab-href"> - <xsl:with-param name="tab" select="."/> - <xsl:with-param name="path" select="$path"/> - </xsl:call-template> - </xsl:attribute> - <xsl:value-of select="@label"/> - </a> +<!-- Called from 'selected' --> + <xsl:template name="base-selected"><a class="base-selected"> + <xsl:attribute name="href"> + <xsl:call-template name="calculate-tab-href"> + <xsl:with-param name="tab" select="."/> + <xsl:with-param name="path" select="$path"/> + </xsl:call-template> + </xsl:attribute> + <xsl:value-of select="@label"/></a> + </xsl:template> +<!-- Called from 'not-selected' --> + <xsl:template name="base-not-selected"><a class="base-not-selected"> + <xsl:attribute name="href"> + <xsl:call-template name="calculate-tab-href"> + <xsl:with-param name="tab" select="."/> + <xsl:with-param name="path" select="$path"/> + </xsl:call-template> + </xsl:attribute> + <xsl:value-of select="@label"/></a> </xsl:template> - </xsl:stylesheet>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/common/xslt/html/tabutils.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/common/xslt/html/tabutils.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/common/xslt/html/tabutils.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/common/xslt/html/tabutils.xsl Mon Apr 9 22:33:31 2007 @@ -15,43 +15,39 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- Some callable templates useful when dealing with tab paths. Mostly used in tab2menu.xsl --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> <xsl:include href="pathutils.xsl"/> - <xsl:param name="site-file" select="'cocoon://abs-menulinks'"/> <xsl:variable name="site" select="document($site-file)"/> - - <!-- Given the current path and a tabs.xml entry, returns a relative path to +<!-- Given the current path and a tabs.xml entry, returns a relative path to the specified tab's URL. When rendering a set of tabs, this template will be called once per tab. --> <xsl:template name="calculate-tab-href"> - <xsl:param name="dir_index" select="'index.html'"/> - - <xsl:param name="tab"/> <!-- current 'tab' node --> + <xsl:param name="tab"/> +<!-- current 'tab' node --> <xsl:param name="path" select="$path"/> - - <xsl:if test="starts-with($tab/@href, 'http')"> <!-- Absolute URL --> + <xsl:if test="starts-with($tab/@href, 'http')"> +<!-- Absolute URL --> <xsl:value-of select="$tab/@href"/> </xsl:if> - <xsl:if test="not(starts-with($tab/@href, 'http'))"> <!-- Root-relative path --> + <xsl:if test="not(starts-with($tab/@href, 'http'))"> +<!-- Root-relative path --> <xsl:variable name="backpath"> <xsl:call-template name="dotdots"> <xsl:with-param name="path" select="$path"/> </xsl:call-template> - <xsl:text>/</xsl:text> +<xsl:text>/</xsl:text> <xsl:value-of select="$tab/@dir | $tab/@href"/> - <!-- If we obviously have a directory, add /index.html --> +<!-- If we obviously have a directory, add /index.html --> <xsl:if test="$tab/@dir or substring($tab/@href, string-length($tab/@href), string-length($tab/@href)) = '/'"> - <xsl:text>/</xsl:text> +<xsl:text>/</xsl:text> <xsl:if test="$tab/@indexfile"> <xsl:value-of select="$tab/@indexfile"/> </xsl:if> @@ -60,14 +56,12 @@ </xsl:if> </xsl:if> </xsl:variable> - <xsl:value-of select="translate(normalize-space(translate($backpath, ' /', '/ ')), ' /', '/ ')"/> - <!-- Link to backpath, normalizing slashes --> +<!-- Link to backpath, normalizing slashes --> </xsl:if> </xsl:template> - - <!-- +<!-- The id of any tab, whose path is a subset of the current URL. Ie, the path of the 'current' tab. --> @@ -79,8 +73,7 @@ </xsl:variable> <xsl:value-of select="$site//*[starts-with(@href, $path-noext)]/@tab"/> </xsl:template> - - <!-- +<!-- The longest path of any level 1 tab, whose path is a subset of the current URL. Ie, the path of the 'current' tab. --> @@ -94,8 +87,7 @@ </xsl:if> </xsl:for-each> </xsl:template> - - <!-- +<!-- The longest path of any level 2 tab, whose path is a subset of the current URL. Ie, the path of the 'current' tab. --> @@ -109,7 +101,4 @@ </xsl:if> </xsl:for-each> </xsl:template> - - </xsl:stylesheet> - Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/common/xslt/svg/document2svg.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/common/xslt/svg/document2svg.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/common/xslt/svg/document2svg.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/common/xslt/svg/document2svg.xsl Mon Apr 9 22:33:31 2007 @@ -16,35 +16,30 @@ limitations under the License. --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; > - <xsl:output method="xml" media-type="image/svg" omit-xml-declaration="yes" indent="yes"/> - - <!-- the skinconf file --> + <xsl:output method="xml" media-type="image/svg" omit-xml-declaration="yes" indent="yes"/> +<!-- the skinconf file --> <xsl:param name="config-file"/> <xsl:variable name="config" select="document($config-file)/skinconfig"/> - <!-- Get the section depth to use when generating the minitoc (default is 2) --> +<!-- Get the section depth to use when generating the minitoc (default is 2) --> <xsl:variable name="toc-max-depth" select="number($config/toc/@max-depth)"/> - <xsl:param name="numbersections" select="'true'"/> - - <!-- Section depth at which we stop numbering and just indent --> +<!-- Section depth at which we stop numbering and just indent --> <xsl:param name="numbering-max-depth" select="'3'"/> <xsl:param name="ctxbasedir" select="."/> <xsl:param name="xmlbasedir"/> - <xsl:template match="/"> - <svg width="1305" height="1468" xmlns="http://www.w3.org/2000/svg";> + <svg width="1305" height="1468" xmlns="http://www.w3.org/2000/svg";> <g transform="translate(0 0)"> <xsl:apply-templates/> </g> - </svg> + </svg> </xsl:template> - <xsl:template match="document"> - <text x="00px" y="30px" style="font-size:20;"><xsl:value-of select="header/title"/></text> - <text x="0px" y="50px" style="font-size:12;"> - <xsl:apply-templates/> - </text> + <text x="00px" y="30px" style="font-size:20;"> + <xsl:value-of select="header/title"/> + </text> + <text x="0px" y="50px" style="font-size:12;"> + <xsl:apply-templates/> + </text> </xsl:template> - - </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl Mon Apr 9 22:33:31 2007 @@ -21,13 +21,12 @@ <xsl:template match="/"> <xsl:apply-templates/> </xsl:template> - <!--This template will match the different combinations for hooks--> +<!--This template will match the different combinations for hooks--> <xsl:template match="hook"> - <xsl:element name="fo:[EMAIL PROTECTED]" xmlns:fo="http://www.w3.org/1999/XSL/Format";> - <xsl:apply-templates/> - </xsl:element> + <xsl:element name="fo:[EMAIL PROTECTED]" xmlns:fo="http://www.w3.org/1999/XSL/Format";> + <xsl:apply-templates/> + </xsl:element> </xsl:template> - <xsl:template match="@*|*|text()|processing-instruction()|comment()"> <xsl:copy> <xsl:apply-templates Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl Mon Apr 9 22:33:31 2007 @@ -18,34 +18,30 @@ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format";> - <xsl:key name="static-content" match="fo:static-content" use="@flow-name"/> - <xsl:template match="/"> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";> <fo:layout-master-set> - <xsl:copy-of select="/fo/layout-master-set/*"/> + <xsl:copy-of select="/fo/layout-master-set/*"/> </fo:layout-master-set> <xsl:copy-of select="/fo/fox/outline/*"/> <fo:page-sequence master-reference="book"> <xsl:for-each select="//fo:static-content[generate-id()=generate-id(key('static-content', @flow-name))]"> <xsl:sort select="@flow-name"/> - <xsl:variable name="flow-name" select="@flow-name"/> + <xsl:variable name="flow-name" select="@flow-name"/> <fo:static-content flow-name="[EMAIL PROTECTED]"> <xsl:copy-of select="//fo:[EMAIL PROTECTED]/*"/> </fo:static-content> </xsl:for-each> <fo:flow flow-name="xsl-region-body"> <xsl:copy-of select="/fo/xsl-region-body/title/*"/> - <!-- FIXME : left was {$text-align} --> - <fo:block text-align="left" padding-before="18pt" padding-after="18pt"> +<!-- FIXME : left was {$text-align} --> + <fo:block text-align="left" padding-before="18pt" padding-after="18pt"> <xsl:copy-of select="/fo/xsl-region-body/body/*"/> </fo:block> - <fo:block id="term" /> + <fo:block id="term" /> </fo:flow> </fo:page-sequence> </fo:root> </xsl:template> - - </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl Mon Apr 9 22:33:31 2007 @@ -15,11 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:forrest="http://apache.org/forrest/templates/1.0";> - <xsl:template match="/"> <xsl:copy-of select="forrest:contract/forrest:template/xsl:stylesheet"/> </xsl:template> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl Mon Apr 9 22:33:31 2007 @@ -19,12 +19,10 @@ This stylesheet contains templates for converting documentv11 to HTML. See the imported document2html.xsl for details. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - <!-- Templates for "toc" mode. This will generate a complete +<!-- Templates for "toc" mode. This will generate a complete Table of Contents for the document. This will then be used by the site2xhtml to generate a Menu ToC and a Page ToC --> - <xsl:template name="generate-id"> <xsl:choose> <xsl:when test="@id"> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl Mon Apr 9 22:33:31 2007 @@ -15,7 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:forrest="http://apache.org/forrest/properties/1.0"; xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> @@ -23,7 +22,7 @@ <xsl:import href="lm://transform.xml.pathutils"/> <xsl:param name="path" select="'test.html'"/> <xsl:param name="theme" select="'notheme'"/> - <!-- Path (..'s) to the root directory --> +<!-- Path (..'s) to the root directory --> <xsl:variable name="root"> <xsl:call-template name="dotdots"> <xsl:with-param name="path" select="$path"/> @@ -34,7 +33,7 @@ <xsl:with-param name="path" select="$path"/> </xsl:call-template> </xsl:variable> - <!-- Source filename (eg 'foo.xml') of current page --> +<!-- Source filename (eg 'foo.xml') of current page --> <xsl:variable name="filename"> <xsl:call-template name="filename"> <xsl:with-param name="path" select="$path"/> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/hooksMatcher.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/hooksMatcher.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/hooksMatcher.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/hooksMatcher.xsl Mon Apr 9 22:33:31 2007 @@ -15,11 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:forrest="http://apache.org/forrest/templates/1.0"; xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - <!--This template will match the different combinations for forrest:hooks--> +<!--This template will match the different combinations for forrest:hooks--> <xsl:template match="forrest:[EMAIL PROTECTED] and (@type='div' or not(@type) and not(@class))]"> <div id="[EMAIL PROTECTED]"> <xsl:apply-templates/> @@ -33,13 +32,13 @@ </div> </xsl:template> <xsl:template match="forrest:[EMAIL PROTECTED] and @type='span']"> - <span class="[EMAIL PROTECTED]"> + <span class="[EMAIL PROTECTED]"> <xsl:apply-templates/> <xsl:if test="@nbsp='true'"> </xsl:if> </span> </xsl:template> <xsl:template match="forrest:[EMAIL PROTECTED] and @type='span']"> - <span id="[EMAIL PROTECTED]"> + <span id="[EMAIL PROTECTED]"> <xsl:apply-templates/> <xsl:if test="@nbsp='true'"> </xsl:if> </span> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl Mon Apr 9 22:33:31 2007 @@ -19,44 +19,35 @@ book2menu.xsl generates the HTML menu. See the imported book2menu.xsl for details. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - - <xsl:import href="../common/xslt/html/book-to-menu.xsl"/> - + <xsl:import href="../common/xslt/html/book-to-menu.xsl"/> <xsl:template match="book"> <div id="menu"> - <ul> - <xsl:apply-templates select="menu"/> - </ul> + <ul> + <xsl:apply-templates select="menu"/> + </ul> </div> </xsl:template> - <xsl:template match="menu"> - <li> - <h1><xsl:value-of select="@label"/></h1> - <ul> - <xsl:apply-templates/> - </ul> - </li> + <li><h1> + <xsl:value-of select="@label"/> + </h1> + <ul> + <xsl:apply-templates/> + </ul></li> </xsl:template> - <xsl:template match="[EMAIL PROTECTED]'hidden']"/> - <xsl:template match="menu-item"> - <li> - <xsl:apply-imports/> - </li> + <li><xsl:apply-imports/></li> </xsl:template> - <xsl:template name="selected"> - <div class="current"><xsl:value-of select="@label"/></div> + <div class="current"> + <xsl:value-of select="@label"/> + </div> </xsl:template> - <xsl:template name="print-external"> <font color="#ffcc00"> <xsl:apply-imports/> </font> </xsl:template> - </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl Mon Apr 9 22:33:31 2007 @@ -19,7 +19,6 @@ This stylesheet contains templates for converting documentv11 to HTML. See the imported document2html.xsl for details. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> <xsl:import href="../common/xslt/html/document-to-html.xsl"/> <xsl:include href="../helper/generateId.xsl"/> @@ -35,7 +34,7 @@ <xsl:value-of select="header/subtitle"/> </h3> </xsl:if> - <!-- +<!-- <xsl:apply-templates select="header/type"/> <xsl:apply-templates select="header/notice"/> <xsl:apply-templates select="header/abstract"/> @@ -57,27 +56,28 @@ <xsl:template match="body"> <xsl:apply-templates/> </xsl:template> - <xsl:template name="tocLinkGenerator"> - <a> - <xsl:attribute name="name"><xsl:call-template - name="generate-id"/></xsl:attribute> - <xsl:attribute name="title"> - <xsl:value-of select="title"/> - </xsl:attribute><xsl:text> </xsl:text> - </a> + <xsl:template name="tocLinkGenerator"><a> + <xsl:attribute name="name"> + <xsl:call-template + name="generate-id"/> + </xsl:attribute> + <xsl:attribute name="title"> + <xsl:value-of select="title"/> + </xsl:attribute> +<xsl:text> </xsl:text></a> </xsl:template> - <!--<xsl:template match="@id"> +<!--<xsl:template match="@id"> <xsl:apply-imports/> </xsl:template>--> - <!-- Generate a <a name="..."> tag for an @id --> - <!--<xsl:template match="@id"> +<!-- Generate a <a name="..."> tag for an @id --> +<!--<xsl:template match="@id"> <xsl:if test="normalize-space(.)!=''"> <a name="{.}"> </a> </xsl:if> </xsl:template>--> <xsl:template match="section"> <xsl:call-template name="tocLinkGenerator"/> - <!-- <xsl:apply-templates select="@id"/>--> +<!-- <xsl:apply-templates select="@id"/>--> <xsl:variable name = "level" select = "count(ancestor::section)+1" /> <xsl:choose> <xsl:when test="$level=1"> @@ -100,13 +100,12 @@ <xsl:apply-templates select="*[not(self::title)]"/> </div> </xsl:when> - <!-- If a faq, answer sections will be level 3 (1=Q/A, 2=part) --> +<!-- If a faq, answer sections will be level 3 (1=Q/A, 2=part) --> <xsl:when test="$level=3 and $notoc='true'"> <h4 class="faq"> <xsl:value-of select="title"/> </h4> - <div align="right"> - <a href="[EMAIL PROTECTED]">^</a> + <div align="right"><a href="[EMAIL PROTECTED]">^</a> </div> <div style="margin-left: 15px"> <xsl:apply-templates select="*[not(self::title)]"/> @@ -148,7 +147,7 @@ <div class="{local-name()}"> <div class="label"> <xsl:choose> - <!-- FIXME: i18n Transformer here --> +<!-- FIXME: i18n Transformer here --> <xsl:when test="@label"> <xsl:value-of select="@label"/> </xsl:when> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl Mon Apr 9 22:33:31 2007 @@ -21,13 +21,13 @@ <xsl:template match="/"> <xsl:apply-templates/> </xsl:template> - <!--This template will match the different combinations for hooks--> +<!--This template will match the different combinations for hooks--> <xsl:template match="hook"> <xsl:if test="@type='block' or not(@type)"> <div> <xsl:call-template name="attributes"/> <xsl:if test="@nbsp='true'"> - <xsl:text> </xsl:text> +<xsl:text> </xsl:text> </xsl:if> <xsl:apply-templates/> </div> @@ -36,7 +36,7 @@ <span id="[EMAIL PROTECTED]"> <xsl:call-template name="attributes"/> <xsl:if test="@nbsp='true'"> - <xsl:text> </xsl:text> +<xsl:text> </xsl:text> </xsl:if> <xsl:apply-templates/> </span> @@ -60,4 +60,4 @@ select="@*|*|text()|processing-instruction()|comment()"/> </xsl:copy> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/strip-dispatcher-remains.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/strip-dispatcher-remains.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/strip-dispatcher-remains.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/strip-dispatcher-remains.xsl Mon Apr 9 22:33:31 2007 @@ -17,13 +17,10 @@ --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - <xsl:template match="/"> <html xmlns="http://www.w3.org/1999/xhtml";> <xsl:copy-of select="html/head"/> <xsl:copy-of select="html/body"/> </html> </xsl:template> - - </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/tab-to-menu.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/tab-to-menu.xsl?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/tab-to-menu.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/tab-to-menu.xsl Mon Apr 9 22:33:31 2007 @@ -15,7 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- This stylesheet generates 'tabs' at the top left of the screen. Tabs are visual indicators that a certain subsection of the URI space is being browsed. @@ -38,44 +37,31 @@ which is then merged by site2xhtml.xsl --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - - <xsl:import href="../common/xslt/html/tab-to-menu.xsl"/> - + <xsl:import href="../common/xslt/html/tab-to-menu.xsl"/> <xsl:template match="tabs"> - <ul id="nav-main"> - <xsl:call-template name="base-tabs"/> - </ul> + <ul id="nav-main"> + <xsl:call-template name="base-tabs"/> + </ul> <xsl:if test="[EMAIL PROTECTED]/tab"> <div id="nav-main-sub"> <xsl:call-template name="level2tabs"/> </div> </xsl:if> </xsl:template> - - <xsl:template name="pre-separator"> - </xsl:template> - - <xsl:template name="post-separator"> - </xsl:template> - - <xsl:template name="separator"> - </xsl:template> - + <xsl:template name="pre-separator"></xsl:template> + <xsl:template name="post-separator"></xsl:template> + <xsl:template name="separator"></xsl:template> <xsl:template name="selected"> - <li class="current"><xsl:call-template name="base-selected"/></li> + <li class="current"><xsl:call-template name="base-selected"/></li> </xsl:template> - <xsl:template name="not-selected"> - <li><xsl:call-template name="base-not-selected"/></li> + <li><xsl:call-template name="base-not-selected"/></li> </xsl:template> - <xsl:template name="level2-not-selected"> <xsl:call-template name="base-not-selected"/> </xsl:template> - <xsl:template name="level2-selected"> - <xsl:call-template name="base-selected"/> + <xsl:call-template name="base-selected"/> </xsl:template> </xsl:stylesheet>
