forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r526522 [1/2] - in /forrest/trunk/plugins/org.apache.forrest.plugin.output.Text: ./ resources/stylesheets/ resources/stylesheets/common/ src/documentation/ src/documentation/content/xdocs/ src/documentation/translations/
Date Sun, 08 Apr 2007 03:36:55 GMT
Author: crossley
Date: Sat Apr  7 20:36:53 2007
New Revision: 526522

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

Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/build.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/default.plugin.properties.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/locationmap.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/output.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/resources/stylesheets/common/text-templates.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/resources/stylesheets/document-to-text.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/index.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/site.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/tabs.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/skinconf.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_af.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_es.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_it.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_no.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_ru.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_sk.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/status.xml

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/build.xml?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/build.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/build.xml Sat Apr  7 20:36:53 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.output.Text"/>
   <property name="forrest.version" value="0.8"/>
   <property name="type" value="output"/>
@@ -26,10 +25,8 @@
   <property name="websiteURL" value="http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.output.Text/"/>
   <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.output.Text/default.plugin.properties.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/default.plugin.properties.xml?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/default.plugin.properties.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/default.plugin.properties.xml Sat Apr  7 20:36:53 2007
@@ -16,5 +16,5 @@
   limitations under the License.
 -->
 <properties>
-       <property name="text.page.width" value="76"/>
-</properties>
\ No newline at end of file
+  <property name="text.page.width" value="76"/>
+</properties>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/locationmap.xml?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/locationmap.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/locationmap.xml Sat Apr  7 20:36:53 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="text.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.output.Text/output.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/output.xmap?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/output.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/output.xmap Sat Apr  7 20:36:53 2007
@@ -15,19 +15,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-  <!-- ============================================================ -->
-  <!-- Plain Text Documentation                                     -->
-  <!-- This plugin performs the transformation of the Forrest       -->
-  <!-- intermediate format (currently document-v*, soon to be       -->
-  <!-- XHTML) to simple text.                                       -->
-  <!-- ============================================================ -->
-
+<!-- ============================================================ -->
+<!-- Plain Text Documentation                                     -->
+<!-- This plugin performs the transformation of the Forrest       -->
+<!-- intermediate format (currently document-v*, soon to be       -->
+<!-- XHTML) to simple text.                                       -->
+<!-- ============================================================ -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
   <map:pipelines>
     <map:pipeline internal="true">
-
-      <!-- Plain Text Documentation -->
+<!-- Plain Text Documentation -->
       <map:match type="regexp" pattern="^(.*?)([^/]*).txt$">
         <map:aggregate element="site">
           <map:part src="cocoon://skinconf.xml"/>
@@ -37,11 +34,10 @@
         <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.txt"/>
         <map:transform src="{lm:transform.html.broken-links}"/>
         <map:transform src="{lm:text.transform.document.text}">
-            <map:parameter name="document-width" value="{properties:text.page.width}"/>
+          <map:parameter name="document-width" value="{properties:text.page.width}"/>
         </map:transform>
         <map:serialize type="text"/>
       </map:match>
-
     </map:pipeline>
   </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/resources/stylesheets/common/text-templates.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/resources/stylesheets/common/text-templates.xsl?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/resources/stylesheets/common/text-templates.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/resources/stylesheets/common/text-templates.xsl Sat Apr  7 20:36:53 2007
@@ -16,19 +16,16 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <!-- A single carriage return -->
+<!-- A single carriage return -->
   <xsl:template name="cr">
-    <xsl:text>&#xa;</xsl:text>
+<xsl:text>&#xa;</xsl:text>
   </xsl:template>
-
-  <!-- A blank line -->
+<!-- A blank line -->
   <xsl:template name="newLine">
     <xsl:call-template name="cr"/>
     <xsl:call-template name="cr"/>
   </xsl:template>
-
-  <!-- Justify passed in text based on a passed in width and
+<!-- Justify passed in text based on a passed in width and
        type of alignment desired.
 
        Currently only supports (and defaults to) center alignment
@@ -37,7 +34,6 @@
     <xsl:param name="text"/>
     <xsl:param name="width" select="'76'"/>
     <xsl:param name="align" select="'center'"/>
-
     <xsl:variable name="leader">
       <xsl:choose>
         <xsl:when test="$align='center'">
@@ -48,20 +44,17 @@
           </xsl:call-template>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:text>*** </xsl:text>
+<xsl:text>*** </xsl:text>
           <xsl:value-of select="$align"/>
-          <xsl:text> alignment is not implemented</xsl:text>
+<xsl:text> alignment is not implemented</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:value-of select="concat($leader, $text)"/>
   </xsl:template>
-
   <xsl:template name="lineOf">
     <xsl:param name="chars" select="' '"/>
     <xsl:param name="size" select="80"/>
-
     <xsl:choose>
       <xsl:when test="$size &lt; 1"/>
       <xsl:when test="string-length($chars) &lt; $size">
@@ -75,21 +68,17 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Takes a block of text, normalizes all the spaces, carriage returns
+<!-- Takes a block of text, normalizes all the spaces, carriage returns
     etc.  It then word wraps to a specified width after indenting each
     line -->
-
   <xsl:template name="wrap-text">
     <xsl:param name="text"/>
     <xsl:param name="indent"/>
     <xsl:param name="width" select="$document-width"/>
     <xsl:param name="fixed" select="false"/>
-
-    <!-- FIXME: Handle case when ($width - $indent) less than 1 -->
+<!-- FIXME: Handle case when ($width - $indent) less than 1 -->
     <xsl:variable name="work-width" select="$width - $indent"/>
-
-    <!-- We'll lose whether the text had a trailing space when we
+<!-- We'll lose whether the text had a trailing space when we
     normalize-space() it.  Needed to preserve the space between
     a text() node and in-line markup.  For example
 
@@ -100,19 +89,17 @@
     A string that consists purely of white space will have the trailing-space
     variable set to ''.
     -->
-
     <xsl:variable name="trailing-space">
       <xsl:choose>
         <xsl:when test="normalize-space($text)!=''">
           <xsl:if test="substring($text, string-length($text))=' '">
-            <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
           </xsl:if>
         </xsl:when>
         <xsl:otherwise/>
       </xsl:choose>
     </xsl:variable>
-
-    <!-- Normalized text.  We'll use this for calculations on
+<!-- Normalized text.  We'll use this for calculations on
     splitting, lengths, etc.  If we're emitting based on fixed
     width text, do not normalize-space() the incoming text -->
     <xsl:variable name="ntext">
@@ -125,34 +112,28 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:choose>
       <xsl:when test="string-length($ntext) > $work-width">
-
-        <!-- Grab string of the maximum width we can have. -->
+<!-- Grab string of the maximum width we can have. -->
         <xsl:variable name="text-maxwidth">
           <xsl:value-of select="substring($ntext, 1, $work-width)"/>
         </xsl:variable>
-
-        <!-- Grab the substring of text-maxwidth that breaks on the last
+<!-- Grab the substring of text-maxwidth that breaks on the last
         space in text-maxwidth -->
         <xsl:variable name="text-wrap">
           <xsl:call-template name="text-to-last-space">
             <xsl:with-param name="text" select="$text-maxwidth"/>
           </xsl:call-template>
         </xsl:variable>
-
-        <!-- Grab the remaining text which will then be emit()'d again -->
+<!-- Grab the remaining text which will then be emit()'d again -->
         <xsl:variable name="text-remaining">
           <xsl:value-of select="substring($ntext, string-length($text-wrap)+1)"/>
         </xsl:variable>
-
         <xsl:call-template name="lineOf">
           <xsl:with-param name="size" select="$indent"/>
         </xsl:call-template>
         <xsl:value-of select="$text-wrap"/>
         <xsl:call-template name="cr"/>
