forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r886147 [3/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...
Date Wed, 02 Dec 2009 13:58:28 GMT
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?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- 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 Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +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">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:param name="serializer" select="'xhtml'"/>
   <xsl:template match="/">
     <xsl:choose>
@@ -30,8 +29,8 @@
   </xsl:template>
   <xsl:template name="do-xhtml">
     <html xmlns="http://www.w3.org/1999/xhtml">
-      <xsl:copy-of select="html/head"/>
-      <xsl:copy-of select="html/body"/>
+      <xsl:copy-of select="html/head" />
+      <xsl:copy-of select="html/body" />
     </html>
   </xsl:template>
   <xsl:template name="do-html">

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?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- 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 Wed Dec  2 13:58:18 2009
@@ -38,14 +38,14 @@
 
 -->
 <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="lm://transform.tab.menu" />
   <xsl:template match="tabs">
     <ul id="nav-main">
-      <xsl:call-template name="base-tabs"/>
+      <xsl:call-template name="base-tabs" />
     </ul>
     <xsl:if test="tab[@dir=$longest-dir]/tab">
       <div id="nav-main-sub">
-        <xsl:call-template name="level2tabs"/>
+        <xsl:call-template name="level2tabs" />
       </div>
     </xsl:if>
   </xsl:template>
@@ -53,15 +53,19 @@
   <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: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>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/xhtml2_to_html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/xhtml2_to_html.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/xhtml2_to_html.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/xhtml2_to_html.xsl Wed Dec  2 13:58:18 2009
@@ -29,952 +29,960 @@
   - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
   - ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-<xsl:stylesheet version="1.0" 
-  xmlns="http://www.w3.org/2002/06/xhtml2" 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:html="http://www.w3.org/2002/06/xhtml2"
-  exclude-result-prefixes="html xsl"
-  >
-  <xsl:include href="lm://transform.xml.generateId"/>
-<!-- If imported into another stylesheet, allow the first level heading
+<xsl:stylesheet version="1.0" xmlns="http://www.w3.org/2002/06/xhtml2"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:html="http://www.w3.org/2002/06/xhtml2"
+exclude-result-prefixes="html xsl">
+  <xsl:include href="lm://transform.xml.generateId" />
+  <!-- If imported into another stylesheet, allow the first level heading
     -  depth to be configured -->
-  <xsl:param name="xhtml-heading" select="1"/>
-<!-- Use XHTML 1.0 as the output schema -->
+  <xsl:param name="xhtml-heading" select="1" />
+  <!-- Use XHTML 1.0 as the output schema -->
   <xsl:output method="html" version="1.0" encoding="utf-8"
-    omit-xml-declaration="yes" media-type="text/html"
-    doctype-public="-//W3C//DTD HTML 4.01//EN"
-    doctype-system="http://www.w3.org/TR/html4/strict.dtd"/>
-<!-- Copy elements by default -->
+  omit-xml-declaration="yes" media-type="text/html"
+  doctype-public="-//W3C//DTD HTML 4.01//EN"
+  doctype-system="http://www.w3.org/TR/html4/strict.dtd" />
+  <!-- Copy elements by default -->
   <xsl:template match="comment()">
     <xsl:comment>
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:comment>
   </xsl:template>
-<!-- Do not process elements and attributes by default -->
-  <xsl:template match="html:*"/>
-  <xsl:template match="html:*/@*" priority="0"/>
-  <xsl:template match="html:*/@*" mode="insdel" priority="0"/>
-  <xsl:template match="html:*/@*" mode="image" priority="0"/>
-  <xsl:template match="html:*/@*" mode="quote" priority="0"/>
-  <xsl:template match="html:*/@*" mode="link" priority="0"/>
-<!--
+  <!-- Do not process elements and attributes by default -->
+  <xsl:template match="html:*" />
+  <xsl:template match="html:*/@*" priority="0" />
+  <xsl:template match="html:*/@*" mode="insdel" priority="0" />
+  <xsl:template match="html:*/@*" mode="image" priority="0" />
+  <xsl:template match="html:*/@*" mode="quote" priority="0" />
+  <xsl:template match="html:*/@*" mode="link" priority="0" />
+  <!--
     - XHTML Attribute Collections
     -->
-<!-- Core Attribute Collection -->
+  <!-- Core Attribute Collection -->
   <xsl:template match="@class">
-    <xsl:param name="class"/>
+    <xsl:param name="class" />
     <xsl:attribute name="class">
       <xsl:if test="$class">
-        <xsl:value-of select="$class"/>
-<xsl:text> </xsl:text>
+        <xsl:value-of select="$class" />
+        <xsl:text>
+ 
+</xsl:text>
       </xsl:if>
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
   <xsl:template match="@id|@title">
     <xsl:attribute name="{local-name()}">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!-- I18N Attribute Collection -->
+  <!-- I18N Attribute Collection -->
   <xsl:template match="@xml:lang">
     <xsl:attribute name="lang">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!-- Bi-directional Text Collection -->
+  <!-- Bi-directional Text Collection -->
   <xsl:template match="@dir">
-<!-- TODO: Need to handle lro and rlo.  Not in HTML4 -->
+    <!-- TODO: Need to handle lro and rlo.  Not in HTML4 -->
     <xsl:attribute name="dir">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!-- Edit Collection -->
-  <xsl:template match="@edit" mode="insdel"/>
+  <!-- Edit Collection -->
+  <xsl:template match="@edit" mode="insdel" />
   <xsl:template match="@datetime" mode="insdel">
     <xsl:attribute name="datetime">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!-- Hypertext Attribute Collection -->
+  <!-- Hypertext Attribute Collection -->
   <xsl:template match="@href|@rel|@rev|@accesskey|@target" mode="link">
     <xsl:attribute name="{local-name()}">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
   <xsl:template match="@navindex" mode="link">
     <xsl:attribute name="tabindex">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!-- Make sure only one tag gets the cite attribute -->
+  <!-- Make sure only one tag gets the cite attribute -->
   <xsl:template match="@cite" mode="insdel">
     <xsl:attribute name="cite">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
   <xsl:template match="@cite" mode="quote">
     <xsl:if test="count(@edit)=0">
       <xsl:attribute name="cite">
-        <xsl:value-of select="."/>
+        <xsl:value-of select="." />
       </xsl:attribute>
     </xsl:if>
   </xsl:template>
-<!-- Embedding Attribute Collection -->
+  <!-- Embedding Attribute Collection -->
   <xsl:template match="@src" mode="image">
     <xsl:attribute name="src">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
   <xsl:template match="html:link/@type" mode="link">
     <xsl:attribute name="type">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!-- Image Map Attribute Collection -->
+  <!-- Image Map Attribute Collection -->
   <xsl:template match="@usemap|@ismap" mode="image">
     <xsl:attribute name="{local-name()}">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!-- Style Attribute Collection -->
+  <!-- Style Attribute Collection -->
   <xsl:template match="@style">
     <xsl:attribute name="style">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!--
+  <!--
     - Block rendering templates
     -->
-<!-- If the edit attribute has been used, add a ins or del as appropriate -->
+  <!-- If the edit attribute has been used, add a ins or del as appropriate -->
   <xsl:template name="block">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- No edit attribute, just call next level -->
+      <!-- No edit attribute, just call next level -->
       <xsl:when test="count(@edit)=0">
         <xsl:call-template name="block-element">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- Edit attribute set to "deleted", create a del element -->
+      <!-- Edit attribute set to "deleted", create a del element -->
       <xsl:when test="@edit='deleted'">
         <del>
           <xsl:apply-templates select="@*" mode="insdel">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="block-element">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </del>
       </xsl:when>
-<!-- Edit attribute set to "inserted", "changed", "moved", create an ins
+      <!-- Edit attribute set to "inserted", "changed", "moved", create an ins
       -  element -->
       <xsl:otherwise>
         <ins>
           <xsl:apply-templates select="@*" mode="insdel">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="block-element">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </ins>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- Create the element before any automatic inline children -->
+  <!-- Create the element before any automatic inline children -->
   <xsl:template name="block-element">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- The hr element is empty -->
+      <!-- The hr element is empty -->
       <xsl:when test="$element='hr'">
         <hr>
           <xsl:apply-templates select="@*">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
         </hr>
       </xsl:when>
-<!-- Create element -->
+      <!-- Create element -->
       <xsl:otherwise>
         <xsl:element name="{$element}">
           <xsl:if test="$class">
             <xsl:attribute name="class">
-              <xsl:value-of select="$class"/>
+              <xsl:value-of select="$class" />
             </xsl:attribute>
-            <xsl:if test="$class='section'"><a>
+            <xsl:if test="$class='section'">
+              <a>
               <xsl:attribute name="name">
                 <xsl:if test="@id">
-                  <xsl:value-of select="@id"/>
+                  <xsl:value-of select="@id" />
                 </xsl:if>
                 <xsl:if test="not(@id)">
-                  <xsl:call-template name="generate-id"/>
+                  <xsl:call-template name="generate-id" />
                 </xsl:if>
-              </xsl:attribute>&#160;
-        </a>
+              </xsl:attribute>&#160;</a>
             </xsl:if>
           </xsl:if>
           <xsl:apply-templates select="@*">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="block-quote">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </xsl:element>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- If the cite attribute appears without edit, create a quote element -->
+  <!-- If the cite attribute appears without edit, create a quote element -->
   <xsl:template name="block-quote">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If no cite attribute or edit was defined, continue to next level -->
-      <xsl:when test="(count(@cite)=0) or (count(@edit)!=0)
-      or ($element='blockquote')">
+      <!-- If no cite attribute or edit was defined, continue to next level -->
+      <xsl:when test="(count(@cite)=0) or (count(@edit)!=0) or ($element='blockquote')">
+
         <xsl:call-template name="block-link">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- Create the quote element -->
+      <!-- Create the quote element -->
       <xsl:otherwise>
         <q>
           <xsl:apply-templates select="@*" mode="quote">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="block-link">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </q>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- If the href attribute appears, make a hyperlink -->
+  <!-- If the href attribute appears, make a hyperlink -->
   <xsl:template name="block-link">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If no href attribute appears, continue to next level -->
+      <!-- If no href attribute appears, continue to next level -->
       <xsl:when test="count(@href)=0">
         <xsl:call-template name="block-image">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- href has been used, so create an anchor -->
-      <xsl:otherwise><a>
-        <xsl:apply-templates select="@*" mode="link">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
-        </xsl:apply-templates>
-        <xsl:call-template name="block-image">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
-        </xsl:call-template></a>
+      <!-- href has been used, so create an anchor -->
+      <xsl:otherwise>
+        <a>
+          <xsl:apply-templates select="@*" mode="link">
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
+          </xsl:apply-templates>
+          <xsl:call-template name="block-image">
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
+          </xsl:call-template>
+        </a>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- If the src attribute appears, make an image -->
+  <!-- If the src attribute appears, make an image -->
   <xsl:template name="block-image">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If no src attribute appears, continue to next level -->
+      <!-- If no src attribute appears, continue to next level -->
       <xsl:when test="count(@src)=0">
-        <xsl:apply-templates/>
+        <xsl:apply-templates />
       </xsl:when>
-<!-- src has been used, so replace with an image -->
+      <!-- src has been used, so replace with an image -->
       <xsl:otherwise>
         <img alt="{.}">
           <xsl:apply-templates select="@*" mode="image">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
         </img>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!--
+  <!--
     - Inline rendering templates
     -->
-<!-- If the edit attribute has been used, add a ins or del as appropriate -->
+  <!-- If the edit attribute has been used, add a ins or del as appropriate -->
   <xsl:template name="inline">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- No edit attribute, just call next level -->
+      <!-- No edit attribute, just call next level -->
       <xsl:when test="count(@edit)=0">
         <xsl:call-template name="inline-quote">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- Edit attribute set to "deleted", create a del element -->
+      <!-- Edit attribute set to "deleted", create a del element -->
       <xsl:when test="@edit='deleted'">
         <del>
           <xsl:apply-templates select="@*" mode="insdel">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="inline-quote">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </del>
       </xsl:when>
-<!-- Edit attribute set to "inserted", "changed", "moved", create an ins
+      <!-- Edit attribute set to "inserted", "changed", "moved", create an ins
       -  element -->
       <xsl:otherwise>
         <ins>
           <xsl:apply-templates select="@*" mode="insdel">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="inline-quote">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </ins>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- If the cite attribute appears without edit, create a quote element -->
+  <!-- If the cite attribute appears without edit, create a quote element -->
   <xsl:template name="inline-quote">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If no cite attribute or edit was defined, continue to next level -->
+      <!-- If no cite attribute or edit was defined, continue to next level -->
       <xsl:when test="(count(@cite)=0) or (count(@edit)!=0)">
         <xsl:call-template name="inline-link">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- Create the quote element -->
+      <!-- Create the quote element -->
       <xsl:otherwise>
         <q>
           <xsl:apply-templates select="@*" mode="quote">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="inline-link">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </q>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- If the href attribute appears, make a hyperlink -->
+  <!-- If the href attribute appears, make a hyperlink -->
   <xsl:template name="inline-link">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If no href attribute appears, continue to next level -->
+      <!-- If no href attribute appears, continue to next level -->
       <xsl:when test="count(@href)=0">
         <xsl:call-template name="inline-image">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- href has been used, so create an anchor -->
-      <xsl:otherwise><a>
-        <xsl:apply-templates select="@*" mode="link">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
-        </xsl:apply-templates>
-        <xsl:call-template name="inline-image">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
-        </xsl:call-template></a>
+      <!-- href has been used, so create an anchor -->
+      <xsl:otherwise>
+        <a>
+          <xsl:apply-templates select="@*" mode="link">
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
+          </xsl:apply-templates>
+          <xsl:call-template name="inline-image">
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
+          </xsl:call-template>
+        </a>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- If the src attribute appears, make an image -->
+  <!-- If the src attribute appears, make an image -->
   <xsl:template name="inline-image">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If no src attribute appears, continue to next level -->
+      <!-- If no src attribute appears, continue to next level -->
       <xsl:when test="count(@src)=0">
         <xsl:call-template name="inline-element">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- src has been used, so replace with an image -->
+      <!-- src has been used, so replace with an image -->
       <xsl:otherwise>
         <img alt="{.}">
           <xsl:apply-templates select="@*" mode="image">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
         </img>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- Finally, create the element (assuming not quote) -->
+  <!-- Finally, create the element (assuming not quote) -->
   <xsl:template name="inline-element">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If element is 'q' or 'a', it has already been made -->
+      <!-- If element is 'q' or 'a', it has already been made -->
       <xsl:when test="($element='q') or ($element='a')">
         <xsl:apply-templates select="@*">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:apply-templates>
-        <xsl:apply-templates/>
+        <xsl:apply-templates />
       </xsl:when>
-<!-- If element is 'br', make a span and put br at end -->
+      <!-- If element is 'br', make a span and put br at end -->
       <xsl:when test="$element='br'">
         <span class="line">
           <xsl:apply-templates select="@*">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
-          <xsl:apply-templates/>
-          <br/>
+          <xsl:apply-templates />
+          <br />
         </span>
       </xsl:when>
-<!-- Create element -->
+      <!-- Create element -->
       <xsl:otherwise>
         <xsl:element name="{$element}">
           <xsl:apply-templates select="@*">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
-          <xsl:apply-templates/>
+          <xsl:apply-templates />
         </xsl:element>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!--
+  <!--
     - List rendering templates
     -->
-<!-- If the edit attribute has been used, add a ins or del as appropriate -->
+  <!-- If the edit attribute has been used, add a ins or del as appropriate -->
   <xsl:template name="list">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- No edit attribute, just call next level -->
+      <!-- No edit attribute, just call next level -->
       <xsl:when test="count(@edit)=0">
         <xsl:call-template name="list-quote">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- Edit attribute set to "deleted", create a del element -->
+      <!-- Edit attribute set to "deleted", create a del element -->
       <xsl:when test="@edit='deleted'">
         <del>
           <xsl:apply-templates select="@*" mode="insdel">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="list-quote">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </del>
       </xsl:when>
-<!-- Edit attribute set to "inserted", "changed", "moved", create an ins
+      <!-- Edit attribute set to "inserted", "changed", "moved", create an ins
       -  element -->
       <xsl:otherwise>
         <ins>
           <xsl:apply-templates select="@*" mode="insdel">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="list-quote">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </ins>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- If the cite attribute appears without edit, create a quote element -->
+  <!-- If the cite attribute appears without edit, create a quote element -->
   <xsl:template name="list-quote">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If no cite attribute or edit was defined, continue to next level -->
+      <!-- If no cite attribute or edit was defined, continue to next level -->
       <xsl:when test="(count(@cite)=0) or (count(@edit)!=0)">
         <xsl:call-template name="list-element">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- Create the quote element -->
+      <!-- Create the quote element -->
       <xsl:otherwise>
         <blockquote>
           <xsl:apply-templates select="@*" mode="quote">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="list-element">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </blockquote>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- Create the element before any automatic inline children -->
+  <!-- Create the element before any automatic inline children -->
   <xsl:template name="list-element">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If going to be replaced with an image, create a para instead -->
+      <!-- If going to be replaced with an image, create a para instead -->
       <xsl:when test="count(@src)">
         <p>
           <xsl:apply-templates select="@*">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="list-link">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </p>
       </xsl:when>
-<!-- Create element and continue to children -->
+      <!-- Create element and continue to children -->
       <xsl:otherwise>
         <xsl:element name="{$element}">
           <xsl:if test="$class">
             <xsl:attribute name="class">
-              <xsl:value-of select="$class"/>
+              <xsl:value-of select="$class" />
             </xsl:attribute>
           </xsl:if>
           <xsl:if test="count(html:summary)">
             <xsl:attribute name="summary">
-              <xsl:value-of select="html:summary"/>
+              <xsl:value-of select="html:summary" />
             </xsl:attribute>
           </xsl:if>
           <xsl:apply-templates select="@*">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
-          <xsl:apply-templates/>
+          <xsl:apply-templates />
         </xsl:element>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- If the href and src are provided, make a linked image -->
+  <!-- If the href and src are provided, make a linked image -->
   <xsl:template name="list-link">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If no href attribute appears, continue to next level -->
+      <!-- If no href attribute appears, continue to next level -->
       <xsl:when test="count(@href)=0">
         <xsl:call-template name="list-image">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- href has been used, so create an anchor -->
-      <xsl:otherwise><a>
-        <xsl:apply-templates select="@*" mode="link">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
-        </xsl:apply-templates>
-        <xsl:call-template name="list-image">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
-        </xsl:call-template></a>
+      <!-- href has been used, so create an anchor -->
+      <xsl:otherwise>
+        <a>
+          <xsl:apply-templates select="@*" mode="link">
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
+          </xsl:apply-templates>
+          <xsl:call-template name="list-image">
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
+          </xsl:call-template>
+        </a>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- If the src attribute appears, make an image -->
+  <!-- If the src attribute appears, make an image -->
   <xsl:template name="list-image">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <img alt="{.}">
       <xsl:apply-templates select="@*" mode="image">
-        <xsl:with-param name="element" select="$element"/>
-        <xsl:with-param name="class" select="$class"/>
+        <xsl:with-param name="element" select="$element" />
+        <xsl:with-param name="class" select="$class" />
       </xsl:apply-templates>
     </img>
   </xsl:template>
-<!--
+  <!--
     - List Item rendering templates
     -->
-<!-- Create the element before any automatic inline children -->
+  <!-- Create the element before any automatic inline children -->
   <xsl:template name="listitem">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:element name="{$element}">
       <xsl:if test="$class">
         <xsl:attribute name="class">
-          <xsl:value-of select="$class"/>
+          <xsl:value-of select="$class" />
         </xsl:attribute>
       </xsl:if>
       <xsl:apply-templates select="@*">
-        <xsl:with-param name="element" select="$element"/>
-        <xsl:with-param name="class" select="$class"/>
+        <xsl:with-param name="element" select="$element" />
+        <xsl:with-param name="class" select="$class" />
       </xsl:apply-templates>
       <xsl:call-template name="listitem-insdel">
-        <xsl:with-param name="element" select="$element"/>
-        <xsl:with-param name="class" select="$class"/>
+        <xsl:with-param name="element" select="$element" />
+        <xsl:with-param name="class" select="$class" />
       </xsl:call-template>
     </xsl:element>
   </xsl:template>
-<!-- If the edit attribute has been used, add a ins or del as appropriate -->
+  <!-- If the edit attribute has been used, add a ins or del as appropriate -->
   <xsl:template name="listitem-insdel">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- No edit attribute, just call next level -->
+      <!-- No edit attribute, just call next level -->
       <xsl:when test="count(@edit)=0">
         <xsl:call-template name="listitem-link">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- Edit attribute set to "deleted", create a del element -->
+      <!-- Edit attribute set to "deleted", create a del element -->
       <xsl:when test="@edit='deleted'">
         <del>
           <xsl:apply-templates select="@*" mode="insdel">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="listitem-quote">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </del>
       </xsl:when>
-<!-- Edit attribute set to "inserted", "changed", "moved", create an ins
+      <!-- Edit attribute set to "inserted", "changed", "moved", create an ins
       -  element -->
       <xsl:otherwise>
         <ins>
           <xsl:apply-templates select="@*" mode="insdel">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="listitem-quote">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </ins>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- If the cite attribute appears without edit, create a quote element -->
+  <!-- If the cite attribute appears without edit, create a quote element -->
   <xsl:template name="listitem-quote">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If no cite attribute or edit was defined, continue to next level -->
+      <!-- If no cite attribute or edit was defined, continue to next level -->
       <xsl:when test="(count(@cite)=0) or (count(@edit)!=0)">
         <xsl:call-template name="listitem-link">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- Create the quote element -->
+      <!-- Create the quote element -->
       <xsl:otherwise>
         <q>
           <xsl:apply-templates select="@*" mode="quote">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
           <xsl:call-template name="listitem-link">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:call-template>
         </q>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- If the href attribute appears, make a hyperlink -->
+  <!-- If the href attribute appears, make a hyperlink -->
   <xsl:template name="listitem-link">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If no href attribute appears, continue to next level -->
+      <!-- If no href attribute appears, continue to next level -->
       <xsl:when test="count(@href)=0">
         <xsl:call-template name="listitem-image">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
+          <xsl:with-param name="element" select="$element" />
+          <xsl:with-param name="class" select="$class" />
         </xsl:call-template>
       </xsl:when>
-<!-- href has been used, so create an anchor -->
-      <xsl:otherwise><a>
-        <xsl:apply-templates select="@*" mode="link">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
-        </xsl:apply-templates>
-        <xsl:call-template name="listitem-image">
-          <xsl:with-param name="element" select="$element"/>
-          <xsl:with-param name="class" select="$class"/>
-        </xsl:call-template></a>
+      <!-- href has been used, so create an anchor -->
+      <xsl:otherwise>
+        <a>
+          <xsl:apply-templates select="@*" mode="link">
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
+          </xsl:apply-templates>
+          <xsl:call-template name="listitem-image">
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
+          </xsl:call-template>
+        </a>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- If the src attribute appears, make an image -->
+  <!-- If the src attribute appears, make an image -->
   <xsl:template name="listitem-image">
-    <xsl:param name="element"/>
-    <xsl:param name="class"/>
+    <xsl:param name="element" />
+    <xsl:param name="class" />
     <xsl:choose>
-<!-- If no src attribute appears, continue to next level -->
+      <!-- If no src attribute appears, continue to next level -->
       <xsl:when test="count(@src)=0">
-        <xsl:apply-templates/>
+        <xsl:apply-templates />
       </xsl:when>
-<!-- src has been used, so replace with an image -->
+      <!-- src has been used, so replace with an image -->
       <xsl:otherwise>
         <img alt="{.}">
           <xsl:apply-templates select="@*" mode="image">
-            <xsl:with-param name="element" select="$element"/>
-            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="element" select="$element" />
+            <xsl:with-param name="class" select="$class" />
           </xsl:apply-templates>
         </img>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!--
+  <!--
     - XHTML Structure Module
     -->
-<!-- Add our Subversion/CVS Id to the root element -->
+  <!-- Add our Subversion/CVS Id to the root element -->
   <xsl:template match="html:html">
-    <xsl:comment> $Id: xhtml2html.xslt 127 2004-11-14 03:06:21Z etherealwake $ </xsl:comment>
+    <xsl:comment>$Id: xhtml2html.xslt 127 2004-11-14 03:06:21Z etherealwake
+    $</xsl:comment>
     <html>
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates/>
+      <xsl:apply-templates select="@*" />
+      <xsl:apply-templates />
     </html>
   </xsl:template>
-<!-- Specify namespace for metadata (if not using schema.X links) -->
+  <!-- Specify namespace for metadata (if not using schema.X links) -->
   <xsl:template match="html:html/@profile">
     <xsl:attribute name="profile">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!-- Add a generator tag to the head section -->
+  <!-- Add a generator tag to the head section -->
   <xsl:template match="html:head">
     <head>
-      <xsl:apply-templates select="@*"/>
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-      <xsl:apply-templates/>
+      <xsl:apply-templates select="@*" />
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+      <xsl:apply-templates />
       <xsl:if test="count(html:meta[@name='generator'])=0">
-        <meta name="generator" content="Ethereal Wake XHTML2 to XHTML1 XSLT"/>
+        <meta name="generator" content="Ethereal Wake XHTML2 to XHTML1 XSLT" />
       </xsl:if>
     </head>
   </xsl:template>
-<!-- <title> and <body> are pretty much copied as is -->
+  <!-- <title> and <body> are pretty much copied as is -->
   <xsl:template match="html:title|html:body">
     <xsl:element name="{local-name()}">
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates/>
+      <xsl:apply-templates select="@*" />
+      <xsl:apply-templates />
     </xsl:element>
   </xsl:template>
-<!--
+  <!--
     - XHTML Block Text Module
     -->
-<!-- Handle the elements practically unchanged since XHTML 1.0 -->
-  <xsl:template match="html:address|html:blockquote|html:div|html:hr
-    |html:pre|html:hr">
+  <!-- Handle the elements practically unchanged since XHTML 1.0 -->
+  <xsl:template match="html:address|html:blockquote|html:div|html:hr |html:pre|html:hr">
+
     <xsl:call-template name="block">
-      <xsl:with-param name="element" select="local-name(.)"/>
+      <xsl:with-param name="element" select="local-name(.)" />
     </xsl:call-template>
   </xsl:template>
-<!-- In XHTML 2.0, paragraphs are a bit more sophisticated than in 1.X -->
+  <!-- In XHTML 2.0, paragraphs are a bit more sophisticated than in 1.X -->
   <xsl:template match="html:p">
     <xsl:choose>
-<!-- If we have XHTML 1.0 block children, make us a div -->
-      <xsl:when test="count(html:ul|html:ol|html:nl|html:dl|html:blockcode
-      |html:blockquote|html:pre|html:table)&gt;0">
+      <!-- If we have XHTML 1.0 block children, make us a div -->
+      <xsl:when test="count(html:ul|html:ol|html:nl|html:dl|html:blockcode |html:blockquote|html:pre|html:table)&gt;0">
+
         <xsl:call-template name="block">
