Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Date: 15 Nov 2004 21:50:02 -0000
Message-ID: <20041115215002.1849.qmail@minotaur.apache.org>
From: rick@apache.org
To: svn@forrest.apache.org
Subject: svn commit: rev 71512 - in forrest/trunk/plugins/text-output: .
 resources/stylesheets/common

Author: rick
Date: Mon Nov 15 13:50:01 2004
New Revision: 71512

Modified:
   forrest/trunk/plugins/text-output/resources/stylesheets/common/text-templates.xsl
   forrest/trunk/plugins/text-output/status.xml
Log:
Line wrapping now works.  Added a text-to-last-space() template to
handle this.


Modified: forrest/trunk/plugins/text-output/resources/stylesheets/common/text-templates.xsl
==============================================================================
--- forrest/trunk/plugins/text-output/resources/stylesheets/common/text-templates.xsl	(original)
+++ forrest/trunk/plugins/text-output/resources/stylesheets/common/text-templates.xsl	Mon Nov 15 13:50:01 2004
@@ -81,43 +81,82 @@
     <xsl:param name="indent"/>
     <xsl:param name="width" select="'76'"/>
 
+    <!-- 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
+    normalize-space() it.  Needed if we're combining multiple outputs
+    of emit() into a single variable and then re-emitting ... -->
+    <xsl:variable name="trailing-space">
+      <xsl:if test="substring($text, string-length($text))=' '">
+        <xsl:text> </xsl:text>
+      </xsl:if>
+    </xsl:variable>
+
+    <!-- Normalized text.  We'll use this for calculations on
+    splitting, lengths, etc. -->
+    <xsl:variable name="ntext" select="normalize-space($text)"/>
+
     <xsl:choose>
-      <xsl:when test="string-length($text) > 0">
-        <xsl:variable name="trailing-space">
-          <xsl:if test="substring($text, string-length($text))=' '">
-            <xsl:text> </xsl:text>
-          </xsl:if>
+      <xsl:when test="string-length($ntext) > $work-width">
+
+        <!-- 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>
-      
-        <xsl:variable name="tmp">
-          <xsl:call-template name="lineOf">
-            <xsl:with-param name="size" select="$indent"/>
+
+        <!-- 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:value-of
-                select="concat(normalize-space($text),$trailing-space)"/>
         </xsl:variable>
 
-        <xsl:variable name="remaining">
-          <xsl:choose>
-            <xsl:when test="string-length($tmp) > $width">
-              <xsl:value-of select="substring($tmp, $width+1)"/>
-            </xsl:when>
-            <xsl:otherwise/>
-          </xsl:choose>
+        <!-- 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:value-of select="substring($tmp, 1, $width)"/>
+        <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="emit">
-          <xsl:with-param name="text" select="$remaining"/>
+          <xsl:with-param name="text" select="$text-remaining"/>
           <xsl:with-param name="indent" select="$indent"/>
           <xsl:with-param name="width" select="$width"/>
         </xsl:call-template>
       </xsl:when>
-      <xsl:otherwise/>
+      <xsl:otherwise>
+        <xsl:call-template name="lineOf">
+          <xsl:with-param name="size" select="$indent"/>
+        </xsl:call-template>
+        <xsl:value-of select="concat($ntext,$trailing-space)"/>
+        <xsl:call-template name="cr"/>
+      </xsl:otherwise>
     </xsl:choose>
+  </xsl:template>
 
+  <!-- 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" select="substring-before($text, ' ')"/>
+    <xsl:variable name="remaining" select="substring-after($text,' ')"/>
+
+    <xsl:value-of select="concat($leading,' ')"/>
+
+    <xsl:choose>
+      <xsl:when test="contains($remaining,' ')">
+        <xsl:call-template name="text-to-last-space">
+          <xsl:with-param name="text" select="$remaining"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise/>
+    </xsl:choose>
   </xsl:template>
 
 </xsl:stylesheet>

Modified: forrest/trunk/plugins/text-output/status.xml
==============================================================================
--- forrest/trunk/plugins/text-output/status.xml	(original)
+++ forrest/trunk/plugins/text-output/status.xml	Mon Nov 15 13:50:01 2004
@@ -43,6 +43,9 @@
         Preliminary handling of section indenting, section title
         underlining, note/warning/fixme elements and list handling.
       </action>
+      <action dev="RFT" type="add" context="code">
+        Got proper line wrapping working.
+      </action>
       <!-- Sample action:
       <action dev="JB" type="fix" due-to="Joe Contributor"
           due-to-email="joec@apache.org" fixes-bug="123">
@@ -62,10 +65,10 @@
         stylesheet into this plugin as well.
       </action>
       <action context="code" dev="RFT">
-        Cleanup indentation and newlines between various body elements.
+        Table handling
       </action>
       <action context="code" dev="RFT">
-        Line wrapping.
+        Hanging indents on ordered and unordered lists
       </action>
         
     </actions>