comparison docs/xsls/changes.xsls @ 4022:10b3b7908efb

- 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)
author Ruslan Ermilov <ru@nginx.com>
date Tue, 23 Aug 2011 09:00:24 +0000
parents 551102312e19
children 7b85e695600a
comparison
equal deleted inserted replaced
4021:fd86fdb3ffaf 4022:10b3b7908efb
62 62
63 63
64 X:template wrap(text, prefix) { 64 X:template wrap(text, prefix) {
65 X:if "$text" { 65 X:if "$text" {
66 X:var offset = { 66 X:var offset = {
67 X:if "starts-with($text, concat($br, ' '))" { 67 X:choose {
68 !{string-length($br) + 2} 68 X:when "starts-with($text, concat($br, ' '))" {
69 } else { 69 !{string-length($br) + 2}
70 1 70 }
71 X:when "starts-with($text, $br)" {
72 !{string-length($br) + 1}
73 }
74 X:otherwise {
75 1
76 }
71 } 77 }
72 } 78 }
73 79
74 X:var length = { 80 X:var length = {
75 !length(text = "substring($text, $offset)", 81 !length(text = "substring($text, $offset)",
87 } 93 }
88 } 94 }
89 95
90 96
91 X:template length(text, prefix, length) { 97 X:template length(text, prefix, length) {
92 X:var break = "substring-before(substring($text, 1, $length - $prefix), 98 X:var break = "substring-before(substring($text, 1,
99 $length - $prefix + string-length($br)),
93 $br)" 100 $br)"
94 101
95 X:choose { 102 X:choose {
96 X:when "$break" { !{string-length($break)} } 103 X:when "$break" { !{string-length($break)} }
97 104
98 X:when "$length = 0" { !{$max} } 105 X:when "$length = 0" { !{$max - $prefix} }
99 106
100 X:when "string-length($text) + $prefix &lt;= $length 107 X:when "string-length($text) + $prefix &lt;= $length" {
101 or substring($text, $length - $prefix, 1) = ' '"
102 {
103 !{$length - $prefix} 108 !{$length - $prefix}
109 }
110
111 X:when "substring($text, $length - $prefix + 1, 1) = ' '" {
112 !{$length - $prefix + 1}
104 } 113 }
105 114
106 X:otherwise { 115 X:otherwise {
107 !length(text = "$text", prefix = "$prefix", length = "$length - 1") 116 !length(text = "$text", prefix = "$prefix", length = "$length - 1")
108 } 117 }