-          <xsl:with-param name="element" select="'div'"/>
-          <xsl:with-param name="class" select="'p'"/>
+          <xsl:with-param name="element" select="'div'" />
+          <xsl:with-param name="class" select="'p'" />
         </xsl:call-template>
       </xsl:when>
-<!-- If no block children, be a traditional paragraph -->
+      <!-- If no block children, be a traditional paragraph -->
       <xsl:otherwise>
         <xsl:call-template name="block">
-          <xsl:with-param name="element" select="'p'"/>
+          <xsl:with-param name="element" select="'p'" />
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-<!-- We will treat sections as simple <div>s of class section -->
+  <!-- We will treat sections as simple <div>s of class section -->
   <xsl:template match="html:section">
     <xsl:call-template name="block">
-      <xsl:with-param name="element" select="'div'"/>
-      <xsl:with-param name="class" select="'section'"/>
+      <xsl:with-param name="element" select="'div'" />
+      <xsl:with-param name="class" select="'section'" />
     </xsl:call-template>
   </xsl:template>
-<!-- <h> gets mapped to a h# based on how many parent sections -->
+  <!-- <h> gets mapped to a h# based on how many parent sections -->
   <xsl:template match="html:h">
-<!-- Count the number of sections -->
+    <!-- Count the number of sections -->
     <xsl:variable name="levelbase">
