forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527027 [1/2] - in /forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook: ./ resources/stylesheets/ src/documentation/ src/documentation/content/xdocs/ src/documentation/content/xdocs/samples/ src/documentation/translations/
Date Tue, 10 Apr 2007 04:56:57 GMT
Author: crossley
Date: Mon Apr  9 21:56:56 2007
New Revision: 527027

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

Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/build.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/input.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/locationmap.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/resources/stylesheets/sdocbook-to-document.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/index.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/samples/sdocbook.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/site.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/tabs.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/skinconf.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_af.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_es.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_it.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_no.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_ru.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_sk.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/status.xml

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/build.xml?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/build.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/build.xml Mon Apr  9 21:56:56 2007
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
-
   <property name="plugin-name" value="org.apache.forrest.plugin.input.simplifiedDocbook"/>
   <property name="forrest.version" value="0.8"/>
   <property name="type" value="input"/>
@@ -26,10 +25,8 @@
   <property name="websiteURL" value="http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.input.simplifiedDocbook"/>
   <property name="downloadURL" value="http://forrest.apache.org/plugins/"/>
   <property name="publish" value="true"/>
-    
   <import file="../build.xml"/>
-  
-  <!-- Add any additional installation work here in the build target, for example:
+<!-- Add any additional installation work here in the build target, for example:
   <target name="build"
           description="Extract the tools">
      <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
@@ -40,5 +37,3 @@
   </target>
   -->
 </project>
-  
-  

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/input.xmap?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/input.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/input.xmap Mon Apr  9 21:56:56 2007
@@ -15,14 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-  <!-- ============================================================ -->
-  <!-- org.apache.forrest.plugin.input.simplifiedDocbook Plugin                                    -->
-  <!-- This plugin allows Simplified DocBook files to be            -->
-  <!-- used in a Forrest site                                       -->
-  <!-- ============================================================ -->
-
+<!-- ============================================================ -->
+<!-- org.apache.forrest.plugin.input.simplifiedDocbook Plugin                                    -->
+<!-- This plugin allows Simplified DocBook files to be            -->
+<!-- used in a Forrest site                                       -->
+<!-- ============================================================ -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
   <map:components>
     <map:actions>
       <map:action logger="sitemap.action.sourcetype" name="sourcetype" src="org.apache.forrest.sourcetype.SourceTypeAction">
@@ -37,39 +35,33 @@
         </sourcetype>
         <sourcetype name="sdocbook-v1.0">
           <document-declaration public-id="-//OASIS//DTD Simplified DocBook XML V1.0//EN" />
-        </sourcetype> 
+        </sourcetype>
       </map:action>
     </map:actions>
-    
     <map:selectors default="parameter">
-	    <map:selector logger="sitemap.selector.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector" />
+      <map:selector logger="sitemap.selector.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector" />
     </map:selectors>
   </map:components>
-  
-  <map:resources>    
+  <map:resources>
     <map:resource name="transform-to-document">
       <map:act type="sourcetype" src="{src}">
         <map:select type="parameter">
           <map:parameter name="parameter-selector-test" value="{sourcetype}" />
-
           <map:when test="docbook-v4.1.2">
             <map:generate src="{lm:project.{../../1}.xml}" />
             <map:transform src="{lm:simplifiedDocbook.transform.sdocbook.document}" />
             <map:serialize type="xml-document"/>
           </map:when>
-          
           <map:when test="docbook-v4.2">
             <map:generate src="{lm:project.{../../1}.xml}" />
             <map:transform src="{lm:simplifiedDocbook.transform.sdocbook.document}" />
             <map:serialize type="xml-document"/>
           </map:when>
-
           <map:when test="sdocbook-v1.0">
             <map:generate src="{lm:project.{../../1}.xml}" />
             <map:transform src="{lm:simplifiedDocbook.transform.sdocbook.document}" />
             <map:serialize type="xml-document"/>
           </map:when>
-
           <map:when test="sdocbook-v4.1.2.5">
             <map:generate src="{lm:project.{../../1}.xml}" />
             <map:transform src="{lm:simplifiedDocbook.transform.sdocbook.document}" />
@@ -79,7 +71,6 @@
       </map:act>
     </map:resource>
   </map:resources>
-  
   <map:pipelines>
     <map:pipeline internal="true">
       <map:match pattern="**.xml">

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/locationmap.xml?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/locationmap.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/locationmap.xml Mon Apr  9 21:56:56 2007
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher 
@@ -24,14 +23,13 @@
         src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
     </matchers>
     <selectors default="exists">
-          <selector name="exists" logger="sitemap.selector.exists"  
+      <selector name="exists" logger="sitemap.selector.exists"  
                     src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </selectors>
   </components>
-  
-  <locator>  
+  <locator>
     <match pattern="simplifiedDocbook.transform.*.*">
-        <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+      <location src="resources/stylesheets/{1}-to-{2}.xsl" />
     </match>
   </locator>
 </locationmap>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/resources/stylesheets/sdocbook-to-document.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/resources/stylesheets/sdocbook-to-document.xsl?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/resources/stylesheets/sdocbook-to-document.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/resources/stylesheets/sdocbook-to-document.xsl Mon Apr  9 21:56:56 2007
@@ -26,177 +26,175 @@
 
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-      <xsl:template match="/">
-            <xsl:apply-templates select="book|chapter|revhistory|article|refentry"/>
-      </xsl:template>
-
-    <xsl:template match="refentry">
-        <document>
-            <header>
-            <title><xsl:value-of select="refmeta/refentrytitle"/><xsl:apply-templates select="refmeta/manvolnum"/></title>
-            </header>
-            <body>
-              <xsl:apply-templates select="refnamediv"/>
-              <xsl:apply-templates select="refsynopsisdiv"/>
-              <xsl:apply-templates select="refsect1"/>
-            </body>
-        </document>
-    </xsl:template>
-    
-    <xsl:template match="manvolnum">
+  <xsl:template match="/">
+    <xsl:apply-templates select="book|chapter|revhistory|article|refentry"/>
+  </xsl:template>
+  <xsl:template match="refentry">
+    <document>
+      <header>
+        <title><xsl:value-of select="refmeta/refentrytitle"/>
+          <xsl:apply-templates select="refmeta/manvolnum"/></title>
+      </header>
+      <body>
+        <xsl:apply-templates select="refnamediv"/>
+        <xsl:apply-templates select="refsynopsisdiv"/>
+        <xsl:apply-templates select="refsect1"/>
+      </body>
+    </document>
+  </xsl:template>
+  <xsl:template match="manvolnum">
       (<xsl:value-of select="."/>)
     </xsl:template>
-
-    <xsl:template match="refsect1">
-       <section>
-         <xsl:apply-templates/>
-       </section>
-    </xsl:template>
-    
-    <xsl:template match="refsynopsisdiv">
-      <section>
-        <title>SYNOPSIS</title>
-        <xsl:apply-templates select="cmdsynopsis"/>
-      </section>
-    </xsl:template>
-    
-    <xsl:template match="refnamediv">
-        <section>
-        <title>NAME</title>
-        <p>
+  <xsl:template match="refsect1">
+    <section>
+      <xsl:apply-templates/>
+    </section>
+  </xsl:template>
+  <xsl:template match="refsynopsisdiv">
+    <section>
+      <title>SYNOPSIS</title>
+      <xsl:apply-templates select="cmdsynopsis"/>
+    </section>
+  </xsl:template>
+  <xsl:template match="refnamediv">
+    <section>
+      <title>NAME</title>
+      <p>
         <xsl:value-of select="refname"/>
         <xsl:apply-templates select="refpurpose"/>
-        </p>
-        <xsl:apply-templates select="refdescriptor"/>
-        </section>
-    </xsl:template>
-    
-    <xsl:template match="refdescriptor">
-        <p>
-            <xsl:value-of select="."/>
-        </p>
-    </xsl:template>
-
-    <xsl:template match="refpurpose">
+      </p>
+      <xsl:apply-templates select="refdescriptor"/>
+    </section>
+  </xsl:template>
+  <xsl:template match="refdescriptor">
+    <p>
+      <xsl:value-of select="."/>
+    </p>
+  </xsl:template>
+  <xsl:template match="refpurpose">
       - <xsl:value-of select="."/>
-    </xsl:template>
-
-      <xsl:template match="book">
-            <document>
-                  <header>
-                        <xsl:apply-templates select="bookinfo/title"/>
-                        <xsl:apply-templates select="bookinfo/subtitle"/>
-                        <authors>
-                              <xsl:apply-templates select="bookinfo/author"/>
-                        </authors>
-                        <!--
+  </xsl:template>
+  <xsl:template match="book">
+    <document>
+      <header>
+        <xsl:apply-templates select="bookinfo/title"/>
+        <xsl:apply-templates select="bookinfo/subtitle"/>
+        <authors>
+          <xsl:apply-templates select="bookinfo/author"/>
+        </authors>
+<!--
                         <notice/>
                         <abstract/>
                         -->