-
         <xsl:call-template name="wrap-text">
           <xsl:with-param name="text" select="concat($text-remaining,$trailing-space)"/>
           <xsl:with-param name="indent" select="$indent"/>
@@ -167,31 +148,25 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Prefixes each line of a block of text with necessary indent,
+<!-- Prefixes each line of a block of text with necessary indent,
     markers (bullets, item numbers) and additional hanging indent.
 
     It does absolutely no word-wrapping as it is assumed that this
     has already been done. -->
-
   <xsl:template name="emit-with-indent">
     <xsl:param name="text"/>
     <xsl:param name="indent"/>
     <xsl:param name="marker" select="''"/>
     <xsl:param name="first-line" select="1"/>
-
     <xsl:variable name="marker-length" select="string-length($marker)"/>
     <xsl:variable name="tmp" select="substring-before($text,'&#xa;')"/>
-
     <xsl:choose>
       <xsl:when test="contains($text,'&#xa;')">
-
-        <!-- Determine the text to emit.  If it's the first line, include
+<!-- Determine the text to emit.  If it's the first line, include
              include the indentation marker.  Otherwise, include 
              an equivalent amount of blank space to replace the
              marker used in the first line.  This will create a
              hanging indent -->
-
         <xsl:variable name="text-to-emit">
           <xsl:call-template name="lineOf">
             <xsl:with-param name="size" select="$indent"/>
@@ -209,12 +184,9 @@
           </xsl:choose>
           <xsl:value-of select="$tmp"/>
         </xsl:variable>
-
         <xsl:value-of select="concat($text-to-emit,'&#xa;')"/>
-        
         <xsl:variable name="text-remaining"
                     select="substring($text, string-length($tmp)+2)"/>
-
         <xsl:call-template name="emit-with-indent">
           <xsl:with-param name="text" select="$text-remaining"/>
           <xsl:with-param name="indent" select="$indent"/>
@@ -239,19 +211,16 @@
           </xsl:choose>
           <xsl:value-of select="$text"/>
         </xsl:variable>
-
         <xsl:value-of select="concat($text-to-emit,'&#xa;')"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Grab the text up until the last space in the passed text -->
+<!-- Grab the text up until the last space in the passed text -->
   <xsl:template name="text-to-last-space">
     <xsl:param name="text"/>
-
     <xsl:variable name="leading">
       <xsl:choose>
-        <xsl:when test="contains($text,' ')"> 
+        <xsl:when test="contains($text,' ')">
           <xsl:value-of select="substring-before($text, ' ')"/>
         </xsl:when>
         <xsl:otherwise>
@@ -259,22 +228,19 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:variable name="remaining">
       <xsl:choose>
-        <xsl:when test="contains($text,' ')"> 
+        <xsl:when test="contains($text,' ')">
           <xsl:value-of select="substring-after($text, ' ')"/>
         </xsl:when>
         <xsl:otherwise/>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:value-of select="$leading"/>
-    <!-- Emit the space if we had one to begin with -->
+<!-- Emit the space if we had one to begin with -->
     <xsl:if test="contains($text,' ')">
-      <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
     </xsl:if>
-
     <xsl:choose>
       <xsl:when test="contains($remaining,' ')">
         <xsl:call-template name="text-to-last-space">
@@ -284,9 +250,8 @@
       <xsl:otherwise/>
     </xsl:choose>
   </xsl:template>
-
-  <!-- ==================================================================== -->
-  <!--  Table Handling
+<!-- ==================================================================== -->
+<!--  Table Handling
 
         The column widths are calculated automatically based on a maximum
         width, "maxwidth" (default 76),  that the table can be .  This maxiumum
@@ -301,24 +266,19 @@
         does a default indentation of 4 for verbatim text.  This value is used
         in the calculation of the column widths.
   -->
-  <!-- ==================================================================== -->
-
+<!-- ==================================================================== -->
   <xsl:template match="table">
     <xsl:param name="level">1</xsl:param>
     <xsl:param name="mincolwidth">10</xsl:param>
     <xsl:param name="width" select="$document-width"/>
     <xsl:variable name="cols">
       <xsl:value-of select="count(tr[1]/th|tr[1]/td) - count(tr[1]/th[@colspan]|tr[1]/td[@colspan]) + sum(tr[1]/th/@colspan) + sum(tr[1]/td/@colspan)"/>
-
     </xsl:variable>
-
     <xsl:variable name="indent" select="$level * $indent-per-level"/>
     <xsl:variable name="maxwidth" select="$width - $indent"/>
-
     <xsl:variable name="calc-colwidth">
       <xsl:value-of select="floor(($maxwidth - $indent - $cols) div $cols) - 1"/>
     </xsl:variable>
-
     <xsl:variable name="colwidth">
       <xsl:choose>
         <xsl:when test="$mincolwidth > $calc-colwidth">
@@ -329,18 +289,15 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:variable name="caption-text">
       <xsl:apply-templates select="caption" mode="in-list">
         <xsl:with-param name="level" select="$level"/>
       </xsl:apply-templates>
     </xsl:variable>
-
     <xsl:call-template name="emit-with-indent">
       <xsl:with-param name="text" select="$caption-text"/>
       <xsl:with-param name="indent" select="$indent"/>
     </xsl:call-template>
-
     <xsl:variable name="the-table">
       <xsl:apply-templates select="tr" mode="in-list">
         <xsl:with-param name="level" select="$level"/>
@@ -348,16 +305,12 @@
         <xsl:with-param name="cols" select="$cols"/>
       </xsl:apply-templates>
     </xsl:variable>
-
     <xsl:call-template name="emit-with-indent">
       <xsl:with-param name="text" select="$the-table"/>
       <xsl:with-param name="indent" select="$indent"/>
     </xsl:call-template>
-
     <xsl:call-template name="newLine"/>
-
   </xsl:template>
-
   <xsl:template match="table" mode="in-list">
     <xsl:param name="level">0</xsl:param>
     <xsl:param name="mincolwidth">10</xsl:param>
@@ -365,14 +318,11 @@
     <xsl:variable name="cols">
       <xsl:value-of select="count(tr[1]/th|tr[1]/td)"/>
     </xsl:variable>
-
     <xsl:variable name="indent" select="$level * $indent-per-level"/>
     <xsl:variable name="maxwidth" select="$width - $indent"/>
-
     <xsl:variable name="calc-colwidth">
       <xsl:value-of select="floor(($maxwidth - $indent - $cols) div $cols) - 1"/>
     </xsl:variable>
-
     <xsl:variable name="colwidth">
       <xsl:choose>
         <xsl:when test="$mincolwidth > $calc-colwidth">
@@ -383,18 +333,15 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:variable name="caption-text">
       <xsl:apply-templates select="caption" mode="in-list">
         <xsl:with-param name="level" select="$level"/>
       </xsl:apply-templates>
     </xsl:variable>
-
     <xsl:call-template name="emit-with-indent">
       <xsl:with-param name="text" select="$caption-text"/>
       <xsl:with-param name="indent" select="$indent"/>
     </xsl:call-template>
-
     <xsl:variable name="the-table">
       <xsl:apply-templates select="tr" mode="in-list">
         <xsl:with-param name="level" select="$level"/>
@@ -402,37 +349,29 @@
         <xsl:with-param name="cols" select="$cols"/>
       </xsl:apply-templates>
     </xsl:variable>
-
     <xsl:call-template name="emit-with-indent">
       <xsl:with-param name="text" select="$the-table"/>
       <xsl:with-param name="indent" select="$indent"/>
     </xsl:call-template>
-
     <xsl:call-template name="newLine"/>
-
   </xsl:template>
-
   <xsl:template match="caption" mode="in-list">
     <xsl:param name="level"/>
     <xsl:apply-templates/>
   </xsl:template>
-    
   <xsl:template match="tr" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="colwidth"/>
     <xsl:param name="cols"/>
