wasy (20jan20)

git-svn-id: svn://tug.org/texlive/trunk@53468 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 432 insertions, 62 deletions

diff --git a/Master/texmf-dist/doc/fonts/wasy/README b/Master/texmf-dist/doc/fonts/wasy/README
new file mode 100644
index 00000000000..21ebef4e581
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/wasy/README
@@ -0,0 +1,20 @@
+This is version 2.4, a 2020 update of the wasy fonts of 1990.
+
+The font wasy contains all lasy characters (by L.Lamport, copyright
+notice in lasychr.mf), and a lot more symbols.  Provided are the
+Metafont files for 5-10pt, and bold and slanted 10pt fonts, together
+with a tex and pdf documentation, and a file for using the fonts
+in a PLAIN-TeX document.
+
+Type-1 fonts by Michael Sharpe and Taco Hoekwater are available
+as separate package wasy-type1.
+
+A LaTeX implementation is in the separate package wasysym by Axel
+Kielhorn.
+
+The files of this package (wasy2.4) are hereby released into the public
+domain. Permission is granted to use and/or distribute these files.
+Extensions and modifications should be restricted to those that are
+downward compatible with this release.
+
+Jan 2020, Roland Waldi
diff --git a/Master/texmf-dist/doc/fonts/wasy/legal.txt b/Master/texmf-dist/doc/fonts/wasy/legal.txt
deleted file mode 100644
index 7a9df31dadd..00000000000
--- a/Master/texmf-dist/doc/fonts/wasy/legal.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-The files of this package "wasy2" are hereby released into the public
-domain. So, permission is granted to use and/or distribute these files.
-The scope of this license are the following files:
-    rsym.mf wasy10.mf wasy5.mf wasy6.mf wasy7.mf wasy8.mf wasy9.mf
-    wasyb10.mf wasychr.mf wasydoc.tex wasyfont.2 wasyfont.tex
-
-As for lasychr.mf, the license is given in the header of the file.
-
-June 2002, Roland Waldi
diff --git a/Master/texmf-dist/doc/fonts/wasy/wasydoc.pdf b/Master/texmf-dist/doc/fonts/wasy/wasydoc.pdf
index 726d45eff71..81fe564418a 100644
--- a/Master/texmf-dist/doc/fonts/wasy/wasydoc.pdf
+++ b/Master/texmf-dist/doc/fonts/wasy/wasydoc.pdf
diff --git a/Master/texmf-dist/doc/fonts/wasy/wasydoc.tex b/Master/texmf-dist/doc/fonts/wasy/wasydoc.tex
index f0adc1e21d7..812710a332a 100644
--- a/Master/texmf-dist/doc/fonts/wasy/wasydoc.tex
+++ b/Master/texmf-dist/doc/fonts/wasy/wasydoc.tex
@@ -1,19 +1,30 @@
 \magnification\magstep1
 \parskip 1.1ex plus 0.4ex
+\advance\hsize -5truemm
+\ifx\pdfoutput\undefines\else
+ \pdfhorigin=1truein
+ \pdfvorigin=1truein
+ \pdfpagewidth=210truemm
+ \pdfpageheight=297truemm
+\fi
 \parindent 0pt
 \pretolerance 1000
 \tolerance 2000
 \hbadness 2000
-\advance\hsize -5truemm
 %
 \font\tenssf = cmss10    % sans-serif font
 \def\ssf{\tenssf}
 \def\\{\char"5C{}}       % define backslash
+\def\({\char`\{}         % define {
+\def\){\char`\}}         % define }
 \def\newline{\hfill\break}
 \def\de{\,{\rm d}}
 \def\LaTeX{{\rm L\kern-.36em\raise.3ex\hbox{\sevenrm A}\kern-.15em\TeX}}
 %
-\input wasyfont
+%  the next line is used for development, to get alias-font names
+%  wasym... 
+%\def\newwasy{}
+\input WASYFONT
 %
 %%% START %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -21,12 +32,12 @@
 \vskip 1\parskip
 \centerline{\it Roland Waldi}
 \vskip 1mm
