diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Doc/Zsh/contrib.yo | 19 | ||||
| -rw-r--r-- | Functions/Zle/define-composed-chars | 38 |
3 files changed, 60 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index b7f9a2aef..8eb035d79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-17 Peter Stephenson <pws@csr.com> + + * unposted: Functions/Zle/define-composed-chars, + Doc/Zsh/contrib.yo: a few more miscellaneous composable symbols. + 2005-10-14 Wayne Davison <wayned@users.sourceforge.net> * unposted: Etc/FAQ.yo: Tweaked the precmd that works like diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo index f6b434c64..7538d0d12 100644 --- a/Doc/Zsh/contrib.yo +++ b/Doc/Zsh/contrib.yo @@ -797,7 +797,7 @@ endsitem() item(Mathematical symbols)( startsitem() sitem(tt(DG))(Degree) -sitem(tt(+-))(+/- sign) +sitem(tt(-2), tt(+-), tt(-+))(- sign, +/- sign, -/+ sign) sitem(tt(2S))(Superscript 2) sitem(tt(3S))(Superscript 3) sitem(tt(1S))(Superscript 1) @@ -809,6 +809,23 @@ sitem(tt(34))(Three quarters) sitem(tt(*X))(Multiplication) sitem(tt(-:))(Division) sitem(tt(%0))(Per mille) +sitem(tt(FA), tt(TE), tt(/0))(For all, there exists, empty set) +sitem(tt(dP), tt(DE), tt(NB))(Partial derivative, delta (increment), del +(nabla)) +sitem(tt(LPAR()-), tt(-RPAR()))(Element of, contains) +sitem(tt(*P), tt(+Z))(Product, sum) +sitem(tt(*-), tt(Ob), tt(Sb))(Asterisk, ring, bullet) +sitem(tt(RT), tt(0+LPAR()), tt(00))(Root sign, proportional to, infinity) +endsitem() +) +item(Other symbols)( +startsitem() +sitem(tt(cS), tt(cH), tt(cD), tt(cC))(Card suits: spades, hearts, diamonds, +clubs) +sitem(tt(Md), tt(M8), tt(M2), tt(Mb), tt(Mx), tt(MX))(Musical notation: +crotchet (quarter note), quaver (eighth note), semiquavers (sixteenth +notes), flag sign, natural signa, sharp sign) +sitem(tt(Fm), tt(Ml))(Female, male) endsitem() ) item(Accents on their own)( diff --git a/Functions/Zle/define-composed-chars b/Functions/Zle/define-composed-chars index 1a67add27..f6d47c53a 100644 --- a/Functions/Zle/define-composed-chars +++ b/Functions/Zle/define-composed-chars @@ -10,7 +10,7 @@ typeset -gA zsh_accented_chars # Save quite a lot of space by using short names internally. local -A z -local a +local a b # grave a=\! @@ -249,6 +249,16 @@ z[$a]+=" Z 5e6" a=h z[$a]+=" S 5e9" +# Card suits: here first character is the interesting one +for a b in S 2660 H 2661 D 2662 C 2663; do + z[$a]+=" c $b" +done + +# Music: ditto +for a b in d 2669 8 266a 2 266b b 266d x 266e X 266f; do + z[$a]+=" M $b" +done + # Remaining characters are handled as separate pairs. # We need to remember that the assoc array is keyed by the second character. # Left square bracket @@ -367,5 +377,31 @@ z[-]+=" / 2020" z[=]+=" / 2021" # per mille z[0]+=" % 2030" +# For all, partial derivative, there exists, empty set +z[A]+=" F 2200" +z[P]+=" d 2202" +z[E]+=" T 2203" +z[0]+=" / 2205" +# Increment, del (nabla), element of, contains, product, sum +z[E]+=" D 2206" +z[B]+=" N 2207" +z[-]+=" ( 2208" +a=\) +z[$a]+=" - 220b" +z[P]+=" * 220F" +z[Z]+=" + 2211" +# Minus, minus or plus, asterisk, ring, bullet +z[2]+=" - 2212" +z[+]+=" - 2213" +z[-]+=" * 2217" +z[b]+=" O 2218 S 2219" +# square root, proportional to, infinity +z[T]+=" R 221A" +a=\( +z[$a]+=" 0 221D" +z[0]+=" 0 221E" +# Female and male +z[m]+=" F 2640" +z[l]+=" M 2642" zsh_accented_chars=("${(kv)z[@]}") |