Mercurial > hg > nginx
changeset 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 | fd86fdb3ffaf |
children | dc4b7050e17e |
files | docs/xsls/changes.xsls |
diffstat | 1 files changed, 18 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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 + } } } @@ -89,20 +95,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") }