-      <xsl:value-of select="count(ancestor::html:section)+$xhtml-heading"/>
+      <xsl:value-of select="count(ancestor::html:section)+$xhtml-heading" />
     </xsl:variable>
-<!-- Limit the heading element to h6 -->
+    <!-- Limit the heading element to h6 -->
     <xsl:variable name="level">
       <xsl:choose>
         <xsl:when test="$levelbase &gt; 6">6</xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="$levelbase"/>
+          <xsl:value-of select="$levelbase" />
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-<!-- Create the appropriate element -->
+    <!-- Create the appropriate element -->
     <xsl:call-template name="block">
-      <xsl:with-param name="element" select="concat('h',$level)"/>
+      <xsl:with-param name="element" select="concat('h',$level)" />
     </xsl:call-template>
   </xsl:template>
-<!--
+  <!--
     - XHTML Inline Text Module
     -->
-<!-- Handle the elements practically unchanged since XHTML 1.0 -->
-  <xsl:template match="html:abbr|html:cite|html:code|html:dfn|html:em
-    |html:kbd|html:samp|html:span|html:strong|html:sub|html:sup
-    |html:var">
+  <!-- Handle the elements practically unchanged since XHTML 1.0 -->
+  <xsl:template match="html:abbr|html:cite|html:code|html:dfn|html:em |html:kbd|html:samp|html:span|html:strong|html:sub|html:sup |html:var">
+
     <xsl:call-template name="inline">