-
     <xsl:variable name="dashes">
       <xsl:call-template name="lineOf">
         <xsl:with-param name="size" select="'80'"/>
         <xsl:with-param name="chars" select="'-'"/>
       </xsl:call-template>
     </xsl:variable>
-
     <xsl:variable name="cell-border">
       <xsl:value-of select="substring( $dashes, 1, $colwidth )"/>
     </xsl:variable>
-    
     <xsl:variable name="row-border">
       <xsl:call-template name="make-row-border">
         <xsl:with-param name="col">1</xsl:with-param>
@@ -441,17 +380,13 @@
         <xsl:with-param name="cell-border" select="$cell-border"/>
       </xsl:call-template>
     </xsl:variable>
-
     <xsl:value-of select="$row-border"/>
     <xsl:call-template name="cr"/>
-
-    <!-- Can we handle a dynamic number of columns?  Not sure how to
+<!-- Can we handle a dynamic number of columns?  Not sure how to
          do that, so just limit the number we can handle to some reasonable
          maximum.  Currently, that maximum is 10 -->
-
-    <!-- For the current row, grab the content for each cell in this row.
+<!-- For the current row, grab the content for each cell in this row.
          The content will be fit by the "handle-cell-content" template.  -->
-
     <xsl:variable name="col-1">
       <xsl:if test="(th|td)[1]">
         <xsl:variable name="tmp">
@@ -582,13 +517,11 @@
         </xsl:call-template>
       </xsl:if>
     </xsl:variable>
-
-    <!--
+<!--
       Okay, so we've got the contents of the cells for a single row.
       Let's pass this off to emit-table-row where we can extract
       $colwidth from each column and emit until we're out of content
     -->
-
     <xsl:call-template name="emit-table-row">
       <xsl:with-param name="maxcols" select="$cols"/>
       <xsl:with-param name="colwidth" select="$colwidth"/>
@@ -603,30 +536,24 @@
       <xsl:with-param name="col-9" select="$col-9"/>
       <xsl:with-param name="col-10" select="$col-10"/>
     </xsl:call-template>
-
     <xsl:if test="position()=last()">
       <xsl:value-of select="$row-border"/>
       <xsl:call-template name="cr"/>
     </xsl:if>
-
   </xsl:template>
-
   <xsl:template match="td|th" mode="in-list">
     <xsl:param name="width"/>
-
     <xsl:apply-templates mode="in-list">
       <xsl:with-param name="width" select="$width"/>
       <xsl:with-param name="level" select="'0'"/>
     </xsl:apply-templates>
   </xsl:template>
-
   <xsl:template name="make-row-border">
     <xsl:param name="col"/>
     <xsl:param name="colwidth"/>
     <xsl:param name="maxcols"/>
     <xsl:param name="cell-border"/>
     <xsl:param name="border">+</xsl:param>
-
     <xsl:choose>
       <xsl:when test="$col > $maxcols">
         <xsl:value-of select="$border"/>
@@ -642,14 +569,12 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- emit-table-row
+<!-- emit-table-row
 
        Recursive template to keep extracting content from each of the
        columns, emit a single line in each cell, until all the content
        is used up
   -->
-
   <xsl:template name="emit-table-row">
     <xsl:param name="maxcols"/>
     <xsl:param name="colwidth"/>
@@ -663,85 +588,65 @@
     <xsl:param name="col-8"/>
     <xsl:param name="col-9"/>
     <xsl:param name="col-10"/>
-
-    <xsl:text>| </xsl:text>
+<xsl:text>| </xsl:text>
     <xsl:call-template name="make-cell">
       <xsl:with-param name="content" select="$col-1"/>
       <xsl:with-param name="colwidth" select="$colwidth"/>
     </xsl:call-template>
-
     <xsl:if test="$maxcols > 1">
-
-      <xsl:text> | </xsl:text>
+<xsl:text> | </xsl:text>
       <xsl:call-template name="make-cell">
         <xsl:with-param name="content" select="$col-2"/>
         <xsl:with-param name="colwidth" select="$colwidth"/>
       </xsl:call-template>
-
       <xsl:if test="$maxcols > 2">
-
-        <xsl:text> | </xsl:text>
+<xsl:text> | </xsl:text>
         <xsl:call-template name="make-cell">
           <xsl:with-param name="content" select="$col-3"/>
           <xsl:with-param name="colwidth" select="$colwidth"/>
         </xsl:call-template>
-
         <xsl:if test="$maxcols > 3">
-
-          <xsl:text> | </xsl:text>
+<xsl:text> | </xsl:text>
           <xsl:call-template name="make-cell">
             <xsl:with-param name="content" select="$col-4"/>
             <xsl:with-param name="colwidth" select="$colwidth"/>
           </xsl:call-template>
-
           <xsl:if test="$maxcols > 4">
-
-            <xsl:text> | </xsl:text>
+<xsl:text> | </xsl:text>
             <xsl:call-template name="make-cell">
               <xsl:with-param name="content" select="$col-5"/>
               <xsl:with-param name="colwidth" select="$colwidth"/>
             </xsl:call-template>
-
             <xsl:if test="$maxcols > 5">
-
-              <xsl:text> | </xsl:text>
+<xsl:text> | </xsl:text>
               <xsl:call-template name="make-cell">
                 <xsl:with-param name="content" select="$col-6"/>
                 <xsl:with-param name="colwidth" select="$colwidth"/>
               </xsl:call-template>
-
               <xsl:if test="$maxcols > 6">
-
-                <xsl:text> | </xsl:text>
+<xsl:text> | </xsl:text>
                 <xsl:call-template name="make-cell">
                   <xsl:with-param name="content" select="$col-7"/>
                   <xsl:with-param name="colwidth" select="$colwidth"/>
                 </xsl:call-template>
-
                 <xsl:if test="$maxcols > 7">
-
-                  <xsl:text> | </xsl:text>
+<xsl:text> | </xsl:text>
                   <xsl:call-template name="make-cell">
                     <xsl:with-param name="content" select="$col-8"/>
                     <xsl:with-param name="colwidth" select="$colwidth"/>
                   </xsl:call-template>
-
                   <xsl:if test="$maxcols > 8">
-
-                    <xsl:text> | </xsl:text>
+<xsl:text> | </xsl:text>
                     <xsl:call-template name="make-cell">
                       <xsl:with-param name="content" select="$col-9"/>
                       <xsl:with-param name="colwidth" select="$colwidth"/>
                     </xsl:call-template>
-
                     <xsl:if test="$maxcols > 9">
-
-                      <xsl:text> | </xsl:text>
+<xsl:text> | </xsl:text>
                       <xsl:call-template name="make-cell">
                         <xsl:with-param name="content" select="$col-10"/>
                         <xsl:with-param name="colwidth" select="$colwidth"/>
                       </xsl:call-template>
-
                     </xsl:if>
                   </xsl:if>
                 </xsl:if>
@@ -751,46 +656,42 @@
         </xsl:if>
       </xsl:if>
     </xsl:if>
-
-    <xsl:text> |</xsl:text>
+<xsl:text> |</xsl:text>
     <xsl:call-template name="cr"/>
-
-    <!-- Determine whether there is any content left in any of the
+<!-- Determine whether there is any content left in any of the
          cells on this row.  If so, we need to call emit-table-row again -->
-
     <xsl:variable name="content-remains">
       <xsl:if test="string-length(substring($col-1, $colwidth - 2)) > 1">
-        <xsl:text>1</xsl:text>
+<xsl:text>1</xsl:text>
       </xsl:if>
       <xsl:if test="string-length(substring($col-2, $colwidth - 2)) > 1">
-        <xsl:text>1</xsl:text>
+<xsl:text>1</xsl:text>
       </xsl:if>
       <xsl:if test="string-length(substring($col-3, $colwidth - 2)) > 1">
-        <xsl:text>1</xsl:text>
+<xsl:text>1</xsl:text>
       </xsl:if>
       <xsl:if test="string-length(substring($col-4, $colwidth - 2)) > 1">
