You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2007/04/10 04:07:19 UTC

svn commit: r526996 [1/3] - in /forrest/trunk/main/webapp/resources: chaperon/stylesheets/ stylesheets/ stylesheets/aggregates/ stylesheets/external/

Author: crossley
Date: Mon Apr  9 19:07:17 2007
New Revision: 526996

URL: http://svn.apache.org/viewvc?view=rev&rev=526996
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644

Modified:
    forrest/trunk/main/webapp/resources/chaperon/stylesheets/pattern2link.xsl
    forrest/trunk/main/webapp/resources/stylesheets/absolutize-linkmap.xsl
    forrest/trunk/main/webapp/resources/stylesheets/aggregates/book-to-cinclude.xsl
    forrest/trunk/main/webapp/resources/stylesheets/aggregates/doc-to-doc-uniqueids.xsl
    forrest/trunk/main/webapp/resources/stylesheets/aggregates/docs-to-document.xsl
    forrest/trunk/main/webapp/resources/stylesheets/aggregates/relativize-split-linkmap.xsl
    forrest/trunk/main/webapp/resources/stylesheets/any-to-document.xsl
    forrest/trunk/main/webapp/resources/stylesheets/book-to-book-i18n.xsl
    forrest/trunk/main/webapp/resources/stylesheets/book-to-cinclude-lucene.xsl
    forrest/trunk/main/webapp/resources/stylesheets/bookv10.xsl
    forrest/trunk/main/webapp/resources/stylesheets/changesv10-to-changesv11.xsl
    forrest/trunk/main/webapp/resources/stylesheets/copyover.xsl
    forrest/trunk/main/webapp/resources/stylesheets/declare-broken-site-links.xsl
    forrest/trunk/main/webapp/resources/stylesheets/directory-to-book.xsl
    forrest/trunk/main/webapp/resources/stylesheets/directory-to-i18n.xsl
    forrest/trunk/main/webapp/resources/stylesheets/directory-to-revisions.xsl
    forrest/trunk/main/webapp/resources/stylesheets/docv10-to-docv11.xsl
    forrest/trunk/main/webapp/resources/stylesheets/docv20-to-docv12.xsl
    forrest/trunk/main/webapp/resources/stylesheets/docv20-to-docv13.xsl
    forrest/trunk/main/webapp/resources/stylesheets/dotdots.xsl
    forrest/trunk/main/webapp/resources/stylesheets/exception-to-html.xsl
    forrest/trunk/main/webapp/resources/stylesheets/external/str.find-last.xslt
    forrest/trunk/main/webapp/resources/stylesheets/extract-svg.xsl
    forrest/trunk/main/webapp/resources/stylesheets/faq-to-document.xsl
    forrest/trunk/main/webapp/resources/stylesheets/faqv10-to-faqv11.xsl
    forrest/trunk/main/webapp/resources/stylesheets/faqv20-to-faqv12.xsl
    forrest/trunk/main/webapp/resources/stylesheets/faqv20-to-faqv13.xsl
    forrest/trunk/main/webapp/resources/stylesheets/generateId.xsl
    forrest/trunk/main/webapp/resources/stylesheets/howto-to-document.xsl
    forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl
    forrest/trunk/main/webapp/resources/stylesheets/html-to-htmlbody.xsl
    forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl
    forrest/trunk/main/webapp/resources/stylesheets/lucene-search-to-xdoc.xsl
    forrest/trunk/main/webapp/resources/stylesheets/lucene-update-to-xdoc.xsl
    forrest/trunk/main/webapp/resources/stylesheets/normalizehrefs.xsl
    forrest/trunk/main/webapp/resources/stylesheets/page-to-html.xsl
    forrest/trunk/main/webapp/resources/stylesheets/pathutils.xsl
    forrest/trunk/main/webapp/resources/stylesheets/pluginBuildFiles-to-pluginDescriptor.xsl
    forrest/trunk/main/webapp/resources/stylesheets/plugins-to-xdoc.xsl
    forrest/trunk/main/webapp/resources/stylesheets/profile-to-html.xsl
    forrest/trunk/main/webapp/resources/stylesheets/profile-to-page.xsl
    forrest/trunk/main/webapp/resources/stylesheets/project-to-text.xsl
    forrest/trunk/main/webapp/resources/stylesheets/project2text.xsl
    forrest/trunk/main/webapp/resources/stylesheets/projectnavigation-to-site.xsl
    forrest/trunk/main/webapp/resources/stylesheets/relativize-linkmap.xsl
    forrest/trunk/main/webapp/resources/stylesheets/replaceCharsInString.xsl
    forrest/trunk/main/webapp/resources/stylesheets/rss-to-document.xsl
    forrest/trunk/main/webapp/resources/stylesheets/rssissues-to-document.xsl
    forrest/trunk/main/webapp/resources/stylesheets/site-to-book.xsl
    forrest/trunk/main/webapp/resources/stylesheets/site-to-site-normalizetabs.xsl
    forrest/trunk/main/webapp/resources/stylesheets/site-to-site-selectnode.xsl
    forrest/trunk/main/webapp/resources/stylesheets/strip-doctype.xsl
    forrest/trunk/main/webapp/resources/stylesheets/strip-i18n-remains.xsl
    forrest/trunk/main/webapp/resources/stylesheets/text-to-document.xsl
    forrest/trunk/main/webapp/resources/stylesheets/upgrade-skinconf.xsl
    forrest/trunk/main/webapp/resources/stylesheets/xdoc-to-lucene.xsl
    forrest/trunk/main/webapp/resources/stylesheets/xml-to-pretty.xsl

Modified: forrest/trunk/main/webapp/resources/chaperon/stylesheets/pattern2link.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/chaperon/stylesheets/pattern2link.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/chaperon/stylesheets/pattern2link.xsl (original)
+++ forrest/trunk/main/webapp/resources/chaperon/stylesheets/pattern2link.xsl Mon Apr  9 19:07:17 2007
@@ -15,48 +15,37 @@
   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:lex="http://chaperon.sourceforge.net/schema/lexemes/2.0">
-
- <xsl:template match="lex:lexeme[@symbol='link']">
-   <xsl:choose>
-  <!-- it is possible to disable link writing by prefixing by '\' -->
-    <xsl:when test="not( starts-with( @text, '\') )">
-      <a href="{@text}">
-       <xsl:value-of select="@text"/>
-      </a>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="lex:group[2]"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
- </xsl:template>
-
- <xsl:template match="lex:lexeme[@symbol='email']">
-  <xsl:choose>
-  <!-- it is possible to disable link writing by prefixing by '\' -->
-    <xsl:when test="not( starts-with( @text, '\') )">
-      <a href="mailto:{@text}">
-        <xsl:value-of select="lex:group[2]"/> at <xsl:value-of select="lex:group[3]"/>
-      </a>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="lex:group[2]"/>@<xsl:value-of select="lex:group[3]"/>
-    </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
-
- <xsl:template match="lex:lexeme[@symbol='cssurl']">
-    <a href="{lex:group[3]}"><xsl:value-of select="lex:group[1]"/></a>
- </xsl:template>
- 
- <xsl:template match="@*|*|text()|processing-instruction()" priority="-1">
-  <xsl:copy>
-   <xsl:apply-templates select="@*|*|text()|processing-instruction()"/>
-  </xsl:copy>
- </xsl:template>
-
+  <xsl:template match="lex:lexeme[@symbol='link']">
+    <xsl:choose>
+<!-- it is possible to disable link writing by prefixing by '\' -->
+      <xsl:when test="not( starts-with( @text, '\') )"><a href="{@text}">
+        <xsl:value-of select="@text"/></a>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="lex:group[2]"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="lex:lexeme[@symbol='email']">
+    <xsl:choose>
+<!-- it is possible to disable link writing by prefixing by '\' -->
+      <xsl:when test="not( starts-with( @text, '\') )"><a href="mailto:{@text}">
+        <xsl:value-of select="lex:group[2]"/> at <xsl:value-of select="lex:group[3]"/></a>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="lex:group[2]"/>@<xsl:value-of select="lex:group[3]"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="lex:lexeme[@symbol='cssurl']"><a href="{lex:group[3]}">
+    <xsl:value-of select="lex:group[1]"/></a>
+  </xsl:template>
+  <xsl:template match="@*|*|text()|processing-instruction()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|*|text()|processing-instruction()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/absolutize-linkmap.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/absolutize-linkmap.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/absolutize-linkmap.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/absolutize-linkmap.xsl Mon Apr  9 19:07:17 2007
@@ -40,13 +40,11 @@
 This is applied to site.xml to generate the 'abs-linkmap' URIs in the sitemap.
 
 -->
-
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <!-- Recursive template to collate @href's -->
+<!-- Recursive template to collate @href's -->
   <xsl:template name="absolutize">
     <xsl:param name="node"/>
-    <!-- Only append ancestor hrefs if we're not a uri-scheme: URL -->
+<!-- Only append ancestor hrefs if we're not a uri-scheme: URL -->
     <xsl:if test="not(contains($node/@href, ':')) or contains(substring-before($node/@href, ':'), '/')">
       <xsl:if test="$node/..">
         <xsl:call-template name="absolutize">
@@ -55,18 +53,16 @@
       </xsl:if>
     </xsl:if>
     <xsl:value-of select="$node/@href"/>
