about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_figlet40
-rw-r--r--Doc/Zsh/compsys.yo4
3 files changed, 49 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8062e1c60..921bf85d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-27  Oliver Kiddle  <opk@zsh.org>
+
+	* John Beppu: 16866 (tweaked): Completion/Unix/Command/_figlet:
+	new completion for figlet
+
+	* 16908: Doc/Zsh/compsys.yo: alter _generic example to be more robust
+
 2002-03-25  Oliver Kiddle  <opk@zsh.org>
 
 	* Clint: 15079: Completion/Unix/Command/_last: completion for last
diff --git a/Completion/Unix/Command/_figlet b/Completion/Unix/Command/_figlet
new file mode 100644
index 000000000..607c774d5
--- /dev/null
+++ b/Completion/Unix/Command/_figlet
@@ -0,0 +1,40 @@
+#compdef figlet
+
+local fontdir
+typeset -A opt_args
+
+fontdir=$(_call_program path figlet -I2 2>/dev/null)
+
+_arguments -s -S \
+  "(-r -l -x)-c[center justify]" \
+  "(-S -s -o -W -m)-k[use kerning]" \
+  "(-r -c -x)-l[left justify]" \
+  "(-p)-n[normal mode]" \
+  "(-k -S -s -W)-o[let letters overlap]" \
+  "(-n)-p[paragraph mode]" \
+  "(-c -l -x)-r[right justify]" \
+  "(-k -S -o -W -m)-s[smushed spacing]" \
+  "(-w)-t[use terminal width]" \
+  "(-I)-v[version]" \
+  "(-r -c -l)-x[use default justification of font]" \
+  "(-E)-D[use Deutsch character set]" \
+  "(-D)-E[use English character set]" \
+  "(-X -R)-L[left-to-right]" \
+  "(-C)-N[clear controlfile list]" \
+  "(-L -X)-R[right-to-left]" \
+  "(-k -s -o -W -m)-S[smush letters together or else!]" \
+  "(-k -S -s -o -m)-W[wide spacing]" \
+  "(-L -R)-X[use default writing direction of font]" \
+  "(-t)-w+[specify output width]:output width (in columns)" \
+  "-d+[specify font directory]:font directory:_path_files -/" \
+  '-f+[specify font]:font:_files -W ${~opt_args[-d]\:-$fontdir} -g \*flf\*\(\:r\)' \
+  '(-k -S -s -o -W)-m+[specify layout mode]:layout mode' \
+  '(-N)-C+[specifiy control file]:control file:_files -W ${~opt_args[-d]\:-$fontdir} -g \*flc\*\(\:r\)' \
+  "(-v)-I+[display info]:info code:((
+    -1\:normal\ operation\ \(default\)
+    0\:version,\ copyright\ and\ usage\ information
+    1\:version\ in\ integer\ format
+    2\:default\ font\ directory
+    3\:name\ of\ font\ figlet\ would\ use
+    4\:output\ width\ in\ columns
+  ))"
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index cdb142795..580b7c43c 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -1832,7 +1832,7 @@ matches.  E.g. for options this means that the `tt(-)', `tt(+)', or
 `tt(-)tt(-)' has to be on the line to make option names be completed at
 all.
 
-The default style for this style is `true'.
+The default value for this style is `true'.
 )
 kindex(preserve-prefix, completion style)
 item(tt(preserve-prefix))(
@@ -2269,7 +2269,7 @@ binding, for example:
 
 example(zle -C all-matches complete-word _generic
 bindkey '^Xa' all-matches
-zstyle ':completion:all-matches:*' old-matches only
+zstyle ':completion:all-matches::::' old-matches only
 zstyle ':completion:all-matches:*' completer _all_matches)
 )
 findex(_approximate)