-        <xsl:text>1</xsl:text>
+<xsl:text>1</xsl:text>
       </xsl:if>
       <xsl:if test="string-length(substring($col-5, $colwidth - 2)) > 1">
-        <xsl:text>1</xsl:text>
+<xsl:text>1</xsl:text>
       </xsl:if>
       <xsl:if test="string-length(substring($col-6, $colwidth - 2)) > 1">
-        <xsl:text>1</xsl:text>
+<xsl:text>1</xsl:text>
       </xsl:if>
       <xsl:if test="string-length(substring($col-7, $colwidth - 2)) > 1">
-        <xsl:text>1</xsl:text>
+<xsl:text>1</xsl:text>
       </xsl:if>
       <xsl:if test="string-length(substring($col-8, $colwidth - 2)) > 1">
-        <xsl:text>1</xsl:text>
+<xsl:text>1</xsl:text>
       </xsl:if>
       <xsl:if test="string-length(substring($col-9, $colwidth - 2)) > 1">
-        <xsl:text>1</xsl:text>
+<xsl:text>1</xsl:text>
       </xsl:if>
       <xsl:if test="string-length(substring($col-10, $colwidth - 2)) > 1">
-        <xsl:text>1</xsl:text>
+<xsl:text>1</xsl:text>
       </xsl:if>
     </xsl:variable>
-
     <xsl:if test="string-length($content-remains) > 0">
       <xsl:call-template name="emit-table-row">
         <xsl:with-param name="maxcols" select="$maxcols"/>
@@ -817,26 +718,20 @@
             select="substring( $col-10, $colwidth - 2 + 1 )"/>
       </xsl:call-template>
     </xsl:if>
-
   </xsl:template>
-
   <xsl:template name="make-cell">
     <xsl:param name="content"/>
     <xsl:param name="colwidth"/>
-
     <xsl:variable name="padding">
       <xsl:call-template name="lineOf">
         <xsl:with-param name="size" select="'80'"/>
       </xsl:call-template>
     </xsl:variable>
-
     <xsl:variable name="cell">
       <xsl:choose>
         <xsl:when test="$colwidth - 2 > string-length($content)">
-
-          <!-- The subtraction of 2 is for the border padding.  It is reflected
+<!-- The subtraction of 2 is for the border padding.  It is reflected
                in the call to make-cell in the "content" parameter -->
-
           <xsl:value-of select="concat($content,
                substring($padding,1,$colwidth - 2 - string-length($content)))"/>
         </xsl:when>
@@ -845,29 +740,24 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:value-of select="$cell"/>
   </xsl:template>
-
-  <!--  handle-cell-content
+<!--  handle-cell-content
 
         Replaces any new-line characters found in the content with 
         an appropriate number of spaces to fill out the cell to the
         end of the cell and another number of spaces to fill out a 
         "blank" line.
   -->
-
   <xsl:template name="handle-cell-content">
     <xsl:param name="text"/>
     <xsl:param name="colwidth"/>
-
     <xsl:variable name="spaces">
       <xsl:call-template name="lineOf">
         <xsl:with-param name="size" select="'80'"/>
         <xsl:with-param name="chars" select="' '"/>
       </xsl:call-template>
     </xsl:variable>
-
     <xsl:choose>
       <xsl:when test="contains( $text, '&#xa;' )">
         <xsl:variable name="text-before">
@@ -875,8 +765,7 @@
         </xsl:variable>
         <xsl:variable name="tmp">
           <xsl:value-of select="$text-before"/>
-
-          <!-- Pad only if the length of the text we've emitted is not
+<!-- Pad only if the length of the text we've emitted is not
                a multiple of the unpadded column width ($colwidth - 2). -->
           <xsl:if test="(string-length($text-before) mod ($colwidth - 2))!=0">
             <xsl:value-of select="substring( $spaces, 1,
@@ -893,7 +782,5 @@
         <xsl:value-of select="$text"/>
       </xsl:otherwise>
     </xsl:choose>
-
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/resources/stylesheets/document-to-text.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/resources/stylesheets/document-to-text.xsl?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/resources/stylesheets/document-to-text.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/resources/stylesheets/document-to-text.xsl Sat Apr  7 20:36:53 2007
@@ -24,29 +24,21 @@
 -->
 <xsl:stylesheet version="1.0" 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:import href="common/text-templates.xsl"/>
-
-  <xsl:param name="dynamic-page" select="'false'"/>  
+  <xsl:param name="dynamic-page" select="'false'"/>
   <xsl:param name="notoc"/>
   <xsl:param name="path"/>
   <xsl:param name="document-width">76</xsl:param>
-
   <xsl:variable name="indent-per-level">2</xsl:variable>
-
   <xsl:template match="/">
     <xsl:apply-templates select="//document"/>
   </xsl:template>
-
   <xsl:template match="document">
     <xsl:apply-templates select="header"/>
-
     <xsl:apply-templates select="body" mode="toc"/>
-
     <xsl:apply-templates select="body"/>
   </xsl:template>
-
-  <!-- Handle the document header bits -->
+<!-- Handle the document header bits -->
   <xsl:template match="header">
     <xsl:call-template name="justify-text">
       <xsl:with-param name="text" select="title"/>
@@ -54,7 +46,6 @@
       <xsl:with-param name="align" select="'center'"/>
     </xsl:call-template>
     <xsl:call-template name="cr"/>
-
     <xsl:if test="normalize-space(subtitle)!=''">
       <xsl:call-template name="justify-text">
         <xsl:with-param name="text" select="subtitle"/>
@@ -63,17 +54,13 @@
       </xsl:call-template>
       <xsl:call-template name="cr"/>
     </xsl:if>
-
     <xsl:apply-templates select="type"/>
     <xsl:apply-templates select="notice"/>
     <xsl:apply-templates select="abstract"/>
-
     <xsl:apply-templates select="authors"/>
     <xsl:apply-templates select="version"/>
     <xsl:call-template name="cr"/>
-
   </xsl:template>
-
   <xsl:template match="header/authors">
     <xsl:for-each select="person">
       <xsl:choose>
@@ -84,23 +71,19 @@
     </xsl:for-each>
     <xsl:call-template name="cr"/>
   </xsl:template>
-
   <xsl:template match="notice">
     <xsl:param name="level" select="'2'"/>
-
     <xsl:call-template name="cr"/>
     <xsl:call-template name="justify-text">
       <xsl:with-param name="text" select="'NOTICE'"/>
       <xsl:with-param name="width" select="$document-width"/>
     </xsl:call-template>
     <xsl:call-template name="cr"/>
-
     <xsl:variable name="para">
       <xsl:apply-templates>
         <xsl:with-param name="level" select="$level"/>
       </xsl:apply-templates>
     </xsl:variable>
-
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="$para"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
@@ -108,23 +91,19 @@
     </xsl:call-template>
     <xsl:call-template name="cr"/>
   </xsl:template>
-
   <xsl:template match="abstract">
     <xsl:param name="level" select="'2'"/>
-
     <xsl:call-template name="cr"/>
     <xsl:call-template name="justify-text">
       <xsl:with-param name="text" select="'ABSTRACT'"/>
       <xsl:with-param name="width" select="$document-width"/>
     </xsl:call-template>
     <xsl:call-template name="cr"/>
-
     <xsl:variable name="para">
       <xsl:apply-templates>
         <xsl:with-param name="level" select="$level"/>
       </xsl:apply-templates>
     </xsl:variable>
-
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="$para"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
@@ -132,29 +111,24 @@
     </xsl:call-template>
     <xsl:call-template name="cr"/>
   </xsl:template>
-
-  <!-- Handle the body bits -->
+<!-- Handle the body bits -->
   <xsl:template match="body">
     <xsl:apply-templates>
       <xsl:with-param name="level" select="'0'"/>
     </xsl:apply-templates>
   </xsl:template>
