diff options
Diffstat (limited to 'Master')
20 files changed, 782 insertions, 154 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 Binary files differindex 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 \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 diff --git a/Master/texmf-dist/fonts/source/public/wasy/rsym.mf b/Master/texmf-dist/fonts/source/public/wasy/rsym.mf index 1d1a4c1f736..94d4e19e734 100644 --- a/Master/texmf-dist/fonts/source/public/wasy/rsym.mf +++ b/Master/texmf-dist/fonts/source/public/wasy/rsym.mf @@ -1,4 +1,4 @@ -% This is RSYM.MF in text format, version 1.1 +% This is RSYM.MF in text format, version 2.3 cmchar "therefore"; beginchar(hex"05",12u#,x_height#,0); @@ -54,7 +54,7 @@ labels(1,2,3); endchar; cmchar "aries"; beginchar(hex"17",asc_height#+2u#,asc_height#,0); -italcorr 2/3asc_height#*slant; +italcorr asc_height#*slant-.5u#; adjust_fit(0,0); pickup rule.nib; y1=y6; y2-y1=x2-x1; top y2 = h+oo; y5=y2; bot y4 = 0-oo; y3=.85[y4,y1]; @@ -82,7 +82,7 @@ beginchar(hex"5E",asc_height#+2u#,asc_height#,0); italcorr 2/3asc_height#*slant; adjust_fit(0,0); pickup rule.nib; top y2 = h+u; bot y1 = 0-u; y4 = y1; y3 = y2; -x1 = x2 = u; x3 = x4 = w-u; +x1 = x2 = u; x3 = x4 = w-u; bot y5 = 1/18h; top y6 = 17/18h; y8 = y5; y7 = y6; x5 = x6 = 1/3w; x7 = x8 = 2/3w; draw z5--z6; @@ -111,7 +111,7 @@ adjust_fit(0,0); pickup rule.nib; top y2 = h; bot y1 = 0; y4 = y1; y3 = y2; y2 - y5 = y5 - y1; y6 = y5; x5 = 1/3w; x5-x1 = x3-x6; -x1 = x2 = hround u; x3 = x4 = hround w-u; +x1 = x2 = hround u; x3 = x4 = hround w-u; draw z5--z6; draw z1..z5..z2; draw z3..z6..z4; @@ -486,7 +486,7 @@ labels(1,2,3,4,5,6,7,8,9); endchar; cmchar "conjunction"; numeric this_size#; this_size# = x_height#*(1+0.9/sqrt2); -beginchar(hex"56",this_size#+1.7u#,this_size#,0); +beginchar(hex"56",this_size#+0.7u#,this_size#,0); italcorr this_size#*slant; adjust_fit(if monospace: u#,u# else: 0,0 fi); pickup rule.nib; autorounded; @@ -500,16 +500,17 @@ draw z1--z9; labels(1,2,3,4,5,6,7,8,9); endchar; cmchar "opposition"; -beginchar(hex"57",2x_height#+2u#, - 2.2x_height#-0.5desc_depth#,0.5desc_depth#); +beginchar(hex"57",2x_height#+1.5u#, + 2x_height#-0.7desc_depth#,0.7desc_depth#); italcorr 1.5x_height#*slant; adjust_fit(if monospace: u#,u# else: 0,0 fi); pickup rule.nib; autorounded; -lft x6=hround u; x2-x6=y8-y4=x_height; bot y4=-d-oo; +lft x6=hround u; x2=x_height+2u-x6; bot y4=-d; y2=-d+.5x_height; circle_points; draw_circle; -x10 = w-u-x2; y10=h+oo-y8; -for n=1 upto 8: z[n]' = z[n] + z10; endfor +z5'=1.5[z5,z1]; +for n=1 upto 4: z[n]' = z[n] + z5' - z5; endfor +for n=6 upto 8: z[n]' = z[n] + z5' - z5; endfor draw z8'{right}...z1'{z2-z8}...z2'{down}...z3'{z4-z2}...z4'{left} ...z5'{z6-z4}...z6'{up}...z7'{z8-z6}...cycle; draw z1--z5'; @@ -1123,11 +1124,19 @@ penlabels(11,12,11',12'); endchar; cmchar "APLuparrowbox"; beginchar(hex"6E",14u#,7u#+math_axis#,7u#-math_axis#); italcorr math_axis#*slant-.5u#; -adjust_fit(0,0); pickup crisp.nib; +adjust_fit(0,0); +pickup rule.nib; +y+.5dot_size=vround(math_axis+math_spread[.5x_height,.6x_height] ++.5dot_size); +lft x11=hround u-eps; x11'=x11; x12=x12'=w-x11; +y11=y12=math_axis-1.8(y-math_axis); +y11'=y12'=math_axis+1.8(y-math_axis); +draw z11--z12--z12'--z11'--cycle; +pickup crisp.nib; pos1(rule_thickness,0); pos2(rule_thickness,0); pos3(bar,90); pos4(bar,90); -lft x1l=hround(.5w-.5rule_thickness); bot y1-rule_thickness=-d; -x0=x1=x2; top y0=h-.5u; x0-x3=x4-x0=3u+eps; +lft x1l=hround(.5w-.5rule_thickness); bot y1-rule_thickness=y11+.5u; +x0=x1=x2; top y0=y11'-1u; x0-x3=x4-x0=3u+eps; y3=y4=y0-.24asc_height-eps; pos5(bar,angle(z4-z0)); z5l=z0; pos6(bar,angle(z3-z0)); z6l=z0; @@ -1138,6 +1147,12 @@ filldraw z0..{z4-z9}z4r--subpath (0,t) of\\(z4l{z9-z4}..z6r) --z2r---z1r..z1l---z2l--subpath (t,0) of\\(z3l{z9-z3}..z5r) --z3r{z9-z3}..z0 & cycle; % arrowhead and stem penlabels(0,1,2,3,4,5,6,9); +penlabels(11,12,11',12'); endchar; + +cmchar "APLdownarrowbox"; +beginchar(hex"6F",14u#,7u#+math_axis#,7u#-math_axis#); +italcorr math_axis#*slant-.5u#; +adjust_fit(0,0); pickup rule.nib; y+.5dot_size=vround(math_axis+math_spread[.5x_height,.6x_height] +.5dot_size); @@ -1145,16 +1160,11 @@ lft x11=hround u-eps; x11'=x11; x12=x12'=w-x11; y11=y12=math_axis-1.8(y-math_axis); y11'=y12'=math_axis+1.8(y-math_axis); draw z11--z12--z12'--z11'--cycle; -penlabels(11,12,11',12'); endchar; - -cmchar "APLdownarrowbox"; -beginchar(hex"6F",14u#,7u#+math_axis#,7u#-math_axis#); -italcorr math_axis#*slant-.5u#; -adjust_fit(0,0); pickup crisp.nib; +pickup crisp.nib; pos1(rule_thickness,0); pos2(rule_thickness,0); pos3(bar,90); pos4(bar,90); -lft x1l=hround(.5w-.5rule_thickness); top y1+rule_thickness=h; -x0=x1=x2; bot y0=-d+.5u; x0-x3=x4-x0=3u+eps; +lft x1l=hround(.5w-.5rule_thickness); top y1+rule_thickness=y11'-.5u; +x0=x1=x2; bot y0=y11+1u; x0-x3=x4-x0=3u+eps; y3=y4=y0+.24asc_height+eps; pos5(bar,angle(z4-z0)); z5l=z0; pos6(bar,angle(z3-z0)); z6l=z0; @@ -1165,13 +1175,6 @@ filldraw z0..{z4-z9}z4l--subpath (0,t) of\\(z4r{z9-z4}..z6r) --z2r---z1r..z1l---z2l--subpath (t,0) of\\(z3r{z9-z3}..z5r) --z3l{z9-z3}..z0 & cycle; % arrowhead and stem penlabels(0,1,2,3,4,5,6,9); -pickup rule.nib; -y+.5dot_size=vround(math_axis+math_spread[.5x_height,.6x_height] -+.5dot_size); -lft x11=hround u-eps; x11'=x11; x12=x12'=w-x11; -y11=y12=math_axis-1.8(y-math_axis); -y11'=y12'=math_axis+1.8(y-math_axis); -draw z11--z12--z12'--z11'--cycle; penlabels(11,12,11',12'); endchar; cmchar "APL box"; @@ -1707,21 +1710,39 @@ penlabels(1,2,3,4,5,6,7,8,9); penlabels(11,12,13,14,15,16,17,18,19); penlabels(21,22,23,24,25,26,27,28,29); endchar; -cmchar "ataribox (Alternate)"; -beginchar(hex"6D",5.5pt#,7.5pt#,0); - pickup pencircle scaled .85pt; - x1=0.05w; y1=0; - x2=x1; y2=h; - x3=0.95w; y3=y2; - x4=x3; y4=y1; - fill z1--z2--z3--z4--cycle; - x5=x1; y5=.5h; - x6=.5w; y6=h; - x7=x3; y7=y5; - x8=x6; y8=0; - undraw z5--z6--z7--z8--cycle; - penlabels(1,2,3,4,5,6,7,8); -endchar; +cmchar "ataribox (Alternate)"; +beginchar(hex"6D",33/45asc_height#,asc_height#,0); +italcorr asc_height#*slant; + pickup pencircle scaled .15w; + x1=0.05w; y1=0; + x2=x1; y2=h; + x3=0.95w; y3=y2; + x4=x3; y4=y1; + fill z1--z2--z3--z4--cycle; + x5=x1; y5=.5h; + x6=.5w; y6=h; + x7=x3; y7=y5; + x8=x6; y8=0; + undraw z5--z6--z7--z8--cycle; + penlabels(1,2,3,4,5,6,7,8); +endchar; + +cmchar "apple cmd"; +beginchar(hex"53",asc_height#,0.92asc_height#,0); +italcorr 3/4asc_height#*slant; +adjust_fit(0,0); pickup rule.nib; +x1 = good.x .5w; +y1 = good.y .5h; +numeric a; a = 1/7h; +x2=x17=x1-a; x9=x10=x1+a; lft x4=lft x15=x1-1/2h; rt x7=rt x12=x1+1/2h; +x3=x5=x14=x16=.5[x2,x4]; +x6=x8=x11=x13=.5[x9,x7]; +y13=y14=y1-a; y5=y6=y1+a; bot y11=bot y16=y1-1/2h; top y3=top y8=y1+1/2h; +y2=y4=y7=y9=.5[y3,y5]; +y10=y12=y15=y17=.5[y14,y16]; +draw z2..z3..z4..z5---z6..z7..z8..z9---z10..z11..z12..z13---z14..z15..z16..z17---z2; +labels(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17); +endchar; charlist hex"72": hex"77"; % integral signs charlist hex"73": hex"78"; % iintegral signs diff --git a/Master/texmf-dist/fonts/source/public/wasy/wasychr.mf b/Master/texmf-dist/fonts/source/public/wasy/wasychr.mf index 7af4d698df7..10b4f8c930c 100644 --- a/Master/texmf-dist/fonts/source/public/wasy/wasychr.mf +++ b/Master/texmf-dist/fonts/source/public/wasy/wasychr.mf @@ -1,5 +1,5 @@ % -% These characters should rather be in an character font than in a +% These characters should rather be in a character font than in a % symbol font % @@ -29,14 +29,14 @@ else: pos1(4/7[vair',flare],80); p.e:=z4e{right}..tension atleast.9 and 1..{dir 75}z5e; fi endfor filldraw stroke pulled_super_arc.e(2,3)(.7superpull) & pulled_super_arc.e(3,4)(.5superpull) & p.e; fi % arc and lower terminal -pickup crisp.nib; +pickup crisp.nib; x6=x7=x8=x9=x2; y7=y2; y8=y4; bot y9=-d; y6-y7 = y8-y9; pos6(bar,0); pos7(bar,0); pos8(bar,0); pos9(bar,0); filldraw stroke z6e--z7e; % upper bar filldraw stroke z8e--z9e; % lower bar penlabels(0,1,2,3,4,5,6,7,8,9); endchar; - + cmchar "Upside down e"; beginchar(hex"55",7.25u#+max(.75u#,.5curve#),x_height#,0); italcorr .5[bar_height#,x_height#]*slant+.5min(curve#-1.5u#,0); @@ -67,7 +67,7 @@ else: pos4(vair,90); path testpath; testpath=super_arc.l(2,3) & super_arc.l(3,4); y1'r=y0r=y0l-.6[thin_join,vair]; y1'l=y0l; x1'l=x1'r=x1; forsuffixes $=l,r: - x0$=xpart(((2h,y0$)--(x1,y0$)) intersectionpoint testpath); endfor + x0$=xpart(((2h,y0$)--(x1,y0$)) intersectionpoint testpath); endfor % old fill stroke z0e--z1'e; % crossbar penlabels(0,1,2,3,4,5); endchar; @@ -77,11 +77,11 @@ italcorr x_height#*slant-.2u#; adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi); pickup fine.nib; pos2(vair',270); pos4(vair',90); x2=x4=.5w; top y4r=vround(h+oo); bot y2r=-1.5oo; -pos3(curve,0); rt x3l=hround (w-max(.6u,1.35u-.5curve)); y3=.5h; +pos3(curve,0); rt x3l=hround (w-max(1.6u,2.35u-.5curve)); y3=.5h; if serifs: pos1(hair,180); pos0(flare,180); y1=h-.70[bar_height,h]+.5flare; - lft x1r=hround(1.0u); bulb(2,1,0); % bulb - pos5(hair,180); lft x5r=hround(1.2u); + lft x1r=hround(0.5u); bulb(2,1,0); % bulb + pos5(hair,180); lft x5r=hround(0.7u); y5=min(good.y(h+oo-.45bar_height+.9),y4l-vair'); (x,y4l)=whatever[z4l,z5r]; x4l:=max(x,x4l-.5u); filldraw stroke pulled_super_arc.e(2,3)(.7superpull) @@ -98,7 +98,7 @@ else: pos1(4/7[vair',flare],260); filldraw stroke pulled_super_arc.e(2,3)(.7superpull) & pulled_super_arc.e(3,4)(.5superpull) & p.e; fi % arc and upper terminal penlabels(0,1,2,3,4,5); endchar; - + cmchar "The small islandic thorn"; beginchar(hex"69",10u#+serif_fit#,asc_height#,desc_depth#); italcorr .5x_height#*slant+min(.5curve#-.85u#,-.1u#); @@ -151,21 +151,21 @@ fill stroke z3e..pulled_arc.e(4,5) & pulled_arc.e(5,6)..z7e; % lobe if serifs: dish_serif(1,0,a,1/3,cap_jut,b,1/3,cap_jut); % upper serif dish_serif(2,0',c,1/3,cap_jut,d,1/3,cap_jut); fi % lower serif math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7); endchar; - + cmchar "Islandic edh"; beginchar(hex"6B",9u#,asc_height#,0); italcorr .8x_height#*slant; adjust_fit(0,0); penpos1(vair,90); penpos3(vair',-90); penpos1'(hair,0); -penpos2(curve,180); penpos4(curve,0); penpos4'(curve,0); +penpos2(curve,180); penpos4(curve,0); penpos4'(curve,0); penpos5(curve,0); penpos6(curve,0); x2r=hround max(.5u,1.25u-.5curve); x4r=w-x2r; x1=x3=.5w; y1r=x_height; y3r=-oo; y2=y4=.5(x_height-oo)-vair_corr; y2l:=y4l:=.5x_height; y4'=y4+1.5u; x4'=x4; -top y6 = h; -x6= if monospace: 2/3 else: 1/3 fi [x2,x5]; +top y6 = h; +x6= if monospace: 2/3 else: 1/3 fi [x2,x5]; y5=0.66[y4',y6]; x5=0.60[x4',x6]; z1' = z4'; @@ -181,9 +181,26 @@ z=.5[z7,z8]; % make bar symmetric (y6-y)/(y6-y5) = (x6-x)/(x6-x5); penstroke z7e--z8e; % bar penlabels(1,2,3,4,5,6,7,8); endchar; - + +cmchar "The letter long-s"; +beginchar(hex"54",5.5u#,asc_height#,0); +italcorr asc_height#*slant+if serifs:flare#-.25u# else: 1.25u# fi; +adjust_fit(stem_shift#,if monospace: .5u# else:-stem_shift# fi); +pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem'); +pickup fine.nib; numeric bulb_diam; +if serifs: bulb_diam=hround .8[stem,flare]; + pos2(bulb_diam,0); y2+.5bulb_diam=.9[x_height,h+oo]; + if monospace: rt x2r=hround(w-.5u)+1 else: lft x2l=hround(w-.75u+.5) fi; +else: pos2(5/7[vair,flare],90); top y2r=h; + rt x2=hround(if monospace:w-.5u else:w+.75u fi); fi +f_stroke(1,2,a,b,c,jut,if not monospace:1.25fi\\ jut); % stem, terminal, serif +pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround .7u; +pos3(bar,90); pos4(bar,90); +rt x4=hround(2.5u); +filldraw stroke z3e--z4e; % bar +penlabels(1,2,3,4); endchar; + cmchar "Permille sign"; -cmchar "Per mille sign"; beginchar(hex"68",9u#+max(9u#,3fudge*(hair#+stem#)), body_height#,body_height#-asc_height#); italcorr if hefty: .4asc_height#*slant-.5u# else: h#*slant-u# fi; @@ -198,7 +215,7 @@ x1=x3=.5[x2,x4]; y2=y4=.5[y1,y3]; filldraw stroke pulled_super_arc.e(1,2)(superpull) & pulled_super_arc.e(2,3)(superpull); % left half of upper bowl filldraw stroke super_arc.e(3,4) & super_arc.e(4,1); % right half of upper bowl -pos5(vair,90); pos6(left_curve,180); pos7(vair,270); +pos5(vair,90); pos6(left_curve,180); pos7(vair,270); pos8(right_curve,360); bot y7r=-d; rt x8r=hround(.70w-u); x6-x8 = x2-x4; top y5r=vround(if monospace: .3 else: .5 fi\\ asc_height); @@ -206,7 +223,7 @@ x5=x7=.5[x6,x8]; y6=y8=.5[y5,y7]; filldraw stroke pulled_super_arc.e(5,6)(superpull) & pulled_super_arc.e(6,7)(superpull); % left half of lower bowl filldraw stroke super_arc.e(7,8) & super_arc.e(8,5); % right half of lower bowl -pos5'(vair,90); pos6'(left_curve,180); pos7'(vair,270); +pos5'(vair,90); pos6'(left_curve,180); pos7'(vair,270); pos8'(right_curve,360); bot y7'r=-d; rt x8'r=hround(w-u); x6'-x8' = x6-x8; top y5'r=vround(if monospace: .3 else: .5 fi\\ asc_height); @@ -223,3 +240,77 @@ else: rt x9=hround(.67w-2.5u); lft x10=hround 2.5u; draw z9--z10; % diagonal path p; p=super_arc.r(1,4); z11r=point 2/3 of p; z12r=z9r; filldraw stroke z11e{direction 2/3 of p}...{z9-z10}z12e; fi % link penlabels(1,2,3,4,5,6,7,8,9,10,11,12); endchar; + +cmchar "German Paragraph sign, similar to section"; +beginchar(hex"4D",8.5u#+max(1.5u#,stem#),asc_height#,1/2desc_depth#); +italcorr cap_height#*slant-u#; +adjust_fit(0,0); pickup fine.nib; + pos0(stem,0); pos1(hair,0); pos2(vair,90); pos3(curve,180); + pos4(vair,270); pos5'(curve,0); pos5(curve,180); +% pos6(9/10curve,0); +pos6(vair,90); pos7(curve,0); pos8(vair,-90); pos9(hair,-180); pos10(stem,-180); +top y2r=h+oo; bot y8r=-d-oo; y2-y1=y9-y8=(y2-y8)/8; +y3=.52[y4,y2]; y5=.52[y4,y6]; y7=.52[y6,y8]; y5'=.52[y6,y4]; +y2-y4=y4-y6=y6-y8; +rt x1r=hround(w-1.5u); lft x3r=hround 1.25u; +x2=x4=x6=x8=.5w; x5=x7=w-x3; x5'=x3; x9=w-x1; +bulb(2,1,0); bulb(8,9,10); % bulbs +filldraw stroke z2e{left}...z3e{down}...z4e{3(x5-x3),y5-y3} + ...z5e{down}...{left}z6e; % upper stroke +filldraw stroke z4e{left}...z5'e{down}...z6e{3(x7-x5'),y7-y5'} + ...z7e{down}...{left}z8e; % upper stroke +penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar; + +cmchar "Euro symbol"; + beginchar(hex"4E",12.5u#,cap_height#,0); + italcorr cap_height#*slant-.5u#; + adjust_fit(0,0); + pickup fine.nib; pos1(25/33flare,80); pos2(15/11slab,90); + pos3(30/37cap_curve,180); pos4(18/11slab,270); pos5(22/33flare,275); + rt x1r=hround(w-1.1u); x2=x4=.5w+1.75u; + lft x3r=hround max(2u,3u-32/64cap_curve); x5r=x1r-0.1u; + top y1r=vround .95h+oo; top y2r=h+oo; y3=.5h; + bot y4r=-oo; bot y5r=vround .08h-oo; y5l:=good.y y5l; x5l:=good.x x5l; + filldraw stroke rterm.e(2,1,right,.9,4) & super_arc.e(2,3) + & super_arc.e(3,4) & term.e(4,5,right,.8,4); % arc and terminals +italcorr h#*slant-.5u#; +adjust_fit(0,0); pickup rule.nib; +lft x9=hround 0.5u-eps; x7=x9+0.1u; x10=0.6w; x8=x10+0.3u; +y7=y8; y9=y10; y7-y9=1/5h; .5[y7,y9]=.5h; +draw z7--z8; % upper bar +draw z9--z10; % upper bar +penlabels(1,1',2,3,4,5,6,7,8,9,10); endchar; + +cmchar "round z zh"; +beginchar(hex"4F",8u#,x_height#,desc_depth#); +italcorr x_height#*slant-.5serif_fit#-.3u#; +adjust_fit(0,.5serif_fit#); +numeric arm_thickness[],z_stem; +if hefty: arm_thickness1=Vround(vair-vair_corr); arm_thickness2=vair; + z_stem=.6[vair,stem]; +else: arm_thickness1=vair; arm_thickness2=vair'; z_stem=.9[vair,stem]; fi +pickup tiny.nib; rt x1r=rt x2r=hround(w-.8u); lft x3l=3u; x4l = x3l; +top y1=h; y2=min(y1,h-2/3arm_thickness1); +y3=vround(-d+.85x_height); y4=y3-2/3arm_thickness1; +numeric alpha; alpha=diag_ratio(1,z_stem-tiny,y2-y3,x2r-x3l-slant*(y2-y3)); +penpos1(alpha*(z_stem-tiny),0); penpos2(alpha*(z_stem-tiny),0); +penpos3(alpha*(z_stem-tiny),0); +penpos4(alpha*(z_stem-tiny),0); +pair delta; delta=penoffset z3-z2 of currentpen; +fill top lft z1l--z2l+delta---z3l+delta..lft z3l---lft z4l--z4r + --z3r-delta---z2r-delta..rt z2r---rt z1r..top z1r + ---cycle; % diagonal +pickup crisp.nib; pos5(arm_thickness1,90); pos6(hair,180); +top y5r=h; x5=x1; lft x6r=hround .75u; y6=good.y(y5l-beak/1.4)-eps; +arm(5,6,a,beak_darkness,-.4beak_jut); % upper arm and beak +pos12(vair',270); pos14(vair',90); +x12=x14=x3; bot y14l=bot y4; bot y12r=-d; +pos13(curve,0); rt x13l=hround (w-max(1.9u,2.65u-.5curve)); +y13=.5[y12,y14]; +%if serifs: + pos11(hair,180); pos10(flare,180); + y11=y14-.70[bar_height,0.85x_height]+.75flare; + lft x11r=hround(0.3u); bulb(12,11,10); % bulb + filldraw stroke pulled_super_arc.e(12,13)(.7superpull) + & pulled_super_arc.e(13,14)(.5superpull); +penlabels(1,2,3,4,10,11,12,13,14); endchar; diff --git a/Master/texmf-dist/fonts/source/public/wasy/wasysl10.mf b/Master/texmf-dist/fonts/source/public/wasy/wasysl10.mf new file mode 100644 index 00000000000..7e5c5cfda0a --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/wasy/wasysl10.mf @@ -0,0 +1,100 @@ +% This is WASY10.MF in text format +% additional symbols for math, physics, astronomy and other fields + +%input modes; +%mode=hp_laser; + +if unknown cmbase: input cmbase fi + +font_identifier:="WASY"; font_size 10pt#; + +u#:=20/36pt#; % unit width +width_adj#:=0pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=5/36pt#; % extra sidebar near uppercase serifs +letter_fit#:=0pt#; % extra space added to all sidebars + +body_height#:=270/36pt#; % height of tallest characters +asc_height#:=250/36pt#; % height of lowercase ascenders +cap_height#:=246/36pt#; % height of caps +fig_height#:=232/36pt#; % height of numerals +x_height#:=155/36pt#; % height of lowercase without ascenders +math_axis#:=90/36pt#; % axis of symmetry for math symbols +bar_height#:=87/36pt#; % height of crossbar in lowercase e +comma_depth#:=70/36pt#; % depth of comma below baseline +desc_depth#:=70/36pt#; % depth of lowercase descenders + +crisp#:=0pt#; % diameter of serif corners +tiny#:=8/36pt#; % diameter of rounded corners +fine#:=7/36pt#; % diameter of sharply rounded corners +thin_join#:=7/36pt#; % width of extrafine details +hair#:=9/36pt#; % lowercase hairline breadth +stem#:=25/36pt#; % lowercase stem breadth +curve#:=30/36pt#; % lowercase curve breadth +ess#:=27/36pt#; % breadth in middle of lowercase s +flare#:=33/36pt#; % diameter of bulbs or breadth of terminals +dot_size#:=38/36pt#; % diameter of dots +cap_hair#:=11/36pt#; % uppercase hairline breadth +cap_stem#:=32/36pt#; % uppercase stem breadth +cap_curve#:=37/36pt#; % uppercase curve breadth +cap_ess#:=35/36pt#; % breadth in middle of uppercase s +rule_thickness#:=.4pt#; % thickness of lines in math symbols + +dish#:=1/36pt#; % amount erased at top or bottom of serifs +bracket#:=20/36pt#; % vertical distance from serif base to tangent +jut#:=28/36pt#; % protrusion of lowercase serifs +cap_jut#:=37/36pt#; % protrusion of uppercase serifs +beak_jut#:=10/36pt#; % horizontal protrusion of beak serifs +beak#:=70/36pt#; % vertical protrusion of beak serifs +vair#:=8/36pt#; % vertical diameter of hairlines +notch_cut#:=10pt#; % maximum breadth above or below notches +bar#:=11/36pt#; % lowercase bar thickness +slab#:=11/36pt#; % serif and arm thickness +cap_bar#:=11/36pt#; % uppercase bar thickness +cap_band#:=11/36pt#; % uppercase thickness above/below lobes +cap_notch_cut#:=10pt#; % max breadth above/below uppercase notches +serif_drop#:=4/36pt#; % vertical drop of sloped serifs +stem_corr#:=1/36pt#; % for small refinements of stem breadth +vair_corr#:=1/36pt#; % for small refinements of hairline height +apex_corr#:=0pt#; % extra width at diagonal junctions + +o#:=8/36pt#; % amount of overshoot for curves +apex_o#:=8/36pt#; % amount of overshoot for diagonal junctions + +slant:=1/6; % tilt ratio $(\Delta x/\Delta y)$ +fudge:=1; % factor applied to weights of heavy characters +math_spread:=0; % extra openness of math symbols +superness:=1/sqrt2; % parameter for superellipses +superpull:=1/6; % extra openness inside bowls +beak_darkness:=11/30; % fraction of triangle inside beak serifs +ligs:=2; % level of ligatures to be included + +square_dots:=false; % should dots be square? +hefty:=false; % should we try hard not to be overweight? +serifs:=true; % should serifs and bulbs be attached? +monospace:=false; % should all characters have the same width? +variant_g:=false; % should an italic-style g be used? +low_asterisk:=false; % should the asterisk be centered at the axis? +math_fitting:=false; % should math-mode spacing be used? + + +if ligs>1: font_coding_scheme:="TeX text"; +else: font_coding_scheme:=if ligs=0: "TeX typewriter text" + else: "TeX text without f-ligatures" fi; + fi + +mode_setup; font_setup; + +input rsym; % symbols +input lasychr; % lasy font symbols + + +font_slant slant; font_x_height x_height#; +if monospace: font_normal_space 9u#; % no stretching or shrinking + font_quad 18u#; + font_extra_space 9u#; +else: font_normal_space 6u#+2letter_fit#; + font_normal_stretch 3u#; font_normal_shrink 2u#; + font_quad 18u#+4letter_fit#; + font_extra_space 2u#; fi +bye. diff --git a/Master/texmf-dist/fonts/tfm/public/wasy/wasy10.tfm b/Master/texmf-dist/fonts/tfm/public/wasy/wasy10.tfm Binary files differindex 43906ad757a..89820cf9afd 100644 --- a/Master/texmf-dist/fonts/tfm/public/wasy/wasy10.tfm +++ b/Master/texmf-dist/fonts/tfm/public/wasy/wasy10.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/wasy/wasy5.tfm b/Master/texmf-dist/fonts/tfm/public/wasy/wasy5.tfm Binary files differindex 2923e06ba42..2c1f9cde560 100644 --- a/Master/texmf-dist/fonts/tfm/public/wasy/wasy5.tfm +++ b/Master/texmf-dist/fonts/tfm/public/wasy/wasy5.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/wasy/wasy6.tfm b/Master/texmf-dist/fonts/tfm/public/wasy/wasy6.tfm Binary files differindex d6eebf1624c..bd1b79c540b 100644 --- a/Master/texmf-dist/fonts/tfm/public/wasy/wasy6.tfm +++ b/Master/texmf-dist/fonts/tfm/public/wasy/wasy6.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/wasy/wasy7.tfm b/Master/texmf-dist/fonts/tfm/public/wasy/wasy7.tfm Binary files differindex a8845673014..1a58e87f36c 100644 --- a/Master/texmf-dist/fonts/tfm/public/wasy/wasy7.tfm +++ b/Master/texmf-dist/fonts/tfm/public/wasy/wasy7.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/wasy/wasy8.tfm b/Master/texmf-dist/fonts/tfm/public/wasy/wasy8.tfm Binary files differindex f7fc3abe284..8e02d16d9f6 100644 --- a/Master/texmf-dist/fonts/tfm/public/wasy/wasy8.tfm +++ b/Master/texmf-dist/fonts/tfm/public/wasy/wasy8.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/wasy/wasy9.tfm b/Master/texmf-dist/fonts/tfm/public/wasy/wasy9.tfm Binary files differindex 42f28b2ef07..999e43bfb03 100644 --- a/Master/texmf-dist/fonts/tfm/public/wasy/wasy9.tfm +++ b/Master/texmf-dist/fonts/tfm/public/wasy/wasy9.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/wasy/wasyb10.tfm b/Master/texmf-dist/fonts/tfm/public/wasy/wasyb10.tfm Binary files differindex 30283a406c6..d4532c118ba 100644 --- a/Master/texmf-dist/fonts/tfm/public/wasy/wasyb10.tfm +++ b/Master/texmf-dist/fonts/tfm/public/wasy/wasyb10.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/wasy/wasysl10.tfm b/Master/texmf-dist/fonts/tfm/public/wasy/wasysl10.tfm Binary files differnew file mode 100644 index 00000000000..e6a86dd32d5 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/wasy/wasysl10.tfm diff --git a/Master/texmf-dist/tex/plain/wasy/wasyfont.tex b/Master/texmf-dist/tex/plain/wasy/wasyfont.tex index 7109ce06971..e5e171dbf4e 100644 --- a/Master/texmf-dist/tex/plain/wasy/wasyfont.tex +++ b/Master/texmf-dist/tex/plain/wasy/wasyfont.tex @@ -1,10 +1,31 @@ -% this is wasyfont.tex version 2.01--92/10 +% this is WASYFONT.tex version 2.4--2020/01 +% to be used with PlainTeX +\catcode`@=11 % make @ letter +\ifx\newwasy\undefined \font\tenwasy = wasy10 \font\wasyb = wasyb10 \font\ninewasy = wasy9 -\font\eightwasy = wasy8 \font\sevenwasy = wasy7 +\font\bigwasy = wasy10 scaled \magstep1 +\font\bigwasyb = wasyb10 scaled \magstep1 +\font\Bigwasy = wasy10 scaled \magstep2 +\font\Bigwasyb = wasyb10 scaled \magstep2 \font\fivewasy = wasy5 +\font\eightwasy = wasy8 +\font\wasysl = wasysl10 +\else +\font\tenwasy = wasym10 +\font\wasyb = wasymb10 +\font\ninewasy = wasym9 +\font\sevenwasy = wasym7 +\font\bigwasy = wasym10 scaled \magstep1 +\font\bigwasyb = wasymb10 scaled \magstep1 +\font\Bigwasy = wasym10 scaled \magstep2 +\font\Bigwasyb = wasymb10 scaled \magstep2 +\font\fivewasy = wasym5 +\font\eightwasy = wasym8 +\font\wasysl = wasyml10 +\fi \newfam\wasyfam \newcount\wasyfamcount \wasyfamcount=\wasyfam \multiply\wasyfamcount by 256 @@ -12,6 +33,14 @@ \textfont\wasyfam=\tenwasy \scriptfont\wasyfam=\sevenwasy \scriptscriptfont\wasyfam=\fivewasy +%%%%%% move to slanted or boldface including wasy symbols +\def\wbf{\bf\let\tenwasy\wasyb} +\def\wsl{\sl\let\tenwasy\wasysl} +\def\euro{{\wasy\char"4E}} +\def\Paragraph{{\wasy\char"4D}} +\def\s{{\wasy\char"54}} +\def\z{{\wasy\char"4F}} +\def\applecmd{{\wasy\char"53}} %%%%%% special macro \def\overstrike#1#2{{\setbox0\hbox{$#2$}\hbox to \wd0{\hss $#1$\hss}\kern-\wd0\box0}} @@ -69,26 +98,6 @@ \def\RIGHTCIRCLE{\hbox{\wasy\char"48}} \def\LEFTcircle{\hbox to 0pt{\wasy\char"47\hss}\hbox{\wasy\char"23}} \def\RIGHTcircle{\hbox to 0pt{\wasy\char"48\hss}\hbox{\wasy\char"23}} -%%%%%% astronomy -\def\vernal{\hbox{\wasy\char"17}} -\def\ascnode{\hbox{\wasy\char"13}} -\def\descnode{\hbox{\wasy\char"14}} -\def\fullmoon{\hbox{\wasy\char"23}} -\def\newmoon{\hbox{\wasy\char"20}} -\def\leftmoon{\hbox{\wasy\char"24}} -\def\rightmoon{\hbox{\wasy\char"25}} -\def\astrosun{\hbox{\tensy\char"0C}} -\def\mercury{\hbox{\wasy\char"27}} -\def\venus{\raise0.2ex\hbox{\wasy\char"19}} -\def\earth{\lower0.3ex\hbox{\wasy\char"26}} -\def\mars{\lower0.2ex\hbox{\wasy\char"1A}} -\def\jupiter{\hbox{\wasy\char"58}} -\def\saturn{\hbox{\wasy\char"59}} -\def\uranus{\hbox{\wasy\char"5A}} -\def\neptune{\hbox{\wasy\char"5B}} -\def\pluto{\hbox{\wasy\char"5C}} -\def\conjunction{\hbox{\wasy\char"56}} -\def\opposition{\hbox{\wasy\char"57}} %%%%%% the zodiac \def\aries{\hbox{\wasy\char"17}} \def\taurus{\hbox{\wasy\char"5D}} @@ -136,7 +145,7 @@ \def\thorn{{\wasy\char"69}} \def\Thorn{{\wasy\char"6A}} \def\dh{{\wasy\char"6B}} -\def\Dh{\leavevmode{\rm\setbox0\hbox{D}% +\def\Dh{\leavevmode{\setbox0\hbox{D}% \hbox to\wd0{\kern 0.04em\char32\hss D}}} \def\openo{{\wasy\char"6C}} \def\inve{{\wasy\char"55}} @@ -166,7 +175,43 @@ \wasymathchardef{1075}{\varoint} \wasymathchardef{1076}{\oiint} % +\wasymathchardef{0027}{\mer@@} +\wasymathchardef{0019}{\ven@@} +\wasymathchardef{0026}{\ear@@} +\wasymathchardef{001A}{\mar@@} +\wasymathchardef{0058}{\jup@@} +\wasymathchardef{0059}{\sat@@} +\wasymathchardef{005A}{\ura@@} +\wasymathchardef{005B}{\nep@@} +\wasymathchardef{0024}{\moon@@} +\wasymathchardef{0017}{\vern@@} +\wasymathchardef{0013}{\ascn@de} +\wasymathchardef{0014}{\descn@de} +\wasymathchardef{0056}{\conju@@} +\wasymathchardef{0057}{\oppos@@} +%%%%%% astronomy +\def\vernal{\ifmmode\vern@@\else{\wasy\char"17}\fi} +\def\ascnode{\ifmmode\ascn@de\else{\wasy\char"13}\fi} +\def\descnode{\ifmmode\descn@de\else{\wasy\char"14}\fi} +\def\fullmoon{\hbox{\wasy\char"23}} +\def\newmoon{\hbox{\wasy\char"20}} +\def\leftmoon{\ifmmode\moon@@\else{\wasy\char"24}\fi} +\def\rightmoon{\hbox{\wasy\char"25}} +\def\astrosun{\ifmmode\odot\else\hbox{\tensy\char"0C}\fi} +\def\mercury{\ifmmode\mer@@\else{\wasy\char"27}\fi} +\def\venus{\ifmmode\ven@@\else\raise0.2ex\hbox{\wasy\char"19}\fi} +\def\earth{\ifmmode\ear@@\else\lower0.3ex\hbox{\wasy\char"26}\fi} +\def\mars{\ifmmode\mar@@\else\lower0.2ex\hbox{\wasy\char"1A}\fi} +\def\jupiter{\ifmmode\jup@@\else{\wasy\char"58}\fi} +\def\saturn{\ifmmode\sat@@\else{\wasy\char"59}\fi} +\def\uranus{\ifmmode\ura@@\else{\wasy\char"5A}\fi} +\def\neptune{\ifmmode\nep@@\else{\wasy\char"5B}\fi} +\def\pluto{\hbox{\wasy\char"5C}} +\def\conjunction{\ifmmode\conju@@\mkern-4mu{}\else{\wasy\char"56}\fi} +\def\opposition{\ifmmode\oppos@@\else{\wasy\char"57}\fi} +% %%%%%% new definitions % \def\newpropto{\let\propto\varpropto} \def\newint{\let\int\varint \let\oint\varoint} % default limits +\catcode`@=12 % at signs are no longer letters diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index 86aa4823f3d..c5543f1980c 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -89,7 +89,7 @@ sub ctaninfo { if ($ARGV[0] eq "--ctan-dir") { my $output = &find_ctan_dir ($ARGV[1], 0); - print "$output\n"; + print "$output\n" if $output; return $output ? 0 : 1; } elsif ($ARGV[0] eq "--prepare") { @@ -256,6 +256,8 @@ sub find_ctan_dir { # a temp dir). $ctan_dir = "$CTAN/$ctan_dir" if defined $ctan_dir && $ctan_dir =~ m,^[^/],; + + warn "$0:find_ctan_dir: no dir for $pkgname?\n" if ! $ctan_dir; return $ctan_dir; } @@ -306,7 +308,7 @@ sub catalogue_find_ctan_path { my $catfile = &catalogue_find_file ($pkgname); return undef if ! $catfile; - + # get the raw tag from the catalogue file. open (CATFILE, "<$catfile") || die "open($catfile) failed, fixme: $!"; while ($ctan_path = <CATFILE>) { @@ -322,6 +324,7 @@ sub catalogue_find_ctan_path { } close CATFILE; $ctan_path =~ s/\n/ /g; # put it on one line +#warn "catalogue ctan path start: $ctan_path\n"; ($ctan_path) = ($ctan_path =~ m,(<.*?/>),); # remove angle brackets return undef unless $ctan_path; # if it's not present at all diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index ccc1c94d171..98bb619aeba 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1324,8 +1324,10 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`); 'vxu', "die 'skipping, obsolete'", 'w32tex', "die 'skipping, whole disttribution'", 'wadalab', "&MAKEwadalab", + 'wasy', "&MAKEflatten", + 'wasy-type1', "&MAKEflatten", 'wasy2', "die 'skipping, use wasy'", - 'wasy2-ps', "&MAKEflatten", + 'wasy2-ps', "die 'skipping, use wasy-type1'", 'webomints', "die 'skipping, nonfree'", 'win32-emacs-auctex', "die 'skipping, not for us'", 'windycity', "&MAKEflatten", @@ -1667,7 +1669,7 @@ $standarddest = "texmf-dist"; 'variations', 'generic', 'vaucanson-g', 'generic', 'vertex', 'plain', - 'wasy', 'plain', + 'wasy', 'plain', 'xepersian', 'xelatex', 'xesearch', 'xetex', 'xetex-def', 'xelatex', @@ -2360,7 +2362,6 @@ $standardtex 'vaucanson-g', 'generic', 'velthuis', 'generic', 'vertex', 'plain', - 'wasy2', 'fonts', 'xepersian', 'xelatex', 'xesearch', 'xetex', 'xetex-devanagari', 'xetex', @@ -2402,7 +2403,6 @@ $standarddocfmt='latex'; 'subfig', 'pdflatex', 'texsis', 'tex', 'typespec', 'tex', - 'wasy2', 'tex', 'webeq', 'pdflatex', ); @@ -2484,7 +2484,6 @@ $standarddocfmt='latex'; 'universa', 'fonts', 'variations', 'generic', 'velthuis', 'fonts', - 'wasy2', 'fonts', 'xint', 'generic', 'xltxtra', 'xelatex', ); @@ -5699,8 +5698,8 @@ sub PREHOOK_vhistory { } sub PREHOOK_wasy { - print "PREHOOK_$package - rm ps-type1 subdir, in own package wasy2-ps\n"; - &SYSTEM ("$RM -rf ps-type1"); + print "PREHOOK_$package - downcase wasyfont macro files\n"; + &SYSTEM ("rename tr/A-Z/a-z/ WASYFONT.*"); } sub PREHOOK_webquiz { diff --git a/Master/tlpkg/tlpsrc/wasy.tlpsrc b/Master/tlpkg/tlpsrc/wasy.tlpsrc index a6b866691d7..e69de29bb2d 100644 --- a/Master/tlpkg/tlpsrc/wasy.tlpsrc +++ b/Master/tlpkg/tlpsrc/wasy.tlpsrc @@ -1 +0,0 @@ -catalogue wasy2 |