-                  </header>
-                  <body>
-                        <xsl:apply-templates select="node()[ local-name() != 'bookinfo']"/>
-                        <xsl:call-template name="apply-footnotes"/>
-                  </body>
-            </document>
-      </xsl:template>
-
-      <xsl:template match="chapter">
-            <document>
-                  <header>
-                        <xsl:apply-templates select="title"/>
-                        <xsl:apply-templates select="subtitle"/>
-                        <authors>
-                              <xsl:apply-templates select="chapterinfo/authorgroup/author"/>
-                        </authors>
-                  </header>
-                  <body>
-                        <xsl:apply-templates select="node()[
+      </header>
+      <body>
+        <xsl:apply-templates select="node()[ local-name() != 'bookinfo']"/>
+        <xsl:call-template name="apply-footnotes"/>
+      </body>
+    </document>
+  </xsl:template>
+  <xsl:template match="chapter">
+    <document>
+      <header>
+        <xsl:apply-templates select="title"/>
+        <xsl:apply-templates select="subtitle"/>
+        <authors>
+          <xsl:apply-templates select="chapterinfo/authorgroup/author"/>
+        </authors>
+      </header>
+      <body>
+        <xsl:apply-templates select="node()[
                               local-name() != 'title' and
                               local-name() != 'subtitle' and
                               local-name() != 'chapterinfo' 
                               ]"/>
-                        <xsl:call-template name="apply-footnotes"/>
-                  </body>
-            </document>
-      </xsl:template>
-
-       <xsl:template match="article">
-             <document>
-                   <header>
-                         <xsl:apply-templates select="articleinfo/title|title"/>
-                         <xsl:apply-templates select="articleinfo/subtitle|subtitle"/>
-                         <authors>
-                               <xsl:apply-templates select="articleinfo/author"/>
-                               <xsl:apply-templates select="articleinfo/corpauthor"/>
-                         </authors>
-                   </header>
-                   <body>
-                         <xsl:call-template name="extract-articleinfo"/>
-                         <xsl:apply-templates select="node()[
+        <xsl:call-template name="apply-footnotes"/>
+      </body>
+    </document>
+  </xsl:template>
+  <xsl:template match="article">
+    <document>
+      <header>
+        <xsl:apply-templates select="articleinfo/title|title"/>
+        <xsl:apply-templates select="articleinfo/subtitle|subtitle"/>
+        <authors>
+          <xsl:apply-templates select="articleinfo/author"/>
+          <xsl:apply-templates select="articleinfo/corpauthor"/>
+        </authors>
+      </header>
+      <body>
+        <xsl:call-template name="extract-articleinfo"/>
+        <xsl:apply-templates select="node()[
                                local-name() != 'title' and
                                local-name() != 'subtitle' and
                                local-name() != 'articleinfo'
                                ]"/>
-                         <xsl:call-template name="apply-footnotes"/>
-                   </body>
-             </document>
-       </xsl:template>
-
-      <xsl:template name="extract-articleinfo">
-          <xsl:if test="articleinfo/copyright">
-              <section id="pubinfo">
-                  <title>Publication Information</title>
-                  <xsl:if test="articleinfo/pubdate">
-                      <p>Date published:
-                          <xsl:value-of select="articleinfo/pubdate"/>
-                      </p>
-                  </xsl:if>
-                  <xsl:apply-templates select="articleinfo/copyright"/>
-              </section>
-          </xsl:if>
-      </xsl:template>
-
-      <xsl:template name="apply-footnotes">
-            <xsl:if test="//footnote">
-                  <section><title>Footnotes</title>
-                        <xsl:apply-templates select="//footnote" mode="base"/>
-                  </section>
-            </xsl:if>
-      </xsl:template>
-
-      <xsl:template match="author">
-            <xsl:element name="person">
-                  <xsl:if test="id"><xsl:attribute name="id"><xsl:value-of select="id"/></xsl:attribute></xsl:if>
-                  <xsl:attribute name="name">
-                        <xsl:if test="honorific"><xsl:value-of select="honorific"/>. </xsl:if>
-                        <xsl:if test="firstname"><xsl:value-of select="firstname"/></xsl:if>
-                        <xsl:text> </xsl:text><xsl:value-of select="surname"/>
-                        <xsl:if test="affiliation">
-                            <xsl:text> (</xsl:text>
+        <xsl:call-template name="apply-footnotes"/>
+      </body>
+    </document>
+  </xsl:template>
+  <xsl:template name="extract-articleinfo">
+    <xsl:if test="articleinfo/copyright">
+      <section id="pubinfo">
+        <title>Publication Information</title>
+        <xsl:if test="articleinfo/pubdate">
+          <p>
+            Date published:
+            <xsl:value-of select="articleinfo/pubdate"/>
+          </p>
+        </xsl:if>
+        <xsl:apply-templates select="articleinfo/copyright"/>
+      </section>
+    </xsl:if>
+  </xsl:template>
+  <xsl:template name="apply-footnotes">
+    <xsl:if test="//footnote">
+      <section>
+        <title>Footnotes</title>
+        <xsl:apply-templates select="//footnote" mode="base"/>
+      </section>
+    </xsl:if>
+  </xsl:template>
+  <xsl:template match="author">
+    <xsl:element name="person">
+      <xsl:if test="id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="id"/>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:attribute name="name">
+        <xsl:if test="honorific">
+          <xsl:value-of select="honorific"/>. </xsl:if>
+        <xsl:if test="firstname">
+          <xsl:value-of select="firstname"/>
+        </xsl:if>
+<xsl:text> </xsl:text>
+        <xsl:value-of select="surname"/>
+        <xsl:if test="affiliation">
+<xsl:text> (</xsl:text>
 <!-- FIXME: horrid hack - there can be zero-or-more jobtitle -->
-                            <xsl:if test="affiliation/jobtitle">
-                                <xsl:value-of select="affiliation/jobtitle"/>
-                                <xsl:text>, </xsl:text>
-                            </xsl:if>
-                            <xsl:if test="affiliation/orgname">
-                                <xsl:value-of select="affiliation/orgname"/>
-                            </xsl:if>
-                            <xsl:text>)</xsl:text>
-                        </xsl:if>
-                  </xsl:attribute>
-                  <xsl:attribute name="email"><xsl:value-of select="address/email"/></xsl:attribute>
-            </xsl:element>
-      </xsl:template>
-      <xsl:template match="chapter">
-            <section>
-                  <xsl:apply-templates/>
-            </section>
-      </xsl:template>
-      
-      <xsl:template match="cmdsynopsis">
-            <!--
+          <xsl:if test="affiliation/jobtitle">
+            <xsl:value-of select="affiliation/jobtitle"/>
+<xsl:text>, </xsl:text>
+          </xsl:if>
+          <xsl:if test="affiliation/orgname">
+            <xsl:value-of select="affiliation/orgname"/>
+          </xsl:if>
+<xsl:text>)</xsl:text>
+        </xsl:if>
+      </xsl:attribute>
+      <xsl:attribute name="email">
+        <xsl:value-of select="address/email"/>
+      </xsl:attribute>
+    </xsl:element>
+  </xsl:template>
+  <xsl:template match="chapter">
+    <section>
+      <xsl:apply-templates/>
+    </section>
+  </xsl:template>
+  <xsl:template match="cmdsynopsis">
+<!--
             <cmdsynopsis>
                   <command>xindice add_collection</command>
                   <arg choice="req">-c <replaceable>context</replaceable></arg>
@@ -204,651 +202,640 @@
                   <arg choice="opt">-v <replaceable></replaceable></arg>
             </cmdsynopsis>
             -->
-            <p>
-                  <code class="cmdsynopsis">
-                        <xsl:value-of select="command"/>
-                        <xsl:apply-templates select="node()[ local-name() != 'command' ]"/>
-                  </code>
-            </p>
-      </xsl:template>
-      <xsl:template match="arg">
-            <xsl:choose>
-                  <xsl:when test="@choice = 'req' ">
-                        <xsl:apply-templates/>
-                  </xsl:when>
-                  <xsl:otherwise>
+    <p>
+      <code class="cmdsynopsis">
+      <xsl:value-of select="command"/>
+      <xsl:apply-templates select="node()[ local-name() != 'command' ]"/>
+      </code>
+    </p>
+  </xsl:template>
+  <xsl:template match="arg">
+    <xsl:choose>
+      <xsl:when test="@choice = 'req' ">
+        <xsl:apply-templates/>
+      </xsl:when>
+      <xsl:otherwise>
                         [<xsl:apply-templates/>]
                   </xsl:otherwise>
-            </xsl:choose>
-      </xsl:template>
-      <xsl:template match="replaceable">
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="replaceable">
             (or <xsl:value-of select="."/>)
       </xsl:template>