-
   <xsl:template match="section">
     <xsl:param name="level" select="'0'"/>
-
     <xsl:variable name="title-text">
       <xsl:value-of select="normalize-space(title)"/>
     </xsl:variable>
-
     <xsl:call-template name="cr"/>
     <xsl:call-template name="lineOf">
       <xsl:with-param name="size" select="$level * $indent-per-level"/>
     </xsl:call-template>
     <xsl:value-of select="$title-text"/>
     <xsl:call-template name="cr"/>
-
-    <!-- generate a title element, level 1 -> h3, level 2 -> h4 and so on... -->
+<!-- generate a title element, level 1 -> h3, level 2 -> h4 and so on... -->
     <xsl:call-template name="lineOf">
       <xsl:with-param name="size" select="$level * $indent-per-level"/>
     </xsl:call-template>
@@ -183,22 +157,19 @@
           <xsl:with-param name="size" select="string-length($title-text)"/>
         </xsl:call-template>
       </xsl:when>
-    </xsl:choose>    
+    </xsl:choose>
     <xsl:call-template name="cr"/>
-
-    <!-- FIXME display $indent spaces -->
+<!-- FIXME display $indent spaces -->
     <xsl:apply-templates select="*[not(self::title)]">
       <xsl:with-param name="level" select="$level + 1"/>
     </xsl:apply-templates>
   </xsl:template>
-
   <xsl:template match="p[@xml:space='preserve']">
     <xsl:param name="level" select="'1'"/>
     <xsl:call-template name="cr"/>
     <xsl:value-of select="."/>
     <xsl:call-template name="cr"/>
   </xsl:template>
-
   <xsl:template match="source">
     <xsl:param name="level" select="'1'"/>
     <xsl:call-template name="emit-with-indent">
@@ -208,55 +179,43 @@
     </xsl:call-template>
     <xsl:call-template name="cr"/>
   </xsl:template>
-
   <xsl:template match="p">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:call-template name="cr"/>
-
     <xsl:variable name="para">
       <xsl:apply-templates>
         <xsl:with-param name="level" select="$level"/>
         <xsl:with-param name="width" select="$width"/>
       </xsl:apply-templates>
     </xsl:variable>
-
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="$para"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="width" select="$width"/>
     </xsl:call-template>
-
     <xsl:call-template name="cr"/>
-
   </xsl:template>
-
   <xsl:template match="p" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:variable name="para">
       <xsl:apply-templates mode="in-list">
         <xsl:with-param name="level" select="$level"/>
         <xsl:with-param name="width" select="$width"/>
       </xsl:apply-templates>
     </xsl:variable>
-
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="$para"/>
       <xsl:with-param name="indent" select="'0'"/>
       <xsl:with-param name="width" select="$width"/>
     </xsl:call-template>
-
     <xsl:if test="position()!=last()">
       <xsl:call-template name="cr"/>
     </xsl:if>
-
   </xsl:template>
-
   <xsl:template match="div|span">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
@@ -266,7 +225,6 @@
       <xsl:with-param name="width" select="$width"/>
     </xsl:apply-templates>
   </xsl:template>
-
   <xsl:template match="div|span" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
@@ -276,7 +234,6 @@
       <xsl:with-param name="width" select="$width"/>
     </xsl:apply-templates>
   </xsl:template>
-
   <xsl:template match="ol|ul">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
@@ -287,7 +244,6 @@
       <xsl:with-param name="width" select="$width"/>
     </xsl:apply-templates>
   </xsl:template>
-
   <xsl:template match="ol|ul" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
@@ -298,7 +254,6 @@
       <xsl:with-param name="width" select="$width"/>
     </xsl:apply-templates>
   </xsl:template>
-
   <xsl:template match="dl">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
@@ -309,7 +264,6 @@
       <xsl:with-param name="width" select="$width"/>
     </xsl:apply-templates>
   </xsl:template>
-
   <xsl:template match="dl" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
@@ -319,19 +273,16 @@
       <xsl:with-param name="width" select="$width"/>
     </xsl:apply-templates>
   </xsl:template>
-
   <xsl:template match="note | warning | fixme">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:call-template name="cr"/>
     <xsl:call-template name="lineOf">
       <xsl:with-param name="size" select="$level * $indent-per-level"/>
     </xsl:call-template>
-
     <xsl:variable name="title-text">
-      <xsl:text>** </xsl:text>
+<xsl:text>** </xsl:text>
       <xsl:choose>
         <xsl:when test="@label">
           <xsl:value-of select="@label"/>
@@ -340,48 +291,40 @@
         <xsl:when test="local-name() = 'warning'">Warning</xsl:when>
         <xsl:otherwise>Fixme (<xsl:value-of select="@author"/>)</xsl:otherwise>
       </xsl:choose>
-      <xsl:text> **</xsl:text>
+<xsl:text> **</xsl:text>
     </xsl:variable>
-
     <xsl:call-template name="justify-text">
       <xsl:with-param name="text" select="$title-text"/>
       <xsl:with-param name="width" select="$width"/>
     </xsl:call-template>
     <xsl:call-template name="cr"/>
-
     <xsl:variable name="para">
       <xsl:apply-templates>
         <xsl:with-param name="level" select="$level"/>
         <xsl:with-param name="width" select="$width"/>
       </xsl:apply-templates>
     </xsl:variable>
-
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="$para"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="width" select="$width"/>
     </xsl:call-template>
-
     <xsl:call-template name="cr"/>
     <xsl:call-template name="lineOf">
       <xsl:with-param name="size" select="$level * $indent-per-level"/>
     </xsl:call-template>
-
     <xsl:call-template name="lineOf">
       <xsl:with-param name="size" select="$width"/>
       <xsl:with-param name="chars" select="'-'"/>
     </xsl:call-template>
     <xsl:call-template name="cr"/>
-
   </xsl:template>
-
   <xsl:template match="note | warning | fixme" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:variable name="title-text">
-      <xsl:text>** </xsl:text>
+<xsl:text>** </xsl:text>
       <xsl:choose>
         <xsl:when test="@label">
           <xsl:value-of select="@label"/>
@@ -390,62 +333,52 @@
         <xsl:when test="local-name() = 'warning'">Warning</xsl:when>
         <xsl:otherwise>Fixme (<xsl:value-of select="@author"/>)</xsl:otherwise>
       </xsl:choose>
-      <xsl:text> **</xsl:text>
+<xsl:text> **</xsl:text>
     </xsl:variable>
-
     <xsl:call-template name="justify-text">
       <xsl:with-param name="text" select="$title-text"/>
       <xsl:with-param name="width" select="$width"/>
     </xsl:call-template>
     <xsl:call-template name="cr"/>
-
     <xsl:variable name="para">
       <xsl:apply-templates mode="in-list">
         <xsl:with-param name="level" select="$level"/>
         <xsl:with-param name="width" select="$width"/>
       </xsl:apply-templates>
     </xsl:variable>
-
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="$para"/>
       <xsl:with-param name="indent" select="'0'"/>
       <xsl:with-param name="width" select="$width"/>
       <xsl:with-param name="fixed" select="true"/>
     </xsl:call-template>
-
     <xsl:call-template name="cr"/>
     <xsl:call-template name="lineOf">
       <xsl:with-param name="size" select="$width"/>
       <xsl:with-param name="chars" select="'-'"/>
     </xsl:call-template>
     <xsl:call-template name="cr"/>
-
   </xsl:template>
-
   <xsl:template match="figure">
     <xsl:param name="level" select="'1'"/>
-    <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
     <xsl:apply-templates>
       <xsl:with-param name="level" select="$level"/>
     </xsl:apply-templates>
-
-    <xsl:text>[Figure: </xsl:text>
+<xsl:text>[Figure: </xsl:text>
     <xsl:value-of select="@alt"/>
-    <xsl:text>]</xsl:text>
+<xsl:text>]</xsl:text>
   </xsl:template>