-      <xsl:with-param name="element" select="local-name()"/>
+      <xsl:with-param name="element" select="local-name()" />
     </xsl:call-template>
   </xsl:template>
-<!-- quote maps to the 'q' element from XHTML 1.0 -->
+  <!-- quote maps to the 'q' element from XHTML 1.0 -->
   <xsl:template match="html:quote">
     <xsl:call-template name="inline">
-      <xsl:with-param name="element" select="'q'"/>
+      <xsl:with-param name="element" select="'q'" />
     </xsl:call-template>
   </xsl:template>
-<!-- <l> is a more complex version of HTML's <br> -->
+  <!-- <l> is a more complex version of HTML's <br> -->
   <xsl:template match="html:l">
     <xsl:call-template name="inline">
-      <xsl:with-param name="element" select="'br'"/>
+      <xsl:with-param name="element" select="'br'" />
     </xsl:call-template>
   </xsl:template>
-<!--
+  <!--
     - XHTML Hypertext Module
     -->
   <xsl:template match="html:a">
     <xsl:call-template name="inline">
-      <xsl:with-param name="element" select="'a'"/>
+      <xsl:with-param name="element" select="'a'" />
     </xsl:call-template>
   </xsl:template>
   <xsl:template match="html:a/@id" mode="link">
     <xsl:attribute name="id">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
     <xsl:attribute name="name">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!--
