diff --git a/docs/GNUmakefile b/docs/GNUmakefile
index a8372d267..748b71bbd 100644
--- a/docs/GNUmakefile
+++ b/docs/GNUmakefile
@@ -6,20 +6,21 @@ TEMP= tmp
CP= $(HOME)/java
define XSLScript
- javavm -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \
+ java -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \
com.pault.StyleSheet \
-x com.pault.XX -y com.pault.XX \
- $(1) docs/xsls/dump.xsls \
- | awk 'BEGIN{e=0}/^\n*$$/{e=1;next}{if(e){print"";e=0};print}' > $(2)
+ $(1) docs/xsls/dump.xsls \
+ | sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $(2)
if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2)
endef
define XSLT
- xsltproc $(shell echo $4 \
+ xmllint --noout --valid $2; \
+ xsltproc -o $3 \
+ $(shell echo $4 \\
| sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \
- $3 $1 \
- > $(HTML)/$(strip $(2))
+ $1 $2
endef
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")
}
diff --git a/docs/xslt/changes.xslt b/docs/xslt/changes.xslt
index 8b1cd0a8b..89c348d4d 100644
--- a/docs/xslt/changes.xslt
+++ b/docs/xslt/changes.xslt
@@ -4,23 +4,29 @@
+
+
+
+
+
<br>
-
+
-
+
-
+
+
@@ -31,10 +37,14 @@
+
+
+
+
@@ -44,8 +54,8 @@
-
+
@@ -59,9 +69,9 @@
-
+
@@ -73,6 +83,7 @@
+
@@ -84,31 +95,38 @@
-
+
+
+
+
+
+
- 1
+ 1
+
+
-
+
@@ -119,23 +137,29 @@
-
+
-
+
+
+
-
+
-
+
+
+
+
+
@@ -145,14 +169,14 @@
-
@
-
+
-
+
-
\ No newline at end of file
+
+