-      <xsl:template match="bridgehead">
-            <section>
-                  <title>
-                        <xsl:value-of select="."/>
-                  </title>
-            </section>
-      </xsl:template>
-      <xsl:template match="example">
-            <!-- changed to note because section gives a hard time
+  <xsl:template match="bridgehead">
+    <section>
+      <title><xsl:value-of select="."/></title>
+    </section>
+  </xsl:template>
+  <xsl:template match="example">
+<!-- changed to note because section gives a hard time
                  to set the class: it's done in skins/common, pelt 
                  and then in site2xhtml, too :-(  -->
-            <note class="example" label="{title}">
-                  <xsl:apply-templates/>
-            </note>
-      </xsl:template>
-      <xsl:template match="note">
-            <note>
-              <xsl:if test="title">
-                <xsl:attribute name="label"><xsl:value-of select="title"/></xsl:attribute>
-              </xsl:if>
-              <xsl:apply-templates/>
-            </note>
-      </xsl:template>
-      <xsl:template match="informaltable">
-            <table>
-                  <xsl:apply-templates/>
-            </table>
-      </xsl:template>
-      <xsl:template match="anchor">
-            <!--
+    <note class="example" label="{title}">
+      <xsl:apply-templates/>
+    </note>
+  </xsl:template>
+  <xsl:template match="note">
+    <note>
+      <xsl:if test="title">
+        <xsl:attribute name="label">
+          <xsl:value-of select="title"/>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:apply-templates/>
+    </note>
+  </xsl:template>
+  <xsl:template match="informaltable">
+    <table>
+      <xsl:apply-templates/>
+    </table>
+  </xsl:template>
+  <xsl:template match="anchor">
+<!--
             <a name="{.}"/>
             -->
-            <xsl:element name="link">
-                  <xsl:if test="@href">
-                        <xsl:attribute name="href"><xsl:value-of select="@href"/></xsl:attribute>
-                  </xsl:if>
-                  <xsl:attribute name="id"><xsl:value-of select="."/></xsl:attribute>
-            </xsl:element>
-      </xsl:template>
-      <xsl:template match="a">
-            <link href="{@href}">
-                  <xsl:value-of select="."/>
-            </link>
-      </xsl:template>
-      <xsl:template match="subtitle">
-            <subtitle>
-                  <xsl:value-of select="."/>
-            </subtitle>
-      </xsl:template>
-      <xsl:template match="title">
-            <title>
-                  <xsl:value-of select="."/>
-            </title>
-      </xsl:template>
-      <xsl:template match="affiliation">
-            <li>
-                  <xsl:text>[</xsl:text>
-                  <xsl:value-of select="shortaffil"/>
-                  <xsl:text>] </xsl:text>
-                  <b>
-                        <xsl:value-of select="jobtitle"/>
-                  </b>
-                  <i>
-                        <xsl:value-of select="orgname"/>
-                        <xsl:if test="orgdiv">
-                              <xsl:text>/</xsl:text>
-                              <xsl:value-of select="orgdiv"/>
-                        </xsl:if>
-                  </i>
-            </li>
-      </xsl:template>
-      <xsl:template match="authorblurb">
-            <section title="Bio">
-                  <xsl:apply-templates/>
-            </section>
-      </xsl:template>
-      <xsl:template match="honorific|firstname|surname|orgdiv|orgname|shortaffil|jobtitle"/>
-      <xsl:template match="revhistory">
-            <document>
-                  <header>
-                        <title>Revision History</title>
-                  </header>
-                  <body>
-                        <section>
-                              <title>Revision History</title>
-                              <table>
-                                    <xsl:variable name="unique-revisions" select="revision[not(revnumber=preceding-sibling::revision/revnumber)]/revnumber"/>
-                                    <xsl:variable name="base" select="."/>
-                                    <xsl:for-each select="$unique-revisions">
-                                          <tr>
-                                                <td>
-                                                      <b>Revision <xsl:value-of select="."/> 
+    <xsl:element name="link">
+      <xsl:if test="@href">
+        <xsl:attribute name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:attribute name="id">
+        <xsl:value-of select="."/>
+      </xsl:attribute>
+    </xsl:element>
+  </xsl:template>
+  <xsl:template match="a"><link href="{@href}">
+    <xsl:value-of select="."/></link>
+  </xsl:template>
+  <xsl:template match="subtitle">
+    <subtitle>
+      <xsl:value-of select="."/>
+    </subtitle>
+  </xsl:template>
+  <xsl:template match="title">
+    <title><xsl:value-of select="."/></title>
+  </xsl:template>
+  <xsl:template match="affiliation">
+    <li><xsl:text>[</xsl:text>
+      <xsl:value-of select="shortaffil"/>
+<xsl:text>] </xsl:text>
+      <b>
+        <xsl:value-of select="jobtitle"/>
+      </b>
+      <i>
+        <xsl:value-of select="orgname"/>
+        <xsl:if test="orgdiv">
+<xsl:text>/</xsl:text>
+          <xsl:value-of select="orgdiv"/>
+        </xsl:if>
+      </i></li>
+  </xsl:template>
+  <xsl:template match="authorblurb">
+    <section title="Bio">
+      <xsl:apply-templates/>
+    </section>
+  </xsl:template>
+  <xsl:template match="honorific|firstname|surname|orgdiv|orgname|shortaffil|jobtitle"/>
+  <xsl:template match="revhistory">
+    <document>
+      <header>
+        <title>Revision History</title>
+      </header>
+      <body>
+        <section>
+          <title>Revision History</title>
+          <table>
+            <xsl:variable name="unique-revisions" select="revision[not(revnumber=preceding-sibling::revision/revnumber)]/revnumber"/>
+            <xsl:variable name="base" select="."/>
+            <xsl:for-each select="$unique-revisions">
+              <tr>
+                <td>
+                  <b>Revision <xsl:value-of select="."/> 
                                                             (<xsl:value-of select="$base/revision[revnumber=current()]/date"/>)
                                                       </b>
-                                                </td>
-                                          </tr>
-                                          <tr>
-                                                <td>
-                                                      <font color="#000000" face="arial,helvetica,sanserif">
-                                                            <br/>
-                                                            <ul>
-                                                                  <xsl:apply-templates select="$base/revision[revnumber=current()]"/>
-                                                            </ul>
-                                                      </font>
-                                                </td>
-                                          </tr>
-                                    </xsl:for-each>
-                              </table>
-                        </section>
-                  </body>
-            </document>
-      </xsl:template>
-
-      <xsl:template match="para">
-            <p><xsl:apply-templates/></p>
-      </xsl:template>
-
-      <xsl:template match="emphasis">
-          <xsl:choose>
-              <xsl:when test="@role='bold'">
-                  <strong><xsl:apply-templates/></strong>
-              </xsl:when>
-              <xsl:otherwise>
-                  <em><xsl:apply-templates/></em>
-              </xsl:otherwise>
-          </xsl:choose>
-       </xsl:template>
-
-      <xsl:template match="firstterm">
-            <em><xsl:apply-templates/></em>
-      </xsl:template>
-
-      <xsl:template match="revision">
-            <li>
-                  <xsl:choose>
-                        <xsl:when test="@revisionflag='added'">
-                              <img align="absmiddle" alt="added" src="images/add.jpg"/>
-                        </xsl:when>
-                        <xsl:when test="@revisionflag='changed'">
-                              <img align="absmiddle" alt="changed" src="images/update.jpg"/>
-                        </xsl:when>
-                        <xsl:when test="@revisionflag='deleted'">
-                              <img align="absmiddle" alt="deleted" src="images/remove.jpg"/>
-                        </xsl:when>
-                        <xsl:when test="@revisionflag='off'">
-                              <img align="absmiddle" alt="off" src="images/fix.jpg"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                              <img align="absmiddle" alt="changed" src="images/update.jpg"/>
-                        </xsl:otherwise>
-                  </xsl:choose>
-                  <xsl:value-of select="revremark"/>
-                  <xsl:text> (</xsl:text>
-                  <xsl:value-of select="authorinitials"/>
-                  <xsl:text>)</xsl:text>
-            </li>
-      </xsl:template>
-      <xsl:template match="revnumber|revremark|authorinitials|date"/>
-    
-      <xsl:template match="sect1|sect2|sect3|sect4|sect5|section">
-            <xsl:param name="idval">
-                <xsl:if test="@id">
-                            <xsl:value-of select="@id"/>
-                </xsl:if>
-            </xsl:param>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <font color="#000000" face="arial,helvetica,sanserif">
+                    <br/>
+                    <ul>
+                      <xsl:apply-templates select="$base/revision[revnumber=current()]"/>
+                    </ul>
+                  </font>
+                </td>
+              </tr>
+            </xsl:for-each>
+          </table>
+        </section>
+      </body>
+    </document>
+  </xsl:template>
+  <xsl:template match="para">
+    <p>
+      <xsl:apply-templates/>
+    </p>
+  </xsl:template>
+  <xsl:template match="emphasis">
+    <xsl:choose>
+      <xsl:when test="@role='bold'"><strong>
+        <xsl:apply-templates/></strong>
+      </xsl:when>
+      <xsl:otherwise><em>
+        <xsl:apply-templates/></em>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="firstterm"><em>
+    <xsl:apply-templates/></em>
+  </xsl:template>
+  <xsl:template match="revision">
+    <li><xsl:choose>
+        <xsl:when test="@revisionflag='added'">
+          <img align="absmiddle" alt="added" src="images/add.jpg"/>
+        </xsl:when>
+        <xsl:when test="@revisionflag='changed'">
+          <img align="absmiddle" alt="changed" src="images/update.jpg"/>
+        </xsl:when>
+        <xsl:when test="@revisionflag='deleted'">
+          <img align="absmiddle" alt="deleted" src="images/remove.jpg"/>
+        </xsl:when>
+        <xsl:when test="@revisionflag='off'">
+          <img align="absmiddle" alt="off" src="images/fix.jpg"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <img align="absmiddle" alt="changed" src="images/update.jpg"/>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:value-of select="revremark"/>
+<xsl:text> (</xsl:text>
+      <xsl:value-of select="authorinitials"/>
+<xsl:text>)</xsl:text></li>
+  </xsl:template>
+  <xsl:template match="revnumber|revremark|authorinitials|date"/>
+  <xsl:template match="sect1|sect2|sect3|sect4|sect5|section">
+    <xsl:param name="idval">
+      <xsl:if test="@id">
+        <xsl:value-of select="@id"/>
+      </xsl:if>
+    </xsl:param>
+    <xsl:choose>
+      <xsl:when test="@id">
+        <xsl:element name="section">
+          <xsl:attribute name="id">
+            <xsl:value-of select="$idval"/>
+          </xsl:attribute>
+          <xsl:apply-templates/>
+        </xsl:element>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:element name="section">
+          <xsl:apply-templates/>
+        </xsl:element>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="dedication">
+    <table>
+      <tr>
+        <td>
+          <b>Dedication</b>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <br/>
+          <xsl:apply-templates/>
+        </td>
+      </tr>
+    </table>
+  </xsl:template>
+  <xsl:template match="edition|pubdate|year|holder"/>
+  <xsl:template match="copyright">
+    <p>
+      Copyright &#x00A9;
+      <xsl:value-of select="year"/>
+      by
+      <xsl:value-of select="holder"/>
+<xsl:text> </xsl:text>
+      <i>All rights reserved.</i>
+    </p>
+  </xsl:template>
+  <xsl:template match="legalnotice">
+    <table>
+      <tr>
+        <td>
+          <xsl:apply-templates/>
+        </td>
+      </tr>
+    </table>
+  </xsl:template>
+  <xsl:template match="programlisting">
+    <source>
+      <xsl:apply-templates/>
+    </source>
+  </xsl:template>
+  <xsl:template match="screen">
+    <source>
+      <xsl:apply-templates/>
+    </source>
+  </xsl:template>
+  <xsl:template match="variablelist">
+    <dl>
+      <xsl:apply-templates/>
+    </dl>
+  </xsl:template>
+  <xsl:template match="varlistentry">
+    <dt><xsl:apply-templates select="term"/></dt>
+    <dd><xsl:apply-templates select="listitem/*"/></dd>
+  </xsl:template>
+  <xsl:template match="orderedlist">
+    <ol>
+      <xsl:apply-templates/>
+    </ol>
+  </xsl:template>
+  <xsl:template match="listitem">
+    <li><xsl:apply-templates/></li>
+  </xsl:template>
+  <xsl:template match="itemizedlist">
+    <ul>
+      <xsl:apply-templates/>
+    </ul>
+  </xsl:template>
+  <xsl:template match="command"><code class="command">
+    <xsl:value-of select="."/></code>
+  </xsl:template>
+  <xsl:template match="computeroutput"><code  class="computeroutput">
+    <xsl:value-of select="."/></code>
+  </xsl:template>
+  <xsl:template match="userinput"><code class="userinput">
+    <xsl:value-of select="."/></code>
+  </xsl:template>
+  <xsl:template match="varname"><code class="varname">
+    <xsl:value-of select="."/></code>
+  </xsl:template>
+  <xsl:template match="literal">
+<!-- @moreinfo ignored --><code class="literal">
+    <xsl:value-of select="."/></code>
+  </xsl:template>
+  <xsl:template match="option"><code class="option">
+    <xsl:value-of select="."/></code>
+  </xsl:template>
+  <xsl:template match="constant"><code class="constant">
+    <xsl:value-of select="."/></code>
+  </xsl:template>
+  <xsl:template match="trademark">
+    <xsl:apply-templates/>&#x2122;
+      </xsl:template>
+  <xsl:template match="filename"><code class="filename">
+    <xsl:value-of select="."/></code>
+  </xsl:template>
+  <xsl:template match="classname|function|parameter"><code class="{local-name()}">
+    <xsl:apply-templates/>
+    <xsl:if test="name(.)='function'">
+<xsl:text>()</xsl:text>
+    </xsl:if></code>
+  </xsl:template>
+  <xsl:template match="quote">
+<xsl:text>"</xsl:text>
+    <xsl:apply-templates/>
+<xsl:text>"</xsl:text>
+  </xsl:template>
+  <xsl:template match="blockquote">
+    <table>
+      <xsl:if test="title">
+        <tr>
+          <td>
+            <xsl:value-of select="title"/>
+          </td>
+        </tr>
+      </xsl:if>
+      <tr>
+        <td>
+          <xsl:apply-templates/>
+        </td>
+      </tr>
+    </table>
+  </xsl:template>
+  <xsl:template match="warning">
+    <warning>
+      <xsl:apply-templates/>
+    </warning>
+  </xsl:template>
+  <xsl:template match="ulink">
+    <xsl:element name="link">
+      <xsl:attribute name="href">
+        <xsl:choose>
+          <xsl:when test="@uri">
+            <xsl:value-of select="@uri"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="@url"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+      <xsl:choose>
+        <xsl:when test="not(node()[not(self::comment())])">
           <xsl:choose>
-              <xsl:when test="@id">
-                  <xsl:element name="section">
-                  <xsl:attribute name="id">
-                        <xsl:value-of select="$idval"/>
-                    </xsl:attribute>
-                    <xsl:apply-templates/>
-                  </xsl:element>                  
-              </xsl:when>
-              <xsl:otherwise>
-                  <xsl:element name="section">
-                      <xsl:apply-templates/>
-                  </xsl:element>
-              </xsl:otherwise>
+            <xsl:when test="@uri">
+              <xsl:value-of select="@uri"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="@url"/>
+            </xsl:otherwise>
           </xsl:choose>
-      </xsl:template>
-    
-      <xsl:template match="dedication">
-            <table>
-                  <tr>
-                        <td>
-                              <b>Dedication</b>
-                        </td>
-                  </tr>
-                  <tr>
-                        <td>
-                              <br/>
-                              <xsl:apply-templates/>
-                        </td>
-                  </tr>
-            </table>
-      </xsl:template>
-      <xsl:template match="edition|pubdate|year|holder"/>
-      <xsl:template match="copyright">
-            <p>Copyright &#x00A9;<xsl:value-of select="year"/> by <xsl:value-of select="holder"/>
-                <xsl:text> </xsl:text>
-                <i>All rights reserved.</i>
-            </p>
-      </xsl:template>
-      <xsl:template match="legalnotice">
-            <table>
-                  <tr>
-                        <td>
-                              <xsl:apply-templates/>
-                        </td>
-                  </tr>
-            </table>
-      </xsl:template>
-      <xsl:template match="programlisting">
-            <source>
-                  <xsl:apply-templates/>
-            </source>
-      </xsl:template>
-      <xsl:template match="screen">
-            <source>
-                  <xsl:apply-templates/>
-            </source>
-      </xsl:template>
-      <xsl:template match="variablelist">
-          <dl>
-            <xsl:apply-templates/>
-          </dl>
-      </xsl:template>
-      <xsl:template match="varlistentry">
-         <dt><xsl:apply-templates select="term"/></dt>
-         <dd><xsl:apply-templates select="listitem/*"/></dd>
-      </xsl:template>
-      <xsl:template match="orderedlist">
-            <ol>
-                  <xsl:apply-templates/>
-            </ol>
-      </xsl:template>
-      <xsl:template match="listitem">
-            <li>
-                  <xsl:apply-templates/>
-            </li>
-      </xsl:template>
-      <xsl:template match="itemizedlist">
-            <ul>
-                  <xsl:apply-templates/>
-            </ul>
-      </xsl:template>
-      <xsl:template match="command">
-            <code class="command">
-                  <xsl:value-of select="."/>
-            </code>
-      </xsl:template>
-      <xsl:template match="computeroutput">
-            <code  class="computeroutput">
-                  <xsl:value-of select="."/>
-            </code>
-      </xsl:template>
-      <xsl:template match="userinput">
-            <code class="userinput">
-                  <xsl:value-of select="."/>
-            </code>
-      </xsl:template>
-      <xsl:template match="varname">
-            <code class="varname">
-                  <xsl:value-of select="."/>
-            </code>
-      </xsl:template>
-      <xsl:template match="literal"> 
-            <!-- @moreinfo ignored -->
-            <code class="literal">
-                  <xsl:value-of select="."/>
-            </code>
-      </xsl:template>
-      <xsl:template match="option">
-            <code class="option"><xsl:value-of select="."/></code>
-      </xsl:template>
-       <xsl:template match="constant">
-            <code class="constant"><xsl:value-of select="."/></code>
-      </xsl:template>
-      <xsl:template match="trademark">
-            <xsl:apply-templates/>&#x2122;
-      </xsl:template>
-      <xsl:template match="filename">
-            <code class="filename">
-                  <xsl:value-of select="."/>
-            </code>
-      </xsl:template>
-      <xsl:template match="classname|function|parameter">
-            <code class="{local-name()}">
-                  <xsl:apply-templates/>
-                  <xsl:if test="name(.)='function'">
-                        <xsl:text>()</xsl:text>
-                  </xsl:if>
-            </code>
-      </xsl:template>
-      <xsl:template match="quote">
-            <xsl:text>"</xsl:text><xsl:apply-templates/><xsl:text>"</xsl:text>
-      </xsl:template>
-
-      <xsl:template match="blockquote">
-            <table>
-                  <xsl:if test="title">
-                        <tr>
-                              <td>
-                                    <xsl:value-of select="title"/>
-                              </td>
-                        </tr>
-                  </xsl:if>
-                  <tr>
-                        <td>
-                              <xsl:apply-templates/>
-                        </td>
-                  </tr>
-            </table>
-      </xsl:template>
-      <xsl:template match="warning">
-            <warning>
-                  <xsl:apply-templates/>
-            </warning>
-      </xsl:template>
-      <xsl:template match="ulink">
-            <xsl:element name="link">
-                  <xsl:attribute name="href"><xsl:choose><xsl:when test="@uri"><xsl:value-of select="@uri"/></xsl:when><xsl:otherwise><xsl:value-of select="@url"/></xsl:otherwise></xsl:choose></xsl:attribute>
-                  <xsl:choose><xsl:when test="not(node()[not(self::comment())])"><xsl:choose><xsl:when test="@uri"><xsl:value-of select="@uri"/></xsl:when><xsl:otherwise><xsl:value-of select="@url"/></xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise><xsl:apply-templates/></xsl:otherwise></xsl:choose>
-            </xsl:element>
-      </xsl:template>
-      <xsl:template match="footnote">
-            <xsl:variable name="footnote-id">
-                  <xsl:value-of select="count(preceding::footnote)+1"/>
-            </xsl:variable>
-            <anchor id="footnote-{$footnote-id}-ref"/>
-            <sup>
-                  <link href="#footnote-{$footnote-id}">
-                        <xsl:value-of select="$footnote-id"/>
-                  </link>
-            </sup>
-      </xsl:template>
-
-      <xsl:template match="footnote" mode="base">
-            <p>
-                  <xsl:variable name="footnote-id">
-                        <xsl:value-of select="count(preceding::footnote)+1"/>
-                  </xsl:variable>
-                  <anchor id="footnote-{$footnote-id}"/>
-                  <link href="#footnote-{$footnote-id}-ref">
-                        <xsl:value-of select="$footnote-id"/>
-                  </link><xsl:text>) </xsl:text>
-                  <!-- Most footnotes have a para nested; strip if there is only one-->
-                  <xsl:if test="not(para)"><xsl:apply-templates/></xsl:if>
-                  <xsl:if test="count(para)=1"><xsl:apply-templates
-                              select="para/node()"/></xsl:if>
-            </p>
-            <xsl:if test="count(para)>1"><xsl:apply-templates/></xsl:if>
-      </xsl:template>
-
-      <xsl:template match="figure">
-            <table>
-                <tr>
-                    <td>
-                        <xsl:value-of select="title"/>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <xsl:apply-templates select="*[not(self::title)]"/>
-                    </td>
-                </tr>
-            </table>
-      </xsl:template>
-
-      <xsl:template match="mediaobject|imageobject">
-            <xsl:apply-templates/>
-      </xsl:template>
-
-      <xsl:template match="inlinegraphic">
-            <img alt="{@srccredit}" src="{@fileref}"/>
-      </xsl:template>
-
-      <xsl:template match="graphic|imagedata">
-            <img alt="{@srccredit}" src="{@fileref}"/>
-            <xsl:if test="@srccredit">
-                <ul>
-                      <li>
-                          <xsl:value-of select="@srccredit"/>
-                      </li>
-                </ul>
-            </xsl:if>
-      </xsl:template>
-      <xsl:template match="simplelist">
-            <ul>
-                  <xsl:apply-templates/>
-            </ul>
-      </xsl:template>
-      <xsl:template match="member">
-            <li>
-                  <xsl:apply-templates/>
-            </li>
-      </xsl:template>
-      <xsl:template match="table">
-            <table>
-              <caption><xsl:value-of select="title"/></caption>
-                  <xsl:apply-templates/>
-            </table>
-      </xsl:template>
-      <xsl:template match="tgroup">
-            <xsl:apply-templates select="thead|tbody|tfoot"/>
-      </xsl:template>
-      <xsl:template match="thead">
-            <xsl:apply-templates mode="thead"/>
-      </xsl:template>
-      <xsl:template match="row" mode="thead">
-            <tr>
-              <xsl:apply-templates mode="thead"/>
-            </tr>
-      </xsl:template>
-      <xsl:template match="entry" mode="thead">
-            <th>
-                  <xsl:call-template name="entry.spans"/>
-                  <xsl:apply-templates/>
-            </th>
-      </xsl:template>
-      <xsl:template match="row">
-            <tr>
-                  <xsl:apply-templates/>
-            </tr>
-      </xsl:template>
-      <xsl:template match="tbody|tfoot">
-            <xsl:apply-templates/>
-      </xsl:template>
-
-      <xsl:template match="entry">
-            <td>
-                  <xsl:call-template name="entry.spans"/>
-                  <xsl:apply-templates/>
-            </td>
-      </xsl:template>
-
-      <xsl:template name="entry.spans">
-              <xsl:if test="@morerows">
-                <xsl:attribute name="rowspan">
-                  <xsl:value-of select="number(@morerows)+1"/>
-                </xsl:attribute>
-              </xsl:if>
-              <xsl:if test="@namest and @nameend">
-                  <xsl:attribute name="colspan">
-
-                  <xsl:variable name="start">
-                    <xsl:call-template name="colspec.index">
-                      <xsl:with-param name="olist" select="ancestor::tgroup/colspec"/>
-                      <xsl:with-param name="colname" select="@namest"/>
-                    </xsl:call-template>
-                  </xsl:variable>
-                  <xsl:variable name="end">
-                    <xsl:call-template name="colspec.index">
-                      <xsl:with-param name="olist" select="ancestor::tgroup/colspec"/>
-                      <xsl:with-param name="colname" select="@nameend"/>
-                    </xsl:call-template>
-                  </xsl:variable>
-
-                  <xsl:value-of select="number($end)-number($start)+1"/>
-                </xsl:attribute>
-              </xsl:if>
-      </xsl:template>
-      <xsl:template name="colspec.index">
-        <!-- calculate the index for a given colname, e.g. from entry/@nameend -->
-        <!-- inspired from the original docbook stylesheets -->
-        <xsl:param name="olist" select="//table/tgroup/colspec"/>
-        <xsl:param name="colname" select="c1"/>
-        <xsl:for-each select="$olist">
-          <xsl:if test="@colname=$colname">
-            <xsl:choose>
-              <xsl:when test="@colnum"><xsl:value-of select="@colnum"/></xsl:when>
-              <xsl:otherwise><xsl:value-of select="position()"/></xsl:otherwise>
-            </xsl:choose>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:template>
-
-
-      <xsl:template match="trademark">
-            <xsl:apply-templates/>
-            <sup>TM</sup>
-      </xsl:template>
-      <xsl:template match="email">
-        &lt;<link>
-            <xsl:attribute name="href">
-                <xsl:value-of select="concat('mailto:',.)"/>
-            </xsl:attribute>
-             <xsl:apply-templates/>
-         </link>&gt;
-      </xsl:template>
-
-      <!-- Filched from Norm Walsh's inline.xsl -->
-      <xsl:template match="sgmltag">
-            <xsl:call-template name="format.sgmltag"/>
-      </xsl:template>
-
-      <xsl:template name="format.sgmltag">
-            <xsl:param name="class">
-                  <xsl:choose>
-                        <xsl:when test="@class">
-                              <xsl:value-of select="@class"/>
-                        </xsl:when>
-                        <xsl:otherwise>element</xsl:otherwise>
-                  </xsl:choose>
-            </xsl:param>
-
-            <tt class="sgmltag-{$class}">
-                  <xsl:choose>
-                        <xsl:when test="$class='attribute'">
-                              <xsl:apply-templates/>
-                        </xsl:when>
-                        <xsl:when test="$class='attvalue'">
-                              <xsl:apply-templates/>
-                        </xsl:when>
-                        <xsl:when test="$class='element'">
-                              <xsl:apply-templates/>
-                        </xsl:when>
-                        <xsl:when test="$class='endtag'">
-                              <xsl:text>&lt;/</xsl:text>
-                              <xsl:apply-templates/>
-                              <xsl:text>&gt;</xsl:text>
-                        </xsl:when>
-                        <xsl:when test="$class='genentity'">
-                              <xsl:text>&amp;</xsl:text>
-                              <xsl:apply-templates/>
-                              <xsl:text>;</xsl:text>
-                        </xsl:when>
-                        <xsl:when test="$class='numcharref'">
-                              <xsl:text>&amp;#</xsl:text>
-                              <xsl:apply-templates/>
-                              <xsl:text>;</xsl:text>
-                        </xsl:when>
-                        <xsl:when test="$class='paramentity'">
-                              <xsl:text>%</xsl:text>
-                              <xsl:apply-templates/>
-                              <xsl:text>;</xsl:text>
-                        </xsl:when>
-                        <xsl:when test="$class='pi'">
-                              <xsl:text>&lt;?</xsl:text>
-                              <xsl:apply-templates/>
-                              <xsl:text>&gt;</xsl:text>
-                        </xsl:when>
-                        <xsl:when test="$class='xmlpi'">
-                              <xsl:text>&lt;?</xsl:text>
-                              <xsl:apply-templates/>
-                              <xsl:text>?&gt;</xsl:text>
-                        </xsl:when>
-                        <xsl:when test="$class='starttag'">
-                              <xsl:text>&lt;</xsl:text>
-                              <xsl:apply-templates/>
-                              <xsl:text>&gt;</xsl:text>
-                        </xsl:when>
-                        <xsl:when test="$class='emptytag'">
-                              <xsl:text>&lt;</xsl:text>
-                              <xsl:apply-templates/>
-                              <xsl:text>/&gt;</xsl:text>
-                        </xsl:when>
-                        <xsl:when test="$class='sgmlcomment'">
-                              <xsl:text>&lt;!--</xsl:text>
-                              <xsl:apply-templates/>
-                              <xsl:text>--&gt;</xsl:text>
-                        </xsl:when>
-                        <xsl:otherwise>
-                              <xsl:apply-templates/>
-                        </xsl:otherwise>
-                  </xsl:choose>
-            </tt>
-      </xsl:template>
-    
-    <xsl:template match="xref">
-        <xsl:param name="linkend">
-            <xsl:value-of select="@linkend"/>
-        </xsl:param>
-        <xsl:param name="endterm">
-            <xsl:value-of select="@endterm"/>
-        </xsl:param>
-        <xsl:param name="xreflabelvalue">
-            <xsl:value-of select="@xreflabel"/>
-        </xsl:param>
-        <xsl:param name="linkendvalue">
-            <xsl:if test="$linkend">
-                <xsl:value-of select="//*[@id=$linkend]/title"/>
-            </xsl:if>
-        </xsl:param>
-        <xsl:param name="endtermvalue">
-            <xsl:if test="$endterm">
-                <xsl:value-of select="//*[@id=$endterm]"/>
-            </xsl:if>
-        </xsl:param>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:element>
+  </xsl:template>
+  <xsl:template match="footnote">
+    <xsl:variable name="footnote-id">
+      <xsl:value-of select="count(preceding::footnote)+1"/>
+    </xsl:variable>
+    <anchor id="footnote-{$footnote-id}-ref"/><sup><link href="#footnote-{$footnote-id}">
+    <xsl:value-of select="$footnote-id"/></link></sup>
+  </xsl:template>
+  <xsl:template match="footnote" mode="base">
+    <p>
+      <xsl:variable name="footnote-id">
+        <xsl:value-of select="count(preceding::footnote)+1"/>
+      </xsl:variable>
+      <anchor id="footnote-{$footnote-id}"/>
+      <link href="#footnote-{$footnote-id}-ref">
+      <xsl:value-of select="$footnote-id"/>
+      </link>
+<xsl:text>) </xsl:text>
+<!-- Most footnotes have a para nested; strip if there is only one-->
+      <xsl:if test="not(para)">
+        <xsl:apply-templates/>
+      </xsl:if>
+      <xsl:if test="count(para)=1">
+        <xsl:apply-templates
+                              select="para/node()"/>
+      </xsl:if>
+    </p>
+    <xsl:if test="count(para)>1">
+      <xsl:apply-templates/>
+    </xsl:if>
+  </xsl:template>
+  <xsl:template match="figure">
+    <table>
+      <tr>
+        <td>
+          <xsl:value-of select="title"/>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <xsl:apply-templates select="*[not(self::title)]"/>
+        </td>
+      </tr>
+    </table>
+  </xsl:template>
+  <xsl:template match="mediaobject|imageobject">
+    <xsl:apply-templates/>
+  </xsl:template>
+  <xsl:template match="inlinegraphic">
+    <img alt="{@srccredit}" src="{@fileref}"/>
+  </xsl:template>
+  <xsl:template match="graphic|imagedata">
+    <img alt="{@srccredit}" src="{@fileref}"/>
+    <xsl:if test="@srccredit">
+      <ul>
+        <li><xsl:value-of select="@srccredit"/></li>
+      </ul>
+    </xsl:if>
+  </xsl:template>
+  <xsl:template match="simplelist">
+    <ul>
+      <xsl:apply-templates/>
+    </ul>
+  </xsl:template>
+  <xsl:template match="member">
+    <li><xsl:apply-templates/></li>
+  </xsl:template>
+  <xsl:template match="table">
+    <table>
+      <caption>
+        <xsl:value-of select="title"/>
+      </caption>
+      <xsl:apply-templates/>
+    </table>
+  </xsl:template>
+  <xsl:template match="tgroup">
+    <xsl:apply-templates select="thead|tbody|tfoot"/>
+  </xsl:template>
+  <xsl:template match="thead">
+    <xsl:apply-templates mode="thead"/>
+  </xsl:template>
+  <xsl:template match="row" mode="thead">
+    <tr>
+      <xsl:apply-templates mode="thead"/>
+    </tr>
+  </xsl:template>
+  <xsl:template match="entry" mode="thead">
+    <th>
+      <xsl:call-template name="entry.spans"/>
+      <xsl:apply-templates/>
+    </th>
+  </xsl:template>
+  <xsl:template match="row">
+    <tr>
+      <xsl:apply-templates/>
+    </tr>
+  </xsl:template>
+  <xsl:template match="tbody|tfoot">
+    <xsl:apply-templates/>
+  </xsl:template>
+  <xsl:template match="entry">
+    <td>
+      <xsl:call-template name="entry.spans"/>
+      <xsl:apply-templates/>
+    </td>
+  </xsl:template>
+  <xsl:template name="entry.spans">
+    <xsl:if test="@morerows">
+      <xsl:attribute name="rowspan">
+        <xsl:value-of select="number(@morerows)+1"/>
+      </xsl:attribute>
+    </xsl:if>
+    <xsl:if test="@namest and @nameend">
+      <xsl:attribute name="colspan">
+        <xsl:variable name="start">
+          <xsl:call-template name="colspec.index">
+            <xsl:with-param name="olist" select="ancestor::tgroup/colspec"/>
+            <xsl:with-param name="colname" select="@namest"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="end">
+          <xsl:call-template name="colspec.index">
+            <xsl:with-param name="olist" select="ancestor::tgroup/colspec"/>
+            <xsl:with-param name="colname" select="@nameend"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="number($end)-number($start)+1"/>
+      </xsl:attribute>
+    </xsl:if>
+  </xsl:template>
+  <xsl:template name="colspec.index">
+<!-- calculate the index for a given colname, e.g. from entry/@nameend -->
+<!-- inspired from the original docbook stylesheets -->
+    <xsl:param name="olist" select="//table/tgroup/colspec"/>
+    <xsl:param name="colname" select="c1"/>
+    <xsl:for-each select="$olist">
+      <xsl:if test="@colname=$colname">
         <xsl:choose>