+  <!--
     - XHTML List Module
     -->
   <xsl:template match="html:ul|html:ol|html:dl">
     <xsl:call-template name="list">
-      <xsl:with-param name="element" select="local-name(.)"/>
+      <xsl:with-param name="element" select="local-name(.)" />
     </xsl:call-template>
   </xsl:template>
   <xsl:template match="html:li|html:dt|html:dd">
     <xsl:call-template name="listitem">
-      <xsl:with-param name="element" select="local-name(.)"/>
+      <xsl:with-param name="element" select="local-name(.)" />
     </xsl:call-template>
   </xsl:template>
-<!--
+  <!--
     - XHTML Linking Module
     -->
-  <xsl:template match="html:link"><link>
-    <xsl:apply-templates select="@*" mode="link"/></link>
+  <xsl:template match="html:link">
+    <link>
+      <xsl:apply-templates select="@*" mode="link" />
+    </link>
   </xsl:template>
   <xsl:template match="html:link/@media" mode="link">
     <xsl:attribute name="media">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
   <xsl:template match="html:link/@xml:lang" mode="link">
     <xsl:attribute name="hreflang">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!--
+  <!--
     - XHTML Metainformation Module
     -->
   <xsl:template match="html:meta">
     <meta>
-      <xsl:apply-templates select="@*"/>
+      <xsl:apply-templates select="@*" />
       <xsl:attribute name="content">