-
   </xsl:template>
-
   <xsl:template match="@href">
     <xsl:attribute name="href">
       <xsl:choose>
         <xsl:when test="starts-with(., '/')">
-          <!-- already is an absolute path, strip the leading slash -->
+<!-- already is an absolute path, strip the leading slash -->
           <xsl:value-of select="substring-after(., '/')"/>
         </xsl:when>
         <xsl:otherwise>
-          <!-- the path needs to be absolutized -->
+<!-- the path needs to be absolutized -->
           <xsl:call-template name="absolutize">
             <xsl:with-param name="node" select=".."/>
           </xsl:call-template>
@@ -74,7 +70,6 @@
       </xsl:choose>
     </xsl:attribute>
   </xsl:template>
-
   <xsl:template match="@*|node()" priority="-1">
     <xsl:copy>
       <xsl:apply-templates select="@*|node()"/>

Modified: forrest/trunk/main/webapp/resources/stylesheets/aggregates/book-to-cinclude.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/aggregates/book-to-cinclude.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/aggregates/book-to-cinclude.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/aggregates/book-to-cinclude.xsl Mon Apr  9 19:07:17 2007
@@ -24,10 +24,8 @@
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:cinclude="http://apache.org/cocoon/include/1.0">
-
   <xsl:param name="title" select="''"/>
   <xsl:param name="ignore" select="'jira-manual'"/>
-
   <xsl:template match="book">
     <document>
       <header>
@@ -38,26 +36,28 @@
       </body>
     </document>
   </xsl:template>
-
-
-  <xsl:template match="menu[contains(@href, ':')]"/>  <!-- Ignore all non-local links -->
-  <xsl:template match="menu[contains(@href, '/')]"/>  <!-- Ignore directories -->
+  <xsl:template match="menu[contains(@href, ':')]"/>
+<!-- Ignore all non-local links -->
+  <xsl:template match="menu[contains(@href, '/')]"/>
+<!-- Ignore directories -->
   <xsl:template match="menu[not(contains(@href, '.'))]">
     <section>
       <title><xsl:value-of select="@label"/></title>
       <xsl:apply-templates/>
     </section>
   </xsl:template>
-
-  <xsl:template match="menu-item[@type='hidden']"/>  <!-- Ignore hidden items -->
-  <xsl:template match="menu-item[contains(@href, '#')]"/>  <!-- Ignore #frag-id items -->
-  <xsl:template match="menu-item[contains(@href, ':')]"/>  <!-- Ignore all non-local links -->
-  <xsl:template match="menu-item[starts-with(@href, $ignore)]"/>  <!-- Ignore the aggregated pages -->
-
-  <!-- Recursive template to collate @href's -->
+  <xsl:template match="menu-item[@type='hidden']"/>
+<!-- Ignore hidden items -->
+  <xsl:template match="menu-item[contains(@href, '#')]"/>
+<!-- Ignore #frag-id items -->
+  <xsl:template match="menu-item[contains(@href, ':')]"/>
+<!-- Ignore all non-local links -->
+  <xsl:template match="menu-item[starts-with(@href, $ignore)]"/>
+<!-- Ignore the aggregated pages -->
+<!-- Recursive template to collate @href's -->
   <xsl:template name="absolute-href">
     <xsl:param name="node"/>
-    <!-- Only append ancestor hrefs if we're not a http(s): URL -->
+<!-- Only append ancestor hrefs if we're not a http(s): URL -->
     <xsl:if test="not(starts-with($node/@href, 'http:') or starts-with($node/@href, 'https:'))">
       <xsl:if test="$node/../@href">
         <xsl:call-template name="absolute-href">
@@ -67,8 +67,7 @@
     </xsl:if>
     <xsl:value-of select="$node/@href"/>
   </xsl:template>