-
   <xsl:template match="ol/li">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:variable name="marker">
       <xsl:value-of select="position()"/>
-      <xsl:text>. </xsl:text>
+<xsl:text>. </xsl:text>
     </xsl:variable>
-
     <xsl:variable name="item">
-      <!-- If we have no surrounding "p" elements in which word wrapping
+<!-- If we have no surrounding "p" elements in which word wrapping
       can take place, we need to see if we can word-wrap everything
       we have.  We can do this if we have no "p" elements and no
       nested lists or tables. -->
@@ -473,26 +406,22 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:call-template name="emit-with-indent">
       <xsl:with-param name="text" select="$item"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="marker" select="$marker"/>
     </xsl:call-template>
   </xsl:template>
-
   <xsl:template match="ol/li" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:variable name="marker">
       <xsl:value-of select="position()"/>
-      <xsl:text>. </xsl:text>
+<xsl:text>. </xsl:text>
     </xsl:variable>
-
     <xsl:variable name="item">
-      <!-- If we have no surrounding "p" elements in which word wrapping
+<!-- If we have no surrounding "p" elements in which word wrapping
       can take place, we need to see if we can word-wrap everything
       we have.  We can do this if we have no "p" elements and no
       nested lists or tables. -->
@@ -520,21 +449,18 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:call-template name="emit-with-indent">
       <xsl:with-param name="text" select="$item"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="marker" select="$marker"/>
     </xsl:call-template>
   </xsl:template>
-
   <xsl:template match="ul/li">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:variable name="item">
-      <!-- If we have no surrounding "p" elements in which word wrapping
+<!-- If we have no surrounding "p" elements in which word wrapping
       can take place, we need to see if we can word-wrap everything
       we have.  We can do this if we have no "p" elements and no
       nested lists or tables. -->
@@ -560,22 +486,18 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:call-template name="emit-with-indent">
       <xsl:with-param name="text" select="$item"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="marker" select="'* '"/>
     </xsl:call-template>
-
   </xsl:template>
-
   <xsl:template match="ul/li" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:variable name="item">
-      <!-- If we have no surrounding "p" elements in which word wrapping
+<!-- If we have no surrounding "p" elements in which word wrapping
       can take place, we need to see if we can word-wrap everything
       we have.  We can do this if we have no "p" elements and no
       nested lists or tables. -->
@@ -601,22 +523,18 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:call-template name="emit-with-indent">
       <xsl:with-param name="text" select="$item"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="marker" select="'* '"/>
     </xsl:call-template>
-
   </xsl:template>
-
   <xsl:template match="dd">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:variable name="item">
-      <!-- If we have no surrounding "p" elements in which word wrapping
+<!-- If we have no surrounding "p" elements in which word wrapping
       can take place, we need to see if we can word-wrap everything
       we have.  We can do this if we have no "p" elements and no
       nested lists or tables. -->
@@ -642,21 +560,18 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:call-template name="emit-with-indent">
       <xsl:with-param name="text" select="$item"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="marker" select="'   '"/>
     </xsl:call-template>
   </xsl:template>
-
   <xsl:template match="dd" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:variable name="item">
-      <!-- If we have no surrounding "p" elements in which word wrapping
+<!-- If we have no surrounding "p" elements in which word wrapping
       can take place, we need to see if we can word-wrap everything
       we have.  We can do this if we have no "p" elements and no
       nested lists or tables. -->
@@ -682,20 +597,17 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:call-template name="emit-with-indent">
       <xsl:with-param name="text" select="$item"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="marker" select="'   '"/>
     </xsl:call-template>
   </xsl:template>
-
-  <!-- Simple items that can contain only in-line mark up -->
+<!-- Simple items that can contain only in-line mark up -->
   <xsl:template match="dt">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:call-template name="cr"/>
     <xsl:variable name="item">
       <xsl:apply-templates mode="in-list">
@@ -709,12 +621,10 @@
       <xsl:with-param name="marker" select="':: '"/>
     </xsl:call-template>
   </xsl:template>
-
   <xsl:template match="dt" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:call-template name="cr"/>
     <xsl:variable name="item">
       <xsl:apply-templates mode="in-list">
@@ -728,15 +638,13 @@
       <xsl:with-param name="marker" select="':: '"/>
     </xsl:call-template>
   </xsl:template>
-
-  <!-- Handle some in-line elements that we won't actually do anything
+<!-- Handle some in-line elements that we won't actually do anything
        with other than handle the emission of a space after the element
        has been emitted.  Needs to be done since any text nodes will
        have any leading spaces removed when they go through the 
        the wrap-text() template.  This will preserve the space
        between an in-line element and a following text node.
   -->
-
   <xsl:template match="em|strong|code">
     <xsl:param name="level" select="'1'"/>
     <xsl:apply-templates>
@@ -744,15 +652,14 @@
     </xsl:apply-templates>
     <xsl:choose>
       <xsl:when test="starts-with(following-sibling::text(),' ')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:when test="starts-with(following-sibling::text(),'&#xa;')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:otherwise/>
     </xsl:choose>
   </xsl:template>
-
   <xsl:template match="em|strong|code" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:apply-templates>
@@ -760,68 +667,60 @@
     </xsl:apply-templates>
     <xsl:choose>
       <xsl:when test="starts-with(following-sibling::text(),' ')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:when test="starts-with(following-sibling::text(),'&#xa;')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:otherwise/>
     </xsl:choose>
   </xsl:template>
-
   <xsl:template match="link|jump|fork|a">
     <xsl:param name="level" select="'1'"/>
     <xsl:apply-templates>
       <xsl:with-param name="level" select="$level"/>
     </xsl:apply-templates>
-
-    <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="concat('[Link: ', @href, ']')"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="width"
           select="$document-width - ($level * $indent-per-level)"/>
     </xsl:call-template>
-      
     <xsl:choose>
       <xsl:when test="starts-with(following-sibling::text(),' ')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:when test="starts-with(following-sibling::text(),'&#xa;')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:otherwise/>
     </xsl:choose>
   </xsl:template>
-
   <xsl:template match="link|jump|fork|a" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:apply-templates mode="in-list">
       <xsl:with-param name="level" select="$level"/>
     </xsl:apply-templates>
-
-    <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="concat('[Link: ', @href, ']')"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="width"
           select="$document-width - ($level * $indent-per-level)"/>
     </xsl:call-template>
-      
     <xsl:choose>
       <xsl:when test="starts-with(following-sibling::text(),' ')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:when test="starts-with(following-sibling::text(),'&#xa;')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:otherwise/>
     </xsl:choose>
   </xsl:template>
-
   <xsl:template match="icon|img">
     <xsl:param name="level" select="'1'"/>
-
     <xsl:variable name="type">
       <xsl:choose>
         <xsl:when test="local-name()='icon'">Icon: </xsl:when>
@@ -829,7 +728,6 @@
         <xsl:otherwise>Unknown: </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:variable name="value">
       <xsl:choose>
         <xsl:when test="local-name()='icon'">
@@ -843,30 +741,25 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
-    <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="concat('[', $type, $value, ']')"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="width"
           select="$document-width - ($level * $indent-per-level)"/>
     </xsl:call-template>
-      
     <xsl:choose>
       <xsl:when test="starts-with(following-sibling::text(),' ')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:when test="starts-with(following-sibling::text(),'&#xa;')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:otherwise/>
     </xsl:choose>
-
   </xsl:template>
-
   <xsl:template match="icon|img" mode="in-list">
     <xsl:param name="level" select="'1'"/>
-
     <xsl:variable name="type">
       <xsl:choose>
         <xsl:when test="local-name()='icon'">Icon: </xsl:when>