-        <xsl:value-of select="."/>
+        <xsl:value-of select="." />
       </xsl:attribute>
     </meta>
   </xsl:template>
   <xsl:template match="html:meta/@name">
     <xsl:attribute name="name">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!--
+  <!--
     - XHTML Object Module
     -->
-<!--
+  <!--
     - Ruby Module
     -->
-<!--
+  <!--
     - XHTML Scripting Module
     -->
-<!--
+  <!--
     - XHTML Style Sheet Module
     -->
   <xsl:template match="html:style">
     <style>
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates/>
+      <xsl:apply-templates select="@*" />
+      <xsl:apply-templates />
     </style>
   </xsl:template>
   <xsl:template match="html:style/@media">
     <xsl:attribute name="media">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!--
+  <!--
     - XHTML Tables Module
     -->
-<!-- Some table elements are pretty much left unchanged -->
-  <xsl:template match="html:caption|html:col|html:colgroup|html:thead
-    |html:tfoot|html:tbody|html:tr">
+  <!-- Some table elements are pretty much left unchanged -->
+  <xsl:template match="html:caption|html:col|html:colgroup|html:thead |html:tfoot|html:tbody|html:tr">
+
     <xsl:element name="{local-name()}">
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates/>
+      <xsl:apply-templates select="@*" />
+      <xsl:apply-templates />
     </xsl:element>
   </xsl:template>
   <xsl:template match="html:col/@span|html:colspan/@span">
     <xsl:attribute name="span">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!-- td and th are pretty much as they were -->