-
-  <!-- normally directories are menus and files are menu-items,
+<!-- normally directories are menus and files are menu-items,
       but if 'menu' contained a '.' (then it didn't match the main 'menu' template above),
       and it's probably a file (because the children menu-items are #fragments)
       so we match now like a menu-item
@@ -76,12 +75,13 @@
   <xsl:template match="menu-item|menu">
     <section class="page">
       <xsl:attribute name="id">
-        <xsl:text></xsl:text><xsl:value-of select="@href"/>
+<xsl:text></xsl:text>
+        <xsl:value-of select="@href"/>
       </xsl:attribute>
       <cinclude:include>
         <xsl:attribute name="src">
-          <xsl:text>cocoon://</xsl:text>
-          <!--  This isn't necessary if reading source from cocoon://book-*.xml
+<xsl:text>cocoon://</xsl:text>
+<!--  This isn't necessary if reading source from cocoon://book-*.xml
           <xsl:call-template name="absolute-href">
             <xsl:with-param name="node" select=".."/>
           </xsl:call-template>
@@ -91,5 +91,4 @@
       </cinclude:include>
     </section>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/aggregates/doc-to-doc-uniqueids.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/aggregates/doc-to-doc-uniqueids.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/aggregates/doc-to-doc-uniqueids.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/aggregates/doc-to-doc-uniqueids.xsl Mon Apr  9 19:07:17 2007
@@ -15,35 +15,35 @@
   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:cinclude="http://apache.org/cocoon/include/1.0"
   xmlns:str="http://www.ora.com/XSLTCookbook/namespaces/strings" 
   exclude-result-prefixes="cinclude">
-  
   <xsl:include href="../external/str.find-last.xslt"/>
-
   <xsl:key name="node-id" match="*" use="@id"/>
-
-  <!-- If we encounter a section with an @id, make that @id globally unique by
+<!-- If we encounter a section with an @id, make that @id globally unique by
   prefixing the id of the current document -->
   <xsl:template match="section/document//@id">
-    <xsl:attribute name="id"><xsl:value-of select="concat(ancestor::section/@id, '#', .)"/></xsl:attribute>
+    <xsl:attribute name="id">
+      <xsl:value-of select="concat(ancestor::section/@id, '#', .)"/>
+    </xsl:attribute>
   </xsl:template>
-  
-  <!-- Make #fragment-id references inside each page globally unique -->
+<!-- Make #fragment-id references inside each page globally unique -->
   <xsl:template match="section/document//link/@href[starts-with(., '#')]">
-    <xsl:attribute name="href"><xsl:value-of select="concat('#', ancestor::section/@id, .)"/></xsl:attribute>
+    <xsl:attribute name="href">
+      <xsl:value-of select="concat('#', ancestor::section/@id, .)"/>
+    </xsl:attribute>
   </xsl:template>
-
-  <!-- Translate relative links to '#link' -->
+<!-- Translate relative links to '#link' -->
   <xsl:template match="section/document//link/@href[not(starts-with(., 'http:') or starts-with(., 'https:'))]">
-    <xsl:attribute name="href"><xsl:text>#</xsl:text><xsl:value-of select="."/></xsl:attribute>
+    <xsl:attribute name="href">
+<xsl:text>#</xsl:text>
+      <xsl:value-of select="."/>
+    </xsl:attribute>
   </xsl:template>
-
   <xsl:template match="section/document//figure|img[starts-with(@src, 'my-images')]">
-    <!-- fix my-images/** links, which break as they are not relative to the site root -->
+<!-- fix my-images/** links, which break as they are not relative to the site root -->
     <xsl:variable name="page-root">
       <xsl:call-template name="str:substring-before-last">
         <xsl:with-param name="input" select="ancestor::section/@id"/>
@@ -57,5 +57,4 @@
     </xsl:copy>
   </xsl:template>
   <xsl:include href="../copyover.xsl"/>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/aggregates/docs-to-document.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/aggregates/docs-to-document.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/aggregates/docs-to-document.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/aggregates/docs-to-document.xsl Mon Apr  9 19:07:17 2007
@@ -15,14 +15,10 @@
   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">
-
   <xsl:template match="section/document">
-      <title><xsl:value-of select="header/title"/></title>
-      <xsl:copy-of select="body/node()" />
+    <title><xsl:value-of select="header/title"/></title>
+    <xsl:copy-of select="body/node()" />
   </xsl:template>
-
   <xsl:include href="../copyover.xsl"/>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/aggregates/relativize-split-linkmap.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/aggregates/relativize-split-linkmap.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/aggregates/relativize-split-linkmap.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/aggregates/relativize-split-linkmap.xsl Mon Apr  9 19:07:17 2007
@@ -52,29 +52,21 @@
 document.
 
 -->
-
-
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:param name="path"/>
-  <!-- FIXME: This is a hard-code value -->
+<!-- FIXME: This is a hard-code value -->
   <xsl:param name="site-root" select="'http://localhost:8787/forrest/'"/>
-
   <xsl:variable name="tab">
     <xsl:value-of select="string(//*[starts-with(@href, $path)]/@tab)"/>
   </xsl:variable>
-
   <xsl:include href="../dotdots.xsl"/>
-
-  <!-- Path to site root, eg '../../' -->
+<!-- Path to site root, eg '../../' -->
   <xsl:variable name="root">
     <xsl:call-template name="dotdots">
       <xsl:with-param name="path" select="$path"/>
     </xsl:call-template>
   </xsl:variable>
-
   <xsl:template match="@href">
-
     <xsl:attribute name="href">
       <xsl:choose>
         <xsl:when test="contains(., ':') and not(contains(substring-before(., ':'), '/'))">
@@ -85,32 +77,26 @@
           contains(., '.jpg') or
           contains(., '.gif') or
           contains(., '.tif')">
-          <!-- Image links are always relative -->
-          <xsl:value-of select="$root"/><xsl:value-of select="."/>
+<!-- Image links are always relative -->
+          <xsl:value-of select="$root"/>
+          <xsl:value-of select="."/>
         </xsl:when>
-
         <xsl:when test="$tab='' or ../@tab=$tab">
           <xsl:value-of select="concat('#', .)"/>
         </xsl:when>
-
-        <!-- PDFs can handle inline images, but everything else must become an
+<!-- PDFs can handle inline images, but everything else must become an
         external link -->
         <xsl:when test="contains($path, '.pdf')">
-
-          <!-- Links to outside a PDF are all absolute -->
+<!-- Links to outside a PDF are all absolute -->
           <xsl:value-of select="concat($site-root, .)"/>
-
         </xsl:when>
         <xsl:otherwise>
-
-          <!-- Links outside a HTML are relative -->
-          <xsl:value-of select="$root"/><xsl:value-of select="."/>
-
+<!-- Links outside a HTML are relative -->
+          <xsl:value-of select="$root"/>
+          <xsl:value-of select="."/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:attribute>
   </xsl:template>
-
   <xsl:include href="../copyover.xsl"/>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/any-to-document.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/any-to-document.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/any-to-document.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/any-to-document.xsl Mon Apr  9 19:07:17 2007
@@ -15,233 +15,198 @@
   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">
-
-    <xsl:output method = "xml"  
+  <xsl:output method = "xml"  
                 version="1.0"
                 omit-xml-declaration="no" 
                 indent="no"
                 encoding="ISO-8859-1"
                 doctype-system="document-v11.dtd"
                 doctype-public="-//APACHE//DTD Documentation V1.1//EN" />
-
-    <xsl:template match="/">
-     <xsl:choose>
-   	   <xsl:when test="name(child::node())='document'">
-         <xsl:apply-templates/>
-	   </xsl:when>
-  
-	   <xsl:otherwise>
-	     <document>
-	      <header><title>Error in conversion</title></header>
-	      <body>
-	       <warning>This file is not in anakia format, please convert manually.</warning>
-	      </body>
-	     </document>
-	   </xsl:otherwise>
-     </xsl:choose>
-    </xsl:template>
-           
-    <xsl:template match="document">
+  <xsl:template match="/">
+    <xsl:choose>
+      <xsl:when test="name(child::node())='document'">
+        <xsl:apply-templates/>
+      </xsl:when>
+      <xsl:otherwise>
         <document>
-            <xsl:apply-templates/>
+          <header>
+            <title>Error in conversion</title>
+          </header>
+          <body>
+            <warning>
+              This file is not in anakia format, please convert manually.
+            </warning>
+          </body>
         </document>
-    </xsl:template>
-    
-    <!-- properties to header -->
-    <xsl:template match="properties">
-        <header>
-            <xsl:apply-templates/>
-            <authors>
-              <xsl:for-each select = "author">
-                <person email="{@email}" name="{.}"/>
-              </xsl:for-each>
-            </authors>
-        </header>
-    </xsl:template>
-
-    <xsl:template match="P|p">
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="document">
+    <document>
+      <xsl:apply-templates/>
+    </document>
+  </xsl:template>
+<!-- properties to header -->
+  <xsl:template match="properties">
+    <header>
+      <xsl:apply-templates/>
+      <authors>
+        <xsl:for-each select = "author">
+          <person email="{@email}" name="{.}"/>
+        </xsl:for-each>
+      </authors>
+    </header>
+  </xsl:template>
+  <xsl:template match="P|p">
+    <p>
+      <xsl:apply-templates/>
+    </p>
+  </xsl:template>
+  <xsl:template match="figure">
+    <figure alt="{title}" src= "{graphic/@fileref}" />
+  </xsl:template>
+  <xsl:template match="img">
+    <xsl:choose>
+      <xsl:when test="name(..)='section'">
+        <figure alt="{@alt}" src= "{@src}"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <img alt="{@alt}" src= "{@src}"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="source|blockquote">
+    <xsl:choose>
+      <xsl:when test="name(..)='p'"><code>
+        <xsl:value-of select="." /></code>
+      </xsl:when>
+      <xsl:otherwise>
+        <source>
+          <xsl:value-of select="." />
+        </source>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+<!-- person to author -->
+  <xsl:template match="author"/>
+  <xsl:template match="section|s1|s2|s3|s4|s5|s6">
+    <section>
+      <title><xsl:value-of select="@name" /></title>
+      <xsl:apply-templates/>
+    </section>
+  </xsl:template>
+  <xsl:template match="subsection">
+    <section>
+      <title><xsl:value-of select="@name" /></title>
+      <xsl:apply-templates/>
+    </section>
+  </xsl:template>
+<!-- convert a to link -->
+  <xsl:template match="a">
+    <xsl:if test="@name">
+<!-- Attach an id to the current node -->
+      <xsl:attribute name="id">
+        <xsl:value-of select="translate(@name, ' $', '__')"/>
+      </xsl:attribute>
+      <xsl:apply-templates/>
+    </xsl:if>
+    <xsl:if test="@href"><link href="{@href}">
+      <xsl:apply-templates/></link>
+    </xsl:if>
+  </xsl:template>
+  <xsl:template match="@valign | @align"/>
+  <xsl:template match="center">
+    <xsl:choose>
+      <xsl:when test="name(..)='p'">
+        <xsl:apply-templates/>
+      </xsl:when>
+      <xsl:otherwise>
         <p>
           <xsl:apply-templates/>
         </p>
-    </xsl:template>
-    
-    <xsl:template match="figure">
-        <figure alt="{title}" src= "{graphic/@fileref}" />
-    </xsl:template>
-
-    <xsl:template match="img">
-       <xsl:choose>
-    	<xsl:when test="name(..)='section'">
-          <figure alt="{@alt}" src= "{@src}"/>
-    	</xsl:when>
-    	<xsl:otherwise>
-          <img alt="{@alt}" src= "{@src}"/>
-    	</xsl:otherwise>
-       </xsl:choose>
-       
-       
-    </xsl:template>
-    
-    <xsl:template match="source|blockquote">
-      <xsl:choose>
-    	<xsl:when test="name(..)='p'">
-    	  <code>
-    	    <xsl:value-of select="." />
-    	  </code> 
-    	</xsl:when>
-      
-    	<xsl:otherwise>
-    	  <source>
-    	    <xsl:value-of select="." />
-    	  </source> 
-    	</xsl:otherwise>
-       </xsl:choose>
-    </xsl:template>
-
-    
-    <!-- person to author -->
-    <xsl:template match="author"/>
-    
-    <xsl:template match="section|s1|s2|s3|s4|s5|s6">
-        <section>
-          <title><xsl:value-of select="@name" /></title>
-            <xsl:apply-templates/>
-        </section>
-    </xsl:template>
-
-  
-    <xsl:template match="subsection">
-        <section>
-          <title><xsl:value-of select="@name" /></title>
-            <xsl:apply-templates/>
-        </section>
-    </xsl:template>
-    
-    <!-- convert a to link -->
-    <xsl:template match="a">
-      <xsl:if test="@name">
-        <!-- Attach an id to the current node -->
-        <xsl:attribute name="id"><xsl:value-of select="translate(@name, ' $', '__')"/></xsl:attribute>
-        <xsl:apply-templates/>
-      </xsl:if>
-      <xsl:if test="@href">
-        <link href="{@href}">
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="ol">
+    <xsl:choose>
+      <xsl:when test="name(..)='p'">
+<xsl:text disable-output-escaping="yes"><![CDATA[</p>]]></xsl:text>
+        <ol>
           <xsl:apply-templates/>
-        </link>
-      </xsl:if>
-    </xsl:template>
-    
-    <xsl:template match="@valign | @align"/>
-        
-    <xsl:template match="center">
-      <xsl:choose>
-    	<xsl:when test="name(..)='p'">
-    	    <xsl:apply-templates/>
-    	</xsl:when>
-      
-    	<xsl:otherwise>
-    	  <p>
-    	    <xsl:apply-templates/>
-    	  </p> 
-    	</xsl:otherwise>
-       </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="ol">
-      <xsl:choose>
-    	<xsl:when test="name(..)='p'">
-    	   <xsl:text disable-output-escaping="yes"><![CDATA[</p>]]></xsl:text>
-    	    <ol>
-    	     <xsl:apply-templates/>
-    	    </ol>
-    	   <xsl:text disable-output-escaping="yes"><![CDATA[<p>]]></xsl:text>
-    	</xsl:when>
-      	<xsl:otherwise>
-    	    <ol>
-    	     <xsl:apply-templates/>
-    	    </ol>
-    	</xsl:otherwise>
-       </xsl:choose>
-    </xsl:template>
-    
-    <xsl:template match="ul">
-      <xsl:choose>
-    	<xsl:when test="name(..)='p'">
-    	   <xsl:text disable-output-escaping="yes"><![CDATA[</p>]]></xsl:text>
-    	    <ul>
-    	     <xsl:apply-templates/>
-    	    </ul>
-    	   <xsl:text disable-output-escaping="yes"><![CDATA[<p>]]></xsl:text>
-    	</xsl:when>
-      	<xsl:otherwise>
-    	    <ul>
-    	     <xsl:apply-templates/>
-    	    </ul>
-    	</xsl:otherwise>
-       </xsl:choose>
-    </xsl:template>
-        
-    <xsl:template match="b">
-      <strong>
-        <xsl:value-of select = "."/>
-      </strong>
-    </xsl:template>
-    
-    <xsl:template match="i">
-      <em>
-        <xsl:value-of select = "."/>
-      </em>
-    </xsl:template>
-
-    <xsl:template match="table">
-      <table>
-            <xsl:apply-templates select="node()"/>
-      </table>
-    </xsl:template>
-    
-            
-    <xsl:template match="br">
-      <xsl:choose>
-	    <xsl:when test="normalize-space(text())">
-	    	    
-		  <xsl:choose>
-		    <xsl:when test="name(..)='p'">
-		        <xsl:apply-templates/>
-		      <br/> 
-		    </xsl:when>
-	  	    <xsl:otherwise>
-		      <p>
-	            <xsl:apply-templates/>
-		      </p>
-		    </xsl:otherwise>
-	       </xsl:choose>
-	      
-	    </xsl:when>
-  	    <xsl:otherwise>
-	      <br/>
-	    </xsl:otherwise>
-       </xsl:choose>
-    </xsl:template>
-    
-    <!-- Strip -->
-    <xsl:template match="font">
-      <xsl:apply-templates/>
-    </xsl:template>
-
-    <xsl:template match="h1|h2|h3|h4">
-     <xsl:comment> -ATTENTION- THIS IS A SECTION, PLEASE ENCLOSE THE SECTION CONTENTS... -ATTENTION- </xsl:comment>
-     <section><title><xsl:apply-templates/></title> <xsl:comment>... HERE! :-)</xsl:comment></section>
-    </xsl:template>
-                
-    <xsl:template match="node()|@*" priority="-1">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>
-
-
+        </ol>
+<xsl:text disable-output-escaping="yes"><![CDATA[<p>]]></xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <ol>
+          <xsl:apply-templates/>
+        </ol>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="ul">
+    <xsl:choose>
+      <xsl:when test="name(..)='p'">
+<xsl:text disable-output-escaping="yes"><![CDATA[</p>]]></xsl:text>
+        <ul>
+          <xsl:apply-templates/>
+        </ul>
+<xsl:text disable-output-escaping="yes"><![CDATA[<p>]]></xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <ul>
+          <xsl:apply-templates/>
+        </ul>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="b"><strong>
+    <xsl:value-of select = "."/></strong>
+  </xsl:template>
+  <xsl:template match="i"><em>
+    <xsl:value-of select = "."/></em>
+  </xsl:template>
+  <xsl:template match="table">
+    <table>
+      <xsl:apply-templates select="node()"/>
+    </table>
+  </xsl:template>
+  <xsl:template match="br">
+    <xsl:choose>
+      <xsl:when test="normalize-space(text())">
+        <xsl:choose>
+          <xsl:when test="name(..)='p'">
+            <xsl:apply-templates/>
+            <br/>
+          </xsl:when>
+          <xsl:otherwise>
+            <p>
+              <xsl:apply-templates/>
+            </p>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <xsl:otherwise>
+        <br/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+<!-- Strip -->
+  <xsl:template match="font">
+    <xsl:apply-templates/>
+  </xsl:template>
+  <xsl:template match="h1|h2|h3|h4">
+    <xsl:comment> -ATTENTION- THIS IS A SECTION, PLEASE ENCLOSE THE SECTION CONTENTS... -ATTENTION- </xsl:comment>
+    <section>
+      <title><xsl:apply-templates/></title>
+      <xsl:comment>... HERE! :-)</xsl:comment>
+    </section>
+  </xsl:template>
+  <xsl:template match="node()|@*" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/book-to-book-i18n.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/book-to-book-i18n.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/book-to-book-i18n.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/book-to-book-i18n.xsl Mon Apr  9 19:07:17 2007
@@ -15,26 +15,21 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--+
     | Add i18n tags so it can be processed.
     +-->
-
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
-
   <xsl:import href="copyover.xsl"/>
-
   <xsl:template match="@label">
-   <xsl:attribute name="i18n:attr">label</xsl:attribute>
-   <xsl:attribute name="label">
-     <xsl:value-of select="." />
-   </xsl:attribute>
-     <xsl:apply-templates />
+    <xsl:attribute name="i18n:attr">label</xsl:attribute>
+    <xsl:attribute name="label">
+      <xsl:value-of select="." />
+    </xsl:attribute>
+    <xsl:apply-templates />
   </xsl:template>
-  
-  <!-- FIXME: Need support for more than one attribute
+<!-- FIXME: Need support for more than one attribute
   <xsl:template match="@description">
    <xsl:attribute name="i18n:attr">description</xsl:attribute>
    <xsl:attribute name="description">
@@ -43,5 +38,4 @@
      <xsl:apply-templates />
   </xsl:template>
   -->
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/book-to-cinclude-lucene.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/book-to-cinclude-lucene.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/book-to-cinclude-lucene.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/book-to-cinclude-lucene.xsl Mon Apr  9 19:07:17 2007
@@ -24,27 +24,20 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:cinclude="http://apache.org/cocoon/include/1.0"
   xmlns:lucene="http://apache.org/cocoon/lucene/1.0">
-
-  <!-- Java class name of the Lucene analyzer to be used -->
+<!-- Java class name of the Lucene analyzer to be used -->
   <xsl:param name="analyzer"/>
-
-  <!-- Directory where the lucene index will be created (relative to
+<!-- Directory where the lucene index will be created (relative to
   Forrest working directory as determined by servlet engine) -->
   <xsl:param name="directory"/>
- 
-  <!-- Should the index be updated if it already exists? If false and
+<!-- Should the index be updated if it already exists? If false and
   the index already exists, the index is re-created, and the original
   index is discarded. -->
   <xsl:param name="update-index"/>
-  
-  <!-- Index merge factor (see Lucene documentation) -->
-  <xsl:param name="merge-factor"/>  
-
-  <!-- The extension of the lucene index fragments. -->
+<!-- Index merge factor (see Lucene documentation) -->
+  <xsl:param name="merge-factor"/>
+<!-- The extension of the lucene index fragments. -->
   <xsl:param name="extension" select="'lucene'"/>
-
-
-  <!-- Creates the lucene:index root element from the Forrest
+<!-- Creates the lucene:index root element from the Forrest
   book. -->
   <xsl:template match="book">
     <lucene:index analyzer="{$analyzer}"
@@ -54,33 +47,33 @@
       <xsl:apply-templates select="menu|menu-item"/>
     </lucene:index>
   </xsl:template>
-
-  <!-- Recursively processes menu elements. -->
+<!-- Recursively processes menu elements. -->
   <xsl:template match="menu">
     <xsl:apply-templates/>
   </xsl:template>
-
-  <xsl:template match="menu-item[@type='hidden']"/>  <!-- Ignore hidden items -->
-  <xsl:template match="menu-item[contains(@href, '#')]"/>  <!-- Ignore #frag-id items -->
-  <xsl:template match="menu-item[starts-with(@href, 'http:')]"/>  <!-- Ignore absolute http urls -->
-  <xsl:template match="menu-item[starts-with(@href, 'https:')]"/>  <!-- Ignore absolute https urls -->
-
-  <!-- For entries whose @href ends in "/", refer to @href/index.lucene -->
+  <xsl:template match="menu-item[@type='hidden']"/>
+<!-- Ignore hidden items -->
+  <xsl:template match="menu-item[contains(@href, '#')]"/>
+<!-- Ignore #frag-id items -->
+  <xsl:template match="menu-item[starts-with(@href, 'http:')]"/>
+<!-- Ignore absolute http urls -->
+  <xsl:template match="menu-item[starts-with(@href, 'https:')]"/>
+<!-- Ignore absolute https urls -->
+<!-- For entries whose @href ends in "/", refer to @href/index.lucene -->
   <xsl:template match="menu-item[substring(@href, string-length(@href) - string-length('/') + 1) = '/']">
     <cinclude:include>
       <xsl:attribute name="src">
-        <xsl:text>cocoon://</xsl:text>
+<xsl:text>cocoon://</xsl:text>
         <xsl:value-of select="concat(@href, 'index.', $extension)"/>
       </xsl:attribute>
     </cinclude:include>
   </xsl:template>
-
-  <!-- Inserts a cinclude:include element for document referenced by
+<!-- Inserts a cinclude:include element for document referenced by
   menu item. -->
   <xsl:template match="menu-item">
     <cinclude:include>
       <xsl:attribute name="src">
-        <xsl:text>cocoon://</xsl:text>
+<xsl:text>cocoon://</xsl:text>
         <xsl:call-template name="strip-extension">
           <xsl:with-param name="the-string" select="@href"/>
         </xsl:call-template>
@@ -88,18 +81,16 @@
       </xsl:attribute>
     </cinclude:include>
   </xsl:template>
-
-  <!-- Strips the extension from a filename. Works for filenames with
+<!-- Strips the extension from a filename. Works for filenames with
   multiple dots. -->
   <xsl:template name="strip-extension">
     <xsl:param name="the-string"/>
     <xsl:value-of select="substring-before($the-string, '.')"/>
     <xsl:if test="substring-after($the-string, '.') != ''">
-      <xsl:text>.</xsl:text>
+<xsl:text>.</xsl:text>
       <xsl:call-template name="strip-extension">
         <xsl:with-param name="the-string" select="substring-after($the-string, '.')"/>
       </xsl:call-template>
     </xsl:if>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/bookv10.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/bookv10.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/bookv10.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/bookv10.xsl Mon Apr  9 19:07:17 2007
@@ -16,20 +16,16 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:preserve-space elements="*" />
-  
+  <xsl:preserve-space elements="*" />
   <xsl:output doctype-public="-//APACHE//DTD Cocoon Documentation Book V1.0//EN" doctype-system="book-cocoon-v10.dtd"/>
-  
   <xsl:template match="/">
-        <xsl:apply-templates/>
+    <xsl:apply-templates/>
   </xsl:template>
-
-  <!-- the obligatory copy-everything -->
+<!-- the obligatory copy-everything -->
   <xsl:template match="node() | @*">
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
       <xsl:apply-templates/>
     </xsl:copy>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/changesv10-to-changesv11.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/changesv10-to-changesv11.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/changesv10-to-changesv11.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/changesv10-to-changesv11.xsl Mon Apr  9 19:07:17 2007
@@ -16,27 +16,22 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:preserve-space elements="*" />
-  <!-- changes-v10.dtd to changes-v11.dtd transformation -->
-  
+  <xsl:preserve-space elements="*" />
+<!-- changes-v10.dtd to changes-v11.dtd transformation -->
   <xsl:template match="/">
-        <xsl:apply-templates/>
+    <xsl:apply-templates/>
   </xsl:template>
-
   <xsl:template match="changes/@title">
     <title><xsl:value-of select="."/></title>
   </xsl:template>
-
   <xsl:template match="link/@type | link/@actuate | link/@show |
                        jump/@type | jump/@actuate | jump/@show |
                        fork/@type | fork/@actuate | fork/@show"/>
-
-  <!-- the obligatory copy-everything -->
+<!-- the obligatory copy-everything -->
   <xsl:template match="node() | @*">
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
       <xsl:apply-templates/>
     </xsl:copy>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/copyover.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/copyover.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/copyover.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/copyover.xsl Mon Apr  9 19:07:17 2007
@@ -15,15 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <xsl:stylesheet
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     version="1.0">
-
   <xsl:template match="@*|*|text()|processing-instruction()|comment()">
     <xsl:copy>
       <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/>
     </xsl:copy>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/declare-broken-site-links.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/declare-broken-site-links.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/declare-broken-site-links.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/declare-broken-site-links.xsl Mon Apr  9 19:07:17 2007
@@ -15,9 +15,7 @@
   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">
-
 <!-- This is a workaround for FOR-284 "link rewriting broken when
   linking to xml source views which contain site: links"
 
@@ -25,7 +23,6 @@
   The remaining ones are the bogus ones caused by FOR-284 which are
   then excluded by cli.xconf
 -->
-
   <xsl:template match="@*">
     <xsl:attribute name="{name(.)}">
       <xsl:choose>
@@ -33,16 +30,14 @@
           <xsl:value-of select="concat('error:', .)"/>
         </xsl:when>
         <xsl:otherwise>
-         <xsl:value-of select="."/>
+          <xsl:value-of select="."/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:attribute>
   </xsl:template>
-
-  <xsl:template match="/ | * | comment() | processing-instruction() | text()"> 
-    <xsl:copy> 
-      <xsl:apply-templates select="@* | * | comment() | processing-instruction() | text()"/> 
-    </xsl:copy> 
-  </xsl:template> 
-
+  <xsl:template match="/ | * | comment() | processing-instruction() | text()">
+    <xsl:copy>
+      <xsl:apply-templates select="@* | * | comment() | processing-instruction() | text()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/directory-to-book.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/directory-to-book.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/directory-to-book.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/directory-to-book.xsl Mon Apr  9 19:07:17 2007
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!-- Converts the output of the DirectoryGenerator to Forrest's book.xml
 format.  Typically this would be used to define a book.xml pipeline for a
 specific page.  Eg, in menu.xmap, define the DirectoryGenerator:
@@ -55,77 +54,70 @@
    <map:serialize type="xml"/>
 </map:match>
 -->
-
 <xsl:stylesheet exclude-result-prefixes="dir" version="1.0"
     xmlns:dir="http://apache.org/cocoon/directory/2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:dyn="http://exslt.org/dynamic">
-    <xsl:import href="../../skins/common/xslt/html/pathutils.xsl"/>
-    <xsl:output doctype-public="-//APACHE//DTD Cocoon Documentation Book V1.0//EN" doctype-system="book-cocoon-v10.dtd"/>
-
-    <xsl:param name="served-extension" select="'html'"/>
-    <xsl:param name="sort-order" select="'ascending'"/>
-    <xsl:param name="sort-case-order" select="'upper-first'"/>
-    <xsl:param name="sort-select" select="'.'"/>
-
-    <xsl:template match="/">
-        <book copyright="" software="" title="">
-            <!--
+  <xsl:import href="../../skins/common/xslt/html/pathutils.xsl"/>
+  <xsl:output doctype-public="-//APACHE//DTD Cocoon Documentation Book V1.0//EN" doctype-system="book-cocoon-v10.dtd"/>
+  <xsl:param name="served-extension" select="'html'"/>
+  <xsl:param name="sort-order" select="'ascending'"/>
+  <xsl:param name="sort-case-order" select="'upper-first'"/>
+  <xsl:param name="sort-select" select="'.'"/>
+  <xsl:template match="/">
+    <book copyright="" software="" title="">
+<!--
       <menu label="Aggregates">
         <menu-item label="Combined content" href="combined.html"/>
       </menu>
       -->
-            <xsl:apply-templates/>
-        </book>
-    </xsl:template>
-
-    <xsl:template match="dir:directory">
-        <menu label="{translate(@name,'-_',' ')}">
-            <xsl:apply-templates select="dir:file">
-                <xsl:sort case-order="{$sort-case-order}" order="{$sort-order}" select="dyn:evaluate($sort-select)"/>
-            </xsl:apply-templates>
-        </menu>
-        <xsl:apply-templates select="dir:directory [descendant::dir:file]"/>
-    </xsl:template>
-
-    <xsl:template match="dir:file">
-        <!-- name without extension -->
-        <xsl:variable name="corename">
-            <xsl:call-template name="path-noext">
-                <xsl:with-param name="path" select="@name"/>
-            </xsl:call-template>
-        </xsl:variable>
-        <!-- indirection to allow get-label overriding -->
-        <xsl:variable name="label">
-            <xsl:call-template name="get-label">
-                <xsl:with-param name="corename" select="$corename"/>
-            </xsl:call-template>
-        </xsl:variable>
-        <!-- empty label means side menu item inexistence -->
-        <xsl:if test="$label != ''">
-            <menu-item label="{$label}">
-                <xsl:attribute name="href">
-                    <xsl:variable name="path"/>
-                    <xsl:for-each select="ancestor::dir:directory [not (position()=last())]">
-                        <xsl:variable name="path" select="concat($path, @name, '/')"/>
-                        <xsl:value-of select="$path"/>
-                    </xsl:for-each>
-                    <!-- indirection to allow get-href overriding -->
-                    <xsl:call-template name="get-href">
-                        <xsl:with-param name="corename" select="$corename"/>
-                    </xsl:call-template>
-                </xsl:attribute>
-            </menu-item>
-        </xsl:if>
-    </xsl:template>
-
-    <!-- override this to your needs. For example, see xpathdirectory-to-book.xsl -->
-    <xsl:template name="get-label">
-        <xsl:param name="corename"/>
-        <xsl:value-of select="translate($corename,'-_',' ')"/>
-    </xsl:template>
-
-    <xsl:template name="get-href">
-        <xsl:param name="corename"/>
-        <xsl:value-of select="concat($corename, '.', $served-extension)"/>
-    </xsl:template>
+      <xsl:apply-templates/>
+    </book>
+  </xsl:template>
+  <xsl:template match="dir:directory">
+    <menu label="{translate(@name,'-_',' ')}">
+      <xsl:apply-templates select="dir:file">
+        <xsl:sort case-order="{$sort-case-order}" order="{$sort-order}" select="dyn:evaluate($sort-select)"/>
+      </xsl:apply-templates>
+    </menu>
+    <xsl:apply-templates select="dir:directory [descendant::dir:file]"/>
+  </xsl:template>
+  <xsl:template match="dir:file">
+<!-- name without extension -->
+    <xsl:variable name="corename">
+      <xsl:call-template name="path-noext">
+        <xsl:with-param name="path" select="@name"/>
+      </xsl:call-template>
+    </xsl:variable>
+<!-- indirection to allow get-label overriding -->
+    <xsl:variable name="label">
+      <xsl:call-template name="get-label">
+        <xsl:with-param name="corename" select="$corename"/>
+      </xsl:call-template>
+    </xsl:variable>
+<!-- empty label means side menu item inexistence -->
+    <xsl:if test="$label != ''">
+      <menu-item label="{$label}">
+        <xsl:attribute name="href">
+          <xsl:variable name="path"/>
+          <xsl:for-each select="ancestor::dir:directory [not (position()=last())]">
+            <xsl:variable name="path" select="concat($path, @name, '/')"/>
+            <xsl:value-of select="$path"/>
+          </xsl:for-each>
+<!-- indirection to allow get-href overriding -->
+          <xsl:call-template name="get-href">
+            <xsl:with-param name="corename" select="$corename"/>
+          </xsl:call-template>
+        </xsl:attribute>
+      </menu-item>
+    </xsl:if>
+  </xsl:template>
+<!-- override this to your needs. For example, see xpathdirectory-to-book.xsl -->
+  <xsl:template name="get-label">
+    <xsl:param name="corename"/>
+    <xsl:value-of select="translate($corename,'-_',' ')"/>
+  </xsl:template>
+  <xsl:template name="get-href">
+    <xsl:param name="corename"/>
+    <xsl:value-of select="concat($corename, '.', $served-extension)"/>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/directory-to-i18n.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/directory-to-i18n.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/directory-to-i18n.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/directory-to-i18n.xsl Mon Apr  9 19:07:17 2007
@@ -18,43 +18,39 @@
 <!--
   Create a div element with all the alternate language versions.
 -->
-
 <xsl:stylesheet exclude-result-prefixes="dir" version="1.0"
     xmlns:dir="http://apache.org/cocoon/directory/2.0" 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
-
-    <xsl:param name="ext" />
-
-    <xsl:template match="/">
-        <div class="lang" >
-            <xsl:apply-templates/>
-        </div>
-    </xsl:template>
-
-    <xsl:template match="dir:file">
-    <!-- Assume that the file pattern is resource_locale.extension -->
-     <xsl:element name="a">
-       <xsl:attribute name="href">
-         <xsl:value-of select="concat(substring-before(@name,'_'),'.',$ext)"/>
-       </xsl:attribute >
-       <xsl:attribute name="hreflang">
-         <xsl:value-of select="substring-after(substring-before(@name, '.'),'_')"/>
-       </xsl:attribute >
-       <xsl:attribute name="lang">
-       <!-- It just specify that the content on "a" element is in this language -->
-         <xsl:value-of select="substring-after(substring-before(@name, '.'),'_')"/>
-       </xsl:attribute >
-       <xsl:attribute name="rel">
-         <xsl:value-of select="'alternate'"/>
-       </xsl:attribute>
-     <xsl:attribute name="i18n:attr">title</xsl:attribute>
-     <xsl:attribute name="title" >
-           <xsl:value-of select="substring-after(substring-before(@name, '.'),'_')"/>
-     </xsl:attribute>
-     <i18n:text i18n:catalogue="langcode">
-           <xsl:value-of select="substring-after(substring-before(@name, '.'),'_')"/>
-     </i18n:text>
-     </xsl:element>
-    </xsl:template>
+  <xsl:param name="ext" />
+  <xsl:template match="/">
+    <div class="lang" >
+      <xsl:apply-templates/>
+    </div>
+  </xsl:template>
+  <xsl:template match="dir:file">
+<!-- Assume that the file pattern is resource_locale.extension -->
+    <xsl:element name="a">
+      <xsl:attribute name="href">
+        <xsl:value-of select="concat(substring-before(@name,'_'),'.',$ext)"/>
+      </xsl:attribute >
+      <xsl:attribute name="hreflang">
+        <xsl:value-of select="substring-after(substring-before(@name, '.'),'_')"/>
+      </xsl:attribute >
+      <xsl:attribute name="lang">
+<!-- It just specify that the content on "a" element is in this language -->
+        <xsl:value-of select="substring-after(substring-before(@name, '.'),'_')"/>
+      </xsl:attribute >
+      <xsl:attribute name="rel">
+        <xsl:value-of select="'alternate'"/>
+      </xsl:attribute>
+      <xsl:attribute name="i18n:attr">title</xsl:attribute>
+      <xsl:attribute name="title" >
+        <xsl:value-of select="substring-after(substring-before(@name, '.'),'_')"/>
+      </xsl:attribute>
+      <i18n:text i18n:catalogue="langcode">
+        <xsl:value-of select="substring-after(substring-before(@name, '.'),'_')"/>
+      </i18n:text>
+    </xsl:element>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/directory-to-revisions.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/directory-to-revisions.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/directory-to-revisions.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/directory-to-revisions.xsl Mon Apr  9 19:07:17 2007
@@ -15,29 +15,28 @@
   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:dir="http://apache.org/cocoon/directory/2.0">
- 
- 
- <xsl:param name="page" />
- <xsl:variable name="revisionPage"><xsl:value-of select="concat('revision-',$page)" /></xsl:variable>
-
+  <xsl:param name="page" />
+  <xsl:variable name="revisionPage">
+    <xsl:value-of select="concat('revision-',$page)" />
+  </xsl:variable>
   <xsl:template match="dir:directory">
-  <revisions>
+    <revisions>
       <xsl:apply-templates select="dir:file" />
-  </revisions>
+    </revisions>
   </xsl:template>
-
   <xsl:template match="dir:file">
-  
- <xsl:if test="starts-with(@name,$revisionPage)" >
-  	<revision>
-  	  <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-  	  <xsl:attribute name="date"><xsl:value-of select="@date"/></xsl:attribute>
-	</revision>
- </xsl:if>
+    <xsl:if test="starts-with(@name,$revisionPage)" >
+      <revision>
+        <xsl:attribute name="name">
+          <xsl:value-of select="@name"/>
+        </xsl:attribute>
+        <xsl:attribute name="date">
+          <xsl:value-of select="@date"/>
+        </xsl:attribute>
+      </revision>
+    </xsl:if>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/docv10-to-docv11.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/docv10-to-docv11.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/docv10-to-docv11.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/docv10-to-docv11.xsl Mon Apr  9 19:07:17 2007
@@ -17,35 +17,35 @@
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <!-- <xsl:preserve-space elements="*" /> -->
-  <!-- document-v10.dtd to document-v11.dtd transformation -->
-
-
-  <!-- We should something similar, i.e. make sure the result of this transformation is validated against the v11 DTD
+<!-- document-v10.dtd to document-v11.dtd transformation -->
+<!-- We should something similar, i.e. make sure the result of this transformation is validated against the v11 DTD
   -->
   <xsl:template match="/">
     <xsl:choose>
       <xsl:when test="document">
-        <!-- there exists a document element -->
+<!-- there exists a document element -->
         <xsl:apply-templates/>
       </xsl:when>
       <xsl:otherwise>
-        <!-- no document element, presumably no header also, so I will generate one -->
+<!-- no document element, presumably no header also, so I will generate one -->
         <document>
           <header>
             <title><xsl:value-of select="s1[1]/@title"/></title>
-            <authors><person name="unknown" email="unknown"/></authors>
+            <authors>
+              <person name="unknown" email="unknown"/>
+            </authors>
           </header>
           <body>
             <xsl:choose>
               <xsl:when test="count(s1)='1'">
-                <!-- only one s1 in the entire document, must be a hack to create a title -->
+<!-- only one s1 in the entire document, must be a hack to create a title -->
                 <xsl:choose>
                   <xsl:when test="count(s1/s2)='1'">
-                    <!-- only one s2 inside that s1, unwrap the content of that s2 -->
+<!-- only one s2 inside that s1, unwrap the content of that s2 -->
                     <xsl:apply-templates select="s1/s2/*"/>
                   </xsl:when>
                   <xsl:otherwise>
-                    <!-- in any case, we get rid of these s1/s2 elements -->
+<!-- in any case, we get rid of these s1/s2 elements -->
                     <xsl:apply-templates select="s1/*"/>
                   </xsl:otherwise>
                 </xsl:choose>
@@ -59,54 +59,45 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
-  <!-- no links allowed in em anymore -->
+<!-- no links allowed in em anymore -->
   <xsl:template match="em[link]">
     <xsl:apply-templates/>
   </xsl:template>
-
-  <!-- fixes sections -->
+<!-- fixes sections -->
   <xsl:template match="s1 | s2 | s3 | s4">
     <section>
       <xsl:apply-templates select="@*[name()!='title']"/>
       <xsl:apply-templates select="@*[name()='title']"/>
-	  <!-- apply title rule last. See http://sourceforge.net/forum/forum.php?thread_id=729070&forum_id=94027 -->
+<!-- apply title rule last. See http://sourceforge.net/forum/forum.php?thread_id=729070&forum_id=94027 -->
       <xsl:apply-templates select="node()"/>
     </section>
   </xsl:template>
-
   <xsl:template match="s1/@title | s2/@title | s3/@title | s4/@title">
     <title><xsl:value-of select="."/></title>
   </xsl:template>
-
-  <!-- dunnow what to do with connect - maybe just evaporize it? -->
+<!-- dunnow what to do with connect - maybe just evaporize it? -->
   <xsl:template match="connect">
     <xsl:message terminate="no">The connect element isn't supported anymore in the document-v11.dtd, please fix your document.</xsl:message>
     [[connect: <xsl:apply-templates/> ]]
   </xsl:template>
-
   <xsl:template match="link/@idref">
     <xsl:message terminate="no">The link element has no idref attribute defined in the document-v11.dtd, please fix your document.</xsl:message>
     [[link/@idref: <xsl:apply-templates/> ]]
   </xsl:template>
-
   <xsl:template match="link/@type | link/@actuate | link/@show |
                        jump/@type | jump/@actuate | jump/@show |
                        fork/@type | fork/@actuate | fork/@show"/>
-
-  <!-- 'simple lists' become unordered lists -->
+<!-- 'simple lists' become unordered lists -->
   <xsl:template match="sl">
     <ul>
       <xsl:apply-templates select="@*|node()"/>
     </ul>
   </xsl:template>
-        
-  <!-- the obligatory copy-everything -->
+<!-- the obligatory copy-everything -->
   <xsl:template match="node() | @*">
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
       <xsl:apply-templates/>
     </xsl:copy>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/docv20-to-docv12.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/docv20-to-docv12.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/docv20-to-docv12.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/docv20-to-docv12.xsl Mon Apr  9 19:07:17 2007
@@ -16,32 +16,24 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- document-v20x.dtd to document-v12.dtd transformation -->
-
+<!-- document-v20x.dtd to document-v12.dtd transformation -->
   <xsl:template match="/">
     <xsl:apply-templates/>
   </xsl:template>
-
-  <xsl:template match="a">
-    <link>
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates select="node()"/>
-    </link>
+  <xsl:template match="a"><link>
+    <xsl:apply-templates select="@*"/>
+    <xsl:apply-templates select="node()"/></link>
   </xsl:template>
-
-  <!--
+<!--
   <xsl:template match="s1/@title | s2/@title | s3/@title | s4/@title">
     <title><xsl:value-of select="."/></title>
   </xsl:template>
   -->
-
-
-  <!-- the obligatory copy-everything -->
+<!-- the obligatory copy-everything -->
   <xsl:template match="node() | @*">
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
       <xsl:apply-templates/>
     </xsl:copy>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/docv20-to-docv13.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/docv20-to-docv13.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/docv20-to-docv13.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/docv20-to-docv13.xsl Mon Apr  9 19:07:17 2007
@@ -16,25 +16,19 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- document-v20.dtd to document-v13.dtd transformation -->
-
+<!-- document-v20.dtd to document-v13.dtd transformation -->
   <xsl:template match="/">
     <xsl:apply-templates/>
   </xsl:template>
-
-  <xsl:template match="a">
-    <link>
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates select="node()"/>
-    </link>
+  <xsl:template match="a"><link>
+    <xsl:apply-templates select="@*"/>
+    <xsl:apply-templates select="node()"/></link>
   </xsl:template>
-
-  <!-- the obligatory copy-everything -->
+<!-- the obligatory copy-everything -->
   <xsl:template match="node() | @*">
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
       <xsl:apply-templates/>
     </xsl:copy>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/dotdots.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/dotdots.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/dotdots.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/dotdots.xsl Mon Apr  9 19:07:17 2007
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--
 Contains the 'dotdots' template, which, given a path, will output a set of
 directory traversals to get back to the source directory. Handles both '/' and
@@ -37,15 +36,13 @@
 work.
 
 -->
-
 <xsl:stylesheet
   version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:template name="dotdots">
     <xsl:param name="path"/>
     <xsl:variable name="dirs" select="normalize-space(translate(concat($path, 'x'), ' /\', '_  '))"/>
-    <!-- The above does the following:
+<!-- The above does the following:
        o Adds a trailing character to the path. This prevents us having to deal
          with the special case of ending with '/'
        o Translates all directory separators to ' ', and normalize spaces,
@@ -54,14 +51,13 @@
     -->
     <xsl:variable name="remainder" select="substring-after($dirs, ' ')"/>
     <xsl:if test="$remainder">
-      <xsl:text>../</xsl:text>
+<xsl:text>../</xsl:text>
       <xsl:call-template name="dotdots">
         <xsl:with-param name="path" select="translate($remainder, ' ', '/')"/>
-		<!-- Translate back to /'s because that's what the template expects. -->
+<!-- Translate back to /'s because that's what the template expects. -->
       </xsl:call-template>
     </xsl:if>
   </xsl:template>
-
 <!--
   Uncomment to test.
   Usage: saxon dotdots.xsl dotdots.xsl path='/my/test/path'
@@ -74,5 +70,4 @@
     </xsl:call-template>
   </xsl:template>
  -->
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/exception-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/exception-to-html.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/exception-to-html.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/exception-to-html.xsl Mon Apr  9 19:07:17 2007
@@ -15,39 +15,40 @@
   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:ex="http://apache.org/cocoon/exception/1.0">
-
- <xsl:template match="/">
-   <html>
-     <head>
-       <title>Exception</title>
-     </head>
-     <body>
+  <xsl:template match="/">
+    <html>
+      <head>
+        <title>Exception</title>
+      </head>
+      <body>
         <xsl:apply-templates/>
-     </body>
-   </html>
- </xsl:template>
- 
- <xsl:template match="ex:exception-report">
-   <xsl:choose>
-     <xsl:when test="contains(ex:message, '(Access is denied)')">
-         <h1>An Error Occurred</h1>
-         
-         <p>It looks like there is a problem with an unresolved hint in the your locationmap.</p>         
-         
-         <p>More information can be found in the logs.</p>
-     </xsl:when>
-     <xsl:otherwise>
-         <h1>An Error Occurred</h1>
-         
-         <p><xsl:value-of select="ex:message"/></p>
-         
-         <p>More information can be found in the logs.</p>
-     </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
-
+      </body>
+    </html>
+  </xsl:template>
+  <xsl:template match="ex:exception-report">
+    <xsl:choose>
+      <xsl:when test="contains(ex:message, '(Access is denied)')">
+        <h1>An Error Occurred</h1>
+        <p>
+          It looks like there is a problem with an unresolved hint in the your
+          locationmap.
+        </p>
+        <p>
+          More information can be found in the logs.
+        </p>
+      </xsl:when>
+      <xsl:otherwise>
+        <h1>An Error Occurred</h1>
+        <p>
+          <xsl:value-of select="ex:message"/>
+        </p>
+        <p>
+          More information can be found in the logs.
+        </p>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/external/str.find-last.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/external/str.find-last.xslt?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/external/str.find-last.xslt (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/external/str.find-last.xslt Mon Apr  9 19:07:17 2007
@@ -5,154 +5,123 @@
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" id="str.find-last"
   xmlns:str="http://www.ora.com/XSLTCookbook/namespaces/strings" extension-element-prefixes="str">
-
-
-<xsl:template name="str:substring-before-last"> 
-  <xsl:param name="input"/>
-  <xsl:param name="substr"/>
-  
-  <xsl:if test="$substr and contains($input, $substr)">
-    <xsl:variable name="temp" select="substring-after($input, $substr)" />
-    <xsl:value-of select="substring-before($input, $substr)" />
-    <xsl:if test="contains($temp, $substr)">
-      <xsl:value-of select="$substr" />
-      <xsl:call-template name="str:substring-before-last">
-        <xsl:with-param name="input" select="$temp" />
-        <xsl:with-param name="substr" select="$substr" />
-      </xsl:call-template>
+  <xsl:template name="str:substring-before-last">
+    <xsl:param name="input"/>
+    <xsl:param name="substr"/>
+    <xsl:if test="$substr and contains($input, $substr)">
+      <xsl:variable name="temp" select="substring-after($input, $substr)" />
+      <xsl:value-of select="substring-before($input, $substr)" />
+      <xsl:if test="contains($temp, $substr)">
+        <xsl:value-of select="$substr" />
+        <xsl:call-template name="str:substring-before-last">
+          <xsl:with-param name="input" select="$temp" />
+          <xsl:with-param name="substr" select="$substr" />
+        </xsl:call-template>
+      </xsl:if>
     </xsl:if>
-  </xsl:if>
-  
-</xsl:template>
-
-
-<xsl:template name="str:substring-after-last">
-  <xsl:param name="input"/>
-  <xsl:param name="substr"/>
-  
-  <!-- Extract the string which comes after the first occurence -->
-  <xsl:variable name="temp" select="substring-after($input,$substr)"/>
-  
-  <xsl:choose>
-  	<xsl:when test="$substr and contains($temp,$substr)">
-  		<xsl:call-template name="str:substring-after-last">
-  			<xsl:with-param name="input" select="$temp"/>
-  			<xsl:with-param name="substr" select="$substr"/>
-  		</xsl:call-template>
-  	</xsl:when>
-  	<xsl:otherwise>
-  		<xsl:value-of select="$temp"/>
-  	</xsl:otherwise>
-  </xsl:choose>
-</xsl:template> 
-
-
-<xsl:template match="xsl:stylesheet[@id='str.find-last'] | xsl:include[@href='str.find-last.xslt'] " >
-<tests>
-
+  </xsl:template>
+  <xsl:template name="str:substring-after-last">
+    <xsl:param name="input"/>
+    <xsl:param name="substr"/>
+<!-- Extract the string which comes after the first occurence -->
+    <xsl:variable name="temp" select="substring-after($input,$substr)"/>
+    <xsl:choose>
+      <xsl:when test="$substr and contains($temp,$substr)">
+        <xsl:call-template name="str:substring-after-last">
+          <xsl:with-param name="input" select="$temp"/>
+          <xsl:with-param name="substr" select="$substr"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$temp"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="xsl:stylesheet[@id='str.find-last'] | xsl:include[@href='str.find-last.xslt'] " >
+    <tests>
 <!-- before -->
-	<test name="str:substring-before-last with no occurences of yes">
-	<xsl:call-template name="str:substring-before-last">
-		<xsl:with-param name="input" select=" 'No occurences' "/>
-		<xsl:with-param name="substr" select=" 'yes' "/>
-	</xsl:call-template>
-	</test>
-	
-	<test name="str:substring-before-last starts with yes">
-	<xsl:call-template name="str:substring-before-last">
-		<xsl:with-param name="input" select=" 'yes occurences' "/>
-		<xsl:with-param name="substr" select=" 'yes' "/>
-	</xsl:call-template>
-	</test>
-
-	<test name="str:substring-before-last starts with yes and ends with yes">
-	<xsl:call-template name="str:substring-before-last">
-		<xsl:with-param name="input" select=" 'yes occurences yes' "/>
-		<xsl:with-param name="substr" select=" 'yes' "/>
-	</xsl:call-template>
-	</test>
-
-	<test name="str:substring-before-last 3 yes">
-	<xsl:call-template name="str:substring-before-last">
-		<xsl:with-param name="input" select=" 'yesyesyes' "/>
-		<xsl:with-param name="substr" select=" 'yes' "/>
-	</xsl:call-template>
-	</test>
-	<test name="str:substring-before-last empty input">
-	<xsl:call-template name="str:substring-before-last">
-		<xsl:with-param name="substr" select=" 'yes' "/>
-	</xsl:call-template>
-	</test>
-	
-	<test name="str:substring-before-last empty search">
-	<xsl:call-template name="str:substring-before-last">
-		<xsl:with-param name="input" select=" 'No occurences' "/>
-	</xsl:call-template>
-
-	</test>
-
-	<test name="str:substring-before-last large">
-	<xsl:call-template name="str:substring-before-last">
-		<xsl:with-param name="input" select=" 'yesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyes
 yesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesye
 syesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesy
 esyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyes
 yesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyes' "/>
-		<xsl:with-param name="substr" select=" 'yes' "/>
-	</xsl:call-template>
-
-
-	</test>
-
+      <test name="str:substring-before-last with no occurences of yes">
+        <xsl:call-template name="str:substring-before-last">
+          <xsl:with-param name="input" select=" 'No occurences' "/>
+          <xsl:with-param name="substr" select=" 'yes' "/>
+        </xsl:call-template>
+      </test>
+      <test name="str:substring-before-last starts with yes">
+        <xsl:call-template name="str:substring-before-last">
+          <xsl:with-param name="input" select=" 'yes occurences' "/>
+          <xsl:with-param name="substr" select=" 'yes' "/>
+        </xsl:call-template>
+      </test>
+      <test name="str:substring-before-last starts with yes and ends with yes">
+        <xsl:call-template name="str:substring-before-last">
+          <xsl:with-param name="input" select=" 'yes occurences yes' "/>
+          <xsl:with-param name="substr" select=" 'yes' "/>
+        </xsl:call-template>
+      </test>
+      <test name="str:substring-before-last 3 yes">
+        <xsl:call-template name="str:substring-before-last">
+          <xsl:with-param name="input" select=" 'yesyesyes' "/>
+          <xsl:with-param name="substr" select=" 'yes' "/>
+        </xsl:call-template>
+      </test>
+      <test name="str:substring-before-last empty input">
+        <xsl:call-template name="str:substring-before-last">
+          <xsl:with-param name="substr" select=" 'yes' "/>
+        </xsl:call-template>
+      </test>
+      <test name="str:substring-before-last empty search">
+        <xsl:call-template name="str:substring-before-last">
+          <xsl:with-param name="input" select=" 'No occurences' "/>
+        </xsl:call-template>
+      </test>
+      <test name="str:substring-before-last large">
+        <xsl:call-template name="str:substring-before-last">
+          <xsl:with-param name="input" select=" 'yesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesy
 esyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyes
 yesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesye
 syesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesy
 esyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyesyes' "/>
+          <xsl:with-param name="substr" select=" 'yes' "/>
+        </xsl:call-template>
+      </test>
 <!-- after -->
-
-	<test name="str:substring-after-last with no occurences of yes">
-	<xsl:call-template name="str:substring-after-last">
-		<xsl:with-param name="input" select=" 'No occurences' "/>
-		<xsl:with-param name="substr" select=" 'yes' "/>
-	</xsl:call-template>
-	</test>
-	
-	<test name="str:substring-after-last starts with yes">
-	<xsl:call-template name="str:substring-after-last">
-		<xsl:with-param name="input" select=" 'yes occurences' "/>
-		<xsl:with-param name="substr" select=" 'yes' "/>
-	</xsl:call-template>
-	</test>
-
-	<test name="str:substring-after-last starts with yes and ends with yes">
-	<xsl:call-template name="str:substring-after-last">
-		<xsl:with-param name="input" select=" 'yes occurences yes' "/>
-		<xsl:with-param name="substr" select=" 'yes' "/>
-	</xsl:call-template>
-	</test>
-
-	<test name="str:substring-after-last 3 yes">
-	<xsl:call-template name="str:substring-after-last">
-		<xsl:with-param name="input" select=" 'yesyesyes' "/>
-		<xsl:with-param name="substr" select=" 'yes' "/>
-	</xsl:call-template>
-	</test>
-
-	<test name="str:substring-after-last 3 yes then no">
-	<xsl:call-template name="str:substring-after-last">
-		<xsl:with-param name="input" select=" 'yesyesyesno' "/>
-		<xsl:with-param name="substr" select=" 'yes' "/>
-	</xsl:call-template>
-	</test>
-	
-	<test name="str:substring-after-last empty input">
-	<xsl:call-template name="str:substring-after-last">
-		<xsl:with-param name="substr" select=" 'yes' "/>
-	</xsl:call-template>
-	</test>
-	
-	<test name="str:substring-after-last empty search">
-	<xsl:call-template name="str:substring-after-last">
-		<xsl:with-param name="input" select=" 'No occurences' "/>
-	</xsl:call-template>
-
-	</test>
-
-</tests>
-</xsl:template>
-
- <xsl:template match="text()"/>
-  
+      <test name="str:substring-after-last with no occurences of yes">
+        <xsl:call-template name="str:substring-after-last">
+          <xsl:with-param name="input" select=" 'No occurences' "/>
+          <xsl:with-param name="substr" select=" 'yes' "/>
+        </xsl:call-template>
+      </test>
+      <test name="str:substring-after-last starts with yes">
+        <xsl:call-template name="str:substring-after-last">
+          <xsl:with-param name="input" select=" 'yes occurences' "/>
+          <xsl:with-param name="substr" select=" 'yes' "/>
+        </xsl:call-template>
+      </test>
+      <test name="str:substring-after-last starts with yes and ends with yes">
+        <xsl:call-template name="str:substring-after-last">
+          <xsl:with-param name="input" select=" 'yes occurences yes' "/>
+          <xsl:with-param name="substr" select=" 'yes' "/>
+        </xsl:call-template>
+      </test>
+      <test name="str:substring-after-last 3 yes">
+        <xsl:call-template name="str:substring-after-last">
+          <xsl:with-param name="input" select=" 'yesyesyes' "/>
+          <xsl:with-param name="substr" select=" 'yes' "/>
+        </xsl:call-template>
+      </test>
+      <test name="str:substring-after-last 3 yes then no">
+        <xsl:call-template name="str:substring-after-last">
+          <xsl:with-param name="input" select=" 'yesyesyesno' "/>
+          <xsl:with-param name="substr" select=" 'yes' "/>
+        </xsl:call-template>
+      </test>
+      <test name="str:substring-after-last empty input">
+        <xsl:call-template name="str:substring-after-last">
+          <xsl:with-param name="substr" select=" 'yes' "/>
+        </xsl:call-template>
+      </test>
+      <test name="str:substring-after-last empty search">
+        <xsl:call-template name="str:substring-after-last">
+          <xsl:with-param name="input" select=" 'No occurences' "/>
+        </xsl:call-template>
+      </test>
+    </tests>
+  </xsl:template>
+  <xsl:template match="text()"/>
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/resources/stylesheets/extract-svg.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/extract-svg.xsl?view=diff&rev=526996&r1=526995&r2=526996
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/extract-svg.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/extract-svg.xsl Mon Apr  9 19:07:17 2007
@@ -15,23 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--+
     | Replace element for the value on the project descriptor 
     | xmlns:for has to be replaced for the final version
     +-->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:svg="http://www.w3.org/2000/svg" version="1.0">
-
   <xsl:template match="/">
     <xsl:apply-templates select="//svg:svg"/>
   </xsl:template>
-
   <xsl:template match="svg:svg">
     <xsl:copy-of select="."/>
   </xsl:template>
-
   <xsl:template match="*"/>
-
 </xsl:stylesheet>