-            <xsl:when test="//xref[not(@endterm)]">
-                <xsl:element name="link">
-                    <xsl:attribute name="href">
-                        <xsl:text>#</xsl:text>
-                        <xsl:value-of select="$linkend"/>
-                    </xsl:attribute>
-                    <xsl:choose>
-                        <xsl:when test="@xreflabel">
-                            <xsl:value-of select="$xreflabelvalue"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="$linkendvalue"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:element>
-                <xsl:apply-templates/>
+          <xsl:when test="@colnum">
+            <xsl:value-of select="@colnum"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="position()"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+  <xsl:template match="trademark">
+    <xsl:apply-templates/><sup>TM</sup>
+  </xsl:template>
+  <xsl:template match="email">
+        &lt;<link>
+    <xsl:attribute name="href">
+      <xsl:value-of select="concat('mailto:',.)"/>
+    </xsl:attribute>
+    <xsl:apply-templates/></link>&gt;
+      </xsl:template>
+<!-- Filched from Norm Walsh's inline.xsl -->
+  <xsl:template match="sgmltag">
+    <xsl:call-template name="format.sgmltag"/>
+  </xsl:template>
+  <xsl:template name="format.sgmltag">
+    <xsl:param name="class">
+      <xsl:choose>
+        <xsl:when test="@class">
+          <xsl:value-of select="@class"/>
+        </xsl:when>
+        <xsl:otherwise>element</xsl:otherwise>
+      </xsl:choose>
+    </xsl:param><tt class="sgmltag-{$class}">
+    <xsl:choose>
+      <xsl:when test="$class='attribute'">
+        <xsl:apply-templates/>
+      </xsl:when>
+      <xsl:when test="$class='attvalue'">
+        <xsl:apply-templates/>
+      </xsl:when>
+      <xsl:when test="$class='element'">
+        <xsl:apply-templates/>
+      </xsl:when>
+      <xsl:when test="$class='endtag'">
+<xsl:text>&lt;/</xsl:text>
+        <xsl:apply-templates/>
+<xsl:text>&gt;</xsl:text>
+      </xsl:when>
+      <xsl:when test="$class='genentity'">
+<xsl:text>&amp;</xsl:text>
+        <xsl:apply-templates/>
+<xsl:text>;</xsl:text>
+      </xsl:when>
+      <xsl:when test="$class='numcharref'">
+<xsl:text>&amp;#</xsl:text>
+        <xsl:apply-templates/>
+<xsl:text>;</xsl:text>
+      </xsl:when>
+      <xsl:when test="$class='paramentity'">
+<xsl:text>%</xsl:text>
+        <xsl:apply-templates/>
+<xsl:text>;</xsl:text>
+      </xsl:when>
+      <xsl:when test="$class='pi'">
+<xsl:text>&lt;?</xsl:text>
+        <xsl:apply-templates/>
+<xsl:text>&gt;</xsl:text>
+      </xsl:when>
+      <xsl:when test="$class='xmlpi'">
+<xsl:text>&lt;?</xsl:text>
+        <xsl:apply-templates/>
+<xsl:text>?&gt;</xsl:text>
+      </xsl:when>
+      <xsl:when test="$class='starttag'">
+<xsl:text>&lt;</xsl:text>
+        <xsl:apply-templates/>
+<xsl:text>&gt;</xsl:text>
+      </xsl:when>
+      <xsl:when test="$class='emptytag'">
+<xsl:text>&lt;</xsl:text>
+        <xsl:apply-templates/>
+<xsl:text>/&gt;</xsl:text>
+      </xsl:when>
+      <xsl:when test="$class='sgmlcomment'">
+<xsl:text>&lt;!--</xsl:text>
+        <xsl:apply-templates/>
+<xsl:text>--&gt;</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates/>
+      </xsl:otherwise>
+    </xsl:choose></tt>
+  </xsl:template>
+  <xsl:template match="xref">
+    <xsl:param name="linkend">
+      <xsl:value-of select="@linkend"/>
+    </xsl:param>
+    <xsl:param name="endterm">
+      <xsl:value-of select="@endterm"/>
+    </xsl:param>
+    <xsl:param name="xreflabelvalue">
+      <xsl:value-of select="@xreflabel"/>
+    </xsl:param>
+    <xsl:param name="linkendvalue">
+      <xsl:if test="$linkend">
+        <xsl:value-of select="//*[@id=$linkend]/title"/>
+      </xsl:if>
+    </xsl:param>
+    <xsl:param name="endtermvalue">
+      <xsl:if test="$endterm">
+        <xsl:value-of select="//*[@id=$endterm]"/>
+      </xsl:if>
+    </xsl:param>
+    <xsl:choose>
+      <xsl:when test="//xref[not(@endterm)]">
+        <xsl:element name="link">
+          <xsl:attribute name="href">
+<xsl:text>#</xsl:text>
+            <xsl:value-of select="$linkend"/>
+          </xsl:attribute>
+          <xsl:choose>
+            <xsl:when test="@xreflabel">
+              <xsl:value-of select="$xreflabelvalue"/>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:element name="link">
-                    <xsl:attribute name="href">
-                        <xsl:text>#</xsl:text>
-                        <xsl:value-of select="$linkend"/>
-                    </xsl:attribute>
-                    <xsl:value-of select="$endtermvalue"/>
-                </xsl:element>
-                <xsl:apply-templates/>
+              <xsl:value-of select="$linkendvalue"/>
             </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-      <xsl:template match="node()|@*" priority="-1">
