From 2bfad02a94ca607d918ea871147680dbeff0999c Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Wed, 20 Sep 2006 09:22:34 +0000 Subject: 22742: parameter padding uses string lengths unless (m) flag set 22743: restrict sh "- [args]" -> "-xv [-- args]" hack to sh mode --- Doc/Zsh/builtins.yo | 4 ++++ Doc/Zsh/expn.yo | 22 +++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) (limited to 'Doc/Zsh') diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo index d8892cd5c..820888ac3 100644 --- a/Doc/Zsh/builtins.yo +++ b/Doc/Zsh/builtins.yo @@ -1160,6 +1160,10 @@ positional parameters will be unset. If no arguments and no `tt(-)tt(-)' are given, then the names and values of all parameters are printed on the standard output. If the only argument is `tt(PLUS())', the names of all parameters are printed. + +For historical reasons, `tt(set -)' is treated as `tt(set +xv)' +and `tt(set -) var(args)' as `tt(set +xv --) var(args)' when in +any other emulation mode than zsh's native mode. ) module(setcap)(zsh/cap) findex(setopt) diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo index 34d61ed4d..b840f62f0 100644 --- a/Doc/Zsh/expn.yo +++ b/Doc/Zsh/expn.yo @@ -869,11 +869,23 @@ var(string1) and var(string2) are given, tt(string2) is inserted once directly to the left of each word, truncated if necessary, before var(string1) is used to produce any remaining padding. -If the tt(MULTIBYTE) option is in effect, screen character widths will -be used for the calculation of padding; otherwise individual bytes are -treat as occupying one unit of width. Control characters are always -assumed to be one unit wide; this allows the mechanism to be used -for generating repetitions of control characters. +If the tt(MULTIBYTE) option is in effect, the flag tt(m) may also +be given, in which case widths will be used for the calculation of +padding; otherwise individual multibyte characters are treated as occupying +one unit of width. + +IF the tt(MULTIBYTE) option is not in effect, each byte in the string is +treated as occupying one unit of width. + +Control characters are always assumed to be one unit wide; this allows the +mechanism to be used for generating repetitions of control characters. +) +item(tt(m))( +Only useful together with tt(l) and tt(r) when the tt(MULTIBYTE) option +is in effect. Use the character width reported by the system in +calculating the how much of the string it occupies. Most printable +characters have a width of one unit, however certain Asian character sets +and certain special effects use wider characters. ) item(tt(r:)var(expr)tt(::)var(string1)tt(::)var(string2)tt(:))( As tt(l), but pad the words on the right and insert var(string2) -- cgit 1.4.1