Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:

Changes log build procedure fixes:

*) using sed instead of perl
*) support <br/> in the middle of input
*) fixed "<br>" lookup (eliminates the need in " <br/>" hacks)
*) fixed maximum length for unbreakable input
*) fixed space lookup (allows a space at column 77 to break a line)
*) traling spaces removal in text CHANGES files.

1 files changed, 20 insertions, 10 deletions

diff --git a/docs/xsls/changes.xsls b/docs/xsls/changes.xsls
index 000461692..f9c2efbf7 100644
--- a/docs/xsls/changes.xsls
+++ b/docs/xsls/changes.xsls
@@ -64,10 +64,16 @@ X:template para(prefix) = "para" {
 X:template wrap(text, prefix) {
     X:if "$text" {
         X:var offset = {
-            X:if "starts-with($text, concat($br, ' '))" {
-                !{string-length($br) + 2}
-            } else {
-                1
+            X:choose {
+                X:when "starts-with($text, concat($br, ' '))" {
+                    !{string-length($br) + 2}
+                }
+                X:when "starts-with($text, $br)" {
+                    !{string-length($br) + 1}
+                }
+                X:otherwise {
+                    1
+                }
             }
         }
 
@@ -79,7 +85,8 @@ X:template wrap(text, prefix) {
 
         !{$prefix}
 
-        !{translate(substring($text, $offset, $length), ' ', ' ')}
+        !{normalize-space(translate(substring($text, $offset, $length),
+                                    ' ', ' '))}
 
         X:text {
}
 
@@ -89,20 +96,23 @@ X:template wrap(text, prefix) {
 
 
 X:template length(text, prefix, length) {
-    X:var break = "substring-before(substring($text, 1, $length - $prefix),
+    X:var break = "substring-before(substring($text, 1,
+                                    $length - $prefix + string-length($br)),
                                     $br)"
 
     X:choose {
         X:when "$break" { !{string-length($break)} }
 
-        X:when "$length = 0" { !{$max} }
+        X:when "$length = 0" { !{$max - $prefix} }
 
-        X:when "string-length($text) + $prefix <= $length
-                or substring($text, $length - $prefix, 1) = ' '"
-        {
+        X:when "string-length($text) + $prefix <= $length" {
             !{$length - $prefix}
         }
 
+        X:when "substring($text, $length - $prefix + 1, 1) = ' '" {
+            !{$length - $prefix + 1}
+        }
+
         X:otherwise {
             !length(text = "$text", prefix = "$prefix", length = "$length - 1")
         }