-            <xsl:copy>
-                  <xsl:apply-templates select="node()|@*"/>
-            </xsl:copy>
-      </xsl:template>
+          </xsl:choose>
+        </xsl:element>
+        <xsl:apply-templates/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:element name="link">
+          <xsl:attribute name="href">
+<xsl:text>#</xsl:text>
+            <xsl:value-of select="$linkend"/>
+          </xsl:attribute>
+          <xsl:value-of select="$endtermvalue"/>
+        </xsl:element>
+        <xsl:apply-templates/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="node()|@*" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>
 <!-- vim: set ft=xml sw=6: -->

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/index.xml?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/index.xml Mon Apr  9 21:56:56 2007
@@ -16,37 +16,45 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Welcome to the org.apache.forrest.plugin.input.simplifiedDocbook Plugin</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Welcome to the org.apache.forrest.plugin.input.simplifiedDocbook Plugin</title>
+  </header>
+  <body>
     <section>
       <title>Apache Forrest - org.apache.forrest.plugin.input.simplifiedDocbook Plugin</title>
-      <p>This plugin allows files written in the Simplified Docbook vocabulary
-      to be included in an Apache Forrest site.</p>
+      <p>
+        This plugin allows files written in the Simplified Docbook vocabulary to
+        be included in an Apache Forrest site.
+      </p>
     </section>
     <section>
       <title>Supported Simplified Docbook Versions</title>
