X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=crawler%2Fkiss%2Fsrc%2Futilities.xsl;h=c98c1139d8faae9082375bf955f1191c182ae0fd;hb=90b16f4f43973b23b5a52d1bd70a25160e110268;hp=e6863db215bbe0e0842b3078edad149fd48ba1c1;hpb=17c55ed4fa1f62885fe813ecaa99d053e1111f48;p=utils

diff --git a/crawler/kiss/src/utilities.xsl b/crawler/kiss/src/utilities.xsl
index e6863db2..c98c1139 100644
--- a/crawler/kiss/src/utilities.xsl
+++ b/crawler/kiss/src/utilities.xsl
@@ -3,16 +3,16 @@
 <!-- Note the declaration of the namespace for XInclude. -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
   xmlns:xi="http://www.w3.org/2001/XInclude">
-  
-  
+
+
   <xsl:variable name="newline">
     <xsl:text>&#10;</xsl:text>
   </xsl:variable>
-  
+
   <xsl:variable name="carriageReturn">
     <xsl:text>&#13;&#10;</xsl:text>
   </xsl:variable>
-  
+
   <!-- =====================================================
     Replace one string by another
     - src: string to do substituion in
@@ -38,47 +38,60 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
+
   <xsl:template name="indent">
     <xsl:param name="src"/>
     <xsl:param name="indentString"/>
     <xsl:value-of select="$indentString"/>
     <xsl:call-template name="string-replace">
-      <xsl:with-param name="src"><xsl:value-of select="$src"/></xsl:with-param>
-      <xsl:with-param name="from"><xsl:value-of select="$newline"/></xsl:with-param>
+      <xsl:with-param name="src">
+        <xsl:value-of select="$src"/>
+      </xsl:with-param>
+      <xsl:with-param name="from">
+        <xsl:value-of select="$newline"/>
+      </xsl:with-param>
       <xsl:with-param name="to">
         <xsl:value-of select="$newline"/>
         <xsl:value-of select="$indentString"/>
       </xsl:with-param>
     </xsl:call-template>
   </xsl:template>
-  
+
   <xsl:template name="word-wrap">
     <xsl:param name="src"/>
     <xsl:param name="width"/>
-    
+
     <xsl:call-template name="word-wrap-impl">
       <xsl:with-param name="src">
         <xsl:call-template name="string-replace">
           <xsl:with-param name="src">
-            <xsl:value-of select="$src"/>     
+            <xsl:value-of select="$src"/>
+            <xsl:text> </xsl:text>
+          </xsl:with-param>
+          <xsl:with-param name="from">
+            <xsl:text>  </xsl:text>
+          </xsl:with-param>
+          <xsl:with-param name="to">
+            <xsl:text> </xsl:text>
           </xsl:with-param>
-          <xsl:with-param name="from"><xsl:text>  </xsl:text></xsl:with-param>
-          <xsl:with-param name="to"><xsl:text> </xsl:text></xsl:with-param>
         </xsl:call-template>
       </xsl:with-param>
-      <xsl:with-param name="width"><xsl:value-of select="$width"/></xsl:with-param>
-      <xsl:with-param name="index"><xsl:value-of select="0"/></xsl:with-param>
+      <xsl:with-param name="width">
+        <xsl:value-of select="$width"/>
+      </xsl:with-param>
+      <xsl:with-param name="index">
+        <xsl:value-of select="0"/>
+      </xsl:with-param>
     </xsl:call-template>
   </xsl:template>
-  
+
   <xsl:template name="word-wrap-impl">
     <xsl:param name="src"/>
     <xsl:param name="index"/>
     <xsl:param name="width"/>
-    
+
     <xsl:variable name="word">
-      <xsl:value-of select="substring-before($src, ' ')"></xsl:value-of>
+      <xsl:value-of select="substring-before($src, ' ')"/>
     </xsl:variable>
     <xsl:variable name="wordlength">
       <xsl:value-of select="string-length($word)"/>
@@ -86,32 +99,45 @@
     <xsl:variable name="remainder">
       <xsl:value-of select="substring($src, $wordlength+2)"/>
     </xsl:variable>
-    
-    <xsl:value-of select="$word"/><xsl:text> </xsl:text>
-    
-    <xsl:if test="string-length($remainder) > 0">
-      
-      <!-- xsl:value-of select="$index"/ -->
-      <xsl:choose>
-        <xsl:when test="$index + $wordlength + 1 &gt; $width">
-          <xsl:value-of select="$newline"/>
+
+    <xsl:choose>
+      <xsl:when test="$index + $wordlength + 1 &gt; $width">
+        <xsl:value-of select="$newline"/>
+        <xsl:value-of select="$word"/>
+        <xsl:text> </xsl:text>
+        <xsl:if test="string-length($remainder) > 0">
           <xsl:call-template name="word-wrap-impl">
-            <xsl:with-param name="src"><xsl:value-of select="$remainder"></xsl:value-of></xsl:with-param>
-            <xsl:with-param name="index"><xsl:value-of select="0"/></xsl:with-param>
-            <xsl:with-param name="width"><xsl:value-of select="$width"></xsl:value-of></xsl:with-param>
+            <xsl:with-param name="src">
+              <xsl:value-of select="$remainder"/>
+            </xsl:with-param>
+            <xsl:with-param name="index">
+              <xsl:value-of select="$wordlength + 1"/>
+            </xsl:with-param>
+            <xsl:with-param name="width">
+              <xsl:value-of select="$width"/>
+            </xsl:with-param>
           </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
+        </xsl:if>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$word"/>
+        <xsl:text> </xsl:text>
+
+        <xsl:if test="string-length($remainder) > 0">
           <xsl:call-template name="word-wrap-impl">
-            <xsl:with-param name="src"><xsl:value-of select="$remainder"></xsl:value-of></xsl:with-param>
-            <xsl:with-param name="index"><xsl:value-of select="$index + $wordlength+1"/></xsl:with-param>
-            <xsl:with-param name="width"><xsl:value-of select="$width"></xsl:value-of></xsl:with-param>
+            <xsl:with-param name="src">
+              <xsl:value-of select="$remainder"/>
+            </xsl:with-param>
+            <xsl:with-param name="index">
+              <xsl:value-of select="$index + $wordlength+1"/>
+            </xsl:with-param>
+            <xsl:with-param name="width">
+              <xsl:value-of select="$width"/>
+            </xsl:with-param>
           </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-     
-      
-    </xsl:if>
+        </xsl:if>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
-  
+
 </xsl:stylesheet>