-\centerline{Institut f\"ur Experimentelle Kernphysik}
-\centerline{Universit\"at Karlsruhe}
-\centerline{Physikhochhaus, P.O.Box 6980}
-\centerline{D-7500 Karlsruhe, Fed.~Rep.~Germany}
+\centerline{Institut f\"ur Physik}
+\centerline{Universit\"at Rostock}
+\centerline{D-18051 Rostock, Germany}
+\centerline{roland.waldi@uni-rostock.de}
 \vskip 1mm
-\centerline{Version 2.0 -- September 1992}
+\centerline{Version 2.4 -- January 2020}
 
 \vskip 1.5\parskip
 
@@ -35,10 +46,13 @@ a lot more symbols.
 New characters
 were modified from the {\tt mf} files of the standard \TeX\ fonts,
 and many were designed from scratch.
-Metafont sources for 5--10pt and a bold 10pt font are available.
 
+The first version was released in 1990.
+Metafont sources for 5--10pt and a bold and slanted 10pt font
+are available in the present version.
 An extension to PLAIN-\TeX\ for using the fonts is included
-in the file {\tt wasyfont.tex}.
+in the file {\tt WASYFONT.tex}.
+
 This can probably be used in \LaTeX\ documents,
 but a new \LaTeX\ format with the bindings already included and with
 {\tt wasy} replacing the {\tt lasy} font would be the superiour
@@ -46,13 +60,28 @@ solution.
 This version includes all {\tt lasy} characters at the proper codes
 (causing some incompatibilities with version 1 of {\tt wasy})
 to make such a procedure easy.
-The file {\tt wasyfont.2} contains substitutes for some macros
-of {\tt wasyfont.tex} to be used
+
+The file {\tt WASYFONT.2} contains substitutes for some macros
+of {\tt WASYFONT.tex} to be used
 at installations, that do not
 support the {\tt wasy} fonts.
 
+Some characters make sense in slanted or boldface form (only available at 10pt,
+although scaled fonts can be defined by the user).
+These are included in slanted text, if instead of {\tt\\sl}
+the command {\tt\\wsl} is used, and in bold text,\
+if instead of {\tt\\bf}
+the command {\tt\\wbf} is used. Analogue commands for
+\LaTeX\ are easy to define, too.
+
+Symbols (not letters) are defined in {\tt WASYFONT.tex} as
+boxes, which simplifies their use in math-mode, but the {\tt\\/}
+for italic correction for the slanted characters
+will not work after a symbol. If this feature is
+required, the {\tt\\hbox\(...\)} should be removed from the definition.
+
 A list of characters with their bindings in
-{\tt wasyfont.tex} follows.
+{\tt WASYFONT.tex} follows.
 Some macros are actually compositions of several characters useful in
 the given context.
 Macros using symbols
@@ -60,12 +89,14 @@ which are already available from standard \TeX\ fonts
 are also included; these are marked
 with $^*$.
 
+\bigskip
+
 general symbols
 $$
 \halign{&\tt\\# \hfil&#\qquad\hfil\cr
 male&\male         &female&\female \cr
 currency&\currency &cent &\cent  \cr
-lozenge&\lozenge   &kreuz&\kreuz \cr
+euro     &\euro    &kreuz&\kreuz \cr
 smiley&\smiley     &blacksmiley&\blacksmiley \cr
 frownie&\frownie   &sun&\sun \cr
 checked&\checked   &brokenvert&\brokenvert \cr
@@ -74,13 +105,9 @@ phone&\phone       &recorder   &\recorder    \cr
 clock&\clock       &permil     &\permil      \cr
 bell&\bell         &ataribox   &\ataribox    \cr
 pointer&\pointer   &lightning  &\lightning   \cr
-agemO      &\agemO \cr}
-$$
-
-diagrams
-$$
-\halign{&\tt\\# \hfil&#\qquad\hfil\cr
-photon     &\photon    &gluon    &\gluon  \cr}
+agemO      &\agemO &Paragraph  &\Paragraph   \cr
+lozenge&\lozenge   &applecmd   &\applecmd  \cr
+therefore&\therefore \cr}
 $$
 
 music notes
@@ -108,13 +135,13 @@ APLuparrowbox &\APLuparrowbox&APLdownarrowbox &\APLdownarrowbox\cr
 APLinput&\APLinput &APLminus$^*$&\APLminus \cr
 APLlog  &\APLlog  &APLstar    &\APLstar    \cr
 APLvert$^*$&\APLvert{\ } &
- APLvert\char`\{\\APLdown\char`\} &\APLvert{\APLdown} \cr
+ APLvert\(\\APLdown\) &\APLvert{\APLdown} \cr
 APLnot$^*$&\APLnot{\ } &
- APLnot\char`\{\\APLdown\char`\} &\APLnot{\APLdown} \cr
-APLnot\char`\{\\land\char`\} &\APLnot{\land} &
- APLnot\char`\{\\lor\char`\} &\APLnot{\lor} \cr
+ APLnot\(\\APLdown\) &\APLnot{\APLdown} \cr
+APLnot\(\\land\) &\APLnot{\land} &
+ APLnot\(\\lor\) &\APLnot{\lor} \cr
 APLcirc$^*$&\APLcirc{\ } &