-      <warning>SDocbook support is not yet considered complete. However, it 
-      is certainly usable. If you find an element is not supported please
-      raise an issue on the project issue tracker.</warning>
-      <p>The following versions of SDocbook are supported. Other versions
-      can be added, please raise an issue if you need additional 
-      support.</p>
+      <warning>
+        SDocbook support is not yet considered complete. However, it is
+        certainly usable. If you find an element is not supported please raise
+        an issue on the project issue tracker.
+      </warning>
+      <p>
+        The following versions of SDocbook are supported. Other versions can be
+        added, please raise an issue if you need additional support.
+      </p>
       <ul>
         <li>-//OASIS//DTD Simplified DocBook XML V1.0//EN</li>
       </ul>
-      <p>This plugin can also be used to render full docbook files. However,
-      it is not intended for this purpose and results may vary. Supported DTD's
-      are:</p>
+      <p>
+        This plugin can also be used to render full docbook files. However, it
+        is not intended for this purpose and results may vary. Supported DTD's
+        are:
+      </p>
       <ul>
         <li>-//OASIS//DTD DocBook XML V4.1.2//EN</li>
         <li>-//OASIS//DTD DocBook XML V4.2//EN</li>
       </ul>
-
-      <p>Support for other versions of Docbook can be added easily. Ask us on
-      the user list.</p> 
+      <p>
+        Support for other versions of Docbook can be added easily. Ask us on the
+        user list.
+      </p>
     </section>
   </body>
 </document>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/samples/sdocbook.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/samples/sdocbook.xml?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/samples/sdocbook.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/samples/sdocbook.xml Mon Apr  9 21:56:56 2007