@@ -874,7 +767,6 @@
         <xsl:otherwise>Unknown: </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
     <xsl:variable name="value">
       <xsl:choose>
         <xsl:when test="local-name()='icon'">
@@ -888,75 +780,65 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
-    <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="concat('[', $type, $value, ']')"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="width"
           select="$document-width - ($level * $indent-per-level)"/>
     </xsl:call-template>
-      
     <xsl:choose>
       <xsl:when test="starts-with(following-sibling::text(),' ')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:when test="starts-with(following-sibling::text(),'&#xa;')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:otherwise/>
     </xsl:choose>
-
   </xsl:template>
-
   <xsl:template match="acronym">
     <xsl:param name="level" select="'1'"/>
     <xsl:apply-templates>
       <xsl:with-param name="level" select="$level"/>
     </xsl:apply-templates>
-
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="concat(' (',@title,')')"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="width"
           select="$document-width - ($level * $indent-per-level)"/>
     </xsl:call-template>
-      
     <xsl:choose>
       <xsl:when test="starts-with(following-sibling::text(),' ')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:when test="starts-with(following-sibling::text(),'&#xa;')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:otherwise/>
     </xsl:choose>
   </xsl:template>
-
   <xsl:template match="acronym" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:apply-templates>
       <xsl:with-param name="level" select="$level"/>
     </xsl:apply-templates>
-
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="concat(' (',@title,')')"/>
       <xsl:with-param name="indent" select="$level * $indent-per-level"/>
       <xsl:with-param name="width"
           select="$document-width - ($level * $indent-per-level)"/>
     </xsl:call-template>
-      
     <xsl:choose>
       <xsl:when test="starts-with(following-sibling::text(),' ')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:when test="starts-with(following-sibling::text(),'&#xa;')">
-        <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
       </xsl:when>
       <xsl:otherwise/>
     </xsl:choose>
   </xsl:template>
-
   <xsl:template match="version">
     <xsl:param name="level" select="'1'"/>
     <xsl:apply-templates select="@major"/>
@@ -974,96 +856,74 @@
     </xsl:choose>
     <xsl:call-template name="cr"/>
   </xsl:template>
-
   <xsl:template match="@major">
      v<xsl:value-of select="."/>
   </xsl:template>
-
   <xsl:template match="@minor">
-     <xsl:value-of select="concat('.',.)"/>
+    <xsl:value-of select="concat('.',.)"/>
   </xsl:template>
-
   <xsl:template match="@fix">
-     <xsl:value-of select="concat('.',.)"/>
+    <xsl:value-of select="concat('.',.)"/>
   </xsl:template>
-
   <xsl:template match="@tag">
-     <xsl:value-of select="concat('-',.)"/>
+    <xsl:value-of select="concat('-',.)"/>
   </xsl:template>
-
   <xsl:template match="type">
     <xsl:param name="level" select="'1'"/>
-    <xsl:text>Type: </xsl:text><xsl:value-of select="normalize-space(.)"/>
+<xsl:text>Type: </xsl:text>
+    <xsl:value-of select="normalize-space(.)"/>
   </xsl:template>
-
   <xsl:template name="email">
-    <xsl:param name="level" select="'1'"/>
-    <a>
-      <xsl:attribute name="href">
-        <xsl:value-of select="concat('mailto:',@email)"/>
-      </xsl:attribute>
-       <xsl:value-of select="@name"/>
-    </a>
+    <xsl:param name="level" select="'1'"/><a>
+    <xsl:attribute name="href">
+      <xsl:value-of select="concat('mailto:',@email)"/>
+    </xsl:attribute>
+    <xsl:value-of select="@name"/></a>
   </xsl:template>
-
   <xsl:template match="text()">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="."/>
       <xsl:with-param name="indent" select="'0'"/>
       <xsl:with-param name="width" select="$width"/>
     </xsl:call-template>
   </xsl:template>
-
   <xsl:template match="text()" mode="in-list">
     <xsl:param name="level" select="'1'"/>
     <xsl:param name="width"
             select="$document-width - ($level * $indent-per-level)"/>
-
     <xsl:call-template name="wrap-text">
       <xsl:with-param name="text" select="."/>
       <xsl:with-param name="indent" select="'0'"/>
       <xsl:with-param name="width" select="$width"/>
     </xsl:call-template>
   </xsl:template>
-
-  <!--  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="body" mode="toc">
-    <xsl:text>Table Of Contents&#xa;=================</xsl:text>
+<xsl:text>Table Of Contents&#xa;=================</xsl:text>
     <xsl:call-template name="cr"/>
     <xsl:apply-templates select="section" mode="toc">
       <xsl:with-param name="level" select="1"/>
     </xsl:apply-templates>
   </xsl:template>
-
   <xsl:template match="section" mode="toc">
     <xsl:param name="level" select="'1'"/>
-
     <xsl:call-template name="lineOf">
       <xsl:with-param name="size" select="($level - 1) * $indent-per-level"/>
     </xsl:call-template>
     <xsl:value-of select="normalize-space(title)"/>
     <xsl:call-template name="cr"/>
-
     <xsl:apply-templates mode="toc">
       <xsl:with-param name="level" select="$level+1"/>
     </xsl:apply-templates>
-
   </xsl:template>
-
   <xsl:template match="text()" mode="toc">
     <xsl:value-of select="normalize-space(.)"/>
   </xsl:template>
-
   <xsl:template match="node()|@*" mode="toc"/>
-
-  <!-- End of "toc" mode templates -->
-
+<!-- End of "toc" mode templates -->
 </xsl:stylesheet>
-

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/index.xml?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/index.xml Sat Apr  7 20:36:53 2007
@@ -21,247 +21,232 @@
   <header>
     <title>Welcome to the Text Plugin</title>
   </header>
-
   <body>
     <section>
       <title>Apache Forrest - Text Plugin</title>
-
-      <p>This plugin allows Forrest files to be output as simple text.</p>
+      <p>
+        This plugin allows Forrest files to be output as simple text.
+      </p>
     </section>
-
     <section>
       <title>How to Use the Text Plugin</title>
-
-      <p>The plugin needs to be incorporated into your existing build of
-      Forrest. To do this,</p>
-
+      <p>
+        The plugin needs to be incorporated into your existing build of Forrest.
+        To do this,
+      </p>
       <ol>
         <li><code>cd $FORREST_HOME/plugin/</code></li>
-
         <li><code>$FORREST_HOME/tools/ant/bin/ant local-deploy</code></li>
-
         <li>At this point, you'll be asked the name of the plugin to deploy.
         The name of this plugin is <strong>org.apache.forrest.plugin.output.Text</strong></li>
       </ol>
-
-      <p>Once you have the text plugin installed, it is simply a case of
-      requesting a file with an txt extension. For example, <a
-      href="index.txt">this page as text</a>.</p>
+      <p>
+        Once you have the text plugin installed, it is simply a case of
+        requesting a file with an txt extension. For example,
+        <a
+      href="index.txt">this page as text</a>.
+      </p>
     </section>
-
     <section>
       <title>Features</title>
-
-      <p>Overall, each section and subsection are indented by two spaces.
-      First level sections are underlined with equal signs, '='. Second level
-      sections with dashes, '-'. Third level sections are underlined with '-.'
-      and fourth level sections with dots, '.'.</p>
-
+      <p>
+        Overall, each section and subsection are indented by two spaces. First
+        level sections are underlined with equal signs, '='. Second level
+        sections with dashes, '-'. Third level sections are underlined with '-.'
+        and fourth level sections with dots, '.'.
+      </p>
       <section>
         <title>Second Level Section</title>
-
         <section>
           <title>Third Level Section</title>
-
           <section>
             <title>Fourth Level Section</title>
           </section>
         </section>
       </section>
-
       <section>
         <title>Lists</title>
-
         <ul>
           <li>This is an unordered list. Notice that each list item is text
           wrapped and hangining indents are also implmented.</li>