- APLcirc\char`\{\\bot\char`\} &\APLcirc{\bot} \cr
+ APLcirc\(\\bot\) &\APLcirc{\bot} \cr
 notbackslash$^*$ &\notbackslash &
  notslash$^*$ &\notslash \cr
 APLcomment &\APLcomment \cr}
@@ -170,29 +197,30 @@ general math \& physics
 $$
 \halign{&\tt# \hfil&#\qquad\hfil\cr
 \\varangle&\varangle &\$\\invneg\$ &$\invneg$\cr
+\\diameter   &\diameter  &\\therefore&\therefore \cr
 \\leftturn  &\leftturn   &\\rightturn  &\rightturn   \cr
-\\diameter   &\diameter  &\\therefore&\therefore \cr}
+\\photon     &\photon    &\\gluon    &\gluon  \cr}
 $$
 
 math operators
 $$
-\halign{&\tt\$a\\# b \hfil&$a#b$\qquad\hfil\cr
-ocircle&\ocircle &logof&\logof \cr
-oplus$^*$&\oplus &otimes$^*$&\otimes \cr
-le$^*$ &\le      &ge$^*$&\ge   \cr
-apprle &\apprle  &apprge&\apprge \cr
+\halign{&\tt\$a\\#b\$ \hfil&$a#b$\qquad\hfil\cr
+ocircle &\ocircle &logof &\logof \cr
+oplus$^*$ &\oplus &otimes$^*$ &\otimes \cr
+le$^*$ &\le      &ge$^*$ &\ge   \cr
+apprle &\apprle  &apprge &\apprge \cr
 lhd    &\lhd     &rhd  &\rhd   \cr
-unlhd  &\unlhd   &unrhd&\unrhd   \cr
+unlhd  &\unlhd   &unrhd &\unrhd   \cr
 LHD    &\LHD     &RHD  &\RHD   \cr
-sqsubset&\sqsubset  &sqsupset&\sqsupset \cr
-sqsubseteq$^*$&\sqsubseteq  &sqsupseteq$^*$&\sqsupseteq \cr
-propto$^*$&\propto      &varpropto     &\varpropto  \cr
+sqsubset &\sqsubset  &sqsupset &\sqsupset \cr
+sqsubseteq$^*$ &\sqsubseteq  &sqsupseteq$^*$ &\sqsupseteq \cr
+propto$^*$ &\propto      &varpropto     &\varpropto  \cr
 leadsto    &\leadsto   \cr}
 $$
 
 integrals (text style)
 $$
-\halign{&\tt\$\\#\_a\char`\^b f(x)dx \hfil&$#_a^b f(x)dx$\qquad\hfil\cr
+\halign{&\tt\$\\#\_a\char`\^b f(x)dx\$ \hfil&$#_a^b f(x)dx$\qquad\hfil\cr
 varint&\varint  &iint&\iint  \cr
 iiint&\iiint    &varoint&\varoint \cr
 oiint&\oiint  \cr}
@@ -207,7 +235,7 @@ With the control sequence
 {\tt\\newpropto} you can change the proportional sign to the
 thin {\tt wasy} symbol ($\varpropto$),
 which is more distinct from alpha ($\alpha$)
-then the default symbol ($\propto$).
+than the default symbol ($\propto$).
 
 With the control sequence
 {\tt\\newint} you can change the \TeX\ integrals from $\int,\oint$
@@ -217,16 +245,21 @@ $$\int_a^b \to \varint_a^b,\qquad
 $$
 
 There are also a few letters
-in roman style added (although these and some symbols as
-\agemO, \permil\ should 
+in roman style added, although these and some symbols as
+\agemO, \permil\ should
 be in a separate font, to be created in different
 styles like italic, sans serif etc. -- the {\tt wasychr.mf} source
-is prepared for that.
+is prepared for that, and now has bold and slanted versions.
 $$
 \halign{&\tt\\# \hfil&#\qquad\hfil\cr
-thorn &\thorn   &Thorn  &\Thorn \cr
-dh    &\dh      &Dh$^*$ &\Dh    \cr
-inve  &\inve    &openo  &\openo \cr
+thorn &\thorn { \wbf\thorn} {\wsl\thorn}
+      &Thorn  &\Thorn { \wbf\Thorn} {\wsl\Thorn}\cr
+dh    &\dh    { \wbf\dh} {\wsl\dh}
+      &Dh$^*$ &\Dh { \wbf \Dh} {\wsl \Dh}\cr
+inve  &\inve  { \wbf\inve} {\wsl\inve}
+      &openo  &\openo { \wbf\openo} {\wsl\openo}\cr
+s     &\s     { \wbf\s   } {\wsl\s   }
+      &z      &\z { \wbf\z} {\wsl\z}\cr
 }
 $$
 
@@ -239,9 +272,9 @@ $$
 
 The planets ($\astrosun\to{}$outer space):
 \mercury\ \venus\ \earth\ \mars\ asteroids
-\jupiter\ \saturn\ \uranus\ \neptune\ \pluto.
+\jupiter\ \saturn\ \uranus\ \neptune\ (\pluto).  $r_{\mercury} < r_{\earth}$
 
-special characters on IBM PC's: \smiley, \blacksmiley, $\heartsuit$,
+special characters on PCs: \smiley, \blacksmiley, $\heartsuit$,
 $\diamondsuit$, $\clubsuit$, $\spadesuit$, $\bullet$,
 $\ocircle$, \male, \female, \eighthnote, \twonotes, \sun, \RIGHTarrow,
 \LEFTarrow, $\updownarrow$, !!, \P, \S,
@@ -250,7 +283,7 @@ $\underline{\updownarrow}$,
 $\uparrow$, $\downarrow$, $\to$, $\leftarrow$, \UParrow, \DOWNarrow,
 \brokenvert, $\invneg$, $\neg$, \dots
 
-special characters on Atari ST's: \pointer, \ataribox,
+special characters on Atari STs: \pointer, \ataribox,
 \checked, \clock, \bell,
 \eighthnote, \inve,
 $\invneg$, $\neg$, $\varoint$, \dots
@@ -258,6 +291,23 @@ $\invneg$, $\neg$, $\varoint$, \dots
 tube dimensions: $\diameter 5\,{\rm mm}$, $d = 0.5\,{\rm mm}$,
  $l = 50\,{\rm mm}$
 
+prices 1\$ 2\cent\ or 0.95\euro\ or 0.80{\it\$}.\newline
+{\wsl prices 1\$ 2\cent\ or 0.95\euro\ or 0.80{\it\$}.}
+
+legal text: \Paragraph\Paragraph\ 9--22 StVG, \Paragraph\ 12 StVO oder
+{\wsl \Paragraph\Paragraph\ 9--22 StVG, \Paragraph\ 12 StVO}
+
+Icelandic text: \'Eg veit \thorn a\dh\ ekki e\dh a
+{\wbf \'Eg veit \thorn a\dh\ ekki}.
+
+traditional typography: ligature \s\z=\ss, \s ure to po\s\s e\s s
+\s atisfaction
+
+simple phonetic notation:
+corner ['k\openo:n\inve], this [\dh is],
+thrash [{\teni\char"12}r\ae{\tensy\char"73\kern 0.3pt}],
+vision ['v\i\z n]
+
 display math:
 $$
 \mathop{\varangle}(\vec a,\vec b) = 30^{\circ}
@@ -283,8 +333,9 @@ $U \leftarrow \APLminus 1+ G \leftarrow 2 \times \iota N
 \leftarrow \APLbox$ \qquad \APLcomment\quad generate vectors of odd and
 even numbers
 
+\goodbreak
 APL keyboard layout:
-
+\par\nobreak
 \def\1{\underbar}
 \halign{&#\ \cr
 &1& &2& &3& &4& &5& &6& &7& &8& &9& &0& &+& &$\times$& &$\diamond$\cr
@@ -317,10 +368,6 @@ APL keyboard layout:
 }
 \medskip
 
-simple phonetic notation:
-corner [{\tt'}k\openo:n\inve], this [\dh is],
-thrash [{\teni\char"12}r\ae{\tensy\char"73\kern 0.3pt}]
-
 check the appropriate box like this \XBox\ or that
 \Box\kern-.6em\checked:
 
@@ -332,6 +379,7 @@ check the appropriate box like this \XBox\ or that
 
 
 \bigskip
+\goodbreak
 
 \centerline{\bf Font Table}
 
@@ -470,6 +518,141 @@ $$}
 
 \bigskip
 
+{\tt wasy 5pt}:
+{\fivewasy$$
+\halign {&#\quad\hfil\cr
+ {\tt 00 =}  \char"00%
+&{\tt 01 =}  \char"01%
+&{\tt 02 =}  \char"02%
+&{\tt 03 =}  \char"03%
+&{\tt 04 =}  \char"04%
+&{\tt 05 =}  \char"05%
+&{\tt 06 =}  \char"06%
+&{\tt 07 =}  \char"07\cr
+ {\tt 08 =}  \char"08%
+&{\tt 09 =}  \char"09%
+&{\tt 0A =}  \char"0A%
+&{\tt 0B =}  \char"0B%
+&{\tt 0C =}  \char"0C%
+&{\tt 0D =}  \char"0D%
+&{\tt 0E =}  \char"0E%
+&{\tt 0F =}  \char"0F\cr
+ {\tt 10 =}  \char"10%
+&{\tt 11 =}  \char"11%
+&{\tt 12 =}  \char"12%
+&{\tt 13 =}  \char"13%
+&{\tt 14 =}  \char"14%
+&{\tt 15 =}  \char"15%
+&{\tt 16 =}  \char"16%
+&{\tt 17 =}  \char"17\cr
+ {\tt 18 =}  \char"18%
+&{\tt 19 =}  \char"19%
+&{\tt 1A =}  \char"1A%
+&{\tt 1B =}  \char"1B%
+&{\tt 1C =}  \char"1C%
+&{\tt 1D =}  \char"1D%
+&{\tt 1E =}  \char"1E%
+&{\tt 1F =}  \char"1F\cr
+ {\tt 20 =}  \char"20%
+&{\tt 21 =}  \char"21%
+&{\tt 22 =}  \char"22%
+&{\tt 23 =}  \char"23%
+&{\tt 24 =}  \char"24%
+&{\tt 25 =}  \char"25%
+&{\tt 26 =}  \char"26%
+&{\tt 27 =}  \char"27\cr
+ {\tt 28 =}  \char"28%
+&{\tt 29 =}  \char"29%
+&{\tt 2A =}  \char"2A%
+&{\tt 2B =}  \char"2B%
+&{\tt 2C =}  \char"2C%
+&{\tt 2D =}  \char"2D%
+&{\tt 2E =}  \char"2E%
+&{\tt 2F =}  \char"2F\cr
+ {\tt 30 =}  \char"30%
+&{\tt 31 =}  \char"31%
+&{\tt 32 =}  \char"32%
+&{\tt 33 =}  \char"33%
+&{\tt 34 =}  \char"34%
+&{\tt 35 =}  \char"35%
+&{\tt 36 =}  \char"36%
+&{\tt 37 =}  \char"37\cr
+ {\tt 38 =}  \char"38%
+&{\tt 39 =}  \char"39%
+&{\tt 3A =}  \char"3A%
+&{\tt 3B =}  \char"3B%
+&{\tt 3C =}  \char"3C%
+&{\tt 3D =}  \char"3D%
+&{\tt 3E =}  \char"3E%
+&{\tt 3F =}  \char"3F\cr
+ {\tt 40 =}  \char"40%
+&{\tt 41 =}  \char"41%
+&{\tt 42 =}  \char"42%
+&{\tt 43 =}  \char"43%
+&{\tt 44 =}  \char"44%
+&{\tt 45 =}  \char"45%
+&{\tt 46 =}  \char"46%
+&{\tt 47 =}  \char"47\cr
+ {\tt 48 =}  \char"48%
+&{\tt 49 =}  \char"49%
+&{\tt 4A =}  \char"4A%
+&{\tt 4B =}  \char"4B%
+&{\tt 4C =}  \char"4C%
+&{\tt 4D =}  \char"4D%
+&{\tt 4E =}  \char"4E%
+&{\tt 4F =}  \char"4F\cr
+ {\tt 50 =}  \char"50%
+&{\tt 51 =}  \char"51%
+&{\tt 52 =}  \char"52%
+&{\tt 53 =}  \char"53%
+&{\tt 54 =}  \char"54%
+&{\tt 55 =}  \char"55%
+&{\tt 56 =}  \char"56%
+&{\tt 57 =}  \char"57\cr
+ {\tt 58 =}  \char"58%
+&{\tt 59 =}  \char"59%
+&{\tt 5A =}  \char"5A%
+&{\tt 5B =}  \char"5B%
+&{\tt 5C =}  \char"5C%
+&{\tt 5D =}  \char"5D%
+&{\tt 5E =}  \char"5E%
+&{\tt 5F =}  \char"5F\cr
+ {\tt 60 =}  \char"60%
+&{\tt 61 =}  \char"61%
+&{\tt 62 =}  \char"62%
+&{\tt 63 =}  \char"63%
+&{\tt 64 =}  \char"64%
+&{\tt 65 =}  \char"65%
+&{\tt 66 =}  \char"66%
+&{\tt 67 =}  \char"67\cr
+ {\tt 68 =}  \char"68%
+&{\tt 69 =}  \char"69%
+&{\tt 6A =}  \char"6A%
+&{\tt 6B =}  \char"6B%
+&{\tt 6C =}  \char"6C%
+&{\tt 6D =}  \char"6D%
+&{\tt 6E =}  \char"6E%
+&{\tt 6F =}  \char"6F\cr
+ {\tt 70 =}  \char"70%
+&{\tt 71 =}  \char"71%
+&{\tt 72 =}  \char"72%
+&{\tt 73 =}  \char"73%
+&{\tt 74 =}  \char"74%
+&{\tt 75 =}  \char"75%
+&{\tt 76 =}  \char"76%
+&{\tt 77 =}  \char"77\cr
+ {\tt 78 =}  \char"78%
+&{\tt 79 =}  \char"79%
+&{\tt 7A =}  \char"7A%
+&{\tt 7B =}  \char"7B%
+&{\tt 7C =}  \char"7C%
+&{\tt 7D =}  \char"7D%
+&{\tt 7E =}  \char"7E%
+&{\tt 7F =}  \char"7F\cr}
+$$}
+
+\bigskip
+
 {\tt wasyb}:
 {\wasyb$$
 \halign {&#\quad\hfil\cr
@@ -605,6 +788,141 @@ $$}
 
 \bigskip
 
+{\tt wasysl}:
+{\wasysl$$
+\halign {&#\quad\hfil\cr
+ {\tt 00 =}  \char"00%
+&{\tt 01 =}  \char"01%
+&{\tt 02 =}  \char"02%
+&{\tt 03 =}  \char"03%
+&{\tt 04 =}  \char"04%
+&{\tt 05 =}  \char"05%
+&{\tt 06 =}  \char"06%
+&{\tt 07 =}  \char"07\cr
+ {\tt 08 =}  \char"08%
+&{\tt 09 =}  \char"09%
+&{\tt 0A =}  \char"0A%
+&{\tt 0B =}  \char"0B%
+&{\tt 0C =}  \char"0C%
+&{\tt 0D =}  \char"0D%
+&{\tt 0E =}  \char"0E%
+&{\tt 0F =}  \char"0F\cr
+ {\tt 10 =}  \char"10%
+&{\tt 11 =}  \char"11%
+&{\tt 12 =}  \char"12%
+&{\tt 13 =}  \char"13%
+&{\tt 14 =}  \char"14%
+&{\tt 15 =}  \char"15%
+&{\tt 16 =}  \char"16%
+&{\tt 17 =}  \char"17\cr
+ {\tt 18 =}  \char"18%
+&{\tt 19 =}  \char"19%
+&{\tt 1A =}  \char"1A%
+&{\tt 1B =}  \char"1B%
+&{\tt 1C =}  \char"1C%
+&{\tt 1D =}  \char"1D%
+&{\tt 1E =}  \char"1E%
+&{\tt 1F =}  \char"1F\cr
+ {\tt 20 =}  \char"20%
+&{\tt 21 =}  \char"21%
+&{\tt 22 =}  \char"22%
+&{\tt 23 =}  \char"23%
+&{\tt 24 =}  \char"24%
+&{\tt 25 =}  \char"25%
+&{\tt 26 =}  \char"26%
+&{\tt 27 =}  \char"27\cr
+ {\tt 28 =}  \char"28%
+&{\tt 29 =}  \char"29%
+&{\tt 2A =}  \char"2A%
+&{\tt 2B =}  \char"2B%
+&{\tt 2C =}  \char"2C%
+&{\tt 2D =}  \char"2D%
+&{\tt 2E =}  \char"2E%
+&{\tt 2F =}  \char"2F\cr
+ {\tt 30 =}  \char"30%
+&{\tt 31 =}  \char"31%
+&{\tt 32 =}  \char"32%
+&{\tt 33 =}  \char"33%
+&{\tt 34 =}  \char"34%
+&{\tt 35 =}  \char"35%
+&{\tt 36 =}  \char"36%
+&{\tt 37 =}  \char"37\cr
+ {\tt 38 =}  \char"38%
+&{\tt 39 =}  \char"39%
+&{\tt 3A =}  \char"3A%
+&{\tt 3B =}  \char"3B%
+&{\tt 3C =}  \char"3C%
+&{\tt 3D =}  \char"3D%
+&{\tt 3E =}  \char"3E%
+&{\tt 3F =}  \char"3F\cr
+ {\tt 40 =}  \char"40%
+&{\tt 41 =}  \char"41%
+&{\tt 42 =}  \char"42%
+&{\tt 43 =}  \char"43%
+&{\tt 44 =}  \char"44%
+&{\tt 45 =}  \char"45%
+&{\tt 46 =}  \char"46%
+&{\tt 47 =}  \char"47\cr
+ {\tt 48 =}  \char"48%
+&{\tt 49 =}  \char"49%
+&{\tt 4A =}  \char"4A%
+&{\tt 4B =}  \char"4B%
+&{\tt 4C =}  \char"4C%
+&{\tt 4D =}  \char"4D%
+&{\tt 4E =}  \char"4E%
+&{\tt 4F =}  \char"4F\cr
+ {\tt 50 =}  \char"50%
+&{\tt 51 =}  \char"51%
+&{\tt 52 =}  \char"52%
+&{\tt 53 =}  \char"53%
+&{\tt 54 =}  \char"54%
+&{\tt 55 =}  \char"55%
+&{\tt 56 =}  \char"56%
+&{\tt 57 =}  \char"57\cr
+ {\tt 58 =}  \char"58%
+&{\tt 59 =}  \char"59%
+&{\tt 5A =}  \char"5A%
+&{\tt 5B =}  \char"5B%
+&{\tt 5C =}  \char"5C%
+&{\tt 5D =}  \char"5D%
+&{\tt 5E =}  \char"5E%
+&{\tt 5F =}  \char"5F\cr
+ {\tt 60 =}  \char"60%
+&{\tt 61 =}  \char"61%
+&{\tt 62 =}  \char"62%
+&{\tt 63 =}  \char"63%
+&{\tt 64 =}  \char"64%
+&{\tt 65 =}  \char"65%
+&{\tt 66 =}  \char"66%
+&{\tt 67 =}  \char"67\cr
+ {\tt 68 =}  \char"68%
+&{\tt 69 =}  \char"69%
+&{\tt 6A =}  \char"6A%
+&{\tt 6B =}  \char"6B%
+&{\tt 6C =}  \char"6C%
+&{\tt 6D =}  \char"6D%
+&{\tt 6E =}  \char"6E%
+&{\tt 6F =}  \char"6F\cr
+ {\tt 70 =}  \char"70%
+&{\tt 71 =}  \char"71%
+&{\tt 72 =}  \char"72%
+&{\tt 73 =}  \char"73%
+&{\tt 74 =}  \char"74%
+&{\tt 75 =}  \char"75%
+&{\tt 76 =}  \char"76%
+&{\tt 77 =}  \char"77\cr
+ {\tt 78 =}  \char"78%
+&{\tt 79 =}  \char"79%
+&{\tt 7A =}  \char"7A%
+&{\tt 7B =}  \char"7B%
+&{\tt 7C =}  \char"7C%
+&{\tt 7D =}  \char"7D%
+&{\tt 7E =}  \char"7E%
+&{\tt 7F =}  \char"7F\cr}
+$$}
+
+\bigskip
+
 {\bf Changes since version 1.0}
 
 version 1.1:
@@ -627,4 +945,36 @@ now the full set of
 
 {\tt wasyb10} font for bold math added
 
+version 2.1:
+
+new spacing for \openo
+
+version 2.2:
+
+{\tt wasysl10} font for slanted characters added
+
+new German Paragraph \Paragraph, currency \euro
+
+new commands {\tt \\wsl, \\wbf}
+
+version 2.3:
+
+new scaling for \ataribox\ (bugfix)
+
+corrections for \APLuparrowbox\ and \APLdownarrowbox\ at small fonts (bugfix)
+
+italic corrections improved ({\tt\\/} for {\tt wasysl10}; works for
+symbols only without {\tt\\hbox} in the definition!)
+
+new apple cmd symbol \applecmd
+
+version 2.4:
+
+new characters long-s \s\ and round-z \z
+
+improved \opposition\ (bugfix)
+
+new macros for planets and some other astronomy symbols for use
+in math mode subscripts (i.e.\ proper size change).
+
 \bye
diff --git a/Master/texmf-dist/doc/fonts/wasy/wasyfont.2 b/Master/texmf-dist/doc/fonts/wasy/wasyfont.2
index 0a2e2533086..ce8c3efb363 100644
--- a/Master/texmf-dist/doc/fonts/wasy/wasyfont.2
+++ b/Master/texmf-dist/doc/fonts/wasy/wasyfont.2
@@ -14,6 +14,7 @@
 \textfont\wasyfam=\tenwasy
 \scriptfont\wasyfam=\sevenwasy
 \scriptscriptfont\wasyfam=\fivewasy
+\let\wsl\sl \let\wbf\bf
 %%%%%% special macro
 \def\overstrike#1#2{{\setbox0\hbox{$#2$}\hbox to \wd0{\hss
     $#1$\hss}\kern-\wd0\box0}}
@@ -38,6 +39,12 @@
     \lower 1.3pt\hbox to 0pt{\char"13\hss}%
     \lower 4.4pt\hbox to 0pt{%
     \kern 0.82pt\char"12\hss}\kern 4.2pt}}
+\def\euro{\leavevmode\hbox{\kern 0.03em
+    \vrule height 0.7ex depth -0.6ex width 0.5em
+    \kern -0.47em
+    \vrule height 1.0ex depth -0.9ex width 0.5em
+    \kern -0.5em C}}
+\def\z{{\teni 3}}
 %%%%%%%%%%%%%%%%%%%%%%
 \def\clock{\hbox{\kern 1pt
     \vrule width 0.4pt height 3.6pt depth -1.2pt
@@ -81,6 +88,7 @@
 \def\APLcirc#1{\overstrike{\circ}{#1}}
 \def\APLvert#1{\overstrike{\vert}{#1}}
 \def\APLminus{\raise0.7ex\hbox{$-$}}
+\def\diameter{\overstrike{\circ}{/}}
 %%%%%%%%%%%%%%%%%%%%%%
 \def\AC{\hbox{\kern0.5pt\wasy\char"3A\kern0.5pt}}
 \def\HF{\lower0.9pt\hbox to 0pt{\kern0.5pt\wasy\char"3A\hss}%
@@ -94,13 +102,14 @@
 %%%%%% math characters
 \def\Bowtie{\hbox{\wasy\char"31}}
 %%%%%% special characters
-\def\permil{$^0\!{/}\!{}_{00}$}
+\def\permil{\ifmmode{^0\!{/}\!{}_{00}}\else$^0\!{/}\!{}_{00}$\fi}
 \def\agemO{{\wasy\char"30}}
-\def\Dh{\leavevmode{\rm\setbox0\hbox{D}%
+\def\Dh{\leavevmode{\setbox0\hbox{D}%
     \hbox to\wd0{\kern 0.04em\char32\hss D}}}
 \def\cent{\overstrike/{\rm c}}
 \def\thorn{\overstrike{\rm b}{\rm p}}
 \def\astrosun{\hbox{\tensy\char"0C}}
+\let\Paragraph\S
 %%%%%% math operators as mathchars
 \def\wasymathchardef#1#2{%
     \count"FF=\wasyfamcount