@@ -19,65 +19,45 @@
 "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd">
 <article>
   <title>Simplified DocBook example</title>
-
   <subtitle>Sample Page subtitle</subtitle>
-
   <titleabbrev>Title abbrev</titleabbrev>
-
   <articleinfo>
     <author>
       <authorblurb>
         <title>Author blurb Title</title>
-
         <para>Author blurb paragraph</para>
       </authorblurb>
-
       <firstname>John</firstname>
-
       <othername>Q</othername>
-
       <surname>Public</surname>
     </author>
-
     <date>01-August-2003</date>
   </articleinfo>
-
   <abstract>
     <title>Abstract title</title>
-
     <para>Abstract paragraph</para>
   </abstract>
-
   <epigraph>
     <attribution>Epigraph Attribution</attribution>
-
     <literallayout>Literal layout</literallayout>
-
     <para>Epigraph paragraph</para>
   </epigraph>
-
   <example>
     <title>Example title</title>
-
     <para>Example paragraph</para>
   </example>
-
   <figure>
     <title>Figure title</title>
-
     <literallayout>Literal layout</literallayout>
   </figure>
-
   <figure>
     <title>Figure Image</title>
-
     <mediaobject>
       <imageobject>
         <imagedata fileref="../images/project-logo.gif" />
       </imageobject>
     </mediaobject>
   </figure>
-
   <informaltable>
     <tgroup cols="2">
       <thead>
@@ -86,100 +66,76 @@
           <entry>head entry 2</entry>
         </row>
       </thead>
-
       <tfoot>
         <row>
           <entry>Table foot entry</entry>
           <entry>foot entry 2</entry>
         </row>
       </tfoot>
-
       <tbody>
         <row>
           <entry>1</entry>
-
           <entry>2</entry>
         </row>
       </tbody>
     </tgroup>
   </informaltable>
-
   <itemizedlist>
     <listitem>
       <para>list item</para>
     </listitem>
   </itemizedlist>
-
   <note>
     <para>Note</para>
   </note>
-
   <orderedlist>
     <listitem>
       <para>Ordered list item</para>
     </listitem>
   </orderedlist>
-
   <para>Article paragraph</para>
-
   <programlisting>Program listing</programlisting>
-
   <sidebar>
     <para>Sidebar</para>
   </sidebar>
-
   <variablelist>
     <varlistentry>
       <term>Term</term>
-
       <listitem>
         <para>Definition</para>
       </listitem>
     </varlistentry>
   </variablelist>
-
   <table>
     <title>Table</title>
-
     <tgroup cols="2">
       <colspec align="center" />
-
       <thead>
         <row>
           <entry align="center">Head entry</entry>
-
           <entry align="center">Head entry</entry>
         </row>
       </thead>
-
       <tbody>
         <row>
           <entry>1</entry>
-
           <entry>2</entry>
         </row>
-
         <row>
           <entry>3</entry>
-
           <entry>4</entry>
         </row>
       </tbody>
     </tgroup>
   </table>
-
   <section>
     <title>Section title</title>
-
     <para>Section paragraph</para>
   </section>
-
   <appendix>
     <title>Appendix title</title>
-
     <para>Appendix paragraph</para>
   </appendix>
-
   <bibliography>
     <bibliomixed>Bibliography</bibliomixed>
   </bibliography>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/site.xml?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/site.xml Mon Apr  9 21:56:56 2007
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--
 Forrest site.xml
 
@@ -29,29 +28,24 @@
 
 See http://forrest.apache.org/docs/linking.html for more info
 -->
-
 <site label="MyProj" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
-
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to the Feed Plugin Example"/>
     <forrestPlugins label="Plugins Index" href="site:forrest/plugins" description="Index of Forrest Plugins"/>
     <changes label="Changes" href="changes.html" description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>
-  
   <samples label="Samples" href="samples/">
     <sdocbook label="Simplifed Docbook" href="sdocbook.html" 
-      description="Simplified DocBook example" />     
+      description="Simplified DocBook example" />
   </samples>