-
           <li>This is the second item in this unordered list. Notice also how
           the indents of the current section are also applied to the lists
           themselves.</li>
         </ul>
-
         <ol>
           <li>This is an ordered list, meaning that the each list item is
           numbered.</li>
-
-          <li><p>Again, the indentation of the current section is applied as
-          well as a hanging indent for text that wraps around.</p><p>Also
-          notice that each list item can have multiple paragraphs by making
-          sure that the text is enclosed in paragraph, <code>&lt;p&gt;</code>,
-          elements.</p></li>
-
+          <li><p>
+              Again, the indentation of the current section is applied as well
+              as a hanging indent for text that wraps around.
+            </p>
+            <p>
+              Also notice that each list item can have multiple paragraphs by
+              making sure that the text is enclosed in paragraph,
+              <code>&lt;p&gt;</code>, elements.
+            </p></li>
           <li>The final element in this ordered list.</li>
         </ol>
-
         <dl>
           <dt>Definition Lists</dt>
-
           <dd>Lists that have a definition term followed by text that defines
           the term. Again, notice the hanging indents.</dd>
         </dl>
       </section>
-
       <section>
         <title>Tables</title>
-
         <table>
           <tr>
             <th>First Column</th>
-
             <th>Second Column</th>
           </tr>
-
           <tr>
             <td>Just some text to show that text within tables cells is also
             wrapped.</td>
-
-            <td><p>In order to use multiple paragraphs in a table cell, wrap
-            each paragraph in &lt;p&gt; elements.</p><p>Just like in this
-            cell.</p></td>
+            <td>
+              <p>
+                In order to use multiple paragraphs in a table cell, wrap each
+                paragraph in &lt;p&gt; elements.
+              </p>
+              <p>
+                Just like in this cell.
+              </p>
+            </td>
           </tr>
         </table>
       </section>
-
       <section>
         <title>Nesting Lists, Tables</title>
-
         <table>
           <tr>
             <th>Lists</th>
-
             <th>Tables</th>
           </tr>
-
           <tr>
-            <td><ol>
-                <li><p>We can even have lists within tables.</p></li>
-
-                <li><p>Again, these are handled pretty well.</p></li>
-              </ol></td>
-
-            <td><table>
+            <td>
+              <ol>
+                <li><p>
+                    We can even have lists within tables.
+                  </p></li>
+                <li><p>
+                    Again, these are handled pretty well.
+                  </p></li>
+              </ol>
+            </td>
+            <td>
+              <table>
                 <tr>
                   <td>Nested Tables</td>
-
                   <td>With Lists</td>
                 </tr>
-
                 <tr>
                   <td>There is a limit tho.</td>
-
-                  <td><ul>
-                      <li><p>First item</p></li>
-
-                      <li><p>Second Item</p></li>
-                    </ul></td>
+                  <td>
+                    <ul>
+                      <li><p>
+                          First item
+                        </p></li>
+                      <li><p>
+                          Second Item
+                        </p></li>
+                    </ul>
+                  </td>
                 </tr>
-              </table></td>
+              </table>
+            </td>
           </tr>
-
           <tr>
-            <td><ul>
+            <td>
+              <ul>
                 <li>Bulletted items work in here as well.</li>
-
                 <li>This is the second item.</li>
-              </ul></td>
-
+              </ul>
+            </td>
             <td>This cell intentionally left blank.</td>
           </tr>
         </table>
       </section>
     </section>
-
     <section>
       <title>Limitations</title>
-
       <section>
         <title>Use the &lt;p&gt; element</title>
-
-        <p>Generally, text wrapping in list items and in table cells will work
-        better if the text in those item is enclosed in &lt;p&gt; elements.
-        For example, we'll take the table above and remove the &lt;p&gt;
-        elements from the list items, the &lt;li&gt; elements.</p>
-
+        <p>
+          Generally, text wrapping in list items and in table cells will work
+          better if the text in those item is enclosed in &lt;p&gt; elements.
+          For example, we'll take the table above and remove the &lt;p&gt;
+          elements from the list items, the &lt;li&gt; elements.
+        </p>
         <table>
           <tr>
             <th>Lists</th>
-
             <th>Tables</th>
           </tr>
-
           <tr>
-            <td><ol>
+            <td>
+              <ol>
                 <li>We can even have lists within tables.</li>
-
                 <li>Again, these are handled pretty well.</li>
-              </ol></td>
-
-            <td><table>
+              </ol>
+            </td>
+            <td>
+              <table>
                 <tr>
                   <td>Nested Tables</td>
-
                   <td>With Lists</td>
                 </tr>
-
                 <tr>
                   <td>There is a limit tho.</td>
-
-                  <td><ul>
+                  <td>
+                    <ul>
                       <li>First item</li>
-
                       <li>Second Item</li>
-                    </ul></td>
+                    </ul>
+                  </td>
                 </tr>
-              </table></td>
+              </table>
+            </td>
           </tr>
-
           <tr>
-            <td><ul>
+            <td>
+              <ul>
                 <li>Bulletted items work in here as well.</li>
-
                 <li>This is the second item.</li>
-              </ul></td>
-
+              </ul>
+            </td>
             <td>This cell intentionally left blank.</td>
           </tr>
         </table>
-
-        <p>You can see that some of the text wrapping gets messed up.</p>
+        <p>
+          You can see that some of the text wrapping gets messed up.
+        </p>
       </section>
-
       <section>
         <title>Table Cell Minimum Width </title>
-
-        <p>Table cells, even when nested, have a minimum width of 10 defined.
-        This means that when nesting tables, that minimum width will be
-        quickly hit and the formatting will get, for lack of a better word,
-        gibbled. An example will help illustrate the point.</p>
-
+        <p>
+          Table cells, even when nested, have a minimum width of 10 defined.
+          This means that when nesting tables, that minimum width will be
+          quickly hit and the formatting will get, for lack of a better word,
+          gibbled. An example will help illustrate the point.
+        </p>
         <table>
           <tr>
             <td>First of Three Columns</td>
-
             <td>Second of Three Columns</td>
-
             <td>Third of Three Columns</td>
           </tr>
-
           <tr>
-            <td><table>
+            <td>
+              <table>
                 <tr>
                   <td>Nested</td>
-
                   <td>Four</td>
-
                   <td>Column</td>
-
                   <td>Table</td>
                 </tr>
-              </table></td>
-
+              </table>
+            </td>
             <td>You can see how the first column is gibbled</td>
-
             <td>That is simply due to the minimum column width
             requirement.</td>
           </tr>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/site.xml?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/site.xml Sat Apr  7 20:36:53 2007
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--
 Forrest site.xml
 
@@ -29,24 +28,20 @@
 
 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>
-  
-  <!--
+<!--
   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"/>
@@ -56,5 +51,4 @@
       <plugins href="docs/plugins"/>
     </forrest>
   </external-refs>
-
 </site>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/tabs.xml?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/content/xdocs/tabs.xml Sat Apr  7 20:36:53 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,12 +30,10 @@
    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"/>
-  <!-- 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.output.Text/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/skinconf.xml?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/skinconf.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/skinconf.xml Sat Apr  7 20:36:53 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: Text output</project-name>
   <project-description>org.apache.forrest.plugin.output.Text plugin for Apache Forrest</project-description>
-
 </skinconfig>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_af.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_af.xml?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_af.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_af.xml Sat Apr  7 20:36:53 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.output.Text/src/documentation/translations/menu_es.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_es.xml?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_es.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_es.xml Sat Apr  7 20:36:53 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.output.Text/src/documentation/translations/menu_it.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_it.xml?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_it.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_it.xml Sat Apr  7 20:36:53 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.output.Text/src/documentation/translations/menu_no.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_no.xml?view=diff&rev=526522&r1=526521&r2=526522
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_no.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/src/documentation/translations/menu_no.xml Sat Apr  7 20:36:53 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