+  <!-- td and th are pretty much as they were -->
   <xsl:template match="html:td|html:th">
     <xsl:call-template name="listitem">
-      <xsl:with-param name="element" select="local-name()"/>
+      <xsl:with-param name="element" select="local-name()" />
     </xsl:call-template>
   </xsl:template>
-  <xsl:template match="html:td/@abbr|html:td/@axis|html:td/@colspan
-    |html:td/@headers|html:td/@rowspan|html:td/@scope|html:th/@abbr
-    |html:th/@axis|html:th/@colspan|html:th/@headers|html:th/@rowspan
-    |html:th/@scope">
+  <xsl:template match="html:td/@abbr|html:td/@axis|html:td/@colspan |html:td/@headers|html:td/@rowspan|html:td/@scope|html:th/@abbr |html:th/@axis|html:th/@colspan|html:th/@headers|html:th/@rowspan |html:th/@scope">
+
     <xsl:attribute name="{local-name()}">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." />
     </xsl:attribute>
   </xsl:template>
-<!-- The table element acts a lot like a list -->
+  <!-- The table element acts a lot like a list -->
   <xsl:template match="html:table">
     <xsl:call-template name="list">
-      <xsl:with-param name="element" select="'table'"/>
+      <xsl:with-param name="element" select="'table'" />
     </xsl:call-template>
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts-to-document.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts-to-document.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts-to-document.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts-to-document.xsl Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,81 +15,80 @@
   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:xhtml="http://www.w3.org/1999/xhtml" 
-  xmlns:dir="http://apache.org/cocoon/directory/2.0" 
-  xmlns:session="http://apache.org/cocoon/session/1.0" 
-  xmlns:forrest="http://apache.org/forrest/templates/1.0" >
-<!--
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:xhtml="http://www.w3.org/1999/xhtml"
+xmlns:dir="http://apache.org/cocoon/directory/2.0"
+xmlns:session="http://apache.org/cocoon/session/1.0"
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <!--
       Create row for each document.  Information about the document is
       extracted from the document itself using the document()
       function.
   -->
-  <xsl:param name="requestedContract" select="'false'"/>
-  <xsl:param name="less" select="'false'"/>
+  <xsl:param name="requestedContract" select="'false'" />
+  <xsl:param name="less" select="'false'" />
   <xsl:template match="/">
     <xsl:if test="$less='false'">
       <document>
         <header>
-          <title>ls.contract<xsl:if 
-            test="$requestedContract='false'">s</xsl:if>
-            <xsl:if 
-            test="$requestedContract!='false'">&#160;<xsl:value-of 
-            select="$requestedContract" />
-            </xsl:if></title>
+          <title>ls.contract 
+          <xsl:if test="$requestedContract='false'">s</xsl:if>
+          <xsl:if test="$requestedContract!='false'">&#160; 
+          <xsl:value-of select="$requestedContract" /></xsl:if></title>
         </header>
         <body>
           <xsl:choose>
             <xsl:when test="$requestedContract='false'">
-              <xsl:apply-templates/>
+              <xsl:apply-templates />
             </xsl:when>
             <xsl:otherwise>
-              <xsl:apply-templates 
-                select=".//forrest:contract[@name=$requestedContract]"/>
+              <xsl:apply-templates select=".//forrest:contract[@name=$requestedContract]" />
             </xsl:otherwise>
           </xsl:choose>
         </body>
       </document>
     </xsl:if>
     <xsl:if test="$less='true'">
-      <xsl:apply-templates 
-        select=".//forrest:contract[@name=$requestedContract]"/>
+      <xsl:apply-templates select=".//forrest:contract[@name=$requestedContract]" />
     </xsl:if>
   </xsl:template>
   <xsl:template match="forrest:theme">
-    <xsl:variable select="@name" name="name"/>
+    <xsl:variable select="@name" name="name" />
     <section id="{$name}">
-      <title> theme name: <xsl:value-of select="@name" /></title>
+      <title>theme name: 
+      <xsl:value-of select="@name" /></title>
       <xsl:apply-templates select="./forrest:contract">
-        <xsl:with-param select="$name" name="theme"/>
+        <xsl:with-param select="$name" name="theme" />
       </xsl:apply-templates>
     </section>
   </xsl:template>
   <xsl:template match="forrest:contract">
-    <xsl:param name="theme" select="common"/>
+    <xsl:param name="theme" select="common" />
     <xsl:choose>
       <xsl:when test="$requestedContract!='false'">
         <section id="{@name}">
-          <xsl:call-template name="innerBodyLs"/>
+          <xsl:call-template name="innerBodyLs" />
         </section>
       </xsl:when>
       <xsl:otherwise>
         <section id="{$theme}-{@name}">
-          <xsl:call-template name="innerBodyLs"/>
+          <xsl:call-template name="innerBodyLs" />
         </section>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
   <xsl:template name="innerBodyLs">
-    <title><xsl:value-of select="@name" /></title>
+    <title>
+      <xsl:value-of select="@name" />
+    </title>
     <p class="file">
       <strong>file-name:</strong>
-      <br/>
+      <br />
       <xsl:value-of select="@file-name" />
     </p>
     <p class="description">
       <strong>description:</strong>
-      <br/>
+      <br />
       <xsl:if test="./description/*">
         <xsl:copy-of select="./description/*" />
       </xsl:if>
@@ -106,9 +105,10 @@
     <p class="template-definition">
       <strong>forrest-template definition:</strong>
     </p>