-  
-  <!--
+<!--
   The href must be wholesite.html/pdf  You can change the labels and node names
   <all label="All">
     <whole_site_html label="Whole Site HTML" href="wholesite.html"/>
     <whole_site_pdf label="Whole Site PDF" href="wholesite.pdf"/>
   </all>
   -->
-
   <external-refs>
     <forrest href="http://forrest.apache.org/">
       <linking href="docs/linking.html"/>
@@ -61,5 +55,4 @@
       <plugins href="docs/plugins"/>
     </forrest>
   </external-refs>
-
 </site>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/tabs.xml?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/content/xdocs/tabs.xml Mon Apr  9 21:56:56 2007
@@ -16,13 +16,11 @@
   limitations under the License.
 -->
 <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd">
-
 <tabs software="MyProj"
   title="MyProj"
   copyright="Foo"
   xmlns:xlink="http://www.w3.org/1999/xlink">
-
-  <!-- The rules for tabs are:
+<!-- The rules for tabs are:
     @dir will always have '/@indexfile' added.
     @indexfile gets appended to @dir if the tab is selected. Defaults to 'index.html'
     @href is not modified unless it is root-relative and obviously specifies a
@@ -32,13 +30,11 @@
    Tabs can be embedded to a depth of two. The second level of tabs will only 
     be displayed when their parent tab is selected.    
   -->
-
   <tab id="plugins" label="Forrest Plugins" href="http://forrest.apache.org/pluginDocs" indexfile="index.html"/>
   <tab id="" label="Home" dir="" indexfile="index.html"/>
   <tab id="samples" label="Samples" dir="samples" indexfile="sdocbook.html"/>
-  <!-- Add new tabs here, eg:
+<!-- Add new tabs here, eg:
   <tab label="How-Tos" dir="community/howto/"/>
   <tab label="XML Site" dir="xml-site/"/>
   -->
-
 </tabs>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/skinconf.xml?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/skinconf.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/skinconf.xml Mon Apr  9 21:56:56 2007
@@ -15,16 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.7-1//EN" "http://forrest.apache.org/dtd/skinconfig-v07-1.dtd"
 [
   <!ENTITY skinconf-common PUBLIC "-//Apache Forrest//ENTITIES Skin Configuration common plugins V0.7-1//EN" "">
 ]>
-
 <skinconfig>
   &skinconf-common;
 
   <project-name>Plugin: simplifiedDocbook input</project-name>
   <project-description>org.apache.forrest.plugin.input.simplifiedDocbook plugin for Apache Forrest</project-description>
-
 </skinconfig>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_af.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_af.xml?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_af.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_af.xml Mon Apr  9 21:56:56 2007
@@ -16,18 +16,18 @@
   limitations under the License.
 -->
 <catalogue xml:lang="af">
-    <message key="About">Aangaande</message>
-    <message key="Index">Inhoud</message>
-    <message key="Changes">Veranderinge</message>
-    <message key="Todo">Om te doen</message>
-    <message key="Samples">Voorbeelde</message>
-    <message key="Apache document">Apache dokument</message>
-    <message key="Static content">Statise Inhoud</message>
-    <message key="Linking">Linking</message>
-    <message key="Wiki page">Wiki bladsy</message>
-    <message key="ihtml page">Ihtml bladsy</message>
-    <message key="ehtml page">Ehtml bladsy</message>
-    <message key="FAQ">FAQ</message>
-    <message key="Simplifed Docbook">Vereenvoudigde Docbook</message>
-    <message key="XSP page">XSP bladsy</message>
+  <message key="About">Aangaande</message>
+  <message key="Index">Inhoud</message>
+  <message key="Changes">Veranderinge</message>
+  <message key="Todo">Om te doen</message>
+  <message key="Samples">Voorbeelde</message>
+  <message key="Apache document">Apache dokument</message>
+  <message key="Static content">Statise Inhoud</message>
+  <message key="Linking">Linking</message>
+  <message key="Wiki page">Wiki bladsy</message>
+  <message key="ihtml page">Ihtml bladsy</message>
+  <message key="ehtml page">Ehtml bladsy</message>
+  <message key="FAQ">FAQ</message>
+  <message key="Simplifed Docbook">Vereenvoudigde Docbook</message>
+  <message key="XSP page">XSP bladsy</message>
 </catalogue>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_es.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_es.xml?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_es.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_es.xml Mon Apr  9 21:56:56 2007
@@ -16,18 +16,18 @@
   limitations under the License.
 -->
 <catalogue xml:lang="es">
-    <message key="About">Acerca de</message>
-    <message key="Index">Indice</message>
-    <message key="Changes">Cambios</message>
-    <message key="Todo">Tareas pendientes</message>
-    <message key="Samples">Ejemplos</message>
-    <message key="Apache document">Documento Apache</message>
-    <message key="Static content">Contenido Estático</message>
-    <message key="Linking">Linking</message>
-    <message key="Wiki page">Página Wiki</message>
-    <message key="ihtml page">Página ihtml</message>
-    <message key="ehtml page">Página ehtml</message>
-    <message key="FAQ">Preguntas Frecuentes</message>
-    <message key="Simplifed Docbook">Página Simplifed Docbook</message>
-    <message key="XSP page">Página XSP</message>
+  <message key="About">Acerca de</message>
+  <message key="Index">Indice</message>
+  <message key="Changes">Cambios</message>
+  <message key="Todo">Tareas pendientes</message>
+  <message key="Samples">Ejemplos</message>
+  <message key="Apache document">Documento Apache</message>
+  <message key="Static content">Contenido Estático</message>
+  <message key="Linking">Linking</message>
+  <message key="Wiki page">Página Wiki</message>
+  <message key="ihtml page">Página ihtml</message>
+  <message key="ehtml page">Página ehtml</message>
+  <message key="FAQ">Preguntas Frecuentes</message>
+  <message key="Simplifed Docbook">Página Simplifed Docbook</message>
+  <message key="XSP page">Página XSP</message>
 </catalogue>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_it.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_it.xml?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_it.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_it.xml Mon Apr  9 21:56:56 2007
@@ -16,18 +16,18 @@
   limitations under the License.
 -->
 <catalogue xml:lang="it">
-    <message key="About">Riguardo a</message>
-    <message key="Index">Indice</message>
-    <message key="Changes">Cambiamenti</message>
-    <message key="Todo">Cose da fare</message>
-    <message key="Samples">Esempi</message>
-    <message key="Apache document">Apache document</message>
-    <message key="Static content">Contenuto Statico</message>
-    <message key="Linking">Linking</message>
-    <message key="Wiki page">Pagina Wiki</message>
-    <message key="ihtml page">Pagina ihtml</message>
-    <message key="ehtml page">Pagina ehtml</message>
-    <message key="FAQ">Domande frequenti</message>
-    <message key="Simplifed Docbook">Simplifed Docbook</message>
-    <message key="XSP page">Pagina XSP</message>
+  <message key="About">Riguardo a</message>
+  <message key="Index">Indice</message>
+  <message key="Changes">Cambiamenti</message>
+  <message key="Todo">Cose da fare</message>
+  <message key="Samples">Esempi</message>
+  <message key="Apache document">Apache document</message>
+  <message key="Static content">Contenuto Statico</message>
+  <message key="Linking">Linking</message>
+  <message key="Wiki page">Pagina Wiki</message>
+  <message key="ihtml page">Pagina ihtml</message>
+  <message key="ehtml page">Pagina ehtml</message>
+  <message key="FAQ">Domande frequenti</message>
+  <message key="Simplifed Docbook">Simplifed Docbook</message>
+  <message key="XSP page">Pagina XSP</message>
 </catalogue>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_no.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_no.xml?view=diff&rev=527027&r1=527026&r2=527027
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_no.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/src/documentation/translations/menu_no.xml Mon Apr  9 21:56:56 2007
@@ -16,18 +16,18 @@
   limitations under the License.
 -->
 <catalogue xml:lang="no">
-    <message key="About">Om</message>
-    <message key="Index">Indeks</message>
-    <message key="Changes">Endringer</message>
-    <message key="Todo">Oppgave liste</message>
-    <message key="Samples">Eksempler</message>
-    <message key="Apache document">Apache Dokument</message>
-    <message key="Static content">Statisk innhold</message>
-    <message key="Linking">Linking</message>
-    <message key="Wiki page">Wiki side</message>
-    <message key="ihtml page">ihtml side</message>
-    <message key="ehtml page">ehtml side</message>
-    <message key="FAQ">FAQ</message>
-    <message key="Simplifed Docbook">Simplifed Docbook</message>
-    <message key="XSP page">XSP side</message>
+  <message key="About">Om</message>
+  <message key="Index">Indeks</message>
+  <message key="Changes">Endringer</message>
+  <message key="Todo">Oppgave liste</message>
+  <message key="Samples">Eksempler</message>
+  <message key="Apache document">Apache Dokument</message>
+  <message key="Static content">Statisk innhold</message>
+  <message key="Linking">Linking</message>
+  <message key="Wiki page">Wiki side</message>
+  <message key="ihtml page">ihtml side</message>
+  <message key="ehtml page">ehtml side</message>
+  <message key="FAQ">FAQ</message>
+  <message key="Simplifed Docbook">Simplifed Docbook</message>
+  <message key="XSP page">XSP side</message>
 </catalogue>



Mime
View raw message