-    <source>&lt;forrest:template<xsl:apply-templates 
-      select="./forrest:template/@*" />/&gt; </source>
+    <source>&lt;forrest:template 
+    <xsl:apply-templates select="./forrest:template/@*" />/&gt;</source>
   </xsl:template>
-  <xsl:template match="forrest:template/@*">&#160;<xsl:value-of 
-    select="name()"/>="<xsl:value-of select="."/>"</xsl:template>
+  <xsl:template match="forrest:template/@*">&#160; 
+  <xsl:value-of select="name()" />=" 
+  <xsl:value-of select="." />"</xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts.xsl Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,12 +15,12 @@
   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" 
-  xmlns:forrest="http://apache.org/forrest/templates/1.0" >
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:dir="http://apache.org/cocoon/directory/2.0"
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <xsl:template match="/">
     <forrest:themes xmlns:forrest="http://apache.org/forrest/templates/1.0">
-      <xsl:apply-templates select="dir:directory/dir:directory"/>
+      <xsl:apply-templates select="dir:directory/dir:directory" />
     </forrest:themes>
   </xsl:template>
   <xsl:template match="dir:directory">
@@ -30,14 +30,14 @@
   </xsl:template>
   <xsl:template match="dir:file[./*/*/@name]">
     <forrest:contract name="{./*/*/@name}" file-name="{@name}">
-      <xsl:copy-of select="./*/*/description"/>
-      <xsl:copy-of select="./*/*/usage"/>
-      <xsl:apply-templates select=".//forrest:template"/>
+      <xsl:copy-of select="./*/*/description" />
+      <xsl:copy-of select="./*/*/usage" />
+      <xsl:apply-templates select=".//forrest:template" />
     </forrest:contract>
   </xsl:template>
   <xsl:template match="forrest:template">
     <forrest:template>
-      <xsl:copy-of select="@*"/>
+      <xsl:copy-of select="@*" />
     </forrest:template>
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-abstract.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-abstract.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-abstract.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-abstract.xsl Wed Dec  2 13:58:18 2009
@@ -20,12 +20,12 @@
 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 match="document">
     <div class="abstract">
-      <xsl:value-of select="header/abstract"/>
+      <xsl:value-of select="header/abstract" />
     </div>
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-authors.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-authors.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-authors.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-authors.xsl Wed Dec  2 13:58:18 2009
@@ -20,12 +20,12 @@
 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 match="document">
     <div id="content-authors">
-      <xsl:apply-templates select="header/authors"/>
+      <xsl:apply-templates select="header/authors" />
     </div>
   </xsl:template>
   <xsl:template match="header/authors">
@@ -33,10 +33,10 @@
       <xsl:for-each select="person">
         <div class="author">
           <div class="name">
-            <xsl:value-of select="@name"/>
+            <xsl:value-of select="@name" />
           </div>
           <div class="email">
-            <xsl:value-of select="@email"/>
+            <xsl:value-of select="@email" />
           </div>
         </div>
       </xsl:for-each>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-notice.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-notice.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-notice.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-notice.xsl Wed Dec  2 13:58:18 2009
@@ -22,7 +22,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:template match="document">
     <div class="notice">
-      <xsl:value-of select="header/notice"/>
+      <xsl:value-of select="header/notice" />
     </div>
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-title.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-title.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-title.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-title.xsl Wed Dec  2 13:58:18 2009
@@ -20,19 +20,19 @@
 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 match="document">
     <xsl:choose>
       <xsl:when test="header/title">
-        <xsl:copy-of select="header/title"/>
+        <xsl:copy-of select="header/title" />
       </xsl:when>
       <xsl:otherwise>
         <title>*No* title found</title>
       </xsl:otherwise>
     </xsl:choose>
-<!-- FIXME - Need to manage the subtitle -->
-<!--xsl:copy-of select="header/subtitle"/-->
+    <!-- FIXME - Need to manage the subtitle -->
+    <!--xsl:copy-of select="header/subtitle"/-->
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl Wed Dec  2 13:58:18 2009
@@ -20,33 +20,32 @@
 imported document2html.xsl for details.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:include href="../helper/generateId.xsl"/>
-<!--  Templates for "toc" mode.  This will generate a complete
+  <xsl:include href="lm://transform.xml.generateId" />
+  <!--  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 match="document">
-    <xsl:apply-templates mode="toc"/>
+    <xsl:apply-templates mode="toc" />
   </xsl:template>
   <xsl:template match="body" mode="toc">
     <tocitems>
       <xsl:apply-templates select="section" mode="toc">
-        <xsl:with-param name="level" select="1"/>
+        <xsl:with-param name="level" select="1" />
       </xsl:apply-templates>
     </tocitems>
   </xsl:template>
   <xsl:template match="section" mode="toc">
-    <xsl:param name="level"/>
+    <xsl:param name="level" />
     <tocitem level="{$level}">
-      <xsl:attribute name="href">#<xsl:call-template 
-        name="generate-id"/>
-      </xsl:attribute>
+      <xsl:attribute name="href"># 
+      <xsl:call-template name="generate-id" /></xsl:attribute>
       <xsl:attribute name="title">
-        <xsl:value-of select="title"/>
+        <xsl:value-of select="title" />
       </xsl:attribute>
       <xsl:apply-templates mode="toc">
-        <xsl:with-param name="level" select="$level+1"/>
+        <xsl:with-param name="level" select="$level+1" />
       </xsl:apply-templates>
     </tocitem>
   </xsl:template>
-  <xsl:template match="node()|@*" mode="toc"/>
+  <xsl:template match="node()|@*" mode="toc" />
 </xsl:stylesheet>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec  2 13:58:18 2009
@@ -0,0 +1 @@
+target



Mime
View raw message