diff options
| author | Karl Berry <karl@freefriends.org> | 2006-07-01 22:18:57 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2006-07-01 22:18:57 +0000 |
| commit | 12e838406005e7d86054c1b4a605be7eb2f49080 (patch) | |
| tree | 5f2ca548c1fb8a1e28eb34b3ad57396471ff7902 /Master/texmf-dist | |
| parent | a8fc2d59858b6da806b0b23d7b41e2c8ea801c2a (diff) | |
lh fonts 3.5d update
git-svn-id: svn://tug.org/texlive/trunk@1738 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
550 files changed, 11976 insertions, 18813 deletions
diff --git a/Master/texmf-dist/doc/fonts/lh/INSTALL b/Master/texmf-dist/doc/fonts/lh/INSTALL deleted file mode 100644 index ca3fd20515c..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/INSTALL +++ /dev/null @@ -1,78 +0,0 @@ -These are installation instructions for the LH fonts package version 3.4g. - -The following sections are for teTeX and emTeX users; however, it is -simple to install LH fonts on any TeX system, as these instructions -are quite generic. - -First of all, an important note. Please, REMOVE (i.e., backup) all old -LH fonts (all MF, PK, TFM and VF files) from your TEXMF tree, since -otherwise the name conflicts and unpredictable errors are guaranteed. -The fonts with names wn*.mf (e.g. wnr10.mf) which actually use LH -fonts also should be removed. However, the AMS Washington Cyrillic -fonts with names wncy*.mf (e.g. wncyr10.mf) can happily coexist with -the LH fonts and should not be deleted. - -After installing the fonts, you can test your setup with - - "tex testfont" or "latex nfssfont" or "tex fontchart" - -specifying e.g. larm1000 as the font (testfont.tex is part of emTeX's -Metafont package). - - -teTeX: ------- - -First, you can get the latest version of teTeX, --- it already includes -LH fonts properly installed (in particular, you should upgrade from -teTeX-0.4 to teTeX-1.0 or later). - -Just run the script inst-lh.sh. It will do the work automatically, -or do the work manually: - -1) Unpack the LH fonts package. - -2) Go to the `tex' directory and run (plain) tex on 99allenc.tex to - produce the base files for la, lb, lc, ld, rx, wn, and lh fonts for - encodings T2A, T2B, T2C, T2D, X2, OT2, LCY, respectively. - - If your version of TeX does not support automatic (on the fly) - generation of METAFONT files (for creation of TFM files), you may - need to change the command \MakeFileHeadsfalse to \MakeFileHeadstrue - in the file `tex/setter.tex' first. - - Note that the `inst-lh.sh' script produces more complete font set, - e.g. supporting SliTeX and concrete fonts. - -3) Copy the just created .mf files (in the wrk subdir) into the proper - $TEXMF/fonts/source/lh/... subdir, e.g. rxbase.mf to lh-x2 etc. - -4) Copy the contents of `mf' directory to $TEXMF/fonts/source/lh/base, - retaining the subdirectory structure. - -5) Run mktexlsr (or texhash) to have all new files `registered'. - -emTeX: ------- - -Do steps 1) and 2) from above. - -3) Copy the just created .mf files (in the wrk subdir) to a directory - which is specified in the %MFINPUT% environment variable, e.g. - emtex\mfinput\lh. - -4) Do the same for all files from `mf' directory. To enable subdirectory - searching, don't forget to have `!' or `!!' (whatever is appropriate - for you) appended to the directory names in %MFINPUT%. - -5) Replace the file emtex\mfjob\dvidrv.mfj with lh\dvidrv.mfj - to enable automatic .pk font creation for all standard lh encodings. - -6) Run necessary ##**-<xx>.tex file (where <xx> -- font in necessary encoding) - to create mfjob file. - -7) Create the .tfm files you'll need, using the <xx>job.mfj files. This - will *not* create PK files to save time. - - - Happy TeXing! diff --git a/Master/texmf-dist/doc/fonts/lh/beresta/beresta.tex b/Master/texmf-dist/doc/fonts/lh/beresta/beresta.tex index daca237f2f2..c2a00f82604 100644 --- a/Master/texmf-dist/doc/fonts/lh/beresta/beresta.tex +++ b/Master/texmf-dist/doc/fonts/lh/beresta/beresta.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/beresta/berestax.tex b/Master/texmf-dist/doc/fonts/lh/beresta/berestax.tex index 809dfe913c8..bf651bc62de 100644 --- a/Master/texmf-dist/doc/fonts/lh/beresta/berestax.tex +++ b/Master/texmf-dist/doc/fonts/lh/beresta/berestax.tex @@ -1,16 +1,16 @@ % -% beresta.tex +% berestax.tex % %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/allenc.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/allenc.tex index 3c252d2220b..07ec17a2083 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/allenc.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/allenc.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/allenc0.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/allenc0.tex index 3b25e0f1387..057f59c24c6 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/allenc0.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/allenc0.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/allenc1.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/allenc1.tex index c10bd98584a..8224065d2ff 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/allenc1.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/allenc1.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/allenc2.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/allenc2.tex index 9f14e92915a..e5b1db071ce 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/allenc2.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/allenc2.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/allenc3.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/allenc3.tex index bb33b46be89..b17e0baf110 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/allenc3.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/allenc3.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/allenc4.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/allenc4.tex index ba2c8da8233..d343389792b 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/allenc4.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/allenc4.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/katalog-beresta.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog-beresta.tex new file mode 100644 index 00000000000..cd5caf3b878 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog-beresta.tex @@ -0,0 +1,27 @@ +% +% katalog-beresta.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.4 // Patchlevel=1 +% (c) O.Lapko +% +% This package belongs to the public domain under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% and to save it under the same name. +% +% Content: +% +% Input TeX file for creation of Katalog for CM-like-encoded fonts +% only size 10 +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\FontPage{\fontii r10} +\FontPage{\fontii sl10} +\FontPage{\fontii ti10} +\FontPage{\fontii ss10} +\FontPage{\fontii tt10} + +\endinput diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/katalog-short.t2 b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog-short.t2 new file mode 100644 index 00000000000..60c42689b16 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog-short.t2 @@ -0,0 +1,30 @@ +% +% katalog-short.t2 +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.4 // Patchlevel=1 +% (c) O.Lapko +% +% This package belongs to the public domain under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% and to save it under the same name. +% +% Content: +% +% Input TeX file for creation of Katalog for EC-like-encoded fonts +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\FontPage{\fontii rm1000} +\FontPage{\fontii sl1000} +\FontPage{\fontii ti1000} +\FontPage{\fontii bx1000} +% +\FontPage{\fontii cc1000} +\FontPage{\fontii sc1000} +% +\FontPage{\fontii ss1000} +% +\FontPage{\fontii tt1000} diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/katalog1.t2 b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog1.t2 index 88735be96a4..4ad7b05b078 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/katalog1.t2 +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog1.t2 @@ -60,4 +60,4 @@ \FontPage{\fontii ti2986} \FontPage{\fontii ti3583} -\endinput +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/katalog2.t2 b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog2.t2 index 3b4714aa3f9..0a9733c5719 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/katalog2.t2 +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog2.t2 @@ -60,4 +60,4 @@ \FontPage{\fontii bi2986} \FontPage{\fontii bi3583} -\endinput +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/katalog5.t2 b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog5.t2 index 34367f5ae1c..f0f8bcbb88c 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/katalog5.t2 +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog5.t2 @@ -60,4 +60,4 @@ \FontPage{\fontii sx2986} \FontPage{\fontii sx3583} -\endinput +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/katalog6.t2 b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog6.t2 index 54c2481cf26..3bc65fd5a3d 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/katalog6.t2 +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog6.t2 @@ -59,4 +59,4 @@ \FontPage{\fontii st2986} \FontPage{\fontii st3583} -\endinput +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/katalog7.t2 b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog7.t2 index cf2b3de78e6..f07332df208 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/katalog7.t2 +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/katalog7.t2 @@ -71,4 +71,4 @@ \FontPage{\fontii xc2986} \FontPage{\fontii xc3583} -\endinput +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/lh-fmap.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/lh-fmap.tex index 6e4b0774519..f608b5878e4 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/lh-fmap.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/lh-fmap.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/lh-text.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/lh-text.tex index a4b33615c3f..36820741019 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/lh-text.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/lh-text.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/lh-texx.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/lh-texx.tex index 5fe8693ad50..e3707e6d4af 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/lh-texx.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/lh-texx.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/lh-texy.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/lh-texy.tex index 7f274ca6ce4..25ca52c4515 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/lh-texy.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/lh-texy.tex @@ -1,16 +1,16 @@ % -% lh-texx.tex +% lh-texy.tex % %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/t2a-fmap-short.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/t2a-fmap-short.tex new file mode 100644 index 00000000000..0cea73ed2ee --- /dev/null +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/t2a-fmap-short.tex @@ -0,0 +1,41 @@ +% +% t2a-fmap-short.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Driver TeX file for Katalogs of LA fonts -- T2A encoding, +% all font shapes in main or all sizes, font encoding tables +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +\vsize10in +\voffset-.5in\eject +\let\noinit!\input testfox +\def\FontPage#1{\medbreak\vbox\bgroup\def\fontname{#1}\startfont\xtable\egroup\vfill} +%\def\fontii{la} +%Only main sizes +%\input katalog-short.t2 +\def\fontii{ec} +%Only main sizes +\input katalog-short.t2 +\end +%Full font Katalog +\input katalog1.t2 +\input katalog2.t2 +\input katalog3.t2 +\input katalog4.t2 +\input katalog5.t2 +\input katalog6.t2 +\input katalog7.t2 +\end diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/t2a-fmap.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/t2a-fmap.tex index 2da7c38ba2c..52e2c8901e8 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/t2a-fmap.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/t2a-fmap.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -23,7 +23,7 @@ \voffset-.5in\eject \let\noinit!\input testfox \def\FontPage#1{\medbreak\vbox\bgroup\def\fontname{#1}\startfont\xtable\egroup\vfill} -\def\fontii{la} +\def\fontii{ld} %Only main sizes \input katalog.t2 \end diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/t2a-text.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/t2a-text.tex index 8b9d7baa270..49fee6dac30 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/t2a-text.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/t2a-text.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/t2b-fmap.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/t2b-fmap.tex index adb77e251ab..30b9578a45b 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/t2b-fmap.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/t2b-fmap.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/t2b-text.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/t2b-text.tex index 7f8fa9309f4..00c33b9b4bd 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/t2b-text.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/t2b-text.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/t2c-fmap.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/t2c-fmap.tex index 56ba90ad181..f9d6ce4dd99 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/t2c-fmap.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/t2c-fmap.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/t2c-text.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/t2c-text.tex index 90dc1eda974..916dc4bfb69 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/t2c-text.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/t2c-text.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/t2d-fmap.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/t2d-fmap.tex index dce1c46cf13..3176dcdde7c 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/t2d-fmap.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/t2d-fmap.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/t2d-text.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/t2d-text.tex index 5ff91e35fac..e8308dc89d8 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/t2d-text.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/t2d-text.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/testfox.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/testfox.tex index daac9abb10a..146cfa8abbf 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/testfox.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/testfox.tex @@ -6,13 +6,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/testkern.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/testkern.tex index 994415e394a..4474901a5ee 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/testkern.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/testkern.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/testtext.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/testtext.tex index 796ccd04766..ad89ab63f97 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/testtext.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/testtext.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/uc-fmap.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/uc-fmap.tex new file mode 100644 index 00000000000..3dc7750aa21 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/uc-fmap.tex @@ -0,0 +1,34 @@ +% +% lh-fmap.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Driver TeX file for Katalogs of LH fonts (or anonther CM-like-enc-font), +% all font shapes and sizes, font encoding tables +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +\vsize10in +\voffset-.5in\eject +\let\noinit!\input testfox +\def\head#1{\def\header{#1\par}} +\def\FontPage#1{\medbreak\vbox\bgroup\def\fontname{#1}\strut\startfont\xtable\char99\egroup\vfill} +\def\fontii{uc} +%Only main sizes +\input katalog-beresta.tex +\end +%Full font Katalog +\input katalog1.lh +\input katalog2.lh +\end diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/wn-comp.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/wn-comp.tex index 222f114b5c1..7421266a7ae 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/wn-comp.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/wn-comp.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/wn-fmap.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/wn-fmap.tex index 32c86d42b91..e57135f6670 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/wn-fmap.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/wn-fmap.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/wn-text.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/wn-text.tex index e4c59cac086..2dd0d4a956f 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/wn-text.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/wn-text.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/x2-fmap.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/x2-fmap.tex index 21252937640..cba617f4c44 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/x2-fmap.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/x2-fmap.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/x2-text.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/x2-text.tex index d487723d9a2..000515fc495 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/x2-text.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/x2-text.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/xsl-fmap.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/xsl-fmap.tex index 1acbc2d215a..7c84f8992d2 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/xsl-fmap.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/xsl-fmap.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/fonttest/xsl-text.tex b/Master/texmf-dist/doc/fonts/lh/fonttest/xsl-text.tex index 548514f5527..79e9ceec525 100644 --- a/Master/texmf-dist/doc/fonts/lh/fonttest/xsl-text.tex +++ b/Master/texmf-dist/doc/fonts/lh/fonttest/xsl-text.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % diff --git a/Master/texmf-dist/doc/fonts/lh/inst-lh.sh b/Master/texmf-dist/doc/fonts/lh/inst-lh.sh deleted file mode 100755 index 92192dac7c0..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/inst-lh.sh +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/sh - -# A script to install LH fonts in X2, T2A, T2B, T2C, T2D encodings -# and optionally also LCY and OT2 encodings -# for web2c-based TeX systems (and teTeX is among them) - -# stop on any error -set -e - -# Uncomment the following line to install ALL *.mf header files -# (see the `INSTALL' file for explanation): -#perl -p -i -e 's/\\MakeFileHeadsfalse/\\MakeFileHeadstrue/' tex/setter.tex - -TEXMF=`kpsewhich -expand-var='$TEXMFMAIN'` -FONTS=$TEXMF/fonts/source/lh -DOC=$TEXMF/doc/fonts/lh - -inst_lh_fonts() { - echo "Installing LH fonts for the `echo $2 | tr '[:lower:]' '[:upper:]'` encoding..." - tex $1.tex > /dev/null - mkdir $FONTS/lh-$2 - cp wrk/*.mf $FONTS/lh-$2 # ??{codes,liker,begin}.mf - rm -f $1.dvi $1.log wrk/* -} - -abort() { - echo Aborting. Please, remove old versions of LH fonts manually - echo and re-run this script. - exit 1 -} - -if ( echo "a\c"; echo a ) | grep c >/dev/null; then - ac_n=-n ac_c= -else - ac_n= ac_c='\c' -fi - -echon () { - echo $ac_n "$*"$ac_c -} - -# Remove old version(s) of LH fonts -echo Looking for old version of LH fonts... -( -kpsewhich -expand-path="`kpsewhich -show-path=tfm`" -kpsewhich -expand-path="`kpsewhich -show-path=mf`" -kpsewhich -expand-path="`kpsewhich -show-path=vf`" -kpsewhich -expand-path="`kpsewhich -show-path=pk`" -kpsewhich -expand-path="`kpsewhich -show-path='TeX system documentation'`" -) | tr ':' '\n' | grep '/lh$' | sort -u > .tmp -dirs=`cat .tmp` -rm -f .tmp -if test -n "$dirs"; then -echo "The following directories found which contain old version of LH fonts:" -echo -echo $dirs | tr ' ' '\n' -echo -echon "Remove them? [y/n] " -read reply -if test "$reply" = y; then - rm -rf $dirs -else - abort -fi -fi -kpsewhich ldcsc.mf >/dev/null && abort - -if test -d $FONTS; then - echo Installation directory $FONTS already exists. - echon "Execute command \"rm -rf $FONTS\"? [y/n] " - read reply - if test "$reply" = y; then - rm -rf $FONTS - else - abort - fi -fi - -echo Installing main METAFONT files... -mkdir -p $FONTS -(cd mf; tar cf - .) | (cd $FONTS; tar xf -) -# cp -r mf/* $FONTS - -cd tex -test -d wrk || mkdir wrk -rm -f wrk/* - -# Generate and install METAFONT headers for LH fonts in X2 encoding -# and T2A, T2B, T2C, T2D encodings. -# Font header files for SliTeX are also generated. -inst_lh_fonts 12ex-la t2a -inst_lh_fonts 13ex-lb t2b -inst_lh_fonts 14ex-lc t2c -inst_lh_fonts 15ex-ld t2d -inst_lh_fonts 11ex-rx x2 - -inst_lh_fonts 03cm-wn ot2 # OT2 7-bit encoding (as in AMS wncy fonts) -inst_lh_fonts 01cm-lh lcy # similar to `New Alternative Variant' of cp866 - -# Other non-standard encodings (matching input encodings). -# These encodings are incompatible with the LaTeX standards. -# IT IS NOT RECOMMENDED TO INSTALL ANY OF THE FOLLOWING FONTS. -# It is better to use T2* encodings with the inputenc package instead. -#inst_lh_fonts 20cm-ct lct # Tatarian variant of cp866 -#inst_lh_fonts 21cm-ic lci # ISO-8859-5 -#inst_lh_fonts 22cm-wc lcw # cp1251 -#inst_lh_fonts 23cm-mc lcm # Macintosh Ukrainian -#inst_lh_fonts 24cm-kc lck # koi8-r - -#inst_lh_fonts 30cm-lx llh # extended cp866 -#inst_lh_fonts 31cm-ix llh # extended ISO-8859-5 -#inst_lh_fonts 32cm-wx llh # extended cp1251 -#inst_lh_fonts 33cm-mx llh # extended Macintosh Ukrainian -#inst_lh_fonts 34cm-kx llh # extended koi8-r - -#inst_lh_fonts 11ex-rs llh # Old Slav Cyrillic not covered by T2D -#inst_lh_fonts 25cm-uc llh # Cyrillic Unicode page -#inst_lh_fonts 04cm-vf llh # 7-bit encoding (for virtual fonts) -#inst_lh_fonts 46cm-ly llh # OT2u -#inst_lh_fonts 46cm-lz llh # OT2l -#inst_lh_fonts 47ex-tx llh # All non-X2 letters & signs - -cd .. -echo Installing documentation files... -mkdir -p $DOC -(cd doc; tar cf - .) | (cd $DOC; tar xf -) - -# Update TeX hash -mktexlsr diff --git a/Master/texmf-dist/doc/fonts/lh/lhfonts/T1inT2.en b/Master/texmf-dist/doc/fonts/lh/lhfonts/T1inT2.en index 70cec1287e6..8e8620cd6c3 100644 --- a/Master/texmf-dist/doc/fonts/lh/lhfonts/T1inT2.en +++ b/Master/texmf-dist/doc/fonts/lh/lhfonts/T1inT2.en @@ -2,26 +2,26 @@ LHFONTS version 3.4 file T1inT2.en ============================================================================== -This file includes information about common parts and differences -of T1 and T2 encodings and LH fonts and EC fonts(1.0). -There is also explanation why it was happen. +This file includes information about common parts and differences of T1 and T2 +encodings and LH fonts and EC fonts(1.0). There is also explanation why it was +happen. I. -File letextit.mf (for Italic font) has one serious difference for Typewriter -Italic fonts which was borrowed from CM textit.mf file: -_first_ run _Italic_ letters and specials (dotless letters and f-ligs) -then if monospace=true: letter_fit:=0 -and _then_ run uppercase letters and common roman/italic specials. +File letextit.mf (for Italic font) has one serious difference for Typewriter +Italic fonts which was borrowed from CM textit.mf file: _first_ run _Italic_ +letters and specials (dotless letters and f-ligs) then if monospace=true: +letter_fit:=0 and _then_ run uppercase letters and common roman/italic +specials. -EC Typewriter Italic extextit.mf run both Uppercase and Italic letters with common -letter_fit; in this case Uppercase letters look _much more_ narrower than -in slanted fonts and they should be unreadable in lower resolutions. +EC Typewriter Italic extextit.mf run both Uppercase and Italic letters with +common letter_fit; in this case Uppercase letters look _much more_ narrower +than in slanted fonts and they should be unreadable in lower resolutions. II. -Here goes information about signs placed in common part of T1 and T2 -encodings and differences of shapes, glyphs and codes (if they exist) +Here goes information about signs placed in common part of T1 and T2 encodings +and differences of shapes, glyphs and codes (if they exist) l -- heavily borrowed from CM or/and EC c -- created for T2 encoding @@ -55,8 +55,8 @@ lgcyracc.mf -- l Aring "06 "06 Scandinavian circle l Ahachek "07 "07 accent hacheck * Abreve "08 "08 accent breve - edited to avoid "hat" form if cmssq8 - (this correction maybe is not so good) + edited to avoid "bowler" form if cmssq8 + (this correction maybe is not so good) accent_gap added (if undefined) for uppercase form l Abar "09 "09 accent macron (bar) @@ -64,8 +64,9 @@ lgcyracc.mf -- * Acedilla "0b "0b cedilla edited: y_move used in lowercase form * Aogonek "0c "0c ogonek - Macro easy_ogonek used (emulates polish macro) - (Also easy_ogonek is used for letter accents) + Macro easy_ogonek used (emulates polish + macro, also easy_ogonek is used for + letter accents) Cyrillic symbols: c Afrown "12 "12 accent reversed breve c Agrave_dbl "13 `` "13 accent reversed hungarian umlaut @@ -80,7 +81,8 @@ lgcyrsym .mf -- Glyphs for EC and Cyrillic symbols used with floating codes X2 T2* c palochka "0d "0d symbol Palochka - l openq Single German opening quote (looks like ,) + l openq Single German opening quote + (looks like comma ,) c angle_left "0e "0e Single left angle bracket l lguillemet Single left guillemet c angle_right "0f "0f Single right angle bracket @@ -96,14 +98,18 @@ lgcyrsym .mf -- * No "9d "9d Cyrillic symbol `Number' Changed shape for good METAFONTing (e.g. in tt and ss fonts) - c currency "9e "9e Cyrillic Currency sign (borrowed from tc fonts) + c currency "9e "9e Cyrillic Currency sign (borrowed from + tc fonts) l section "9f "9f Section sign - l baseqq "bd "bd German Opening quotes (looks like ,,) (EC: "12) - * flqq "be "be Cyrillic Opening Quotes (looks like <<) (EC: "13) - Used more familiar shape for Russian users - * frqq "bf "bf Cyrillic Closing Quotes (looks like >>) (EC: "14) - Used more familiar shape for Russian users + l baseqq "bd "bd German Opening quotes (looks like ,,) + (EC: "12) + * flqq "be "be Cyrillic Opening Quotes (looks like <<) + (EC: "13) Used more familiar shape for + Russian users + * frqq "bf "bf Cyrillic Closing Quotes (looks like >>) + (EC: "14) Used more familiar shape for + Russian users T1/T2-outsider: l pound ("bf) Sterling sign @@ -173,8 +179,8 @@ lg(rom/ital)p.mf -- "3f oct"077" ? Question mark *Spanish open question mark moved out from T2 -III. There were corrected is_cap put_accent put_gravis and put_dot macros in - LH package accordingly to boolean cyrcaph which checks whether it is +III. There were corrected is_cap put_accent put_gravis and put_dot macros in + LH package accordingly to boolean cyrcaph which checks whether it is uppercase letter or not. ============================================================================== diff --git a/Master/texmf-dist/doc/fonts/lh/lhfonts/TODO b/Master/texmf-dist/doc/fonts/lh/lhfonts/TODO deleted file mode 100644 index 925fa316c8f..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/lhfonts/TODO +++ /dev/null @@ -1,8 +0,0 @@ -OT2: -WNTT: (123/`173/"7b) `--' (cmr) and `{' (cmtt) -since this slot have not a logic pair in cmtt (the code of `}' in WNCYR -encoding occupied by number sign) so it is still empty; -check this font with OT2team? - - -ll* fonts for virtual lh* fonts are temporarily removed from LHFONTS package. diff --git a/Master/texmf-dist/doc/fonts/lh/lhfonts/fonttest.en b/Master/texmf-dist/doc/fonts/lh/lhfonts/fonttest.en index 93e72c41e54..6fae3cb7aac 100644 --- a/Master/texmf-dist/doc/fonts/lh/lhfonts/fonttest.en +++ b/Master/texmf-dist/doc/fonts/lh/lhfonts/fonttest.en @@ -1,13 +1,13 @@ ========================================================================= -LHFONTS version 3.4 file FONTTEST.EN +LHFONTS version 3.5 file FONTTEST.EN ========================================================================= Directory FONTTEST ------------------ This directory includes tex-files to demonstrate encoding tables of all -standard LH fonts also there are TeX "batch-files" (extentions of -testfont.tex) which tests kerning and creates font table with decimal +standard LH fonts also there are TeX "batch-files" (extentions of +testfont.tex) which tests kerning and creates font table with decimal codes. @@ -34,7 +34,7 @@ t2*-text.tex -- creates small text test for all T2*; testfox.tex -- extended file testfont.tex + \xtable and \xtables macros: first macro prints decimal codes, second macro creates \xtable for upper part of font table only; -testkern.tex -- extention tex-batch-file for testfont.tex; file creates +testkern.tex -- extention tex-batch-file for testfont.tex; file creates kerning tables for fonts in cp866 (Alternative) and T1/T2 encodings; testtext.tex -- includes text tests in four popular Cyrillic encodings: @@ -59,5 +59,5 @@ katalog7.t2 -- input file for t2-fmap.tex and t2-text.tex (part 7); ========================================================================= -LHFONTS version 3.4 file FONTTEST.EN +LHFONTS version 3.5 file FONTTEST.EN ========================================================================= diff --git a/Master/texmf-dist/doc/fonts/lh/lhfonts/lhfont34.en b/Master/texmf-dist/doc/fonts/lh/lhfonts/lhfont35.en index ff491ac6342..94513b9f8ad 100644 --- a/Master/texmf-dist/doc/fonts/lh/lhfonts/lhfont34.en +++ b/Master/texmf-dist/doc/fonts/lh/lhfonts/lhfont35.en @@ -1,20 +1,15 @@ ========================================================================= -LHFONTS version 3.4 file LHFONT34.EN +LHFONTS version 3.5 file LHFONT35.EN ========================================================================= -(C) A.Khodulev, O.Lapko -(C) Cyrillic TeX Users Group (CyrTUG) 1993-1999 -(C) CyrTeX 1999-2000 +(C) A.Khodulev, O.Lapko, A.Berdnikov, V.Volovich +(C) Cyrillic TeX Users Group (CyrTUG) -This package is freeware product under conditions similar to those of -D. E. Knuth specified for the Computer Modern family of fonts. -In particular, only the authors are entitled to modify this file -and to save it under the same name. +This package is freeware product. The modification and distribution +of modified package without change of its name is forbidden. -You could use this package for your needs free of charge. If your -publication which uses LH fonts contains a reference to a used font set, -you could put there a text "Computer Modern fonts with Cyrillic extension -LH" or "Computer Modern LH". +Use of this macro package is not restricted provided each use is +acknowledged upon publication. ------------------------------------------------------------------------- @@ -219,10 +214,10 @@ The fonts which you may create 04CM-VF - Russian virtual font in 7-bit encoding; 11EX-RS - file in X2 encoding; 11EX-RX - file in XS (Old Slav: experimental) encoding; -12EX-LA - file in T2A encoding; -13EX-LB - file in T2B encoding; -14EX-LC - file in T2C encoding; -15EX-LD - file in T2D encoding; +12EX-LA - file in ’2A encoding; +13EX-LB - file in ’2B encoding; +14EX-LC - file in ’2C encoding; +15EX-LD - file in ’2D encoding; 20CM-CT - Cyrillic in Tatar encoding; 21CM-IC - ISO-8859 Cyrillic; 22CM-WC - Windows-1251 Cyrillic; @@ -247,12 +242,10 @@ The fonts which you may create * The experimental group of encodings which double each other with letter assortment. - - Work with Russian language in MS DOS ------------------------------------ For WORK with Cyrillic you may use Russian versions of MS DOS 4.01 -and later versions (e. g. MS DOS 6.0, No. 147-95 UV 600) with usage of +and later versions (e.g. MS DOS 6.0, No. 147-95 UV 600) with usage of code page 866. In this system you may in file config.sys write the line: @@ -260,8 +253,8 @@ line: If you want to create your documents in Russian with English Alphabet you can use the TRANSLIT program or typesetting by transliteration -(use fonts WNCYR). +(the wn-fonts use the same transliteration mechanism like AmS WNCYR). ========================================================================= -LHFONTS version 3.4 file LHFONT34.EN +LHFONTS version 3.5 file LHFONT35.EN ========================================================================= diff --git a/Master/texmf-dist/doc/fonts/lh/lhfonts/lhfont34.ru b/Master/texmf-dist/doc/fonts/lh/lhfonts/lhfont35.ru index 4fb7000f3ce..8b7b02241fc 100644 --- a/Master/texmf-dist/doc/fonts/lh/lhfonts/lhfont34.ru +++ b/Master/texmf-dist/doc/fonts/lh/lhfonts/lhfont35.ru @@ -1,19 +1,17 @@ ========================================================================= -LHFONTS version 3.4 file LHFONT34.RU +LHFONTS version 3.5 file LHFONT35.RU ========================================================================= -(C) A.Khodulev, O.Lapko -(C) Cyrillic TeX Users Group (CyrTUG) 1993-1999 -(C) CyrTeX 1999-2000 +(C) A.Khodulev, O.Lapko, A.Berdnikov, V.Volovich +(C) Cyrillic TeX Users Group (CyrTUG) - áâ®ï騩 ¯ ª¥â à á¯à®áâà ï¥âáï ª ª freeware ¯à®¤ãªâ «®£¨ç® ãá«®¢¨ï¬ -à á¯à®áâà ¥¨ï èà¨ä⮢ Computer Modern „. Šãâ . ‚ ç áâ®áâ¨, ⮫쪮 ¢- -â®àë ¬®£ãâ ¨§¬¥ïâì ä ©«ë ¤¨áâਡã⨢ ¨ á®åà ïâì ¨å ¯®¤ ⥬ ¦¥ ¨¬¥¥¬. +„ ë© ¯ ª¥â à á¯à®áâà ï¥âáï ª ª freeware ¯à®¤ãªâ á® ¢á¥¬¨ ¢ë⥪ î騬¨ +¨§ í⮣® ®£à ¨ç¥¨ï¬¨ (â® ¥áâì ¬®¤¨ä¨ª 樨 ¨ à á¯à®áâà ¥¨¥ +¬®¤¨ä¨æ¨à®¢ ëå ¢ ਠ⮢ § ¯à¥é¥® ¥á«¨ ‚ë ¥ ¨§¬¥ï¥â¥ ¨¬ï ¯ ª¥â ). -‚ë ¬®¦¥â¥ ᢮¡®¤® ¨ ¡¥á¯« â® ¨á¯®«ì§®¢ âì ¥£® ¤«ï ¢ãâ२å 㦤. -‚ ¢ë室ëå ¤ ëå ¯ã¡«¨ª 権 ¯à¨ «¨ç¨¨ áá뫪¨ £ à¨âãàã èà¨äâ ¯®¬¥- -é ¥âáï â¥áªáâ "ᥬ¥©á⢮ èà¨ä⮢ Computer Modern á ª¨à¨««¨ç¥áª¨¬ à áè¨à¥- -¨¥¬ LH" ¨«¨ "Computer Modern LH". +‚ë ¬®¦¥â¥ ᢮¡®¤® ¨ ¡¥á¯« â® ¨á¯®«ì§®¢ âì ¥£® ¤«ï ¢ãâ२å 㦤, +®¤ ª® ¯à¨¬¥¥¨¥ ¥£® ¯à¨ ¢¥è¨å (â.¥. § ¯à¥¤¥« ¬¨ ‚ 襣® ª®¬¯ìîâ¥à ) +¯ã¡«¨ª æ¨ïå âॡã¥â ®¡ï§ ⥫쮩 áá뫪¨ (acknowledgement' ). ------------------------------------------------------------------------- @@ -254,5 +252,5 @@ LHFONTS version 3.4 file LHFONT34.RU § ª®¢®¬ã á®áâ ¢ã. ========================================================================= -LHFONTS version 3.4 file LHFONT34.RU +LHFONTS version 3.5 file LHFONT35.RU ========================================================================= diff --git a/Master/texmf-dist/doc/fonts/lh/lhfonts/lhfonts.hst b/Master/texmf-dist/doc/fonts/lh/lhfonts/lhfonts.hst index a9ad274aea8..7e5586708b9 100644 --- a/Master/texmf-dist/doc/fonts/lh/lhfonts/lhfonts.hst +++ b/Master/texmf-dist/doc/fonts/lh/lhfonts/lhfonts.hst @@ -1,8 +1,11 @@ -============================================================================== -LHFONTS version 3.4 file LHFONTS.HST - The short history of LHFONTS (MAKEFONT) package -============================================================================== +========================================================================= +LHFONTS version 3.5 file LHFONTS.HST + The short history of LHFONTS (MAKEFONT) package +========================================================================= +Please report errors to Olga Lapko, e-mail: Lapko.O@g23.relcom.ru + +========================================================================= During of font package creation were used: ------------------------------------------ @@ -11,8 +14,9 @@ Cyrillic glyph' sources: the Computer Modern Roman family of fonts by D. E. Knuth - Washington Cyrillic Computer Modern or WNCYR - (Humanities and Arts Computing Center, University of Washington); + Washington Cyrillic Computer Modern (WNCYR) + (Humanities and Arts Computing Center, + University of Washington); Omega Cyrillic fonts by Yannis Haralambous; @@ -26,158 +30,210 @@ Cyrillic glyph' sources: the European Modern Roman family of fonts by J"org Knappen and Norbert Schwarz +========================================================================= + H I S T O R Y +========================================================================= -ver 1.0 (approx 1992--1993) -- ------------------------------- -unrecognized, was used in Mir Publisher only -- -Creation of symbolic letter names for creation of font with three -different coding schemes Alternative, Virtual (7-bit) and Washington -(ISO/ASCII: same as WNCYR encoding); +ver 3.5 patch level 5 (June 2006) -- +---------------------------------------- -Correction of letter shapes, creation of special files of parameters -(Additional Lower Ratios) for each font group. +Added directories in fonts/source/lh directory for Concrete boldface +fonts. The TeX source files for creation of METAFONT files moved to +source/fonts/lh directory to follow TeX Directory Structure rules. -Creation of some batch-files for font generating. +Added minor LaTeX support for standard LaTeX and traditional Cyrillic +encodings (for SliTeX, CM Bright, Concrete fonts). -ver 1.1 (1993) -- ------------------ -unrecognized (there was file rusfont.zip) -- -Virtual encoding as default coding scheme for creating Cyrillic part of -Latin-Cyrillic font (with usage of the virtual files) was changed to -Alternative encoding (Virtual encoding is kept as supply variant only); +ver 3.5 patch level 4 (March 2006) -- +---------------------------------------- -Creation of 32 Computer Modern text fonts. +Corrected bug in file lgt2upu.mf - corrected widths of letters ZHE_dsc +and K_dsc (restored widths of roman shape from version 3.4 --- to avoid +checksum warnings with version 3.4.). Corrected file lgt2upu.mf has +version 3.5, patchlevel 2. -ver 1.2 (1993--1994) -- ------------------------ -the part of CyrTUG-EmTeX package; placed on CD-ROM 4AllTeX -- -All uppercase and lowercase letters are created by separate files: -lgcru.mf and lgcrl.mf (instead of three files: lgcrlu.mf -- file with -common letter shapes for both cases, lgcrspu.mf -- for uppercase -letters, lgcrspl.mf -- for lowercase ones). The analogous way for -lgserb*.mf files. +ver 3.5 patch level 3 (February 2003) -- +---------------------------------------- -Creation of all 56 Computer Modern text fonts. +Added 4 new Unicode letters. Updated Unicode encoding/font. +Changed letter ukre_uml to erev_uml in Unicode font + +Corrected some bad paths in low resolutions. + +Changed files: +lcyrdefs.mf - added new definition for siam_serif +lgocyrac.mf +lgt2lol.mf - added new shape for L_dsc, M_dsc, I_shdsc +lgt2lou.mf - added new shape for l_dsc, m_dsc, i_shdsc +lgt2slvl.mf +lgt2slvu.mf +lgt2upi.mf - added letter N_stl +lgt2upl.mf - added letter N_stl +lgt2upu.mf - added letter N_stl +lgcacci.mf - changed ukre_uml to erev_uml +lgcaccl.mf - changed ukre_uml to erev_uml +lgcaccu.mf - changed ukre_uml to erev_uml +lgunici.mf +lgunicl.mf +lgunicu.mf +lgcyrcl.mf - added new shape for L_dsc +lgcyrcu.mf - added new shape for l_dsc +lgrucl.mf +lgrucu.mf +25cm-uc.tex +enc-t2.tex +setter.tex + +This file rearranged accordingly to analogous history files everywhere. + + +ver 3.5 patch level 2 (December 2001) -- +---------------------------------------- +Deleted some code doubles in unusual encodings -Font generating with usage of MFJob (EmTeX). There were created special -mfj-files. +Added support for cmtex* fonts (this font could be used too rarely + but it more serious than cmdunh10) -ver 2.0 (Sept1994) -- ---------------------- -placed on CTAN -- -Correction of mistakes of letter shapes. All driver files were checked -with drivers of Computer Modern; +Added corrected installation support for Unix (by V.Volovich) -ALL additional cyrillic letters in files of ligs&kerns were rewritten to -their symbolic names; file wnligs.mf was renamed to lwnligs.mf; +Comment out support for Russian close quote (for ,,word``) for CM fonts +(only code of this character was removed from encoding file, so it could +be easy to restore). Comment out simulate support with ligature (```) in +EC fonts. -Files with additional Cyrillic letters lgserb*.mf were rearranged: three -letters below endinput were placed on separate files lgserb(u/l)1.mf. +Corrected bug with absent true_mono +Corrected bug in lc_hacheck macro +Corrected shapes of Cyrillic No and <<, >> for correct METAFONTing. +Corrected shapes of some letters for low res -There was created new package FIL for creating of other Cyrillic letters. +Added definition for stem parameter, used in EC fonts, for RX encoding -Rearranging directory structures. +Small correction for generation of Concrete, CMbright and SliTeX fonts: +added prefix for batch files. Corrected stroke for batch file +(\BatchLine) accordingly for usage in Win32 (is it useful utilite for +others?) -ver 2.1 (Oct1994) -- --------------------- -Correction of mistakes: serif widths, letter widths. -This file (lhfonts.hst) was added. +ver 3.5 patch level 1 (October 2001) 3.5-beta -- +------------------------------------------------ -ver 2.2 (Mar-Sept1995) -- -------------------------- -Protvino & Holland TeX Conferences -- -Correction of mistakes: serif widths, letter widths. Fine tuning of -letter shapes and stem_thicknesses. +Corrected letters (lowercase uk) -The new fonts are added: -The 6 SliTeX (created new driver file ldrsfont.mf for SliTeX "I"), and 2 -AmSTeX text CM fonts added (csc) -- total count: 64 fonts. +Created Cyrillic letters for Concrete (Russian letters were loaded in +previous version) -Rearranging of font generation: default (Alternative) version creates -old font assortment plus Ukrainian and Byelorussian as in MS DOS code -page 866, option `fullrus' creates old Russian letters additionally, -option `fil' creates full assortment of created Cyrillic fonts. +Added support (creation of mf-headers) for Concrete fonts (added by +V.Volovich) -ATTENTION: the number sign and cyrillic quotes have now other codes: -accordingly to PC866 code page. +Added support (creation of mf-headers and some mf-files) for CMBright +fonts (added by V.Volovich) -Files lgcr(u/l/ti), lgserb(u/l/ti) and lbcoding became files drivers. -They run different parts of Cyrillic Alphabet. +Added new Unicode letters -MS Windows encoding is added. +Restored italic Unicode Old Slav letters -The Sauter fonts were created for LH family by S.Znamenskii and -connected to it. +Corrected some definitions of font parameters in ec-like T2 fonts -There are added hints with width correction of letters with mid stems -(analogous of `i' and `j' width correction in CM) as used in Cyrillic -fonts of A.Shen'. +Added support for Russian close quote (look like ,,word``) with correct +space and special ligature (```) for this quote, for CM fonts and add +simulate support with ligature (```) in EC fonts. -The experiment is begun with Omega package. Now full Cyrillic font is -being created. -Option `fullrus' was joined with default font creation so one can get -Russian, Ukrainian, Byelorussian and some old Russian (XIXcent) letters -in one font accordingly to Vinogradov's fonts. +ver 3.4 patch level 1 (January 2000) -- +--------------------------------------- -All coding schemes are made for unification with hexadecimal codes. +some bugs were removed: +RIGHT + Unicode OT2 X2 T2A +----------------------------------------------------- +DJE (0x0402/0x0452) 0x06/0x0E 0x42/0x62 0x82/0xA2 + +TSHE (0x040B/0x045B) 0x07/0x0F 0x43/0x63 0x83/0xA3 + +bugs in LH: +DJE (0x0402/0x0452) 0x07/0x0F 0x42/0x62 0x83/0xA3 - +TSHE (0x040B/0x045B) 0x06/0x0E 0x43/0x63 0x82/0xA2 - -The names of Cyrillic letters (WNCYR letters) were changed with -accordance with standard names in coding schemes (ISO etc.). +edited some Old Slav letters and accents: +Omega_tlo, palatal (round tlo); paerok; zvat'stvo; dasia; psili; +added 5 Old Slav accents: tlo_c; tlo_d; tlo_o; tlo_g; tlo_r; + -ver 2.3 (Sept1995-Okt1995) -- ------------------------------ -NOT `published' -- -DC, Sauter, etc. fontcovers are joined in files-headers. The Polish -file fik-mik.mf is used (it uses cm* font-headers and then changes -standard drivers to Cyrillic ones); it was changed and renamed to -fik-mik_.mf. +ver 3.3 patch level 1 (February 99) -- +-------------------------------------- -ver 2.32 (Okt1995-Jul1996) -- ------------------------------ -For the Dubna TUG'96 Conference -- -The macros of fik-mik_.mf were enlarged for usage of Sauter fonts. -Created special fik-mik-.mf for DC-like fonts. +corrected directory tree accordingly to CTAN common rules -The file dcstdedt.tex (DC fonts package) was used for quick font headers -creation. It was changed and renamed to cfstdedt.tex. + \lh\tex - moved all tex files here from \lh\tex\tex4mf + \lh\doc\testfont - moved tex files here from \lh\tex\testfont -Letters are generated accordingly to necessary encoding and assortment -TeX helps to create encoding and ligature/kerning tables. Also it -creates uccode/lccode/mathcode file and file with list of all Cyrillic -macros-letters. + \lh\mf\base - renamed directory \lh\mf\lh-base + \lh\mf\nont2 - renamed directory \lh\mf\lh-base\nont2 + \lh\mf\lh-begin - moved out -ver 2.5 (July1996-February1997) -- ---------------------------------- -The intermediate version only + reserved directories for font headers are deleted -there were made general modification from this version to next ones ... + \lh\tfm\lh-lcy \ + \lh\tfm\lh-lwn* | + \lh\tfm\lh-t2a* | directories with font metrics for standard font set + \lh\tfm\lh-t2b* | LH WN T2*/X2 etc encodings + \lh\tfm\lh-t2c* | + \lh\tfm\lh-x2* / absent because zip-file should be enlarged to $n$Mb -ver 2.9 (February-11September1997) -- -------------------------------------- -For the St-Peterburg CyrTUG Conference -- + (\lh\vf\lh-lcy) - this directory removed uptil LCY encoding comes + to stability -Support of T2 encoding (beta-version): gathering of all necessary matherial -(letters and signs). +Added some corrections for creation of SliTeX fonts in fikparm.mf and +files in \lh\tex directory. -Ligs & kerns macros of A.Berdnikov are used +ldsroman.mf was removed; all slitex stuff added to ldroman.mf; bollean +slitex must set before ldroman runs. + +There are also added flags for boolean slitex true and extra_endchar's +clearit macro. + + +ver 3.3 (December 98) -- +------------------------ + +changed directory tree accordingly to CTAN common rules + + \lh\doc - documentation about LH font package + \lh\doc\beresta - documentation about Cyrillic letters modern and old + (these files are obsolete for current version) + + \lh\tex\tex4mf - moved all tex files here from \texinput\lh + \lh\tex\testfont - some tex files for testing fonts + + \lh\mf\lh-base - base metafont files all files from \mfinput\lh + \lh\mf\lh-begin - directory for encoding and lig&kern files for + LH WN T2*/X2 etc encodings + + reserved directories for font headers are deleted + + \lh\tfm\lh-lcy \ + \lh\tfm\lh-lwn* | + \lh\tfm\lh-t2a* | directories with font metrics for standard font set + \lh\tfm\lh-t2b* | LH WN T2*/X2 etc encodings + \lh\tfm\lh-t2c* | + \lh\tfm\lh-x2* / absent because zip-file should be enlarged to $n$Mb -ver 3.0 (12September-8October1997) -- + (\lh\vf\lh-lcy) - this directory removed uptil LCY encoding comes + to stability + + +ver 3.0 (12 September-8 October 1997) -- ---------------------------------------- Continues previous version with some file reorganisation; T2 encodinng (beta) adopted in CyrTUG conference; -the Polish ogonek is placed in main letter definitions as variant of descender -with flag `is_ogonek'(variants of letters which use ammoc and ammoc its own -were moved out); +the Polish ogonek is placed in main letter definitions as variant of +descender with flag `is_ogonek' (variants of letters which use ammoc and +ammoc its own were moved out); - instead of Polish macro put_ogonek there is used simplified easy_ogonek -- I had difficulties of putting Polish ogonek to Abkhasian che. The documentation beresta absent in this version for a while - Changes from version 3.0 patchlevel 1 -------------------------------------- @@ -191,10 +247,11 @@ Changes from version 3.0 patchlevel 1 .) there were corrections in lgmodl.mf lgunicl.mf lgunicu.mf -.) files for ligatures & kerning for METAFONT joined to one common file +.) files for ligatures & kerning for METAFONT joined to one common file ??liker.mf which includes flags for different drivers -.) in the case mentioned above were corrected driver files ld*.mf and le*.mf +.) in the case mentioned above were corrected driver files ld*.mf and + le*.mf .) rearranged TeX stuff for ligs&kerns: likermac.tex - macros @@ -202,26 +259,27 @@ Changes from version 3.0 patchlevel 1 likergrp.tex - file with lettergroups rliker.tex - not renamed: start file -.) flag `if wncoding' moved from lig&kerns file to TeX file: - all transliteration ligatures are written to METAFONT file only - if \ifwncodingtrue i.e. for wn fonts only +.) flag `if wncoding' moved from lig&kerns file to TeX file: all + transliteration ligatures are written to METAFONT file only if + \ifwncodingtrue i.e. for wn fonts only .) all sepatate ligatures were gathered at beginning of wnliker.mf -.) file lwnligs.mf was rewritten accordingly to wnliker.mf (created by TeX) +.) file lwnligs.mf was rewritten accordingly to wnliker.mf (created by + TeX) -.) cfhead.tex -- \ifwncoding added: ligsatures for transliteration are written - in mf-file if \wncodingtrue +.) cfhead.tex -- \ifwncoding added: ligsatures for transliteration are + written in mf-file if \wncodingtrue .) cod-iso.tex -- corrected mistakes in Washington encoding .) restored BERESTA documentation; - It includes all T2 letters and languages where Cyrillic used; - documentation created for English and three Cyrillic encodings: + It includes all T2 letters and languages where Cyrillic is used; + documentation created for English and three Cyrillic encodings: Alternative, T2(Windows1251) KOI-8 -.) created files 90berest.tex and 91berest.tex to generate additional fonts - for beresta,tex +.) created files 90berest.tex and 91berest.tex to generate additional + fonts for beresta,tex .) 10lx-rx.tex, 12ex-rxv.tex, 30cm-tx.tex 31cm-txv.tex moved out @@ -271,28 +329,29 @@ Changes from version 3.1 and 319/318 patch letextit.mf lecsc.mf -.) all fonts start with command "input fikparm;" necessary commands +.) all fonts start with command "input fikparm;" necessary commands are recognised by fikparm or by input of ??begin.mf; all standard font sets (LH WN T2*/X2) included in fikparm macros; .) created directories ~~~~~~~~~~~~~~~~~~~~ - \texinput\lh\tex4mf - moved all tex files in this directory from \texinput\lh + \texinput\lh\tex4mf - moved all tex files in this directory from + \texinput\lh - \mfinput\lh-base - base metafont files all files from \mfinput\lh - \mfinput\lh-begin - directory for encoding and lig&kern files for + \mfinput\lh-base - base metafont files all files from \mfinput\lh + \mfinput\lh-begin - directory for encoding and lig&kern files for LH WN T2*/X2 etc encodings \mfinput\lh-lcy \ \mfinput\lh-lwn | - \mfinput\lh-t2a | reserved directories for font headers + \mfinput\lh-t2a | reserved directories for font headers \mfinput\lh-t2b | LH WN T2*/X2 encodings \mfinput\lh-t2c | \mfinput\lh-x2 / \tfm\lh-lcy \ \tfm\lh-lwn | - \tfm\lh-t2a | directories with font metrics for standard font set + \tfm\lh-t2a | directories with font metrics for standard font set \tfm\lh-t2b | LH WN T2*/X2 etc encodings \tfm\lh-t2c | \tfm\lh-x2 / @@ -307,90 +366,159 @@ new possibilities .) one may create (or not) heads of virtual fonts for CM based fonts .) this item for TeXperts ONLY! - attempt to create unheaded files l??def.enc accordingly to file rtrusdef.tex - or rtrusdef.sty (for LaTeX2e) + attempt to create unheaded files l??def.enc accordingly to file + rtrusdef.tex or rtrusdef.sty (for LaTeX2e) -ver 3.3 (December 98) -- ------------------------- -changed directory tree accordingly to CTAN common rules - \lh\doc - documentation about LH font package - \lh\doc\beresta - documentation about Cyrillic letters modern and old - (these files are a bit obsolete for current version) - \lh\tex\tex4mf - moved all tex files in this directory from \texinput\lh - \lh\tex\testfont - some tex files for testing fonts +ver 2.9 (February-11 September1997) -- +-------------------------------------- +For the St-Peterburg CyrTUG Conference -- - \lh\mf\lh-base - base metafont files all files from \mfinput\lh - \lh\mf\lh-begin - directory for encoding and lig&kern files for - LH WN T2*/X2 etc encodings +Support of T2 encoding (beta-version): gathering of all necessary +matherial (letters and signs). - reserved directories for font headers are deleted +Ligs & kerns macros of A.Berdnikov are used - \lh\tfm\lh-lcy \ - \lh\tfm\lh-lwn* | - \lh\tfm\lh-t2a* | directories with font metrics for standard font set - \lh\tfm\lh-t2b* | LH WN T2*/X2 etc encodings - \lh\tfm\lh-t2c* | - \lh\tfm\lh-x2* / absent because zip-file should be enlarged to $n$Mb - (\lh\vf\lh-lcy) - this directory removed uptil LCY encoding comes - to stability +ver 2.5 (July 1996-February 1997) -- +------------------------------------ +The intermediate version only -ver 3.3 patch level 1 (February 99) -- --------------------------------------- +there were made general modification from this version to next ones ... -corrected directory tree accordingly to CTAN common rules - \lh\tex - moved all tex files in this directory from \lh\tex\tex4mf - \lh\doc\testfont - moved tex files in this directory from \lh\tex\testfont +ver 2.32 (Oktober 1995-July 1996) -- +------------------------------------ +For the Dubna TUG'96 Conference -- +The macros of fik-mik_.mf were enlarged for usage of Sauter fonts. +Created special fik-mik-.mf for DC-like fonts. - \lh\mf\base - renamed directory \lh\mf\lh-base - \lh\mf\nont2 - renamed directory \lh\mf\lh-base\nont2 - \lh\mf\lh-begin - moved out +The file dcstdedt.tex (DC fonts package) was used for quick font headers +creation. It was changed and renamed to cfstdedt.tex. - reserved directories for font headers are deleted +Letters are generated accordingly to necessary encoding and assortment +TeX helps to create encoding and ligature/kerning tables. Also it +creates uccode/lccode/mathcode file and file with list of all Cyrillic +macros-letters. - \lh\tfm\lh-lcy \ - \lh\tfm\lh-lwn* | - \lh\tfm\lh-t2a* | directories with font metrics for standard font set - \lh\tfm\lh-t2b* | LH WN T2*/X2 etc encodings - \lh\tfm\lh-t2c* | - \lh\tfm\lh-x2* / absent because zip-file should be enlarged to $n$Mb - (\lh\vf\lh-lcy) - this directory removed uptil LCY encoding comes - to stability +ver 2.3 (September 1995-Oktober 1995) -- +---------------------------------------- +NOT `published' -- +DC, Sauter, etc. fontcovers are joined in files-headers. The Polish +file fik-mik.mf is used (it uses cm* font-headers and then changes +standard drivers to Cyrillic ones); it was changed and renamed to +fik-mik_.mf. -Added some corrections for creation of SliTeX fonts in fikparm.mf and -files in \lh\tex directory. -ldsroman.mf was removed ; all slitex stuff added to ldroman.mf; -bollean slitex must set before ldroman runs. +ver 2.2 (March-September 1995) -- +--------------------------------- +Protvino & Holland TeX Conferences -- +Correction of mistakes: serif widths, letter widths. Fine tuning of +letter shapes and stem_thicknesses. -There are also added flags for boolean slitex true and extra_endchar's clearit -macro. +The new fonts are added: +The 6 SliTeX (created new driver file ldrsfont.mf for SliTeX "I"), and 2 +AmSTeX text CM fonts added (csc) -- total count: 64 fonts. -ver 3.4 patch level 1 (January 2000) -- ---------------------------------------- +Rearranging of font generation: default (Alternative) version creates +old font assortment plus Ukrainian and Byelorussian as in MS DOS code +page 866, option `fullrus' creates old Russian letters additionally, +option `fil' creates full assortment of created Cyrillic fonts. -some bugs were removed: -RIGHT - Unicode OT2 X2 T2A ------------------------------------------------------ -DJE (0x0402/0x0452) 0x06/0x0E 0x42/0x62 0x82/0xA2 + -TSHE (0x040B/0x045B) 0x07/0x0F 0x43/0x63 0x83/0xA3 + -bugs in LH: -DJE (0x0402/0x0452) 0x07/0x0F 0x42/0x62 0x83/0xA3 - -TSHE (0x040B/0x045B) 0x06/0x0E 0x43/0x63 0x82/0xA2 - +ATTENTION: the number sign and cyrillic quotes have now other codes: +accordingly to PC866 code page. -edited some Old Slav letters and accents: -Omega_tlo, palatal (round tlo); paerok; zvat'stvo; dasia; psili; -added 5 Old Slav accents: tlo_c; tlo_d; tlo_o; tlo_g; tlo_r; +Files lgcr(u/l/ti), lgserb(u/l/ti) and lbcoding became files drivers. +They run different parts of Cyrillic Alphabet. +MS Windows encoding is added. + +The Sauter fonts were created for LH family by S.Znamenskii and +connected to it. + +There are added hints with width correction of letters with mid stems +(analogous of `i' and `j' width correction in CM) as used in Cyrillic +fonts of A.Shen'. + +The experiment is begun with Omega package. Now full Cyrillic font is +being created. + +Option `fullrus' was joined with default font creation so one can get +Russian, Ukrainian, Byelorussian and some old Russian (XIXcent) letters +in one font accordingly to Vinogradov's fonts. + +All coding schemes are made for unification with hexadecimal codes. + +The names of Cyrillic letters (WNCYR letters) were changed with +accordance with standard names in coding schemes (ISO etc.). + + +ver 2.1 (October 1994) -- +------------------------- +Correction of mistakes: serif widths, letter widths. + +This file (lhfonts.hst) was added. + + +ver 2.0 (September 1994) -- +--------------------------- +placed on CTAN -- +Correction of mistakes of letter shapes. All driver files were checked +with drivers of Computer Modern; + +ALL additional cyrillic letters in files of ligs&kerns were rewritten to +their symbolic names; file wnligs.mf was renamed to lwnligs.mf; + +Files with additional Cyrillic letters lgserb*.mf were rearranged: three +letters below endinput were placed on separate files lgserb(u/l)1.mf. + +There was created new package FIL for creating of other Cyrillic letters. + +Rearranging directory structures. + + +ver 1.2 (1993--1994) -- +----------------------- +the part of CyrTUG-EmTeX package; placed on CD-ROM 4AllTeX -- +All uppercase and lowercase letters are created by separate files: +lgcru.mf and lgcrl.mf (instead of three files: lgcrlu.mf -- file with +common letter shapes for both cases, lgcrspu.mf -- for uppercase +letters, lgcrspl.mf -- for lowercase ones). The analogous way for +lgserb*.mf files. + +Creation of all 56 Computer Modern text fonts. + +Font generating with usage of MFJob (EmTeX). There were created special +mfj-files. + + +ver 1.1 (1993) -- +----------------- +unrecognized (there was file rusfont.zip) -- +Virtual encoding as default coding scheme for creating Cyrillic part of +Latin-Cyrillic font (with usage of the virtual files) was changed to +Alternative encoding (Virtual encoding is kept as supply variant only); + +Creation of 32 Computer Modern text fonts. + + +ver 1.0 (approx 1992--1993) -- +------------------------------ +unrecognized, was used in Mir Publisher only -- +Creation of symbolic letter names for creation of font with three +different coding schemes Alternative, Virtual (7-bit) and Washington +(ISO/ASCII: same as WNCYR encoding); + +Correction of letter shapes, creation of special files of parameters +(Additional Lower Ratios) for each font group. + +Creation of some batch-files for font generating. -============================================================================== -LHFONTS version 3.4 file LHFONTS.HST - The short history of LHFONTS (MAKEFONT) package -============================================================================== +========================================================================= +LHFONTS version 3.5 file LHFONTS.HST + The short history of LHFONTS (MAKEFONT) package +========================================================================= diff --git a/Master/texmf-dist/doc/fonts/lh/samples/lh-lcy.tex b/Master/texmf-dist/doc/fonts/lh/samples/lh-lcy.tex new file mode 100644 index 00000000000..d8f17868ea7 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/lh/samples/lh-lcy.tex @@ -0,0 +1,171 @@ +% -*- TeX -*- -*- RU -*- +\documentclass[russian%,draft,dvips +]{book} + +\usepackage{mathtext} +%please note that hyphenation depends to font encoding! +\usepackage[LCY]{fontenc} +\usepackage[cp866]{inputenc} + +%var1: lh additions for bold concrete fonts +\usepackage{lh-LCYxccr} +%var2: the package below could be covered with fd-files +%\usepackage{lh-LCYccr} + +\usepackage{babel} +%was needed for one version of russianb +%\languageattribute{russian}{mdq} + +%do not create/modify aux-like files +%\nofiles +\begin{document} +\pagestyle{plain} +\obeylines +\centerline{\Large\bfseries ’¥áâ èà¨ä⮢} + + +\bigskip +\rmfamily +\mdseries\upshape +{Ž¡ëçë©} (roman), +\slshape + ª«®ë© (slanted), +\itshape +ªãàᨢ (italic), +\scshape +ª ¯¨â¥«ì (small caps), +\fontseries b\upshape +¯®«ã¦¨àë© "<á㦥ë©"> (bold), +\bfseries\upshape +¯®«ã¦¨àë© (bold extended), +\itshape +¯®«ã¦¨àë© ªãàᨢ (bold italic), +\slshape +¯®«ã¦¨àë© ª«®ë© (bold slanted), +\scshape +¯®«ã¦¨à ï ª ¯¨â¥«ì (bold small caps), +\mdseries\fontshape{ui}\selectfont +"<¯àאַ©"> ªãàᨢ (upright italic). + +\bigskip +\sffamily +\mdseries\upshape +ã¡«¥ë© (sans serif), +\slshape + ª«®ë© (slanted), +\itshape +"<ªãàᨢ"> (italic), +\bfseries\upshape +¯®«ã¦¨àë©, +\itshape +¯®«ã¦¨àë© "<ªãàᨢ"> (bold), +\slshape +¯®«ã¦¨àë© ª«®ë© (bold slanted), +\fontseries{sbc}\upshape +¯®«ã¦¨àë© "<á㦥ë©"> (semibold condenced). + +\bigskip +\ttfamily +\mdseries\upshape +¨èãé ï ¬ 訪 (typewriter) +\slshape + ª«®ë© (slanted), +\itshape +ªãàᨢ (italic), +\scshape +ª ¯¨â¥«ì (small caps). + +\bigskip +\fontfamily{cmdh}% +\mdseries\upshape +„ 娫« (Danhill). + +\bigskip +\fontfamily{cmfib}% +\mdseries\upshape +”¨¡® çç¨ (Fibonacci), +\slshape + ª«®ë© (slanted). + +\bigskip +\fontfamily{cmfr}% +\mdseries\upshape +‡ ¡ ¢ë© (funny roman), +\itshape +ªãàᨢ (italic). + +\bigskip +\fontfamily{cmvtt}% +\mdseries\upshape + §®è¨à¨ë© èà¨äâ ¯¨èã饩 ¬ 訪¨ (variable typewriter), +\itshape +ªãàᨢ (italic). + +\bigskip +\fontfamily{ccr}% +\mdseries\upshape +˜à¨äâ ¤«ï "<Š®ªà¥â®© ¬ ⥬ ⨪¨"> (concrete roman), +\slshape + ª«®ë© (slanted), +\itshape +ªãàᨢ (italic), +\scshape +ª ¯¨â¥«ì (small caps), +\bfseries\upshape +¯®«ã¦¨àë© (bold), +\itshape +¯®«ã¦¨àë© ªãàᨢ (bold italic), +\slshape +¯®«ã¦¨àë© ª«®ë© (bold slanted), +\scshape +¯®«ã¦¨à ï ª ¯¨â¥«ì (bold small caps), +\fontseries c\slshape +áã¦¥ë© ªãàᨢ (condensed italic). + +\bigskip +\fontfamily{cmbr}% +\mdseries\upshape +˜à¨äâ ᥬ¥©á⢠CM Bright, +\slshape + ª«®ë© (slanted), +\itshape +ªãàᨢ (italic), +\fontseries{sb}\upshape +¯®«ã¦¨àë© (semibold) +\itshape +¯®«ã¦¨àë© "<ªãàᨢ"> (semibold italic), +\slshape +¯®«ã¦¨àë© ª«®ë© (semibold slanted), +\bfseries\upshape +¯®«ã¦¨àë© (bold). + +\bigskip +\fontfamily{cmtl}% +\mdseries\upshape +˜à¨äâ ᥬ¥©á⢠CM Bright Typewriter, +\slshape + ª«®ë© (slanted). + +\bigskip +\fontfamily{lcmss}% +\mdseries\upshape +ã¡«¥ë© èà¨äâ ¤«ï á« ©¤®¢ (slides sans serif), +\slshape + ª«®ë© (slanted), +\bfseries\upshape +¯®«ã¦¨àë© (bold), +\mdseries{\fontshape{In}\selectfont +¥¢¨¤¨¬ë© àã¡«¥ë© èà¨äâ ¤«ï á« ©¤®¢} (invisible ss), +{\fontshape{Isl}\selectfont +¥¢¨¤¨¬ë© ª«®ë©} {\slshape (invisible slanted)}. + +\bigskip +\fontfamily{lcmtt}% +\mdseries\upshape +˜à¨äâ ¯¨èã饩 ¬ 訪¨ ¤«ï á« ©¤®¢ (slides typewriter) +\itshape +ªãàᨢ (italic), +\mdseries{\fontshape{In}\selectfont +¥¢¨¤¨¬ë© èà¨äâ ¯¨èã饩 ¬ 訪¨} {\upshape (invisible tt)}. + +\end{document} diff --git a/Master/texmf-dist/doc/fonts/lh/samples/lh-lcytext.tex b/Master/texmf-dist/doc/fonts/lh/samples/lh-lcytext.tex new file mode 100644 index 00000000000..865badc9a6c --- /dev/null +++ b/Master/texmf-dist/doc/fonts/lh/samples/lh-lcytext.tex @@ -0,0 +1,140 @@ +% -*- TeX -*- -*- RU -*- +\documentclass[russian]{book} + +\usepackage{mathtext} +%to test other T2*, X2, LCY encodings, change option to necessary one +\usepackage[LCY]{fontenc} +\usepackage[cp866]{inputenc} + +%var1: lh additions for bold concrete fonts +\usepackage{lh-LCYxccr} +%var2: the package below could be covered with fd-files +%\usepackage{lh-LCYccr} + +\usepackage{babel} +%was needed for one version of russianb +%\languageattribute{russian}{mdq} + +%do not create/modify aux-like files +%\nofiles +\begin{document} +\pagestyle{empty} + +\centerline{*\quad*\quad*} +\begin{verse}% +„ ! ’¥¯¥àì à¥è¥®. ¥§ ¢®§¢à â \\ +Ÿ ¯®ª¨ã« à®¤ë¥ ¯®«ï.\\ +“¦ ¥ ¡ã¤ãâ «¨áâ¢®î ªàë« â®©\\ + ¤® ¬®î §¢¥¥âì ⮯®«ï. +\bigskip + +¨§ª¨© ¤®¬ ¡¥§ ¬¥ï ááãâ㫨âáï,\\ +‘â àë© ¯ñá ¬®© ¤ ¢® ¨§¤®å.\\ + ¬®áª®¢áª¨å ¨§®£ãâëå 㫨æ å\\ +“¬¥à¥âì, § âì, á㤨« ¬¥ ®£. +\bigskip + +Ÿ «î¡«î íâ®â £®à®¤ ¢ï§¥¢ë©,\\ +ãáâì ®¡à ® ¨ ¯ãáâì ®¤àïå.\\ +‡®«®â ï ¤à¥¬®â ï €§¨ï\\ +Ž¯®ç¨« ªã¯®« å. +\bigskip + +€ ª®£¤ ®çìî ᢥâ¨â ¬¥áïæ.\\ +Š®£¤ ᢥâ¨â\ldots{} çñàâ § ¥â ª ª!\\ +Ÿ ¨¤ã, £®«®¢®î ᢥáïáì,\\ +¥à¥ã«ª®¬ ¢ § ª®¬ë© ª ¡ ª. +\bigskip + +˜ã¬ ¨ £ ¬ ¢ í⮬ «®£®¢¥ ¦ã⪮¬,\\ +® ¢áî ®çì ¯à®«ñâ, ¤® § à¨,\\ +Ÿ ç¨â î áâ¨å¨ ¯à®áâ¨âã⪠¬\\ +ˆ á ¡ ¤¨â ¬¨ ¦ àî ᯨàâ. +\bigskip + +‘¥à¤æ¥ ¡ìñâáï ¢á¥ ç é¥ ¨ ç é¥,\\ +ˆ ã¦ ï £®¢®àî ¥¢¯®¯ ¤:\\ +"<Ÿ â ª®© ¦¥, ª ª ¢ë ¯à®¯ 騩,\\ +Œ¥ ⥯¥àì ¥ ã©â¨ § ¤">. +\bigskip + +¨§ª¨© ¤®¬ ¡¥§ ¬¥ï ááãâ㫨âáï,\\ +‘â àë© ¯ñá ¬®© ¤ ¢® ¨§¤®å.\\ + ¬®áª®¢áª¨å ¨§®£ãâëå 㫨æ å\\ +“¬¥à¥âì, § âì, á㤨« ¬¥ ®£. +\bigskip + +\rightline{\small\slshape ‘.\,…ᥨ, 1922} +\end{verse} + +\newpage +\fontfamily{ccr}\selectfont + +\centerline{\bfseries ‘Ž€Š… Š€—€‹Ž‚€} +\begin{verse}% +„ ©, „¦¨¬, áç áâì¥ « ¯ã ¬¥,\\ +’ ªãî « ¯ã ¥ ¢¨¤ « ï áதã.\\ +„ ¢ © á ⮡®© ¯®« ¥¬ ¯à¨ «ã¥\\ + â¨åãî ¡¥áèã¬ãî ¯®£®¤ã.\\ +„ ©, „¦¨¬, áç áâì¥ « ¯ã ¬¥. +\bigskip + +®¦ «ã©áâ , £®«ã¡ç¨ª, ¥ «¨¦¨áì.\\ +®©¬¨ á® ¬®© å®âì á ¬®¥ ¯à®á⮥.\\ +‚¥¤ì âë ¥ § ¥èì, çâ® â ª®¥ ¦¨§ì,\\ +¥ § ¥èì âë, çâ® ¦¨âì ᢥ⥠á⮨â. +\bigskip + +•®§ï¨ ⢮© ¨ ¬¨« ¨ § ¬¥¨â\\ +ˆ ã ¥£® £®á⥩ ¡ë¢ ¥â ¢ ¤®¬¥ ¬®£®,\\ +ˆ ª ¦¤ë©, ã«ë¡ ïáì, ®à®¢¨â\\ +’¥¡ï ¯® è¥àá⨠¡ àå ⮩ ¯®âண âì. +\bigskip + +’ë ¯®-ᮡ çì¨ ¤ì«ì᪨ ªà ᨢ,\\ +‘ â ª®î ¬¨«®î ¤®¢¥à稢®© ¯à¨ïâ楩.\\ +ˆ, ¨ª®£® ¨ ª ¯«¨ ¥ á¯à®á¨¢,\\ +Š ª ¯ìïë© ¤àã£, âë «¥§¥èì 楫®¢ âìáï. +\bigskip + +Œ®© ¬¨«ë© „¦¨¬, á।¨ ⢮¨å £®á⥩\\ +’ ª ¬®£® ¢áïª¨å ¨ ¥¢áïª¨å ¡ë«®.\\ +® â , çâ® ¢á¥å ¡¥§¬®«¢¥© ¨ £àãá⥩,\\ +‘î¤ á«ãç ©® ¢¤à㣠¥ § 室¨« ? +\bigskip + +Ž ¯à¨¤ñâ, ¤ î ⥡¥ ¯®àãªã.\\ +ˆ ¡¥§ ¬¥ï, ¢ ¥ñ ãáâ ¢ïáì ¢§£«ï¤,\\ +’ë § ¬¥ï «¨§¨ ¥© ¥¦® àãªã\\ +‡ ¢áñ, ¢ çñ¬ ¡ë« ¨ ¥ ¡ë« ¢¨®¢ â. +\bigskip + +\rightline{\small\slshape ‘.\,…ᥨ, 1925} +\end{verse} + +\newpage +\tolerance2000 + +\fontfamily{cmbr}\selectfont + +\ldots + +\cdash--* ‘㤠àëï, \cdash--- £®¢®àî ï, \cdash--- ®áâ®à®¦¥¥ ¯®¢®à 稢 ©â¥ ¬« ¤¥æ , ¥ § ¡ã¤ìâ¥, çâ® ® ஦¤ñ à ¥¥ áப . ‘¬¥àâì í⮣® ¬« ¤¥æ ®§ ç « ¡ë â殮«¥©èãî ãâà âã ¤«ï ¢ 襩 áâà ë! + +\cdash--* Œ®© ¡®£! ƒ®á¯®¦ ®ª«¥ த¨â ¤à㣮£®! + +\cdash--* ƒ®á¯®¦ ®ª«¥ ¨ª®£¤ ¡®«¥¥ ¥ த¨â â ª®£®, ¨ ¨ª ª ï ¤àã£ ï £®á¯®¦ ¢ â¥ç¥¨¥ ¥áª®«ìª¨å á⮫¥â¨© â ª®£® ¥ த¨â. + +\cdash--* ‚ë ¬¥ï ¨§ã¬«ï¥â¥, á㤠àì! + +\cdash--* Ÿ ¨ á ¬ ¨§ã¬«ñ. ®©¬¨â¥, çâ® ¯® ¯à®è¥á⢨¨ âàñå ¢¥ª®¢, ¢ ¤ «ñª®© áâà ¥, ï ¡ã¤ã ¢á¯®¬¨ âì ® ¢ á ⮫쪮 ¯®â®¬ã, çâ® ¢ë áë £®á¯®¤¨ ®ª«¥ ¤¥à¦ «¨ ¢ à㪠å. + +\cdash--* Ÿ ¤¥à¦ « ¢ àãª å ¨ ¡®«¥¥ § âëå ¬« ¤¥æ¥¢. + +\cdash--* —â® ¯®¨¬ ¥â¥ ¢ë ¯®¤ á«®¢®¬ \cdash--- § âë©? â®â ¬« ¤¥¥æ á⠥⠡®«¥¥ ¨§¢¥áâ¥, 祬 ë¥ æ àáâ¢ãî騩 ª®à®«ì ¢ è ‹î¤®¢¨ª XIII, ® á⠥⠡®«¥¥ § ¬¥¨â, 祬 á«¥¤ãî騩 ª®à®«ì, í⮣® ª®à®«ï, á㤠àëï, §®¢ã⠋¢¨ª ‚¥«¨ª¨© ¨«¨ ª®à®«ì-᮫æ¥! „®¡à ï £®á¯®¦ , ¥áâì ¤ «ñª ï áâà , ¢ë ¥ § ¥â¥ ¥ñ, íâ® \cdash--- Œ®áª®¢¨ï. ᥫ¥ ® «î¤ì¬¨, £®¢®àï騬¨ áâà ®¬ ¤«ï ¢ 襣® ãå ï§ëª¥. ˆ ¢ íâã áâà 㠢᪮ॠ¯à®¨ªãâ á«®¢ ⮣®, ª®£® ¢ë ᥩç á ¯à¨¨¬ ¥â¥. ¥ª¨© ¯®«ïª, èãâ æ àï ¥âà ¥à¢®£®, 㦥 ¥ á ¢ 襣®, á ¥¬¥æª®£® ï§ëª ¯¥à¥¢¥¤ñâ ¨å ¢ ࢠà᪨© ï§ëª. + +\ldots + +\rightline{\small\slshape Œ.\,ã«£ ª®¢, †¨§ì \mbox{£- } ¤¥~Œ®«ì¥à , 1932--33\,££.} + +\end{document} diff --git a/Master/texmf-dist/doc/fonts/lh/samples/lh-ot2.tex b/Master/texmf-dist/doc/fonts/lh/samples/lh-ot2.tex new file mode 100644 index 00000000000..ecca3b055ac --- /dev/null +++ b/Master/texmf-dist/doc/fonts/lh/samples/lh-ot2.tex @@ -0,0 +1,173 @@ +% -*- TeX -*- -*- RU -*- +\documentclass[russian,english%,draft,dvips +]{book} + +\usepackage{mathtext} +\usepackage[OT2]{fontenc} +%to run lh fonts only (default font if wnr10 instead of wncyr10) +\usepackage{lh-OT2} + +%var1: lh additions for bold concrete fonts +\usepackage{lh-OT2xccr} +%var2: the package below could be covered with fd-files +%\usepackage{lh-OT2ccr} + +\usepackage{babel} +%was needed for one version of russianb +%\languageattribute{russian}{mdq} + +%do not create/modify aux-like files +%\nofiles + +\addto\extrasrussian{\fontencoding{OT2}\selectfont} +\addto\extrasenglish{\fontencoding{OT1}\selectfont} + +\begin{document} +\pagestyle{plain} +\obeylines +\centerline{\Large\bfseries\selectlanguage{russian}Test shriftov} + + +\bigskip +\rmfamily +\mdseries\upshape +{\selectlanguage{russian}Obychnyi0} (roman), +\slshape +{\selectlanguage{russian}naklonnyi0} (slanted), +\itshape +{\selectlanguage{russian}kursiv} (italic), +\scshape +{\selectlanguage{russian}kapitelp1} (small caps), +\fontseries b\upshape +{\selectlanguage{russian}poluzhirnyi0 "<suzhennyi0">} (bold), +\bfseries\upshape +{\selectlanguage{russian}poluzhirnyi0} (bold extended), +\itshape +{\selectlanguage{russian}poluzhirnyi0 kursiv} (bold italic), +\slshape +{\selectlanguage{russian}poluzhirnyi0 naklonnyi0} (bold slanted), +\scshape +{\selectlanguage{russian}poluzhirnaya kapitelp1} (bold small caps), +\mdseries\fontshape{ui}\selectfont +{\selectlanguage{russian}"<pryamoi0"> kursiv} (upright italic). + +\bigskip +\sffamily +\mdseries\upshape +{\selectlanguage{russian}Rublenyi0} (sans serif), +\slshape +{\selectlanguage{russian}naklonnyi0} (slanted), +\itshape +{\selectlanguage{russian}"<kursiv">} (italic), +\bfseries\upshape +{\selectlanguage{russian}poluzhirnyi0} (bold), +\itshape +{\selectlanguage{russian}poluzhirnyi0 "<kursiv">} (bold italic), +\slshape +{\selectlanguage{russian}poluzhirnyi0 naklonnyi0} (bold slanted), +\fontseries{sbc}\upshape +{\selectlanguage{russian}poluzhirnyi0 "<suzhennyi0">} (semibold condenced). + +\bigskip +\ttfamily +\mdseries\upshape +{\selectlanguage{russian}Pishushchaya mashinka} (typewriter) +\slshape +{\selectlanguage{russian}naklonnyi0} (slanted), +\itshape +{\selectlanguage{russian}kursiv} (italic), +\scshape +{\selectlanguage{russian}kapitelp1} (small caps). + +\bigskip +\fontfamily{cmdh}% +\mdseries\upshape +{\selectlanguage{russian}Danhill} (Danhill). + +\bigskip +\fontfamily{cmfib}% +\mdseries\upshape +{\selectlanguage{russian}Fibonachchi} (Fibonacci), +\slshape +{\selectlanguage{russian}naklonnyi0} (slanted). + +\bigskip +\fontfamily{cmfr}% +\mdseries\upshape +{\selectlanguage{russian}Zabavnyi0} (funny roman), +\itshape +{\selectlanguage{russian}kursiv} (italic). + +\bigskip +\fontfamily{cmvtt}% +\mdseries\upshape +{\selectlanguage{russian}Raznoshirinnyi0 shrift pishushchei0 mashinki} (variable typewriter), +\itshape +{\selectlanguage{russian}kursiv} (italic). + +\bigskip +\fontfamily{ccr}% +\mdseries\upshape +{\selectlanguage{russian}SHrift dlya "<Konkretnoi0 matematiki"> } (concrete roman), +\slshape +{\selectlanguage{russian}naklonnyi0} (slanted), +\itshape +{\selectlanguage{russian}kursiv} (italic), +\scshape +{\selectlanguage{russian}kapitelp1} (small caps), +\bfseries\upshape +{\selectlanguage{russian}poluzhirnyi0} (bold), +\slshape +{\selectlanguage{russian}poluzhirnyi0 naklonnyi0} (bold slanted), +\scshape +{\selectlanguage{russian}poluzhirnaya kapitelp1} (bold small caps), +\fontseries c\slshape +{\selectlanguage{russian}suzhennyi0 kursiv} (condensed italic). + +\bigskip +\fontfamily{cmbr}% +\mdseries\upshape +{\selectlanguage{russian}SHrift semei0stva} CM Bright, +\slshape +{\selectlanguage{russian}naklonnyi0} (slanted), +\itshape +{\selectlanguage{russian}kursiv} (italic), +\fontseries{sb}\upshape +{\selectlanguage{russian}poluzhirnyi0} (semibold) +\itshape +{\selectlanguage{russian}poluzhirnyi0 "<kursiv">} (semibold italic), +\slshape +{\selectlanguage{russian}poluzhirnyi0 naklonnyi0} (semibold slanted), +\bfseries\upshape +{\selectlanguage{russian}poluzhirnyi0} (bold). + +\bigskip +\fontfamily{cmtl}% +\mdseries\upshape +{\selectlanguage{russian}SHrift semei0stva} CM Bright Typewriter, +\slshape +{\selectlanguage{russian}naklonnyi0} (slanted). + +\bigskip +\fontfamily{lcmss}% +\mdseries\upshape +{\selectlanguage{russian}Rublenyi0 shrift dlya slai0dov} (slides sans serif), +\slshape +{\selectlanguage{russian}naklonnyi0} (slanted), +\bfseries\upshape +{\selectlanguage{russian}poluzhirnyi0} (bold), +\mdseries{\fontshape{In}\selectfont +{\selectlanguage{russian}nevidimyi0 rublenyi0 shrift dlya slai0dov}} (invisible ss), +{\fontshape{Isl}\selectfont +{\selectlanguage{russian}nevidimyi0 naklonnyi0}} {\slshape (invisible slanted)}. + +\bigskip +\fontfamily{lcmtt}% +\mdseries\upshape +{\selectlanguage{russian}SHrift pishushchei0 mashinki dlya slai0dov} (slides typewriter) +\itshape +{\selectlanguage{russian}kursiv} (italic), +\mdseries{\fontshape{In}\selectfont +{\selectlanguage{russian}nevidimyi0 shrift pishushchei0 mashinki}} {\upshape (invisible tt}). + +\end{document} diff --git a/Master/texmf-dist/doc/fonts/lh/samples/lh-ot2text.tex b/Master/texmf-dist/doc/fonts/lh/samples/lh-ot2text.tex new file mode 100644 index 00000000000..589528c4941 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/lh/samples/lh-ot2text.tex @@ -0,0 +1,146 @@ +% -*- TeX -*- -*- RU -*- +\documentclass[russian,english]{book} + +\usepackage{mathtext} +\usepackage[OT2]{fontenc} + +%to run lh fonts only (default font if wnr10 instead of wncyr10) +\usepackage{lh-OT2} + +%var1: lh additions for bold concrete fonts +\usepackage{lh-OT2xccr} +%var2: the package below could be covered with fd-files +%\usepackage{lh-OT2ccr} + +\usepackage{babel} +%was needed for one version of russianb +%\languageattribute{russian}{mdq} + +%do not create/modify aux-like files +%\nofiles + +\addto\extrasrussian{\fontencoding{OT2}\selectfont} +\addto\extrasenglish{\fontencoding{OT1}\selectfont} + +\begin{document} +\pagestyle{empty} +\selectlanguage{russian} + +\centerline{*\quad*\quad*} +\begin{verse}% +Da! Teperp1 resheno. Bez vozvrata\\ +YA pokinul rodnye polya.\\ +Uzh ne budut listvoyu krylatoi0\\ +Nado mnoyu zvenetp1 topolya. +\bigskip + +Nizkii0 dom bez menya ssutulit{}sya,\\ +Staryi0 pe0s moi0 davno izdoh.\\ +Na moskovskih izognutyh ulicah\\ +Umeretp1, znatp1, sudil mne Bog. +\bigskip + +YA lyublyu e1tot gorod vyazevyi0,\\ +Pustp1 obryuzg on i pustp1 odryah.\\ +Zolotaya dremotnaya Aziya\\ +Opochila na kupolah. +\bigskip + +A kogda nochp1yu svetit mesyac.\\ +Kogda svetit\ldots{} che0rt znaet kak!\\ +YA idu, golovoyu svesyasp1,\\ +Pereulkom v znakomyi0 kabak. +\bigskip + +SHum i gam v e1tom logove zhutkom,\\ +No vsyu nochp1 naprole0t, do zari,\\ +YA chitayu stihi prostitutkam\\ +I s banditami zharyu spirt. +\bigskip + +Serdce bp1e0t{}sya vse chashche i chashche,\\ +I uzh ya govoryu nevpopad:\\ +"<YA takoi0 zhe, kak vy propashchii0,\\ +Mne teperp1 ne ui0ti nazad">. +\bigskip + +Nizkii0 dom bez menya ssutulit{}sya,\\ +Staryi0 pe0s moi0 davno izdoh.\\ +Na moskovskih izognutyh ulicah\\ +Umeretp1, znatp1, sudil mne Bog. +\bigskip + +\rightline{\small\slshape S.\,Esenin, 1922} +\end{verse} + +\newpage +\fontfamily{ccr}\selectfont + +\centerline{\bfseries SOBAKE KACHALOVA} +\begin{verse}% +Dai0, Dzhim, na schastp1e lapu mne,\\ +Takuyu lapu ne vidal ya srodu.\\ +Davai0 s toboi0 polaem pri lune\\ +Na tihuyu besshumnuyu pogodu.\\ +Dai0, Dzhim, na schastp1e lapu mne. +\bigskip + +Pozhalui0sta, golubchik, ne lizhisp1.\\ +Poi0mi so mnoi0 hotp1 samoe prostoe.\\ +Vedp1 ty ne znaeshp1, chto takoe zhiznp1,\\ +Ne znaeshp1 ty, chto zhitp1 na svete stoit. +\bigskip + +Hozyain tvoi0 i mil i znamenit\\ +I u nego gostei0 byvaet v dome mnogo,\\ +I kazhdyi0, ulybayasp1, norovit\\ +Tebya po shersti barhatnoi0 potrogatp1. +\bigskip + +Ty po-sobachp1i dp1yavolp1ski krasiv,\\ +S takoyu miloyu doverchivoi0 priyatcei0.\\ +I, nikogo ni kapli ne sprosiv,\\ +Kak pp1yanyi0 drug, ty lezeshp1 celovatp1sya. +\bigskip + +Moi0 milyi0 Dzhim, sredi tvoih gostei0\\ +Tak mnogo vsyakih i nevsyakih bylo.\\ +No ta, chto vseh bezmolvnei0 i grustnei0,\\ +Syuda sluchai0no vdrug ne zahodila? +\bigskip + +Ona pride0t, dayu tebe poruku.\\ +I bez menya, v ee0 ustavyasp1 vzglyad,\\ +Ty za menya lizni ei0 nezhno ruku\\ +Za vse0, v che0m byl i ne byl vinovat. +\bigskip + +\rightline{\small\slshape S.\,Esenin, 1925} +\end{verse} + +\newpage +\tolerance2000 + +\fontfamily{cmbr}\selectfont + +\ldots + +\cdash--* Sudarynya, \cdash--- govoryu ya, \cdash--- ostorozhnee povorachivai0te mladenca, ne zabudp1te, chto on rozhde0n ranee sroka. Smertp1 e1togo mladenca oznachala by tyazhelei0shuyu utratu dlya vashei0 strany! + +\cdash--* Moi0 bog! Gospozha Poklen rodit drugogo! + +\cdash--* Gospozha Poklen nikogda bolee ne rodit takogo, i nikakaya drugaya gospozha v techenie neskolp1kih stoletii0 takogo ne rodit. + +\cdash--* Vy menya izumlyaete, sudarp1! + +\cdash--* YA i sam izumle0n. Poi0mite, chto po proshestvii tre0h vekov, v dale0koi0 strane, ya budu vspominatp1 o vas tolp1ko potomu, chto vy syna gospodina Poklena derzhali v rukah. + +\cdash--* YA derzhala v rukah i bolee znatnyh mladencev. + +\cdash--* CHto ponimaete vy pod slovom \cdash--- znatnyi0? E1tot mladenec stanet bolee izvesten, chem nyne carstvuyushchii0 korolp1 vash Lyudovik {\selectlanguage{english}XIII}, on stanet bolee znamenit, chem sleduyushchii0 korolp1, a e1togo korolya, sudarynya, nazovut Lyudovik Velikii0 ili korolp1-solnce! Dobraya gospozha, estp1 dale0kaya strana, vy ne znaete ee0, e1to \cdash--- Moskoviya. Naselena ona lyudp1mi, govoryashchimi na strannom dlya vashego uha yazyke. I v e1tu stranu vskore proniknut slova togo, kogo vy sei0chas prinimaete. Nekii0 polyak, shut carya Petra Pervogo, uzhe ne s vashego, a s nemeckogo yazyka perevede0t ih na varvarskii0 yazyk. + +\ldots + +\rightline{\small\slshape M.\,Bulgakov, ZHiznp1 \mbox{g-na} de~Molp1era, 1932--33\,gg.} + +\end{document} diff --git a/Master/texmf-dist/doc/fonts/lh/samples/lh-t2a.tex b/Master/texmf-dist/doc/fonts/lh/samples/lh-t2a.tex new file mode 100644 index 00000000000..b3bb5d19269 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/lh/samples/lh-t2a.tex @@ -0,0 +1,174 @@ +% -*- TeX -*- -*- RU -*- +\documentclass[russian%,draft,dvips +]{book} + +\usepackage{mathtext} +%to test other T2*, X2 encodings, change option to necessary one +%please note that hyphenation depends to font encoding! +\usepackage[T2A]{fontenc} +%to test other encodings, change cp1251 option to necessary one +%and load text in chosen encoding +\usepackage[cp1251]{inputenc} + +%var1: lh additions for bold concrete fonts +\usepackage{lh-T2Axccr} +%var2: the package below could be covered with fd-files +%\usepackage{lh-T2Accr} + +\usepackage{babel} +%was needed for one version of russianb +%\languageattribute{russian}{mdq} + +%do not create/modify aux-like files +%\nofiles +\begin{document} +\pagestyle{plain} +\obeylines +\centerline{\Large\bfseries Òåñò øðèôòîâ} + + +\bigskip +\rmfamily +\mdseries\upshape +{Îáû÷íûé} (roman), +\slshape +íàêëîííûé (slanted), +\itshape +êóðñèâ (italic), +\scshape +êàïèòåëü (small caps), +\fontseries b\upshape +ïîëóæèðíûé "<ñóæåííûé"> (bold), +\bfseries\upshape +ïîëóæèðíûé (bold extended), +\itshape +ïîëóæèðíûé êóðñèâ (bold italic), +\slshape +ïîëóæèðíûé íàêëîííûé (bold slanted), +\scshape +ïîëóæèðíàÿ êàïèòåëü (bold small caps), +\mdseries\fontshape{ui}\selectfont +"<ïðÿìîé"> êóðñèâ (upright italic). + +\bigskip +\sffamily +\mdseries\upshape +Ðóáëåíûé (sans serif), +\slshape +íàêëîííûé (slanted), +\itshape +"<êóðñèâ"> (italic), +\bfseries\upshape +ïîëóæèðíûé, +\itshape +ïîëóæèðíûé "<êóðñèâ"> (bold), +\slshape +ïîëóæèðíûé íàêëîííûé (bold slanted), +\fontseries{sbc}\upshape +ïîëóæèðíûé "<ñóæåííûé"> (semibold condenced). + +\bigskip +\ttfamily +\mdseries\upshape +Ïèøóùàÿ ìàøèíêà (typewriter) +\slshape +íàêëîííûé (slanted), +\itshape +êóðñèâ (italic), +\scshape +êàïèòåëü (small caps). + +\bigskip +\fontfamily{cmdh}% +\mdseries\upshape +Äàíõèëë (Danhill). + +\bigskip +\fontfamily{cmfib}% +\mdseries\upshape +Ôèáîíà÷÷è (Fibonacci), +\slshape +íàêëîííûé (slanted). + +\bigskip +\fontfamily{cmfr}% +\mdseries\upshape +Çàáàâíûé (funny roman), +\itshape +êóðñèâ (italic). + +\bigskip +\fontfamily{cmvtt}% +\mdseries\upshape +Ðàçíîøèðèííûé øðèôò ïèøóùåé ìàøèíêè (variable typewriter), +\itshape +êóðñèâ (italic). + +\bigskip +\fontfamily{ccr}% +\mdseries\upshape +Øðèôò äëÿ "<Êîíêðåòíîé ìàòåìàòèêè"> (concrete roman), +\slshape +íàêëîííûé (slanted), +\itshape +êóðñèâ (italic), +\scshape +êàïèòåëü (small caps), +\bfseries\upshape +ïîëóæèðíûé (bold), +\itshape +ïîëóæèðíûé êóðñèâ (bold italic), +\slshape +ïîëóæèðíûé íàêëîííûé (bold slanted), +\scshape +ïîëóæèðíàÿ êàïèòåëü (bold small caps), +\fontseries c\slshape +ñóæåííûé êóðñèâ (condensed italic). + +\bigskip +\fontfamily{cmbr}% +\mdseries\upshape +Øðèôò ñåìåéñòâà CM Bright, +\slshape +íàêëîííûé (slanted), +\itshape +êóðñèâ (italic), +\fontseries{sb}\upshape +ïîëóæèðíûé (semibold) +\itshape +ïîëóæèðíûé "<êóðñèâ"> (semibold italic), +\slshape +ïîëóæèðíûé íàêëîííûé (semibold slanted), +\bfseries\upshape +ïîëóæèðíûé (bold). + +\bigskip +\fontfamily{cmtl}% +\mdseries\upshape +Øðèôò ñåìåéñòâà CM Bright Typewriter, +\slshape +íàêëîííûé (slanted). + +\bigskip +\fontfamily{lcmss}% +\mdseries\upshape +Ðóáëåíûé øðèôò äëÿ ñëàéäîâ (slides sans serif), +\slshape +íàêëîííûé (slanted), +\bfseries\upshape +ïîëóæèðíûé (bold), +\mdseries{\fontshape{In}\selectfont +íåâèäèìûé ðóáëåíûé øðèôò äëÿ ñëàéäîâ} (invisible ss), +{\fontshape{Isl}\selectfont +íåâèäèìûé íàêëîííûé} {\slshape (invisible slanted)}. + +\bigskip +\fontfamily{lcmtt}% +\mdseries\upshape +Øðèôò ïèøóùåé ìàøèíêè äëÿ ñëàéäîâ (slides typewriter) +\itshape +êóðñèâ (italic), +\mdseries{\fontshape{In}\selectfont +íåâèäèìûé øðèôò ïèøóùåé ìàøèíêè} {\upshape (invisible tt)}. + +\end{document} diff --git a/Master/texmf-dist/doc/fonts/lh/samples/lh-t2atext.tex b/Master/texmf-dist/doc/fonts/lh/samples/lh-t2atext.tex new file mode 100644 index 00000000000..50b86c6cf7c --- /dev/null +++ b/Master/texmf-dist/doc/fonts/lh/samples/lh-t2atext.tex @@ -0,0 +1,143 @@ +% -*- TeX -*- -*- RU -*- +\documentclass[russian%,draft,dvips +]{book} + +\usepackage{mathtext} +%to test other T2*, X2, LCY encodings, change option to necessary one +%please note that hyphenation depends to font encoding! +\usepackage[T2A]{fontenc} +%to test other encodings, change cp1251 option to necessary one +%and load text in chosen encoding +\usepackage[cp1251]{inputenc} + +%var1: lh additions for bold concrete fonts +\usepackage{lh-T2Axccr} +%var2: the package below could be covered with fd-files +%\usepackage{lh-T2Accr} + +\usepackage{babel} +%was needed for one version of russianb +%\languageattribute{russian}{mdq} + +%do not create/modify aux-like files +%\nofiles +\begin{document} +\pagestyle{empty} + +\centerline{*\quad*\quad*} +\begin{verse}% +Äà! Òåïåðü ðåøåíî. Áåç âîçâðàòà\\ +ß ïîêèíóë ðîäíûå ïîëÿ.\\ +Óæ íå áóäóò ëèñòâîþ êðûëàòîé\\ +Íàäî ìíîþ çâåíåòü òîïîëÿ. +\bigskip + +Íèçêèé äîì áåç ìåíÿ ññóòóëèòñÿ,\\ +Ñòàðûé ï¸ñ ìîé äàâíî èçäîõ.\\ +Íà ìîñêîâñêèõ èçîãíóòûõ óëèöàõ\\ +Óìåðåòü, çíàòü, ñóäèë ìíå Áîã. +\bigskip + +ß ëþáëþ ýòîò ãîðîä âÿçåâûé,\\ +Ïóñòü îáðþçã îí è ïóñòü îäðÿõ.\\ +Çîëîòàÿ äðåìîòíàÿ Àçèÿ\\ +Îïî÷èëà íà êóïîëàõ. +\bigskip + +À êîãäà íî÷üþ ñâåòèò ìåñÿö.\\ +Êîãäà ñâåòèò\ldots{} ÷¸ðò çíàåò êàê!\\ +ß èäó, ãîëîâîþ ñâåñÿñü,\\ +Ïåðåóëêîì â çíàêîìûé êàáàê. +\bigskip + +Øóì è ãàì â ýòîì ëîãîâå æóòêîì,\\ +Íî âñþ íî÷ü íàïðîë¸ò, äî çàðè,\\ +ß ÷èòàþ ñòèõè ïðîñòèòóòêàì\\ +È ñ áàíäèòàìè æàðþ ñïèðò. +\bigskip + +Ñåðäöå áü¸òñÿ âñå ÷àùå è ÷àùå,\\ +È óæ ÿ ãîâîðþ íåâïîïàä:\\ +"<ß òàêîé æå, êàê âû ïðîïàùèé,\\ +Ìíå òåïåðü íå óéòè íàçàä">. +\bigskip + +Íèçêèé äîì áåç ìåíÿ ññóòóëèòñÿ,\\ +Ñòàðûé ï¸ñ ìîé äàâíî èçäîõ.\\ +Íà ìîñêîâñêèõ èçîãíóòûõ óëèöàõ\\ +Óìåðåòü, çíàòü, ñóäèë ìíå Áîã. +\bigskip + +\rightline{\small\slshape Ñ.\,Åñåíèí, 1922} +\end{verse} + +\newpage +\fontfamily{ccr}\selectfont + +\centerline{\bfseries ÑÎÁÀÊÅ ÊÀ×ÀËÎÂÀ} +\begin{verse}% +Äàé, Äæèì, íà ñ÷àñòüå ëàïó ìíå,\\ +Òàêóþ ëàïó íå âèäàë ÿ ñðîäó.\\ +Äàâàé ñ òîáîé ïîëàåì ïðè ëóíå\\ +Íà òèõóþ áåñøóìíóþ ïîãîäó.\\ +Äàé, Äæèì, íà ñ÷àñòüå ëàïó ìíå. +\bigskip + +Ïîæàëóéñòà, ãîëóá÷èê, íå ëèæèñü.\\ +Ïîéìè ñî ìíîé õîòü ñàìîå ïðîñòîå.\\ +Âåäü òû íå çíàåøü, ÷òî òàêîå æèçíü,\\ +Íå çíàåøü òû, ÷òî æèòü íà ñâåòå ñòîèò. +\bigskip + +Õîçÿèí òâîé è ìèë è çíàìåíèò\\ +È ó íåãî ãîñòåé áûâàåò â äîìå ìíîãî,\\ +È êàæäûé, óëûáàÿñü, íîðîâèò\\ +Òåáÿ ïî øåðñòè áàðõàòíîé ïîòðîãàòü. +\bigskip + +Òû ïî-ñîáà÷üè äüÿâîëüñêè êðàñèâ,\\ +Ñ òàêîþ ìèëîþ äîâåð÷èâîé ïðèÿòöåé.\\ +È, íèêîãî íè êàïëè íå ñïðîñèâ,\\ +Êàê ïüÿíûé äðóã, òû ëåçåøü öåëîâàòüñÿ. +\bigskip + +Ìîé ìèëûé Äæèì, ñðåäè òâîèõ ãîñòåé\\ +Òàê ìíîãî âñÿêèõ è íåâñÿêèõ áûëî.\\ +Íî òà, ÷òî âñåõ áåçìîëâíåé è ãðóñòíåé,\\ +Ñþäà ñëó÷àéíî âäðóã íå çàõîäèëà? +\bigskip + +Îíà ïðèä¸ò, äàþ òåáå ïîðóêó.\\ +È áåç ìåíÿ, â å¸ óñòàâÿñü âçãëÿä,\\ +Òû çà ìåíÿ ëèçíè åé íåæíî ðóêó\\ +Çà âñ¸, â ÷¸ì áûë è íå áûë âèíîâàò. +\bigskip + +\rightline{\small\slshape Ñ.\,Åñåíèí, 1925} +\end{verse} + +\newpage + +\fontfamily{cmbr}\selectfont + +\ldots + +\cdash--* Ñóäàðûíÿ, \cdash--- ãîâîðþ ÿ, \cdash--- îñòîðîæíåå ïîâîðà÷èâàéòå ìëàäåíöà, íå çàáóäüòå, ÷òî îí ðîæä¸í ðàíåå ñðîêà. Ñìåðòü ýòîãî ìëàäåíöà îçíà÷àëà áû òÿæåëåéøóþ óòðàòó äëÿ âàøåé ñòðàíû! + +\cdash--* Ìîé áîã! Ãîñïîæà Ïîêëåí ðîäèò äðóãîãî! + +\cdash--* Ãîñïîæà Ïîêëåí íèêîãäà áîëåå íå ðîäèò òàêîãî, è íèêàêàÿ äðóãàÿ ãîñïîæà â òå÷åíèå íåñêîëüêèõ ñòîëåòèé òàêîãî íå ðîäèò. + +\cdash--* Âû ìåíÿ èçóìëÿåòå, ñóäàðü! + +\cdash--* ß è ñàì èçóìë¸í. Ïîéìèòå, ÷òî ïî ïðîøåñòâèè òð¸õ âåêîâ, â äàë¸êîé ñòðàíå, ÿ áóäó âñïîìèíàòü î âàñ òîëüêî ïîòîìó, ÷òî âû ñûíà ãîñïîäèíà Ïîêëåíà äåðæàëè â ðóêàõ. + +\cdash--* ß äåðæàëà â ðóêàõ è áîëåå çíàòíûõ ìëàäåíöåâ. + +\cdash--* ×òî ïîíèìàåòå âû ïîä ñëîâîì \cdash--- çíàòíûé? Ýòîò ìëàäåíåö ñòàíåò áîëåå èçâåñòåí, ÷åì íûíå öàðñòâóþùèé êîðîëü âàø Ëþäîâèê XIII, îí ñòàíåò áîëåå çíàìåíèò, ÷åì ñëåäóþùèé êîðîëü, à ýòîãî êîðîëÿ, ñóäàðûíÿ, íàçîâóò Ëþäîâèê Âåëèêèé èëè êîðîëü-ñîëíöå! Äîáðàÿ ãîñïîæà, åñòü äàë¸êàÿ ñòðàíà, âû íå çíàåòå å¸, ýòî \cdash--- Ìîñêîâèÿ. Íàñåëåíà îíà ëþäüìè, ãîâîðÿùèìè íà ñòðàííîì äëÿ âàøåãî óõà ÿçûêå. È â ýòó ñòðàíó âñêîðå ïðîíèêíóò ñëîâà òîãî, êîãî âû ñåé÷àñ ïðèíèìàåòå. Íåêèé ïîëÿê, øóò öàðÿ Ïåòðà Ïåðâîãî, óæå íå ñ âàøåãî, à ñ íåìåöêîãî ÿçûêà ïåðåâåä¸ò èõ íà âàðâàðñêèé ÿçûê. + +\ldots + +\rightline{\small\slshape Ì.\,Áóëãàêîâ, Æèçíü \mbox{ã-íà} äå~Ìîëüåðà, 1932--33\,ãã.} + +\end{document} diff --git a/Master/texmf-dist/doc/fonts/lh/tex/11ex-rs.tex b/Master/texmf-dist/doc/fonts/lh/tex/11ex-rs.tex deleted file mode 100644 index 6ef3fd6140a..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/tex/11ex-rs.tex +++ /dev/null @@ -1,69 +0,0 @@ -% -% 11ex-rs.tex -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% TeX file for creation Cyrillic Europian Computer Modern font -% in XSlav encoding -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% set defaults -\input cfhead -\lhvercheck(3,4) - -% Two first font/enc letters: -\def\fonttwoletters{rs}\def\encodingletters{xs} -% Encoding data file: enc-t2.tex (default) -% Font headers data file: -\def\fontfile{\fntallec} -% Text for ??begin: absent (default) -\def\defamily{roman_ec:=false; more_letters:=true; old_cyr:=true; genmode:="ex"; % - enc_name:="XSlav";} -% Lettercode output: \char"HEX -\codehatsfalse - -\usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files - -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvec} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconec} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntbriec} -\input cfstdedt -\endgroup -\fi -\end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/11ex-rx.tex b/Master/texmf-dist/doc/fonts/lh/tex/11ex-rx.tex deleted file mode 100644 index c14aa1878ea..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/tex/11ex-rx.tex +++ /dev/null @@ -1,67 +0,0 @@ -% -% 11ex-rx.tex -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% TeX file for creation Cyrillic Europian Computer Modern font -% in X2 encoding -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% set defaults -\input cfhead -\lhvercheck(3,4) - -% Two first font/enc letters: -\def\fonttwoletters{rx}\def\encodingletters{x2} -% Encoding data file: enc-t2.tex (default) -% Font headers data file: -\def\fontfile{\fntallec} -% Text for ??begin: absent (default) -% Lettercode output: \char"HEX -\codehatsfalse - -\usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files - -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvec} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconec} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntbriec} -\input cfstdedt -\endgroup -\fi -\end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/12ex-la.tex b/Master/texmf-dist/doc/fonts/lh/tex/12ex-la.tex deleted file mode 100644 index d87e5df3c78..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/tex/12ex-la.tex +++ /dev/null @@ -1,66 +0,0 @@ -% -% 12ex-la.tex -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% TeX file for creation Latin-Cyrillic Europian Computer Modern font -% in T2A encoding -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% set defaults -\input cfhead -\lhvercheck(3,4) - -% Two first font/enc letters: -\def\fonttwoletters{la}\def\encodingletters{ta} -% Encoding data file: enc-t2.tex (default) -% Font headers data file: -\def\fontfile{\fntallec} -% Text for ??begin: absent (default) -% Lettercode output: ^^hex (default) - -\usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files - -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvec} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconec} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntbriec} -\input cfstdedt -\endgroup -\fi -\end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/14ex-lc.tex b/Master/texmf-dist/doc/fonts/lh/tex/14ex-lc.tex deleted file mode 100644 index 89b1c3d6088..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/tex/14ex-lc.tex +++ /dev/null @@ -1,66 +0,0 @@ -% -% 14ex-lc.tex -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% TeX file for creation Latin-Cyrillic Europian Computer Modern font -% in T2C encoding -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% set defaults -\input cfhead -\lhvercheck(3,4) - -% Two first font/enc letters: -\def\fonttwoletters{lc}\def\encodingletters{tc} -% Encoding data file: enc-t2.tex (default) -% Font headers data file: -\def\fontfile{\fntallec} -% Text for ??begin: absent (default) -% Lettercode output: ^^hex (default) - -\usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files - -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvec} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconec} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntbriec} -\input cfstdedt -\endgroup -\fi -\end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/15ex-ld.tex b/Master/texmf-dist/doc/fonts/lh/tex/15ex-ld.tex deleted file mode 100644 index 65d5b47d732..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/tex/15ex-ld.tex +++ /dev/null @@ -1,66 +0,0 @@ -% -% 15ex-lc.tex -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% TeX file for creation Latin-Cyrillic Europian Computer Modern font -% in T2C encoding -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% set defaults -\input cfhead -\lhvercheck(3,4) - -% Two first font/enc letters: -\def\fonttwoletters{ld}\def\encodingletters{td} -% Encoding data file: enc-t2.tex (default) -% Font headers data file: -\def\fontfile{\fntallec} -% Text for ??begin: absent (default) -% Lettercode output: ^^hex (default) - -\usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files - -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvec} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconec} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntbriec} -\input cfstdedt -\endgroup -\fi -\end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/47ex-tx.tex b/Master/texmf-dist/doc/fonts/lh/tex/47ex-tx.tex deleted file mode 100644 index 8eaf6bb7b8e..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/tex/47ex-tx.tex +++ /dev/null @@ -1,69 +0,0 @@ -% -% 47ex-tx.tex -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% TeX file for creation Cyrillic Europian Computer Modern font -% in X2 encoding -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% set defaults -\input cfhead -\lhvercheck(3,4) - -% Two first font/enc letters: -\def\fonttwoletters{tx} -% Encoding data file: enc-t2.tex (default) -% Font headers data file: -\def\fontfile{\fntallec} -% Text for ??begin: absent (default) -\def\defamily{roman_ec:=false; more_letters:=true; other_cyr:=true; genmode:="ex"; % - enc_name:="Trash";} -% Lettercode output: \char"HEX -\codehatsfalse - -\usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files - -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvec} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconec} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntbriec} -\input cfstdedt -\endgroup -\fi -\end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/99-cmstd.tex b/Master/texmf-dist/doc/fonts/lh/tex/99-cmstd.tex deleted file mode 100644 index c6dfa8581fd..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/tex/99-cmstd.tex +++ /dev/null @@ -1,83 +0,0 @@ -% -% 99allenc.tex -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% TeX file for creation all Standard Latin-Cyrillic font -% in all more or less standard LH encodings -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% set defaults -\input cfhead -\lhvercheck(3,4) - -\usesetter -\def\NMFJobFileName {all-enc.mfj} - -%lh MS DOS Alternative Cyrillic -\begingroup -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup - -\MFJobheadfalse % don't create MFJob head from this point - -%wn WNCYR -\begingroup -\def\fonttwoletters{wn}\wncodingtrue -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup - -\iffalse %COMMENT -%ic ISO Cyrillic -\begingroup -\def\fonttwoletters{ic} -\def\defamily{more_letters:=true; other_cyr:=true; enc_name:="ISO8859-5";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup - -%wc Windows Cyrillic -\begingroup -\def\fonttwoletters{wc} -\def\defamily{more_letters:=true; other_cyr:=true; enc_name:="Win-1251";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup - -%mc Mac Cyrillic -\begingroup -\def\fonttwoletters{mc} -\def\defamily{more_letters:=true; other_cyr:=true; enc_name:="Mac Ukr";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup - -%kc KOI Cyrillic -\begingroup -\def\fonttwoletters{kc}\def\encodingletters{8h} -\def\defamily{enc_name:="KOI8-R";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi %END COMMENT - -\end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntallec.tex b/Master/texmf-dist/doc/fonts/lh/tex/fntallec.tex deleted file mode 100644 index 33bf856f5d7..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntallec.tex +++ /dev/null @@ -1,171 +0,0 @@ -% -% fntallec.tex -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% Data TeX file of head files for ec-like fonts: full assortment -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\lhvercheck(3,4) - -% file names depend to necessary encoding -% - \tablevalues ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] - 29.86[2986] 35.83[3583]) - - \makefont\fonttwoletters rm %cmr - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters sl %cmsl - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters bx %cmbx - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters bl %cmbxsl - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters rb %cmb - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters ti %cmti - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters ui %cmu - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters bi %cmbxti - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters cc %csc - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters xc %bx/csc - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters sc %sl/csc - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters oc %/bx/sl/csc - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters ci % - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters tt %cmtt - (% 5[0500] 6[0600] 7[0700] - 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters it %cmitt - (% 5[0500] 6[0600] 7[0700] - 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters vt %cmvtt - (% 5[0500] 6[0600] 7[0700] - 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters vi %vtt\it - (% 5[0500] 6[0600] 7[0700] - 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters tc %cmtcsc - (% 5[0500] 6[0600] 7[0700] - 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters st % - (% 5[0500] 6[0600] 7[0700] - 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters ss %cmss - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters si %cmssi - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters sx %cmssbx - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() - \makefont\fonttwoletters so % - ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] - 10[1000] 10.95[1095] 12[1200] 14.4[1440] - 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] - 35.83[3583])() -% \makefont\fonttwoletters ff %cmff -% ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] -% 10[1000] 10.95[1095] 12[1200] 14.4[1440] -% 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] -% 35.83[3583])() -% \makefont\fonttwoletters fi %cmfi -% ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] -% 10[1000] 10.95[1095] 12[1200] 14.4[1440] -% 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] -% 35.83[3583])() -% \makefont\fonttwoletters fb %cmfib -% ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] -% 10[1000] 10.95[1095] 12[1200] 14.4[1440] -% 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] -% 35.83[3583])() -% \makefont\fonttwoletters dh %cmdh -% ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] -% 10[1000] 10.95[1095] 12[1200] 14.4[1440] -% 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] -% 35.83[3583])() - diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntconcm.tex b/Master/texmf-dist/doc/fonts/lh/tex/fntconcm.tex deleted file mode 100644 index 9e7358330db..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntconcm.tex +++ /dev/null @@ -1,38 +0,0 @@ -% -% fntconcm.tex -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% Data TeX file of head files for cm-like fonts: concrete fonts -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\lhvercheck(3,4) - -% file names depend to necessary encoding -% -\MakeFileHeadstrue % always do font heads - \tablevalues ( 5 6 7 8 9 10 ) - - \makefont \fonttwoletters cr ( 5 6 7 8 9 10 )(% - def concrete=true enddef;) - \makefont \fonttwoletters csl ( 9 10 )(% - def concrete=true enddef;) - \makefont \fonttwoletters cslc ( 9 )(% - def concrete=true enddef;) - \makefont \fonttwoletters cti ( 10 )(% - def concrete=true enddef;) - \makefont \fonttwoletters ccsc ( 10 )(% - def concrete=true enddef;) -\endinput diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntconec.tex b/Master/texmf-dist/doc/fonts/lh/tex/fntconec.tex deleted file mode 100644 index b88c4dc6207..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntconec.tex +++ /dev/null @@ -1,36 +0,0 @@ -% -% fntconec.tex -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% Data TeX file of head files for ec-like fonts: concrete fonts -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\lhvercheck(3,4) - -% file names depend to necessary encoding -% -\MakeFileHeadstrue % always do font heads - \tablevalues ( 5 6 7 8 9 10 ) - - \makefont \fonttwoletters orm ( 5 6 7 8 9 10 )(% - def concrete=true enddef;) - \makefont \fonttwoletters osl ( 5 6 7 8 9 10 )(% - def concrete=true enddef;) - \makefont \fonttwoletters oti ( 10 )(% - def concrete=true enddef;) - \makefont \fonttwoletters occ ( 10 )(% - def concrete=true enddef;) -\endinput diff --git a/Master/texmf-dist/doc/fonts/lh/tex/likergrp.tex b/Master/texmf-dist/doc/fonts/lh/tex/likergrp.tex deleted file mode 100644 index d0dba619d32..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/tex/likergrp.tex +++ /dev/null @@ -1,409 +0,0 @@ -% -% likergrp.tex -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% Data TeX file ligs & kerns -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\lhvercheck(3,4) - -\lkgroup{A_}{% - \(A) - \(L_YUS) \(IL_YUS) \(VL_YUS) - \(A_brv) \(A_uml) \(A_bar) \(A_ac) - \(L_YUS_ac) \(IL_YUS_ac) - } -\lkgroup{Alo_}{% - \WL{if kapitel:} - \(a) - \WL{fi} - \(l_yus) \(il_yus) \(Vl_yus) - \(l_yus_ac)\(il_yus_ac) - } -% -\lkgroup{Asc_}{% - \(a) - \(a_brv) \(a_uml) \(a_bar) \(a_ac) - } -% -\lkgroup{_A}{% - \(A) - \(AE) - \(L_YUS) \(VL_YUS) - \(A_brv) \(A_uml) \(A_bar) \(A_ac) - \(L_YUS_ac) - } -\lkgroup{_Alo}{% - \WL{if kapitel:} - \(a) - \WL{fi} - \(ae) - \(l_yus) \(Vl_yus) - \(l_yus_ac) - } -\lkgroup{_Asc}{% - \(a) - \(a_brv) \(a_uml) \(a_bar) \(a_ac) - } -%%%%% -\lkgroup{_J}{% - \(L) - \(LJE) \(L_tl) \(L_dsc) - \(L_ldot) - \(OLG) - } -\lkgroup{_Jlo}{% - \(d) - \(l) - \(lje) \(l_tl) \(l_dsc) - \(l_ldot) - \(olg) - } -%%%%% -\lkgroup{bup_}{% - \(HRDSN) \(SFTSN) - \(DJE) \(LJE) \(NJE) - \(YAT) \(SEMISN) - \(P_tl) - \(SHHA) - \(OHRDSN) - \(YAT_ac) \(HRDSN_ac) \(DJE_ac) - } -\lkgroup{blo_}{% - \(hrdsn) \(sftsn) - \WL{if SmallCapsfont:} - \(dje) - \WL{fi} - \(lje) \(nje) - \(yat) \(semisn) - \(p_tl) - \WL{if SmallCapsfont:} - \(shha) - \WL{fi} - \(ohrdsn) - \(hrdsn_ac) \(yat_ac) - \WL{if SmallCapsfont:} - \(dje_ac) - \WL{fi} - } -%%%%% -\lkgroup{R_}{% - \(B_YUS) \(IB_YUS) - \(B_YUS_ac) \(IB_YUS_ac) - } -%% -\lkgroup{Rlo_}{% - \(b_yus) \(ib_yus) - \(b_yus_ac) \(ib_yus_ac) - } -%%% -\lkgroup{_R}{% - \(YA) \(B_YUS) - \(YA_bar) - \(YA_ac) \(B_YUS_ac) - } -%% -\lkgroup{_Rlo}{% - \(ya) \(b_yus) - \(ya_bar) - \(ya_ac) \(b_yus_ac) - } -%%%%% -\lkgroup{K_}{% - %\labeligchar{K}{if wn: setlig\("H",H) setlig\("h",H) fi} - \(KJE) \(K_dsc) \(K_vcrs) \(K_hcrs) \(K_beak) - \(ZH) \(ZH_dsc) \(ZH_brv) \(ZH_uml) - \(H) \(H_dsc) \(H_hcrs) \(H_tl) - } -%% -\lkgroup{k_}{% - %\labeligchar{k}{if wn: setlig\("h",h) fi} - \(kje) \(k_dsc) \(k_vcrs) \(k_hcrs) \(k_beak) - \(zh) \(zh_dsc) \(zh_brv) \(zh_uml) - \(h) \(h_dsc) \(h_hcrs) \(h_tl) - } -%%% -\lkgroup{K}{% - \(ZH) \(ZH_dsc) \(ZH_brv) \(ZH_uml) - \(H) \(H_dsc) \(H_hcrs) \(H_tl) - } -%% -\lkgroup{k}{% - \(zh) \(zh_dsc) \(zh_brv) \(zh_uml) - \(h) \(h_dsc) \(h_hcrs) \(h_tl) - } -%%%%% -\lkgroup{O_}{% - \(YU) - \(YU_bar) \(YU_ac) - } -\lkgroup{O}{% - \(O) \(O_uml) \(O_bar) \(O_ac) %\(O_lcom) - \(F) - \(OTLD) \(OTLD_uml) \(OTLD_bar) \(OTLD_ac) - \(ABH_HA) - \(LAT_Q) - \(OMGA) \(OMGA_tlo) \(OT) - \(PSI) - \(FITA) - \(OMGA_rnd) \(OO_cdot) \(OO_cddot) - } -\lkgroup{o_}{% - \(b) \(yu) - \(yu_bar) \(yu_ac) - } -\lkgroup{o}{% - \(o) \(o_uml) \(o_bar) \(o_ac) %\(o_lcom) - \(otld) \(otld_uml) \(otld_bar) \(otld_ac) - \(abh_ha) - \(omga) \(omga_tlo) \(ot) - \(fita) - \(omga_rnd) \(oo_cdot) \(oo_cddot) - } -\lkgroup{Osc}{% - \(f) - \(lat_q) - \(psi) - } -%%%%% -\lkgroup{_C}{% not used in ligtable - %\labeligchar{S}{if wn: setlig\("H",SH) setlig\("h",SH) fi} - \(S)%<- - \(S_dsc) - \(UKR_E) \(UKR_E_ac) - \(KOPPA) \(AZ) - } -%%% -\lkgroup{_c}{% - %\labeligchar{s}{if wn: setlig\("h",sh) fi} - \(s_dsc) - \(ukr_e) \(ukr_e_ac) - \(koppa) \(az) - } -%%%%% -\lkgroup{C_}{% - \(EREV) - \(SCHWA) \(SCHWA_uml) - \(EREV_uml) \(EREV_bar) \(EREV_dot) - \(EREV_ac) \(SCHWA_ac) - } -%% -\lkgroup{c_}{% - \(erev) - \(schwa) \(schwa_uml) - \(erev_uml) \(erev_bar) \(erev_dot) - \(erev_ac) \(schwa_ac) - } -%%%%% -\lkgroup{T_}{% - %\labeligchar{T}{if wn: setlig\("S",C) setlig\("s",C) fi} - \(T_dsc) - \(G) \(GJE) \(G_hcrs) %\(G_up) - \(NG) - \(VG_hcrs) \(G_dsc) \(G_crsdsc) - \(OLG) - \(T_lcom) - } -%% -\lkgroup{Tlo_}{% - %\labeligchar{t}{if wn: setlig\("s",c) setlig\("s",c) fi} - \(t_dsc) \(t_lcom) - \(g) \(gje) \(g_up) \(g_hcrs) - \(ng) - \(Vg_hcrs) \(g_dsc) \(g_crsdsc) - \(olg) - } -%%% -\lkgroup{_T}{% - \(T) \(T_dsc) \(T_lcom) - \(HRDSN) - \(DJE) \(TSHE) - \(YAT) \(SEMISN) - \(K_beak) \(TETSE) - \(OHRDSN) \(OERY) - \(YAT_ac) \(DJE_ac) - } -\lkgroup{_Tlo}{% - \(t) \(t_dsc) \(t_lcom) - \(hrdsn) - \(yat) \(semisn) - \(k_beak) \(tetse) - \(ohrdsn) \(oery) - \(yat_ac) - } -\lkgroup{_Tsc}{% - \(dje) \(tshe) - \(dje_ac) - } -%%%%% -\lkgroup{Y}{% - \(Y) \(Y_hcrs) - \(Y_bar) \(Y_ac) - } -\lkgroup{YV}{% - \(U) \(U_shrt) - \(U_uml) \(U_dac) \(U_hat) \(U_tld) %\(U_com) - \(U_bar) \(U_gr) \(U_ac) - } -\lkgroup{y}{% - \(u) \(u_shrt) - \(u_bar) \(u_gr) \(u_ac) - \(u_uml) \(u_dac) \(u_hat) \(u_tld) %\(u_com) - \(y) \(y_hcrs) - \(y_bar) \(y_ac) - } -% -\lkgroup{V}{% - \(IZH) \(IZH_dgr) \(IZH_uml) \(IZH_ac) - \(LAT_W) - } -\lkgroup{v}{% - \(izh) \(izh_dgr) \(izh_uml) \(izh_ac) - \(lat_w) - } -% -\lkgroup{P_}{% - \(R) - \(R_dsc) \(R_brv) \(R_gcrs) - \(CHERV) - } -\lkgroup{Plo_}{% - \(r) - \(r_dsc) \(r_brv) \(r_gcrs) \(r_tl) - \(cherv) -} -% -\lkgroup{_P}{% - \(CH) \(CH_ldsc) \(CH_rdsc) \(CH_vcrs) \(CH_uml) - \(CHERV) - } -\lkgroup{_Plo}{% - \(ch) \(ch_ldsc) \(ch_rdsc) \(ch_vcrs) \(ch_uml) - \(cherv) - } -% -\lkgroup{I}{% - \(LAT_I) - \(UKR_I) - \(VIZHE) - \(LAT_I_dsc) \(LAT_I_dot) - \(LAT_I_ac) \(UKR_I_ac) - } -% -\lkgroup{i}{% - \(lat_i) -% \(ukr_i) - \(izhe) - \(lat_i_dsc) - \(lat_i_ac) %\(ukr_i_ac) - } -% -\lkgroup{eh}{% - \(ABH_CH) \(ABH_CH_dsc) - } -\lkgroup{ehl}{% - \(abh_ch) \(abh_ch_dsc) - } -% -%new! -\lkgroup{DSC_}{% - \(C) \(SHCH) - \(ZH_dsc)\(K_dsc) - \(L_dsc) \(M_dsc) \(N_dsc) \(CH_rdsc) - \(LAT_I_dsc) \(I_shdsc) -} -% -\lkgroup{dsc_}{% - \(c) \(shch) - \(zh_dsc)\(k_dsc) \(l_dsc) \(m_dsc) \(n_dsc) \(ch_rdsc) - \(lat_i_dsc) (i_shdsc) -} - - -%%%%%%%%%%%% -% Lowercases only -\lkgroup{a}{% - \(a) - \(a_brv) \(a_uml) \(a_bar) \(a_ac) - } -\lkgroup{e}{% - %\labeligchar{e}{% - %if wn: setlig\("0",yo) setlig\("1",erev) setlig\("2",ukr_e) fi} - \(yo) - \(e_brv) - \(e_ac) \(yo_ac) - } -\lkgroup{p_}{% - \(r) \(f) - \(psi) - } -\lkgroup{_q}{% - \(f) - \(lat_q) - \(psi) - } - -%%%%%%%% -% Italic -\lkgroup{Tit}{% - \(hrdsn) - \(k_beak) \(tetse) - \(hrdsn_ac) - } -\lkgroup{nit}{% - \(k) \(kje) \(k_dsc) \(k_vcrs) \(k_tl) - \(n) \(nje) \(n_dsc) \(n_tl) \(ng) - \(p) \(p_tl) - \(t) \(t_dsc) - \(yu) - \(yat) - \(yu_ac) \(yat_ac) - } -\lkgroup{uit}{% - \(i) \(i_shrt) \(i_bar) \(i_uml) - \(c) \(sh) \(shch) - \(sftsn) - \(ery) \(ery_uml) - \(i_ac) \(ery_ac) - } -\lkgroup{yit}{% - \(u) \(u_shrt) - \(u_uml) \(u_bar) \(u_dac) - \(u_tld) \(u_hat) \(u_gr) \(u_ac) %\(u_com) - } -\lkgroup{vit}{% - \(y) \(y_hcrs) - \(izh) \(izh_dgr) \(izh_uml) - \(lat_w) - \(y_bar) - \(izh_ac) - } -\lkgroup{iit}{% - \(lat_i) - %\(ukr_i) - \(lat_i_dsc) %\(lat_i_dot) - \(ukr_i_ac) \(lat_i_ac) - } -\lkgroup{Jit}{% - \(l) \(m) - \(lje) - \(g_up) - \(l_dsc) \(l_tl) - \(m_dsc) \(m_tl) - \(l_ldot) - } -% -% end of likergrp.tex diff --git a/Master/texmf-dist/doc/fonts/lh/tex/setter.tex b/Master/texmf-dist/doc/fonts/lh/tex/setter.tex deleted file mode 100644 index 121b4001cd3..00000000000 --- a/Master/texmf-dist/doc/fonts/lh/tex/setter.tex +++ /dev/null @@ -1,55 +0,0 @@ -% -% setter.tex -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% The example file of resetting some defaults -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% - -\def\fntallcm{fntbercm} % Font assortment for CM-like fonts -\def\fntallec{fntberec} % Font assortment for EC-like fonts - -\MakeFileHeadsfalse % Create font file headers ? -\SliTeXtrue % Create SliTeX font file headers ? -%\SliTeXfalse % Create SliTeX font file headers ? -\Concretetrue % Create concrete font file headers ? -%\Concretefalse % Create concrete font file headers ? -\CMBrighttrue % Create CM Bright font file headers ? -%\CMBrightfalse % Create CM Bright font file headers ? - -\MakeDvifalse % Create DVI file ? - -%for experts -%\MakeFontEnctrue % Create encoding files ? -\MakeFontEncfalse % Create encoding files ? -%\Babeltrue % Create encoding files like LaTeX2e XXXdef.enc ? -%\Babelfalse % Create encoding files like LaTeX2e XXXdef.enc ? - -%\TFMonlyfalse % Create tfm-files only ? -\TFMonlytrue % Create tfm-files only ? - -\doBatchfalse % Create Batch file - % [true option is only for experts; that was heavily - % borrowed from EC's ecstdedt.tex and had not any testing] - -\doMFJobtrue % Create MFJob file ? -%\doMFJobfalse % Create MFJob file ? -%\def\jobmodedef{m} % (works if \doMFJobtrue) -%\def\fmtbase{plain} % (works if \doMFJobtrue) -%\def\mfjobscaling{s0} % (works if \doMFJobtrue) -%\def\mfcommand{} % (works if \doMFJobtrue) - -\endinput diff --git a/Master/texmf-dist/fonts/source/lh/base/fikparm.mf b/Master/texmf-dist/fonts/source/lh/base/fikparm.mf index dcd04088cd1..7ce793a6b50 100644 --- a/Master/texmf-dist/fonts/source/lh/base/fikparm.mf +++ b/Master/texmf-dist/fonts/source/lh/base/fikparm.mf @@ -4,13 +4,14 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. +% % % Content: % @@ -45,9 +46,9 @@ % -% defining LHver_check 3.4 +% defining LHver_check 3.5 % -lh_maj_ver:=3; lh_min_ver:=4; % version identification +lh_maj_ver:=3; lh_min_ver:=5; % version identification def LHver_check(expr e,f)= if e>lh_maj_ver: message "LH font warning: Obsolete base"; elseif e<lh_maj_ver: message "LH font warning: File from old release found"; @@ -66,9 +67,12 @@ if unknown fonteq: def fonteq=2 enddef; fi -if unknown cmbright: - if unknown ebbase: def cmbright=false enddef; - else: def cmbright=true enddef; +% -- set boolean for cmbright fonts (vvv) +if unknown cmbright: boolean cmbright; + if unknown ebbase: + cmbright:=false; + ebbase:=0; + else: cmbright:=true; fi; fi @@ -121,11 +125,14 @@ unic:=false; boolean is_ogonek; is_ogonek=false; % -- `true' not supported in current version -boolean specific,kapitel; -specific=false; -kapitel:=false; if unknown concrete: - boolean concrete; concrete=false; + boolean concrete; concrete:=false; +fi +if unknown specific: + boolean specific; specific:=false; +fi +if unknown kapitel: + boolean kapitel; kapitel:=false; fi % -- set flags for ligature and kerning stuff @@ -171,16 +178,9 @@ fi boolean altcoding; altcoding:= if wncoding or vfcoding: false else: true fi; -% -- start base file -if not cmbright: -if (genmode="ex") or (genmode="ec"): - if unknown exbase: input exbase; fi -else: - if unknown cmbase: input cmbase; fi -fi -fi - -if unknown ligs: newinternal ligs; fi % exbase, ebbase +% -- start base file: +% exbase won't loaded for run in small memory systems +if unknown cmbase: input cmbase; fi % -- additional macros for ec compatible mode input lcyrbeg; @@ -221,35 +221,39 @@ vardef use_driver @# (expr fonteq) = ii:=ii-1; ss:=substring(length(param_base)-ii,length(param_base)) of param_base; if (genmode="ex") or (genmode="ec"): -if concrete: - gensize:=scantokens(ss); - ss:="input eo"& (substring(fonteq+1,length(param_base)) of param_base); -elseif cmbright: - %gensize:=scantokens(ss); - ss:="input eb"& (substring(fonteq+1,length(param_base)) of param_base); -else: + exbase:=1; %!!! THAT'S TRICK: we don't need exbase at all +% added flag for concrete + if concrete: + gensize:=scantokens(ss); + ss:="input eo"& (substring(fonteq+1,length(param_base)) of param_base); + elseif cmbright: + exbase:=1; %!!! THAT'S TRICK: we don't need exbase at all + gensize:=scantokens(ss); + ss:="input eb"& (substring(fonteq+1,length(param_base)) of param_base); + else: % - set gensize for ec parameter files - if (ss="8") or (ss="10"): % for EC slitex fonts - gensize:=scantokens(ss); - ss:="input "& (substring(0,fonteq-2) of param_base) & "ec" - & (substring(fonteq,length(param_base)) of param_base); - else: - gensize:=scantokens(ss)/100; - ss:="input ec" & (substring(fonteq,length(param_base)-ii) of param_base); - fi -fi + if (ss="8") or (ss="10"): % for EC slitex fonts + gensize:=scantokens(ss); + ss:="input "& (substring(0,fonteq-2) of param_base) & "ec" + & (substring(fonteq,length(param_base)) of param_base); + else: + gensize:=scantokens(ss)/100; + ss:="input ec" & (substring(fonteq,length(param_base)-ii) of param_base); + fi + fi else: % - set gensize for cm parameter files - gensize:=scantokens(ss); -if concrete: - ss:="input "& "cc" & (substring(fonteq+1,length(param_base)) of param_base); -else: -% HERE could be cm or cc genmode: vvvvvvv - ss:="input "& (substring(0,fonteq-2) of param_base) & genmode - & (substring(fonteq,length(param_base)) of param_base); -fi + gensize:=scantokens(ss); +% added flag for concrete + if concrete: + ss:="input cc"& (substring(fonteq+1,length(param_base)) of param_base); + else: +% HERE could be cm genmode: vvvvvvv + ss:="input "& (substring(0,fonteq-2) of param_base) & genmode + & (substring(fonteq,length(param_base)) of param_base); + fi fi -%show gensize,ss; + show gensize,ss; % % - set font_identifier numeric true_pt#; true_pt#=pt#; @@ -264,10 +268,10 @@ fi % - input driver file scantokens("input "& if genmode="ex": - if driver_name= "exroman" : "leroman" + if driver_name= "exroman" : "leroman" % also cmbright&ec (vvv) + elseif driver_name= "ebroman" : "lebroman" % cmbright&ec (vvv) elseif driver_name= "extextit": "letextit" elseif driver_name= "excsc" : "lecsc" - elseif driver_name= "ebroman" : "leroman" else: driver_name fi elseif genmode="ec": if driver_name= "exroman" : "ldroman" @@ -276,11 +280,12 @@ fi else: driver_name fi else: if driver_name= "roman" : "ldroman" - elseif driver_name= "sroman" : "ldroman" % slitex must be true - elseif driver_name= "broman" : "ldroman" + elseif driver_name= "sroman" : "ldroman" % slitex must be true + elseif driver_name= "broman" : "ldbroman" % cmbright (vvv) elseif driver_name= "textit" : "ldtextit" elseif driver_name= "title" : "ldtitle" elseif driver_name= "csc" : "ldcsc" + elseif driver_name= "texset" : "ldtexset" else: driver_name fi fi); enddef; diff --git a/Master/texmf-dist/fonts/source/lh/base/lcyrbeg.mf b/Master/texmf-dist/fonts/source/lh/base/lcyrbeg.mf index b959d126440..2274cf207fc 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lcyrbeg.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lcyrbeg.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -26,7 +26,7 @@ % ** macros for accenting moved in file lcyrdefs.mf % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec if unknown slitex: boolean slitex; slitex := false; fi % |true| simulates behaviour of |sroman| @@ -38,8 +38,16 @@ if unknown suppress_i_dot: boolean suppress_i_dot; suppress_i_dot :=false; fi if unknown hach_sharp: boolean hach_sharp; hach_sharp:=false; fi -if unknown classic_sharp_s: - boolean classic_sharp_s; classic_sharp_s:=false; fi % Chooses shape of sharp s +if unknown classic_sharp_s: boolean classic_sharp_s; + if ebbase=1: + classic_sharp_s:=true; % Chooses shape of sharp s (CMBRIGHT) + else: + classic_sharp_s:=false; % Chooses shape of sharp s + fi +fi % Chooses shape of sharp s +if unknown true_mono: + boolean true_mono; true_mono:=false; % |true| forces ligatures to monowidth +fi if unknown knuthian_ae: boolean knuthian_ae; knuthian_ae:=false; fi % |true| reproduces cm italic \ae if unknown fancy_thorn: @@ -48,6 +56,7 @@ if unknown is_small_cap: boolean is_small_cap; is_small_cap:=false; fi tracingstats:=1; % Print statistics at the end of run + % % % diff --git a/Master/texmf-dist/fonts/source/lh/base/lcyrdefs.mf b/Master/texmf-dist/fonts/source/lh/base/lcyrdefs.mf index 8f7796d668f..bf1f279ed0e 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lcyrdefs.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lcyrdefs.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=2 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -36,14 +36,14 @@ % (borrowed from exaccess) % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec let lhchar=\; % `|lhchar|' should precede each character -%if roman_ec: % for inputed exrullett.mf and exrllett.mf -% def version_check(expr e,f) = enddef; -% let ecchar=\; -%fi; +if roman_ec: % for inputed exrullett.mf and exrllett.mf + def version_check(expr e,f) = enddef; + let ecchar=\; +fi; % % defining cyrchar stuff - chars with floating codes @@ -86,7 +86,7 @@ if unknown acc_height#: % emulation ecfonts parameter file fi -sbeak# := (if serifs: max(beak#,3/4desc_depth#) else: desc_depth# fi) /1.2; +sbeak# := (if serifs: max(beak#,3/4desc_depth#) else: desc_depth# fi) /1.2; cap_sbeak# := if serifs: max(beak#,3/4desc_depth#) else: desc_depth# fi; % @@ -95,20 +95,12 @@ cap_sbeak# := if serifs: max(beak#,3/4desc_depth#) else: desc_depth# fi; % let font_setup_ = font_setup; -if unknown true_mono: - boolean true_mono; - if monospace: true_mono:=true; % |true| forces ligatures to monowidth - else: true_mono:=false; % - fi -fi - def font_setup = font_setup_; define_whole_blacker_pixels(acc_height); define_pixels(cap_sbeak,sbeak); pickup pencircle scaled min(hair,vair); extra_rule.nib:=savepen; - if true_mono: let normal_adjust_fit=mono_adjust_fit; fi enddef; % @@ -120,10 +112,10 @@ cyrcaph.cyrcaph = true; % % advanced cmbase's definitions: macros for cyr letter's drawing -% set_bar_axis, bar_stroke -% cyr_serif, l_serif, r_serif -% cyrbulb -% cbreve +% set_bar_axis, bar_stroke +% cyr_serif, l_serif, r_serif +% cyrbulb +% cbreve % sets for bar axis in lowercase letters % @@ -198,14 +190,66 @@ vardef cyr_serif(suffix $,$$,@) % serif at |z$| for stroke from |z$$| ...{-jut,0}z@4--(x@4,y@1)--z@5--z@6--cycle; % descender else: filldraw z@6--z@5--(x@4,y@1)--z@4{jut,0} - ...(beak_darkness+eps)[beak_corner,.5[z@3,z@4]] - ...{z@2-z@1}z@3--z@2--z@1{-jut,0} - ...(darkness+eps)[corner,.5[z@1,z@0]]{z@0-z@1} - ...{z$$-z$}z@0--cycle; % descender + ...(beak_darkness+eps)[beak_corner,.5[z@3,z@4]] + ...{z@2-z@1}z@3--z@2--z@1{-jut,0} + ...(darkness+eps)[corner,.5[z@1,z@0]]{z@0-z@1} + ...{z$$-z$}z@0--cycle; % descender fi labels (@0,@1,@2,@3,@4,@5,@6); enddef; +vardef siam_serif(suffix $,$$,@) % serif at |z$| for stroke from |z$$| + (expr darkness,jut) = + if serifs: + pickup crisp.nib; + else: + pickup pencircle scaled (3/5[fine,crisp]+eps); + fi + numeric bracket_height,light_stem; pair downward; + bracket_height=bracket; + light_stem=hround (max(tiny.breadth,3/5[fudged.hair,fudged.stem])); + % for cyr_serif always |y$|<|y$$| + if (y$>y$$): errmessage ("`cyr_serif' placed only on the bottom"); fi + downward=z$-z$$; + y@0=min(y$+bracket_height,y$$)+eps; + top y@1-slab-eps=bot y@4+eps=tiny.bot y$; + if y@1>y@0: y@0:=y@1+eps; fi + bot y@2=bot y@3=vround(-d); + y@5=y@1; y@6=y@0; + z@5=whatever[z$,z$$]; z@6=whatever[z$,z$$]; + if jut<0: + z@0+penoffset downward of currentpen = + z$l+penoffset downward of pen_[tiny.nib]+whatever*downward; + lft x@1=hround (tiny.lft x$l+jut)-eps; + if x@6<x@0+eps: x@6:=x@0+eps; fi + lft x@2=rt x@3-light_stem-eps=hround (lft x@1+beak_jut)-eps; + x@4=x$+.5(fudged.stem-3stem_corr-tiny)+eps; + else: + z@0-penoffset downward of currentpen = + z$r-penoffset downward of pen_[tiny.nib]-whatever*downward; + rt x@1=hround (tiny.rt x$r+jut)+eps; + if x@6>x@0-eps: x@6:=x@0-eps; fi + rt x@2=lft x@3+light_stem+eps=x@0+eps; + x@4=x$-.5(fudged.stem-3stem_corr-tiny)-eps; + fi + pair corner,beak_corner; + ypart corner=y@1; corner=z@0+whatever*downward; + ypart beak_corner=y@4; beak_corner=z@3+whatever*(z@1-z@2); + if jut<0: + filldraw z@0{z$-z$$} + ...(darkness+eps)[corner,.5[z@1,z@0]]{z@1-z@0} + ...{jut,0}z@1--z@2--z@3 + --beak_corner + --z@4--(x@4,y@1)--z@5--z@6--cycle; % descender + else: + filldraw z@6--z@5--(x@4,y@1)--z@4 + --beak_corner + --z@3--z@2--z@1{-jut,0} + ...(darkness+eps)[corner,.5[z@1,z@0]]{z@0-z@1} + ...{z$$-z$}z@0--cycle; % descender + fi + labels (@0,@1,@2,@3,@4,@5,@6,beak_corner); +enddef; % % roman descenders % @@ -345,10 +389,13 @@ def hi = if is_small_cap: higher fi\\ enddef; %!!!lhfonts: first goes umlaut for yo vardef lowercase_umlaut(expr x_move,y_move,umlaut_one,umlaut_two, umlaut_three,umlaut_four) = +numeric dot_dist; dot_dist:=round(3.5u); % (CMBRIGHT) pickup tiny.nib; pos[umlaut_one](udot_diam,0); pos[umlaut_two](udot_diam,90); -x[umlaut_one]=x[umlaut_two]=x_move+.5w-1.75u if monospace:/expansion_factor fi ; +%x[umlaut_one]=x[umlaut_two]=x_move+.5w-1.75u if monospace:/expansion_factor fi ; +x[umlaut_one]=x[umlaut_two]=x_move+.5w-0.5dot_dist %(CMBRIGHT) + if monospace:/expansion_factor fi ; %(CMBRIGHT) top y[umlaut_two]r=lc_trema_height; y[umlaut_one]=y_move+.5[y[umlaut_two]l,y[umlaut_two]r]; dot([umlaut_one],[umlaut_two]); % left dot @@ -356,16 +403,20 @@ pos[umlaut_three](udot_diam,0); penpos[umlaut_four](y[umlaut_two]r-y[umlaut_two]l,90); y[umlaut_three]=y[umlaut_four]=y[umlaut_one]; x[umlaut_three]=x[umlaut_four]=x[umlaut_one] - +3.5u if monospace: /expansion_factor fi ; +% +3.5u if monospace: /expansion_factor fi ; + +dot_dist if monospace: /expansion_factor fi ; % (CMBRIGHT) dot([umlaut_three],[umlaut_four]); % right dot enddef; % vardef uppercase_umlaut(expr x_move,y_move,umlaut_one,umlaut_two, umlaut_three,umlaut_four) = +numeric dot_dist; dot_dist:=round(3.5u); % (CMBRIGHT) pickup tiny.nib; pos[umlaut_one](udot_diam,0); pos[umlaut_two](udot_diam,90); -x[umlaut_one]=x[umlaut_two]=x_move+.5w-1.75u if monospace:/expansion_factor fi ; +%x[umlaut_one]=x[umlaut_two]=x_move+.5w-1.75u if monospace:/expansion_factor fi ; +x[umlaut_one]=x[umlaut_two]=x_move+.5w-0.5dot_dist %(CMBRIGHT) + if monospace:/expansion_factor fi ; %(CMBRIGHT) top y[umlaut_two]r=vround(cap_height+dot_height#*hppp); y[umlaut_one]=y_move+.5[y[umlaut_two]l,y[umlaut_two]r]; dot([umlaut_one],[umlaut_two]); % left dot @@ -373,7 +424,8 @@ pos[umlaut_three](udot_diam,0); penpos[umlaut_four](y[umlaut_two]r-y[umlaut_two]l,90); y[umlaut_three]=y[umlaut_four]=y[umlaut_one]; x[umlaut_three]=x[umlaut_four]=x[umlaut_one] - +3.5u if monospace: /expansion_factor fi ; +% +3.5u if monospace: /expansion_factor fi ; + +dot_dist if monospace: /expansion_factor fi ; % (CMBRIGHT) dot([umlaut_three],[umlaut_four]); % right dot enddef; % @@ -1251,7 +1303,7 @@ vardef easy_ogonek (suffix penkind)(expr _one,_two,_three)= bot y[_one]l=0 if known ogonek_move:+ogonek_move fi+eps; numeric ogonek_move; % it's local else: - bot z[_one]l=(.5w,0+eps); + bot z[_one]l=(.5w,eps); fi pos[_one](max(ogonek_breadth,penkind+eps),0); bot z[_three]'=(xpart z[_one]l-.5penkind,y_right-eps)+the_tip_pos; @@ -1276,23 +1328,25 @@ vardef easy_ogonek (suffix penkind)(expr _one,_two,_three)= angle(z[_one]-z[_three]) - if serifs: 90 else: 80 fi); if known ogonek_pos: if y[_one]'<y[_one]: path p; numeric t; - if known join_angle: + if known join_angle: prim_angle:=join_angle; - else: + else: p=z[_one]{dir the_pre_angle}...{(z[_three]-z[_one])}z[_two] ...{dir (the_post_angle)}z[_three]; t=ypart (((0,y[_one]')--(w,y[_one]')) intersectiontimes p); - prim_angle:=angle(direction t of p); - fi + prim_angle:=angle(direction t of p); + fi filldraw stroke - z[_one]'e{dir prim_angle}...{(z[_three]-z[_one])}z[_two]e - ...{dir (the_post_angle)}z[_three]e; % ogonek stroke + z[_one]'e{dir prim_angle}... + {(z[_three]-z[_one])}z[_two]e... + {dir (the_post_angle)}z[_three]e; % ogonek stroke else: - prim_angle:=if known join_angle: join_angle else: the_pre_angle fi; + prim_angle:=if known join_angle: join_angle else: the_pre_angle fi; filldraw stroke - z[_one]'e{dir prim_angle}...z[_one]e{dir the_pre_angle} - ...{(z[_three]-z[_one])}z[_two]e - ...{dir (the_post_angle)}z[_three]e; % ogonek stroke + z[_one]'e{dir prim_angle}... + z[_one]e{dir the_pre_angle}... + {(z[_three]-z[_one])}z[_two]e... + {dir (the_post_angle)}z[_three]e; % ogonek stroke fi else: filldraw stroke @@ -1335,7 +1389,11 @@ def lc_hachek_accent(expr ref) = x52=good.x ref; x52-lft x51=rt x53-x52= hround(1.25accent_u + vair); pos52(stem,0); - bot y52=vround(max(2/3[h,hi.x_height],hi.x_height+o+hair)); + if ebbase=1:%!!! + bot y52=vround(0.33[x_height,lc_hachek_height]);% (CMBRIGHT) + else: + bot y52=vround(max(2/3[h,hi.x_height],hi.x_height+o+hair)); + fi top y51 = top y53 = max(lc_hachek_height,top y52+eps); %!!! z50 = whatever[z51r,z52r] = whatever[z52l,z53l]; y54l=y54r=y52; diff --git a/Master/texmf-dist/fonts/source/lh/base/ldbroman.mf b/Master/texmf-dist/fonts/source/lh/base/ldbroman.mf new file mode 100644 index 00000000000..f2637829f95 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/base/ldbroman.mf @@ -0,0 +1,184 @@ +% +% ldbroman.mf +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% The Computer Modern Roman family of fonts (by D. E. Knuth, 1979--1985) +% Modified for the CM Bright fonts [1995/10/04 v0.997 WaS] +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +LHver_check(3,5); % like |version_check| in ec + +if ligs>1: font_coding_scheme:="TeX text/Cyr - "&enc_name; + if altcoding: + spanish_shriek=oct"074"; spanish_query=oct"076"; + fi +else: font_coding_scheme:=if ligs=0: "TeX typewriter text/Cyr - "&enc_name + else: "TeX text without f-ligs/Cyr - "&enc_name fi; + if altcoding: + spanish_shriek=oct"016"; spanish_query=oct"017"; + fi +fi + +input lxpseudo; + + +mode_setup; font_setup; +pseudo_setup; % |pseudo_setup| from ec +define_pixels(sym_u);define_whole_vertical_pixels(sym_height); +% lowres_fix(stem,cap_stem)1.12; + +if altcoding: + input romanu; % upper case (majuscules) + input bromanl; % lower case (minuscules) + input bgreeku; % upper case Greek letters + input romand; % numerals + input romanp; % ampersand, question marks, currency sign + input romspl; % lowercase specials (dotless \i, ligature \ae, etc.) + input romspu; % uppercase specials (\AE, \OE, \O) + input bpunct; % punctuation symbols common to roman and italic text + input baccent; % accents common to roman and italic text + if ligs>1: input bromlig; fi % letter ligatures + if ligs<=1: input romsub; fi % substitutes for ligatures +fi + +if not vfcoding: % ligs for both altcoding and wncoding (dashes & quotes) + if ligs>0: input comlig; fi % ligatures common with italic text +fi + +input lgcyru; % Cyrillic upper case (majuscules) +input lgcyrl; % Cyrillic lower case (minuscules) +input lgcyrsym; % << >> ,, No +input lgcyracc; % Cyrillic accents +if old_cyr: + input lgocyrac; % Cyrillic Old Slav accents & signs +fi + +if wncoding: %Part used in WNCYR + input romand; % numerals + input lgpunct; % excerpts from punct.mf + input lgromp; % roman question mark + input lgrlig; % roman dotless i,j +fi + +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#; + if altcoding: input llmligtb; fi % input ligs for quotes + if wncoding : input lwnligs; fi % input ligs for Cyrillic letters in WNCYR +else: font_normal_space 5.7u#+2letter_fit#; + font_normal_stretch 2.85u#; font_normal_shrink 1.9u#; + font_quad 18u#+4letter_fit#; + font_extra_space 1.9u#; + k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; % three degrees of kerning + % + % Latin ligs & kerns: + % There are just the same ligs and kerns as in CMBRIGHT + % but they are built in more visible form + TITLEfont:=false; SmallCapsfont:=false; ROMANfont:=true; + if altcoding: + ligtable "k": + if serifs: "v": + "a" kern -u#, fi\\ + "w": "e" kern k#, + "a" kern k#, + "o" kern k#, + "c" kern k#; + ligtable "P": "A" kern kk#, + "y": "o" kern k#, + "e" kern k#, + "a" kern k#, + "." kern kk#, + "," kern kk#; + ligtable "F": "V": "W": + if serifs: "o" kern kk#, + "e" kern kk#, + "u" kern kk#, + "r" kern kk#, + "a" kern kk#, + "A" kern kkk#, + else: "o" kern k#, + "e" kern k#, + "u" kern k#, + "r" kern k#, + "a" kern k#, + "A" kern kk#, fi + "K": "X": "O" kern k#, + "C" kern k#, + "G" kern k#, + "Q" kern k#; + ligtable "T": "y" kern if serifs: k# else: kk# fi, + "Y": "e" kern kk#, + "o" kern kk#, + "r" kern kk#, + "a" kern kk#, + "A" kern kk#, + "u" kern kk#; + ligtable "O": "D": + "X" kern k#, + "W" kern k#, + "A" kern k#, + "V" kern k#, + "Y" kern k#; + if serifs: + ligtable "h": "m": "n": + "t" kern k#, + "u" kern k#, + "b" kern k#, + "y" kern k#, + "v" kern k#, + "w" kern k#; + ligtable "c": + "h" kern k#, + "k" kern k#; + fi + ligtable "o": "b": "p": + if known bx_kerning: + "e" kern -k#, + "o" kern -k#, + "d" kern -k#, + "c" kern -k#, + "q" kern -k#, + fi + "x" kern k#, + "a": if serifs: + "v" kern k#, + "j" kern u#, + else: "r" kern k#, fi + "t": "y" kern k#, + "u": "w" kern k#; + ligtable "A": if serifs: "R": fi\\ + "t" kern k#, + "C" kern k#, + "O" kern k#, + "G" kern k#, + "U" kern k#, + "Q" kern k#, + "L": "T" kern kk#, + "Y" kern kk#, + "V" kern kkk#, + "W" kern kkk#; + ligtable "g": "j" kern -k#; % logjam + ligtable "I": "I" kern -k#; % Richard III + % there are ligature/kern programs for |"f"| in the {\tt romlig} file + % and for |"-"|, |"`"|, and |"'"| in the {\tt comlig} file + input llvligtb; % input ligs & kerns for quotes + fi + scantokens("input "&(substring(fonteq-2,fonteq) of param_base)&"liker"); % Cyrillic ligs & kerns +fi + +bye. +%end of file diff --git a/Master/texmf-dist/fonts/source/lh/base/ldcsc.mf b/Master/texmf-dist/fonts/source/lh/base/ldcsc.mf index b454ff0cfab..cdb899bcb61 100644 --- a/Master/texmf-dist/fonts/source/lh/base/ldcsc.mf +++ b/Master/texmf-dist/fonts/source/lh/base/ldcsc.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -19,7 +19,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec font_coding_scheme:=if ligs=0: "TeX typewriter text/Cyr - "&enc_name else: "TeX text without f-ligs/Cyr - "&enc_name fi; @@ -166,7 +166,7 @@ is_small_cap:=true; input lgcyru; % Cyrillic majuscules (in lowercase positions) if wncoding: %Part used in WNCYR - input lgcspl; % numerals + input lgcspl; % FF ligs fi if not monospace: diff --git a/Master/texmf-dist/fonts/source/lh/base/ldroman.mf b/Master/texmf-dist/fonts/source/lh/base/ldroman.mf index 32fbe85173a..d405be1a95f 100644 --- a/Master/texmf-dist/fonts/source/lh/base/ldroman.mf +++ b/Master/texmf-dist/fonts/source/lh/base/ldroman.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -28,7 +28,7 @@ % There also used special letters UKR_I LAT_I etc in Cyrillic glyphs % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec if ligs>1: font_coding_scheme:="TeX text/Cyr - "&enc_name; if altcoding: diff --git a/Master/texmf-dist/fonts/source/lh/base/ldtexset.mf b/Master/texmf-dist/fonts/source/lh/base/ldtexset.mf new file mode 100644 index 00000000000..3377120e69f --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/base/ldtexset.mf @@ -0,0 +1,152 @@ +% +% ldtexset.mf +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Special version of Computer Modern for \TeX's extended ASCII character set +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +LHver_check(3,5); % like |version_check| in ec + +font_coding_scheme:="TeX extended ASCII/Cyr - "&enc_name; + +input lxpseudo; + +mode_setup; font_setup; mono_charic#:=0; +pseudo_setup; % |pseudo_setup| from ec + +if altcoding: + input tsetsl; % special symbols to be slanted +fi +slant:=0; % the remaining characters will not be slanted +currenttransform:=identity yscaled aspect_ratio scaled granularity; + +if altcoding: + input romanu; % upper case (majuscules) + input romanl; % lower case (minuscules) + input romand; % numerals + input romanp; % ampersand, question marks, currency sign + input punct; % punctuation symbols common to roman and italic text + input tset; % remaining special symbols of extended ASCII +fi + +input lgcyru; % Cyrillic upper case (majuscules) +input lgcyrl; % Cyrillic lower case (minuscules) +input lgcyrsym; % << >> ,, No +input lgcyracc; % Cyrillic accents +if old_cyr: + input lgocyrac; % Cyrillic Old Slav accents & signs +fi + +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#; + k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; % three degrees of kerning + % + % Latin ligs & kerns: + % There are just the same ligs and kerns as in CM + % but they are built in more visible form + TITLEfont:=false; SmallCapsfont:=false; ROMANfont:=true; + if altcoding: + ligtable "k": + if serifs: "v": + "a" kern -u#, fi\\ + "w": "e" kern k#, + "a" kern k#, + "o" kern k#, + "c" kern k#; + ligtable "P": "A" kern kk#, + "y": "o" kern k#, + "e" kern k#, + "a" kern k#, + "." kern kk#, + "," kern kk#; + ligtable "F": "V": "W": + if serifs: "o" kern kk#, + "e" kern kk#, + "u" kern kk#, + "r" kern kk#, + "a" kern kk#, + "A" kern kkk#, + else: "o" kern k#, + "e" kern k#, + "u" kern k#, + "r" kern k#, + "a" kern k#, + "A" kern kk#, fi + "K": "X": "O" kern k#, + "C" kern k#, + "G" kern k#, + "Q" kern k#; + ligtable "T": "y" kern if serifs: k# else: kk# fi, + "Y": "e" kern kk#, + "o" kern kk#, + "r" kern kk#, + "a" kern kk#, + "A" kern kk#, + "u" kern kk#; + ligtable "O": "D": + "X" kern k#, + "W" kern k#, + "A" kern k#, + "V" kern k#, + "Y" kern k#; + if serifs: + ligtable "h": "m": "n": + "t" kern k#, + "u" kern k#, + "b" kern k#, + "y" kern k#, + "v" kern k#, + "w" kern k#; + ligtable "c": + "h" kern k#, + "k" kern k#; + fi + ligtable "o": "b": "p": + "e" kern -k#, + "o" kern -k#, + "x" kern k#, + "d" kern -k#, + "c" kern -k#, + "q" kern -k#, + "a": if serifs: + "v" kern k#, + "j" kern u#, + else: "r" kern k#, fi + "t": "y" kern k#, + "u": "w" kern k#; + ligtable "A": if serifs: "R": fi\\ + "t" kern k#, + "C" kern k#, + "O" kern k#, + "G" kern k#, + "U" kern k#, + "Q" kern k#, + "L": "T" kern kk#, + "Y" kern kk#, + "V" kern kkk#, + "W" kern kkk#; + ligtable "g": "j" kern -k#; % logjam + ligtable "I": "I" kern -k#; % Richard III + fi + scantokens("input "&(substring(fonteq-2,fonteq) of param_base)&"liker"); % Cyrillic ligs & kerns +fi; +bye. diff --git a/Master/texmf-dist/fonts/source/lh/base/ldtextit.mf b/Master/texmf-dist/fonts/source/lh/base/ldtextit.mf index 3d6be4d1494..dbbd90dfdef 100644 --- a/Master/texmf-dist/fonts/source/lh/base/ldtextit.mf +++ b/Master/texmf-dist/fonts/source/lh/base/ldtextit.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -19,7 +19,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec input lxpseudo; @@ -29,15 +29,15 @@ pseudo_setup; % |pseudo_setup| from ec if ligs>1: font_coding_scheme:="TeX text/Cyr - "&enc_name; - spanish_shriek=oct"074"; spanish_query=oct"076"; - if altcoding: + if altcoding: + spanish_shriek=oct"074"; spanish_query=oct"076"; input italig; % letter ligatures - fi + fi else: font_coding_scheme:=if ligs=0: "TeX typewriter text/Cyr - "&enc_name else: "TeX text without f-ligs/Cyr - "&enc_name fi; - if altcoding: + if altcoding: spanish_shriek=oct"016"; spanish_query=oct"017"; - fi + fi fi if altcoding: diff --git a/Master/texmf-dist/fonts/source/lh/base/ldtitle.mf b/Master/texmf-dist/fonts/source/lh/base/ldtitle.mf index 9da66a33785..1bdedd0b9e0 100644 --- a/Master/texmf-dist/fonts/source/lh/base/ldtitle.mf +++ b/Master/texmf-dist/fonts/source/lh/base/ldtitle.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -22,7 +22,7 @@ % This makes a short font (caps and digits only) % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec font_coding_scheme:="Caps and digits/Cyr - "&enc_name; diff --git a/Master/texmf-dist/fonts/source/lh/base/lebroman.mf b/Master/texmf-dist/fonts/source/lh/base/lebroman.mf new file mode 100644 index 00000000000..6b2074145d8 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/base/lebroman.mf @@ -0,0 +1,82 @@ +% +% lebroman.mf +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Driver file, called by parameter files with roman style fonts +% - modified EXROMAN.MF in European Computer Modern fonts (ec fonts) +% CMBRIGHT modification +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +LHver_check(3,5); % like |version_check| in ec + + +input lxpseudo; + +mode_setup; font_setup; +pseudo_setup; % |pseudo_setup| from ec + +% upper part exr(u/l)(lett/west/east) changed to cyrillic glyphs +%vvv +if roman_ec: + input exrulett; + input ebrllett; % lower case (minuscules) % (CMBR) +fi +%<<< +input lgcyru; % input Cyrillic Uppercase shapes +input lgcyrl; % input Cyrillic Lowercase shapes + +input lgcyrsym; % floating symbols in Cyrillic +input lgengsym; % latin symbols +input lgromp; % roman & ? +input lgrdigit; % roman digits +input lgrlig; % roman dotless i j (and ff-ligatures) + +input lgcyracc; % accents +if old_cyr: + input lgocyrac; % Cyrillic Old Slav accents & signs +fi + +% +% Fontparameter +% +font_coding_scheme:="TeX Cyrillic Font Encoding - "&enc_name; +boundarychar:=oct"027"; +font_slant slant; +font_x_height x_height#; +font_cap_height cap_height#; +font_asc_height asc_height#; +font_acc_cap_height (cap_height#+acc_height#); +font_desc_depth desc_depth#; +font_max_height (max(asc_height#,body_height#, + cap_height#+acc_height#)); +font_max_depth (max(desc_depth#,paren_depth#,the_ogonek_depth#)); +% font_digit_width % set inside the digits file +% font_cap_stem % set after the programme of the capital I +font_baselineskip max(1.25*designsize,body_height#+paren_depth#);% (CMBR) + font_normal_space 5.7u#+2letter_fit#; % (CMBR) + font_normal_stretch 2.85u#; font_normal_shrink 1.9u#; %(CMBR) + font_quad 18u#+4letter_fit#; + font_extra_space 1.9u#; % (CMBR) +% input ebrligtb; % do the ligature programs %(CMBR) + TITLEfont:=false; SmallCapsfont:=false; ROMANfont:=true; + input llvligtb; % do the ligature programs, not for monospaced fonts + if roman_ec: input llbligtb; fi + k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; % three degrees of kerning + scantokens("input "&(substring(fonteq-2,fonteq) of param_base)&"liker"); % Cyrillic ligs & kerns +bye. + +bye. +%end of file diff --git a/Master/texmf-dist/fonts/source/lh/base/lecsc.mf b/Master/texmf-dist/fonts/source/lh/base/lecsc.mf index 12cb88e33d1..38128171e67 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lecsc.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lecsc.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -19,7 +19,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec input lxpseudo; @@ -97,18 +97,18 @@ endgroup; % font_coding_scheme:="TeX Cyrillic Font Encoding - "&enc_name; boundarychar:=oct"027"; -font_slant slant; +font_slant slant; font_x_height x_height#; font_cap_height cap_height#; font_asc_height asc_height#; -font_acc_cap_height (max(cap_height#+acc_height#,uc_acc_height#)); +font_acc_cap_height (cap_height#+acc_height#); font_desc_depth desc_depth#; font_max_height (max(asc_height#,body_height#, - cap_height#+acc_height#,uc_acc_height#)); + cap_height#+acc_height#)); font_max_depth (max(desc_depth#,paren_depth#,the_ogonek_depth#)); % font_digit_width % set inside the digits file % font_cap_stem % set after the programme of the capital I -font_baselineskip (1.2*designsize); +font_baselineskip max(1.2*designsize,body_height#+paren_depth#); if monospace: font_normal_space 9u#; % no stretching or shrinking font_quad 18u#; diff --git a/Master/texmf-dist/fonts/source/lh/base/leroman.mf b/Master/texmf-dist/fonts/source/lh/base/leroman.mf index 03b582c717d..269663711a5 100644 --- a/Master/texmf-dist/fonts/source/lh/base/leroman.mf +++ b/Master/texmf-dist/fonts/source/lh/base/leroman.mf @@ -1,16 +1,16 @@ % -% lecsc.mf +% leroman.mf % %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -19,7 +19,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec input lxpseudo; @@ -53,18 +53,18 @@ fi % font_coding_scheme:="TeX Cyrillic Font Encoding - "&enc_name; boundarychar:=oct"027"; -font_slant slant; +font_slant slant; font_x_height x_height#; font_cap_height cap_height#; font_asc_height asc_height#; -font_acc_cap_height (max(cap_height#+acc_height#,uc_acc_height#)); +font_acc_cap_height (cap_height#+acc_height#); font_desc_depth desc_depth#; font_max_height (max(asc_height#,body_height#, - cap_height#+acc_height#,uc_acc_height#)); + cap_height#+acc_height#)); font_max_depth (max(desc_depth#,paren_depth#,the_ogonek_depth#)); % font_digit_width % set inside the digits file % font_cap_stem % set after the programme of the capital I -font_baselineskip (1.2*designsize); +font_baselineskip max(1.2*designsize,body_height#+paren_depth#); if monospace: font_normal_space 9u#; % no stretching or shrinking font_quad 18u#; diff --git a/Master/texmf-dist/fonts/source/lh/base/letextit.mf b/Master/texmf-dist/fonts/source/lh/base/letextit.mf index 19778443a90..7706524e18d 100644 --- a/Master/texmf-dist/fonts/source/lh/base/letextit.mf +++ b/Master/texmf-dist/fonts/source/lh/base/letextit.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -19,7 +19,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec input lxpseudo; @@ -61,18 +61,18 @@ fi % font_coding_scheme:="TeX Cyrillic Font Encoding - "&enc_name; boundarychar:=oct"027"; -font_slant slant; +font_slant slant; font_x_height x_height#; font_cap_height cap_height#; font_asc_height asc_height#; -font_acc_cap_height (max(cap_height#+acc_height#,uc_acc_height#)); +font_acc_cap_height (cap_height#+acc_height#); font_desc_depth desc_depth#; font_max_height (max(asc_height#,body_height#, - cap_height#+acc_height#,uc_acc_height#)); + cap_height#+acc_height#)); font_max_depth (max(desc_depth#,paren_depth#,the_ogonek_depth#)); % font_digit_width % set inside the digits file % font_cap_stem % set after the programme of the capital I -font_baselineskip (1.2*designsize); +font_baselineskip max(1.2*designsize,body_height#+paren_depth#); if monospace: font_normal_space 9u#; % no stretching or shrinking font_quad 18u#; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgcspl.mf b/Master/texmf-dist/fonts/source/lh/base/lgcspl.mf index 10d16248635..71a402c5fe4 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgcspl.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgcspl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,16 +20,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % I,J -% if roman_ec: FI,FL,FFI,FFL fi -- for T2* stuff only (lgcsplff.mf) +% if roman_ec: FI,FL,FFI,FFL fi -- for T2* stuff only % -LHver_check(3,4); % like |version_check| in ec - -if roman_ec: - -input lgcsplff.mf - -fi % roman_ec +LHver_check(3,5); % like |version_check| in ec lhchar "Small Caps letter I"; cyrchar(i_dotl,max(6u#,4u#+cap_stem#),cap_height#,0); @@ -63,5 +57,172 @@ else: filldraw stroke z1e--z2e; % stem filldraw stroke z3e{down}....term.e(4,5,left,1,4); fi % arc and terminal math_fit(0,.5ic#-.5u#); penlabels(1,2,3,4,5); endchar; +if not roman_ec: endinput \\; fi + +lhchar "Small Caps letter FF"; +beginchar(oct"033",2(11.5u#-width_adj#),cap_height#,0); +italcorr cap_height#*slant-.25u#; +normal_adjust_fit(cap_serif_fit#,0); +h:=vround(h-stem_corr); +w':=11.5u-width_adj; +pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +pickup crisp.nib; pos3(slab,90); pos4(hair,0); +top y3r=h; x3=x1; rt x4r=hround(w'-.75u); y4=good.y(y3l-beak)-eps; +arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak +pos5(cap_bar,-90); pos6(hair,0); +top y5l=vround(.5[y2,y1]+.5cap_bar); x5=x1; +pos0(cap_bar,90); pos7(hair,0); +z0=z5; x6=x7; y6-y5l=y0l-y7; +if serifs: rt x6r=hround(w'-4u+.5hair); y6=good.y(y5l+.6beak)+eps; + rt x9r=hround(w'-.5u); +else: rt x6r=hround(w'-1.5u); y6=y5l+eps; rt x9r=hround(w'-.75u); fi +arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif +if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif +% the second F +currentpicture:=currentpicture + currentpicture shifted (w',0); +math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9,11,12); endchar; + +lhchar "Small Caps letter FI"; +beginchar(oct"034",11.5u#-width_adj#+max(6u#,4u#+cap_stem#),cap_height#,0); +italcorr cap_height#*slant-.25u#; +normal_adjust_fit(cap_serif_fit#,0); +h:=vround(h-stem_corr); +w':=11.5u-width_adj; +pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +pickup crisp.nib; pos3(slab,90); pos4(hair,0); +top y3r=h; x3=x1; rt x4r=hround(w'-.75u); y4=good.y(y3l-beak)-eps; +arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak +pos5(cap_bar,-90); pos6(hair,0); +top y5l=vround(.5[y2,y1]+.5cap_bar); x5=x1; +pos0(cap_bar,90); pos7(hair,0); +z0=z5; x6=x7; y6-y5l=y0l-y7; +if serifs: rt x6r=hround(w'-4u+.5hair); y6=good.y(y5l+.6beak)+eps; + rt x9r=hround(w'-.5u); +else: rt x6r=hround(w'-1.5u); y6=y5l+eps; rt x9r=hround(w'-.75u); fi +arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif +if serifs: + nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif +% the I +xshift:=w'; +w':=w-xshift; +pickup tiny.nib; pos11(cap_stem,0); pos12(cap_stem,0); +lft x11l=lft x12l=hround(xshift+.5w'-.5cap_stem); top y11=h; bot y12=0; +filldraw stroke z11e--z12e; % stem +if serifs or slitex or monospace: + dish_serif(11,12,aa,1/3,1.05cap_jut,bb,1/3,1.05cap_jut); % upper serif + dish_serif(12,11,gg,1/3,1.05cap_jut,dd,1/3,1.05cap_jut); fi % lower serif +math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9,11,12); endchar; + +lhchar "Small Caps letter FL"; +beginchar(oct"035",(11.5u#-width_adj#)+11u#-width_adj#,cap_height#,0); +italcorr cap_height#*slant-.25u#; +normal_adjust_fit(cap_serif_fit#,0); +h:=vround(h-stem_corr); +w':=11.5u-width_adj; +pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +pickup crisp.nib; pos3(slab,90); pos4(hair,0); +top y3r=h; x3=x1; rt x4r=hround(w'-.75u); y4=good.y(y3l-beak)-eps; +arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak +pos5(cap_bar,-90); pos6(hair,0); +top y5l=vround(.5[y2,y1]+.5cap_bar); x5=x1; +pos0(cap_bar,90); pos7(hair,0); +z0=z5; x6=x7; y6-y5l=y0l-y7; +if serifs: rt x6r=hround(w'-4u+.5hair); y6=good.y(y5l+.6beak)+eps; + rt x9r=hround(w'-.5u); +else: rt x6r=hround(w'-1.5u); y6=y5l+eps; rt x9r=hround(w'-.75u); fi +arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif +if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif +% the L +xshift:=w'; +pickup tiny.nib; pos11(cap_stem,0); pos12(cap_stem,0); +lft x11l=lft x12l=hround xshift+max(2u,3u-.5cap_stem); top y11=h; bot y12=0; +filldraw stroke z11e--z12e; % stem +pickup crisp.nib; pos13(slab,-90); pos14(hair,0); +bot y13r=0; x13=x12; y14=y13l+7/6beak+eps; rt x14r=hround(w-.75u); +arm(13,14,eee,1.2beak_darkness,beak_jut); % lower arm and beak +if serifs: dish_serif(11,12,aaa,1/3,cap_jut,bbb,1/3,1.25cap_jut); % upper serif + nodish_serif(12,11,ccc,1/3,cap_jut,ddd,1/3,.5cap_jut); fi % lower serif +math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9,11,12); endchar; + +lhchar "Small Caps letter FFI"; +beginchar(oct"036",2(11.5u#-width_adj#)+max(6u#,4u#+cap_stem#),cap_height#,0); +italcorr cap_height#*slant-.25u#; +normal_adjust_fit(cap_serif_fit#,0); +h:=vround(h-stem_corr); +w':=11.5u-width_adj; +pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +pickup crisp.nib; pos3(slab,90); pos4(hair,0); +top y3r=h; x3=x1; rt x4r=hround(w'-.75u); y4=good.y(y3l-beak)-eps; +arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak +pos5(cap_bar,-90); pos6(hair,0); +top y5l=vround(.5[y2,y1]+.5cap_bar); x5=x1; +pos0(cap_bar,90); pos7(hair,0); +z0=z5; x6=x7; y6-y5l=y0l-y7; +if serifs: rt x6r=hround(w'-4u+.5hair); y6=good.y(y5l+.6beak)+eps; + rt x9r=hround(w'-.5u); +else: rt x6r=hround(w'-1.5u); y6=y5l+eps; rt x9r=hround(w'-.75u); fi +arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif +if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif +% the second F +currentpicture:=currentpicture + currentpicture shifted (w',0); +% the I +xshift:=2w'; +w':=w-xshift; +pickup tiny.nib; pos11(cap_stem,0); pos12(cap_stem,0); +lft x11l=lft x12l=hround(xshift+.5w'-.5cap_stem); top y11=h; bot y12=0; +filldraw stroke z11e--z12e; % stem +if serifs or slitex or monospace: + dish_serif(11,12,aa,1/3,1.05cap_jut,bb,1/3,1.05cap_jut); % upper serif + dish_serif(12,11,gg,1/3,1.05cap_jut,dd,1/3,1.05cap_jut); fi % lower serif +math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9,11,12); endchar; + +lhchar "Small Caps letter FFL"; +beginchar(oct"037",2(11.5u#-width_adj#)+11u#-width_adj#,cap_height#,0); +italcorr cap_height#*slant-.25u#; +normal_adjust_fit(cap_serif_fit#,0); +h:=vround(h-stem_corr); +w':=11.5u-width_adj; +pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +pickup crisp.nib; pos3(slab,90); pos4(hair,0); +top y3r=h; x3=x1; rt x4r=hround(w'-.75u); y4=good.y(y3l-beak)-eps; +arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak +pos5(cap_bar,-90); pos6(hair,0); +top y5l=vround(.5[y2,y1]+.5cap_bar); x5=x1; +pos0(cap_bar,90); pos7(hair,0); +z0=z5; x6=x7; y6-y5l=y0l-y7; +if serifs: rt x6r=hround(w'-4u+.5hair); y6=good.y(y5l+.6beak)+eps; + rt x9r=hround(w'-.5u); +else: rt x6r=hround(w'-1.5u); y6=y5l+eps; rt x9r=hround(w'-.75u); fi +arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif +if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif +% the I +currentpicture:=currentpicture + currentpicture shifted (w',0); +% the L +xshift:=2w'; +pickup tiny.nib; pos11(cap_stem,0); pos12(cap_stem,0); +lft x11l=lft x12l=hround xshift+max(2u,3u-.5cap_stem); top y11=h; bot y12=0; +filldraw stroke z11e--z12e; % stem +pickup crisp.nib; pos13(slab,-90); pos14(hair,0); +bot y13r=0; x13=x12; y14=y13l+7/6beak+eps; rt x14r=hround(w-.75u); +arm(13,14,eee,1.2beak_darkness,beak_jut); % lower arm and beak +if serifs: dish_serif(11,12,aaa,1/3,cap_jut,bbb,1/3,1.25cap_jut); % upper serif + nodish_serif(12,11,ccc,1/3,cap_jut,ddd,1/3,.5cap_jut); fi % lower serif +math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9,11,12); endchar; + endinput; %end of file diff --git a/Master/texmf-dist/fonts/source/lh/base/lgcsplff.mf b/Master/texmf-dist/fonts/source/lh/base/lgcsplff.mf deleted file mode 100644 index 53147ac77de..00000000000 --- a/Master/texmf-dist/fonts/source/lh/base/lgcsplff.mf +++ /dev/null @@ -1,192 +0,0 @@ -% -% lgcsplff.mf -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% Metafont program for the characters in positions of ligatures -% for the "caps and small caps" fonts -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% if roman_ec: FI,FL,FFI,FFL fi -- for T2* stuff only -% - -LHver_check(3,4); % like |version_check| in ec - -lhchar "Small Caps letter FF"; -beginchar(oct"033",2(11.5u#-width_adj#),cap_height#,0); -italcorr cap_height#*slant-.25u#; -normal_adjust_fit(cap_serif_fit#,0); -h:=vround(h-stem_corr); -w':=11.5u-width_adj; -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -pickup crisp.nib; pos3(slab,90); pos4(hair,0); -top y3r=h; x3=x1; rt x4r=hround(w'-.75u); y4=good.y(y3l-beak)-eps; -arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak -pos5(cap_bar,-90); pos6(hair,0); -top y5l=vround(.5[y2,y1]+.5cap_bar); x5=x1; -pos0(cap_bar,90); pos7(hair,0); -z0=z5; x6=x7; y6-y5l=y0l-y7; -if serifs: rt x6r=hround(w'-4u+.5hair); y6=good.y(y5l+.6beak)+eps; - rt x9r=hround(w'-.5u); -else: rt x6r=hround(w'-1.5u); y6=y5l+eps; rt x9r=hround(w'-.75u); fi -arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif -if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif -% the second F -currentpicture:=currentpicture + currentpicture shifted (w',0); -math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9,11,12); endchar; - -lhchar "Small Caps letter FI"; -beginchar(oct"034",11.5u#-width_adj#+max(6u#,4u#+cap_stem#),cap_height#,0); -italcorr cap_height#*slant-.25u#; -normal_adjust_fit(cap_serif_fit#,0); -h:=vround(h-stem_corr); -w':=11.5u-width_adj; -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -pickup crisp.nib; pos3(slab,90); pos4(hair,0); -top y3r=h; x3=x1; rt x4r=hround(w'-.75u); y4=good.y(y3l-beak)-eps; -arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak -pos5(cap_bar,-90); pos6(hair,0); -top y5l=vround(.5[y2,y1]+.5cap_bar); x5=x1; -pos0(cap_bar,90); pos7(hair,0); -z0=z5; x6=x7; y6-y5l=y0l-y7; -if serifs: rt x6r=hround(w'-4u+.5hair); y6=good.y(y5l+.6beak)+eps; - rt x9r=hround(w'-.5u); -else: rt x6r=hround(w'-1.5u); y6=y5l+eps; rt x9r=hround(w'-.75u); fi -arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif -if serifs: - nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif -% the I -xshift:=w'; -w':=w-xshift; -pickup tiny.nib; pos11(cap_stem,0); pos12(cap_stem,0); -lft x11l=lft x12l=hround(xshift+.5w'-.5cap_stem); top y11=h; bot y12=0; -filldraw stroke z11e--z12e; % stem -if serifs or slitex or monospace: - dish_serif(11,12,aa,1/3,1.05cap_jut,bb,1/3,1.05cap_jut); % upper serif - dish_serif(12,11,gg,1/3,1.05cap_jut,dd,1/3,1.05cap_jut); fi % lower serif -math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9,11,12); endchar; - -lhchar "Small Caps letter FL"; -beginchar(oct"035",(11.5u#-width_adj#)+11u#-width_adj#,cap_height#,0); -italcorr cap_height#*slant-.25u#; -normal_adjust_fit(cap_serif_fit#,0); -h:=vround(h-stem_corr); -w':=11.5u-width_adj; -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -pickup crisp.nib; pos3(slab,90); pos4(hair,0); -top y3r=h; x3=x1; rt x4r=hround(w'-.75u); y4=good.y(y3l-beak)-eps; -arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak -pos5(cap_bar,-90); pos6(hair,0); -top y5l=vround(.5[y2,y1]+.5cap_bar); x5=x1; -pos0(cap_bar,90); pos7(hair,0); -z0=z5; x6=x7; y6-y5l=y0l-y7; -if serifs: rt x6r=hround(w'-4u+.5hair); y6=good.y(y5l+.6beak)+eps; - rt x9r=hround(w'-.5u); -else: rt x6r=hround(w'-1.5u); y6=y5l+eps; rt x9r=hround(w'-.75u); fi -arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif -if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif -% the L -xshift:=w'; -pickup tiny.nib; pos11(cap_stem,0); pos12(cap_stem,0); -lft x11l=lft x12l=hround xshift+max(2u,3u-.5cap_stem); top y11=h; bot y12=0; -filldraw stroke z11e--z12e; % stem -pickup crisp.nib; pos13(slab,-90); pos14(hair,0); -bot y13r=0; x13=x12; y14=y13l+7/6beak+eps; rt x14r=hround(w-.75u); -arm(13,14,eee,1.2beak_darkness,beak_jut); % lower arm and beak -if serifs: dish_serif(11,12,aaa,1/3,cap_jut,bbb,1/3,1.25cap_jut); % upper serif - nodish_serif(12,11,ccc,1/3,cap_jut,ddd,1/3,.5cap_jut); fi % lower serif -math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9,11,12); endchar; - -lhchar "Small Caps letter FFI"; -beginchar(oct"036",2(11.5u#-width_adj#)+max(6u#,4u#+cap_stem#),cap_height#,0); -italcorr cap_height#*slant-.25u#; -normal_adjust_fit(cap_serif_fit#,0); -h:=vround(h-stem_corr); -w':=11.5u-width_adj; -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -pickup crisp.nib; pos3(slab,90); pos4(hair,0); -top y3r=h; x3=x1; rt x4r=hround(w'-.75u); y4=good.y(y3l-beak)-eps; -arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak -pos5(cap_bar,-90); pos6(hair,0); -top y5l=vround(.5[y2,y1]+.5cap_bar); x5=x1; -pos0(cap_bar,90); pos7(hair,0); -z0=z5; x6=x7; y6-y5l=y0l-y7; -if serifs: rt x6r=hround(w'-4u+.5hair); y6=good.y(y5l+.6beak)+eps; - rt x9r=hround(w'-.5u); -else: rt x6r=hround(w'-1.5u); y6=y5l+eps; rt x9r=hround(w'-.75u); fi -arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif -if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif -% the second F -currentpicture:=currentpicture + currentpicture shifted (w',0); -% the I -xshift:=2w'; -w':=w-xshift; -pickup tiny.nib; pos11(cap_stem,0); pos12(cap_stem,0); -lft x11l=lft x12l=hround(xshift+.5w'-.5cap_stem); top y11=h; bot y12=0; -filldraw stroke z11e--z12e; % stem -if serifs or slitex or monospace: - dish_serif(11,12,aa,1/3,1.05cap_jut,bb,1/3,1.05cap_jut); % upper serif - dish_serif(12,11,gg,1/3,1.05cap_jut,dd,1/3,1.05cap_jut); fi % lower serif -math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9,11,12); endchar; - -lhchar "Small Caps letter FFL"; -beginchar(oct"037",2(11.5u#-width_adj#)+11u#-width_adj#,cap_height#,0); -italcorr cap_height#*slant-.25u#; -normal_adjust_fit(cap_serif_fit#,0); -h:=vround(h-stem_corr); -w':=11.5u-width_adj; -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -pickup crisp.nib; pos3(slab,90); pos4(hair,0); -top y3r=h; x3=x1; rt x4r=hround(w'-.75u); y4=good.y(y3l-beak)-eps; -arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak -pos5(cap_bar,-90); pos6(hair,0); -top y5l=vround(.5[y2,y1]+.5cap_bar); x5=x1; -pos0(cap_bar,90); pos7(hair,0); -z0=z5; x6=x7; y6-y5l=y0l-y7; -if serifs: rt x6r=hround(w'-4u+.5hair); y6=good.y(y5l+.6beak)+eps; - rt x9r=hround(w'-.5u); -else: rt x6r=hround(w'-1.5u); y6=y5l+eps; rt x9r=hround(w'-.75u); fi -arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif -if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif -% the I -currentpicture:=currentpicture + currentpicture shifted (w',0); -% the L -xshift:=2w'; -pickup tiny.nib; pos11(cap_stem,0); pos12(cap_stem,0); -lft x11l=lft x12l=hround xshift+max(2u,3u-.5cap_stem); top y11=h; bot y12=0; -filldraw stroke z11e--z12e; % stem -pickup crisp.nib; pos13(slab,-90); pos14(hair,0); -bot y13r=0; x13=x12; y14=y13l+7/6beak+eps; rt x14r=hround(w-.75u); -arm(13,14,eee,1.2beak_darkness,beak_jut); % lower arm and beak -if serifs: dish_serif(11,12,aaa,1/3,cap_jut,bbb,1/3,1.25cap_jut); % upper serif - nodish_serif(12,11,ccc,1/3,cap_jut,ddd,1/3,.5cap_jut); fi % lower serif -math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9,11,12); endchar; - -endinput; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgcyracc.mf b/Master/texmf-dist/fonts/source/lh/base/lgcyracc.mf index 637f7883d79..fae5347a9cf 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgcyracc.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgcyracc.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -56,7 +56,7 @@ % Acomma - comma above letter % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec %accents % @@ -253,6 +253,7 @@ filldraw stroke z[_one]e{up}... % penlabels(1,2,3); endchar; +if not more_letters: endinput \\; fi % % T2-outsiders % @@ -462,11 +463,12 @@ adjust_fit(0,0); y[_four]+.5bulb_diam=-d+y_move+height; pos[_four](bulb_diam,90); pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45); - z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam + z[_one]r=z[_four]r; + rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam +if monospace:.28u / expansion_factor else:.25u fi)+2eps; x[_three]=x[_four]-.5u if monospace: /expansion_factor fi; - y[_two]=1/3[y[_one],y[_three]]; - bot y[_three]r=vround(y[_four]-(height-.5bulb_diam)); + y[_two]=1/3[y[_one],y[_three]]+eps; + bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps; y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three]) intersectiontimes (z[_four]l{right}..{left}z[_four]r)); if y_<0: y_:=1; fi @@ -477,4 +479,4 @@ adjust_fit(0,0); endchar; endinput; -%end of file +%end of file
\ No newline at end of file diff --git a/Master/texmf-dist/fonts/source/lh/base/lgcyri.mf b/Master/texmf-dist/fonts/source/lh/base/lgcyri.mf index a1cdaf67b19..3952056a53f 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgcyri.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgcyri.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec altaccent:=true; % for cyrillic breve diff --git a/Master/texmf-dist/fonts/source/lh/base/lgcyrl.mf b/Master/texmf-dist/fonts/source/lh/base/lgcyrl.mf index fd9e69538cd..1110715840e 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgcyrl.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgcyrl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec input lgrusl; % Russian letters input lgt2coml; % Letters common for couple of encodings @@ -38,6 +38,7 @@ if not old_cyr or unic: fi if other_cyr: + if concrete: input lgnoncl; fi % Cyrillic concrete letters input lgunicl; % Unicode letters not included in T2 input lgcmodl; % modified letters input lgcaccl; % accended letters diff --git a/Master/texmf-dist/fonts/source/lh/base/lgcyrsp.mf b/Master/texmf-dist/fonts/source/lh/base/lgcyrsp.mf index 734cf04319a..aed89604c1f 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgcyrsp.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgcyrsp.mf @@ -1,16 +1,16 @@ % -% lgt2lou.mf +% lgcyrsp.mf % %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -24,8 +24,9 @@ % SP_NJE - Specisl title Nje % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec +iff not concrete:% lhchar "Title Cyrillic letter LJE (Soft L)"; cyrchar(LJE_title,13.5u#,cap_height#,0); % DL_width:N_width if is_small_cap: getcharcode(lje); fi; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgcyrsym.mf b/Master/texmf-dist/fonts/source/lh/base/lgcyrsym.mf index c832b975264..3f3e37f8fb9 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgcyrsym.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgcyrsym.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -40,13 +40,14 @@ % baseqq "bd "bd German Opening quotes (looks like ,,) (ec: "12) % flqq "be "be Cyrillic Opening Quotes (looks like <<) (ec: "13) % frqq "bf "bf Cyrillic Closing Quotes (looks like >>) (ec: "14) +% grqq - - German Closing quotes (looks like ``) % % T1/T2-outsiders: % % pound ("bf) Sterling sign % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Cyrillic sign palochka (as latin I)"; cyrchar(palochka,max(6u#,4u#+cap_stem#),cap_height#,0); @@ -225,7 +226,7 @@ cyrchar(No,14.5u#+width_adj#,cap_height#,0); italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); adjust_fit(if monospace: 0,0 else: cap_serif_fit# if serifs: +.5(flare#+(cap_stem#-stem#))-.25u#,cap_serif_fit# else:,0 fi fi); -full_w:=w; w:=if serifs: 10u else: 11.5u fi; +full_w:=w; w:=if serifs: 9.5u+.5flare-.5fudged.hair else: 11.5u fi; numeric thin_stem; thin_stem=hround(fudged.hair+stem_corr); pickup tiny.nib; pos1(thin_stem,0); pos2(thin_stem,0); pos3(thin_stem,0); pos4(thin_stem,0); @@ -233,19 +234,21 @@ pickup tiny.nib; top y1=h; if serifs: top y3=.79h; bot y2=.21h; else: top y3=h; bot y2=0; fi bot y4=0; x1=x2; x3=x4; x1l=w-x3r; -rt x3r=hround min(w-2u,w-3u+.5fudged.cap_stem); if serifs: numeric bulb_diam; bulb_diam=flare+(cap_stem-stem); + rt x3r=hround min(w-max(2u,bulb_diam-2thin_stem-letter_fit),w-3u+.5fudged.cap_stem)+eps; pos21(thin_stem,-90); pos22(cap_hair,-180); pos23(bulb_diam,-180); pos31(thin_stem,-90); z31'=z31; pos31'(thin_stem,90); pos32(cap_hair,0); pos33(bulb_diam,0); - y23=vround max(.05fig_height+.5bulb_diam,.1fig_height-.5flare)-o;% - lft x23r=l+letter_fit+.15u; x33=w-x23; y33=h-y22; + y23=vround max(.05fig_height+.5bulb_diam,.1fig_height-.5bulb_diam)-o;% + lft x23r=min(l+letter_fit+.15u,rt x2r-bulb_diam-1)-eps; x33=w-x23; y33=h-y22; x21=max(lft x23r+.5bulb_diam,.45[lft x23r,rt x2r]); x31=w-x21; bot y21r=-oo; top y31l=h+oo; bulb(21,22,23); bulb(31',32,33); - filldraw stroke z1e--z2e & pulled_arc.e(2,21); % left stem - filldraw stroke z4e--z3e & pulled_arc.e(3,31); % right stem -else: filldraw stroke z1e--z2e; filldraw stroke z4e--z3e; fi + filldraw stroke z1e--z2e &{{interim superness:=more_super; super_arc.e(2,21)}}; % left stem + filldraw stroke z4e--z3e &{{interim superness:=more_super; super_arc.e(3,31)}}; % right stem +else: + rt x3r=hround min(w-2u,w-3u+.5fudged.cap_stem); + filldraw stroke z1e--z2e; filldraw stroke z4e--z3e; fi if hefty: penpos5(fudged.cap_stem,0); penpos6(fudged.cap_stem,0); x5l=x1; x6r=x4; y5=h; y6=0; numeric upper_notch,lower_notch; @@ -266,18 +269,19 @@ if serifs: if hefty: serif(1,2,a,1/3,-cap_jut); % upper left serif fi w:=full_w; penpos71(vair,90); penpos73(vair',-90); -if serifs: x72r=x33+hround max(.25u,u-.4curve); x74r=hround(w-.5u); +if serifs: x72r=x33+hround max(.1u,u-.75flare); x74r=hround(w-.5u); else: x72r=x3+1.25u+hround max(0,.75u-.4curve); x74r=hround(w-u); fi penpos72(min(1/3(x74r-x72r),.8curve),180); penpos74(min(1/3(x74r-x72r),.8curve),0); -x71=x73=.5[x72r,x74r]; y71r=h-3u+vround 1.5oo; y73r=x_height-3u-oo; -y72=y74=.5[h,x_height]-3u-vair_corr; y72l:=y74l:=.52[h,x_height]-3u; +x71=x73=.5[x72r,x74r]; y71r=h-max(3u,flare+(cap_stem-stem)+1.5oo)+vround 1.5oo; +y73r=x_height-3u-oo; +y72=y74=.5[y71r,y73r]-vair_corr; y72l:=y74l:=.52[h,x_height]-3u; penstroke pulled_arc.e(71,72) & pulled_arc.e(72,73) & pulled_arc.e(73,74) & pulled_arc.e(74,71) & cycle; % bowl pickup fine.nib; pos81(bar,90); pos82(bar,90); lft x81=x72r-.25fine; rt x82=x74r+.25fine; y81=y82=.8x_height-3u; filldraw stroke z81e--z82e; -penlabels(1,1',2,3,4,4',5,6,7); endchar; +penlabels(1,1',2,3,4,4',5,6,7, 21,22,23, 31',32,33); endchar; lhchar "Cyrillic Currency sign"; % from ec ... from rsym (wasy) cyrchar(currency,1.13 min(asc_height#,9/7x_height#)+2u#, @@ -356,8 +360,8 @@ numeric the_shift,shift_corr; the_shift=hround(max(3u,1.7stem)); shift_corr=the_shift-3u; pos1(max(fine.breadth, if serifs: qvair else: 7/8[vair,fudged.hair]-3stem_corr fi),0); -pos2(max(fine.breadth,if serifs: - if monospace: qvair else: stem fi else:7/8[vair,fudged.hair] fi),0); +pos2(max(fine.breadth,if serifs: + if hefty: qvair else: stem fi else:7/8[vair,fudged.hair] fi),0); pos3(max(fine.breadth, if serifs: qvair else: 7/8[vair,fudged.hair]-3stem_corr fi),0); rt x1r=rt x3r= @@ -372,9 +376,12 @@ if hefty: filldraw stroke z1e--z2e--z3e; % outer < filldraw stroke z1'e--z2'e--z3'e; % inner < else: - pos1'(qvair,0); - pos2'(7/8 [hair,stem],0); - pos3'(qvair,0); + pos1'(max(fine.breadth, + if serifs: qvair else: 7/8[vair,fudged.hair]-3stem_corr fi),0); + pos2'(max(fine.breadth,if serifs: + 2/3[vair,fudged.stem] else: 7/8[vair,fudged.hair] fi),0); + pos3'(max(fine.breadth, + if serifs: qvair else: 7/8[vair,fudged.hair]-3stem_corr fi),0); z2'=z2+the_shift*right; y1'-y2'=y2'-y3'=.8(y1-y2); z1'=z2'+whatever*(z1r-z2r); z3'=z2'+whatever*(z2r-z3r); @@ -401,8 +408,8 @@ numeric the_shift,shift_corr; the_shift=hround(max(3u,1.7stem)); shift_corr=the_shift-3u; pos1(max(fine.breadth, if serifs: qvair else: 7/8[vair,fudged.hair]-3stem_corr fi),0); -pos2(max(fine.breadth,if serifs: - if monospace: qvair else: stem fi else:7/8[vair,fudged.hair] fi),0); +pos2(max(fine.breadth,if serifs: + if hefty: qvair else: stem fi else:7/8[vair,fudged.hair] fi),0); pos3(max(fine.breadth, if serifs: qvair else: 7/8[vair,fudged.hair]-3stem_corr fi),0); lft x1l=lft x3l=w- @@ -417,9 +424,12 @@ if hefty: filldraw stroke z1e--z2e--z3e; % outer < filldraw stroke z1'e--z2'e--z3'e; % inner < else: - pos1'(qvair,0); - pos2'(7/8 [hair,stem],0); - pos3'(qvair,0); + pos1'(max(fine.breadth, + if serifs: qvair else: 7/8[vair,fudged.hair]-3stem_corr fi),0); + pos2'(max(fine.breadth,if serifs: + 2/3[vair,fudged.stem] else: 7/8[vair,fudged.hair] fi),0); + pos3'(max(fine.breadth, + if serifs: qvair else: 7/8[vair,fudged.hair]-3stem_corr fi),0); z2'=z2+the_shift*left; y1'-y2'=y2'-y3'=.8(y1-y2); z1'=z2'+whatever*(z1l-z2l); z3'=z2'+whatever*(z2l-z3l); @@ -455,5 +465,16 @@ pos10(bar,90); pos11(bar,90); x10=3u; x11=w-4.5u; top y10r=top y11r=vround(.5h+.5bar); filldraw stroke z10e--z11e; % bar penlabels(1,2,3,4,5,6,7,8,9,10,11); endchar; +iff (altcoding and (ligs <> 0)): % for CM +lhchar "Cyrillic `German close quotes' (like English opening quotes)"; +cyrchar(grqq,7u#+max(2u#,dot_size#),asc_height#,0); +italcorr asc_height#*slant+dot_size#-4.1u#; +adjust_fit(0,0); +x1-.5dot_size=hround .6u; y2+.5dot_size=h; +x2-x1=hround(1.5u+max(2u,dot_size)); y2=y1; +ammoc(1,a,dot_size,.25u,comma_depth); % left dot and tail +ammoc(2,b,dot_size,.25u,comma_depth); % right dot and tail +penlabels(1,2); endchar; + endinput; %end of file diff --git a/Master/texmf-dist/fonts/source/lh/base/lgcyru.mf b/Master/texmf-dist/fonts/source/lh/base/lgcyru.mf index 0437b340dd0..db98f47c14b 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgcyru.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgcyru.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec if is_small_cap: % for accents %%% fine higher @@ -52,6 +52,7 @@ if not old_cyr or unic: fi if other_cyr: + if concrete: input lgnoncu; fi % Cyrillic concrete letters input lgunicu; % Unicode letters not included in T2 input lgcmodu; % modified letters input lgcaccu; % accended letters diff --git a/Master/texmf-dist/fonts/source/lh/base/lgengsym.mf b/Master/texmf-dist/fonts/source/lh/base/lgengsym.mf index 01397b58735..6f225541cef 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgengsym.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgengsym.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -67,7 +67,7 @@ % "7f oct"177" - Hyphenchar % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Opening quotes"; beginchar(oct"020",3u#+max(2u#,pdot_diam#),asc_height#,0); @@ -99,6 +99,7 @@ top y1r=top y2r=vround(.61803h+.5vair); lft x1=-eps; rt x2=w+eps; filldraw stroke z1e--z2e; % bar penlabels(1,2); endchar; + iff monospace: lhchar "Hyphen"; beginchar(oct"025",6u#,x_height#,0); diff --git a/Master/texmf-dist/fonts/source/lh/base/lgidigit.mf b/Master/texmf-dist/fonts/source/lh/base/lgidigit.mf index deb2b5d3efa..aecddeea507 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgidigit.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgidigit.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -21,7 +21,7 @@ % italic numerals % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec % All digits have the same width diff --git a/Master/texmf-dist/fonts/source/lh/base/lgilig.mf b/Master/texmf-dist/fonts/source/lh/base/lgilig.mf index 98bbe913b79..3b0072af4ba 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgilig.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgilig.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -22,16 +22,10 @@ % % i_dotl "19 i dotless % j_dotl "1a j dotless -% ff-ligs (lgiligff.mf) +% ff-ligs % -LHver_check(3,4); % like |version_check| in ec - -if (roman_ec=true) and (old_cyr=false): - -input lgiligff.mf - -fi %roman_ec +LHver_check(3,5); % like |version_check| in ec lhchar "Italic Cyrillic letter dotless i"; cyrchar(i_dotl,5u#,x_height#,0); @@ -55,5 +49,222 @@ filldraw stroke z2e---z3e...{left}z4e; % stem and arc bulb(4,5,6); % bulb penlabels(0,1,2,3,4,5,6); endchar; +if (roman_ec=true) and (old_cyr=false): %relax +else: endinput \\; fi + +numeric itc; % modified italic correction on `f' and `ff' +itc=(asc_height#-x_height#)*slant+.75u#; + +lhchar "Italic ligature ff"; +beginchar(oct"033", +%if monospace: 12u# else: +(5u#+max(1.5u#,stem#)+max(3.5u#,2flare#))+2letter_fit#, % fi, + asc_height#,desc_depth#); +italcorr asc_height#*slant+.75u#; +normal_adjust_fit(0,0); pickup fine.nib; +z98-z88=z99-z89=z14-z4=z15-z5=(if monospace: 4.3u else: 4.8u fi +2letter_fit,0); +.5[x88,x99]=.5w-.1u; x89-x88=u; y98=h; y99=-d; +numeric theta; theta=angle(z88-z89); +pos0(flare,0); pos1(hair,0); pos2(vair,90); +pos3(.5[hair,stem],180); pos4(stem,theta+90); +pos5(stem,theta-90); pos6(.5[hair,stem],0); +pos7(vair,-90); pos8(hair,-180); pos9(flare,-180); +if monospace: rt x1r=hround(.5w+.75u); +else: + rt x1r=hround(.5w+1.25u); +fi +%if monospace: lft x8r=hround-.35u; +%else: +lft x8r=hround-.35u; +%fi +x2=.5[x1,x4]; x7=.6[x8,x5]; +y9-.5flare=vround -.85d; y2-y0=y9-y7; top y2r=h+oo; bot y7r=-d-oo; +y4=.25[x_height,h]; y5=.5[-d,y4]; +z4=whatever[z88,z89]; z5=whatever[z88,z89]; +x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7]; +bulb(2,1,0); bulb(7,8,9); % left bulbs +filldraw stroke z2e{left}...z3e...{z89-z88}z4e; % upper middle arc +filldraw z4r--z5l--z5r--z4l--cycle; % left stem +filldraw stroke z5e{z89-z88}...z6e...{left}z7e; % lower left arc +pos10(flare,0); pos11(hair,0); pos12(vair,90); +pos13(.5[hair,stem],180); pos14(stem,theta+90); +pos15(stem,theta-90); pos16(.5[hair,stem],0); +pos17(vair,-90); pos18(hair,-180); pos19(flare,-180); +rt x11r=hround(w+.25u); +if monospace: lft x18r=hround(.5w-.75u); +else: lft x18r=hround(.5w-1.25u); fi +x12=.6[x11,x14]; x17=.5[x18,x15]; +x13=.8[x12+x14-x98,x98]; x16=.8[x17+x15-x99,x99]; +y0=y10; y2=y12; y3=y13; y6=y16; y7=y17; y9=y19; +bulb(12,11,10); bulb(17,18,19); % right bulbs +filldraw stroke z12e{left}...z13e...{z99-z98}z14e; % upper right arc +filldraw z14r--z15l--z15r--z14l--cycle; % right stem +filldraw stroke z15e{z99-z98}...z16e...{left}z17e; % lower middle arc +pickup crisp.nib; pos20(bar,90); pos21(bar,90); +top y20r=top y21r=x_height; +lft x20=lft x4r-.5stem-u; rt x21=rt x14l+.5stem+1.5u; +filldraw stroke z20e--z21e; % crossbar +penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19, + 20,21,88,89,98,99); endchar; + +lhchar "Italic ligature fi"; +beginchar(oct"034",if monospace: 4.5u# else: 6.5u# fi +.5max(1.5u#,stem#)+.5max(3.5u#,2flare#) + +2letter_fit#,asc_height#,desc_depth#); +italcorr max(asc_height#*slant+.5stem#-2u#,1/3x_height#*slant+.5hair#+.5u#); +normal_adjust_fit(0,0); pickup fine.nib; +.5[x88,x89]=.5(w-if monospace: 2u else: 4u fi -2letter_fit); x89-x88=u; y88=h; y89=-d; +numeric theta; theta=angle(z88-z89); +pos0(flare,0); pos1(hair,0); pos2(vair,90); +pos3(.5[hair,stem],180); pos4(stem,theta+90); +pos5(stem,theta-90); pos6(.5[hair,stem],0); +pos7(vair,-90); pos8(hair,-180); pos9(flare,-180); +pos11(stem,0); rt x11r=hround(w-2.5u+.5stem); +x12=x11; x14=w; hook_out(12,13,14); % closing hook +x1r=x11r; lft x8r=hround-.35u; x2=.5[x1,x4]; x7=.6[x8,x5]; +y9-.5flare=vround-.85d; bot y7r=-d-oo; +y0+.5flare=vround(.85[x_height,h]); top y2r=h+oo; +y4=.25[x_height,h]; y5=.5[-d,y4]; +z4=whatever[z88,z89]; z5=whatever[z88,z89]; +x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7]; +bulb(2,1,0); bulb(7,8,9); % bulbs +filldraw stroke z2e{left}...z3e...{z89-z88}z4e; % upper arc +filldraw z4r--z5l--z5r--z4l--cycle; % left stem +filldraw stroke z5e{z89-z88}...z6e...{left}z7e; % lower arc +top y11=x_height; filldraw stroke z11e--z12e; % right stem +pickup crisp.nib; pos20(bar,90); pos21(bar,90); +top y20r=top y21r=x_height; +lft x20=lft x4r-.5stem-u; x21=x11; +filldraw stroke z20e--z21e; % crossbar +penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,20,21,88,89); endchar; + +lhchar "Italic ligature fl"; +beginchar(oct"035",if monospace: 5u# else: 7u# fi +.5max(1.5u#,stem#)+.5max(3.5u#,2flare#) + +2letter_fit#,asc_height#,desc_depth#); +italcorr max(asc_height#*slant+.5stem#-2u#,1/3x_height#*slant+.5hair#+.5u#); +normal_adjust_fit(0,0); pickup fine.nib; +.5[x88,x89]=.5(w-if monospace: 3.5u else: 4.5u fi -2letter_fit); +x89-x88=u; y88=h; y89=-d; +numeric theta; theta=angle(z88-z89); +pos0(flare,0); pos1(hair,0); pos2(vair,90); +pos3(.5[hair,stem],180); pos4(stem,theta+90); +pos5(stem,theta-90); pos6(.5[hair,stem],0); +pos7(vair,-90); pos8(hair,-180); pos9(flare,-180); +pos11(stem,0); rt x11r=hround(w-2.5u+.5stem); rt x1r=lft x11l; +x12=x11; x14=w; hook_out(12,13,14); % closing hook +if monospace: lft x8r=hround-.55u; +else: lft x8r=hround-.35u; fi +x2=.5[x1,x4]; x7=.6[x8,x5]; +y9-.5flare=vround -.85d; y2-y0=y9-y7; top y2r=h+oo; bot y7r=-d-oo; +y4=.25[x_height,h]; y5=.5[-d,y4]; +z4=whatever[z88,z89]; z5=whatever[z88,z89]; +x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7]; +bulb(2,1,0); bulb(7,8,9); % bulbs +filldraw stroke z2e{left}...z3e...{z89-z88}z4e; % upper arc +filldraw z4r--z5l--z5r--z4l--cycle; % left stem +filldraw stroke z5e{z89-z88}...z6e...{left}z7e; % lower arc +top y11=h; filldraw stroke z11e--z12e; % right stem +pickup crisp.nib; pos20(bar,90); pos21(bar,90); +top y20r=top y21r=x_height; +lft x20=lft x4r-.5stem-u; x21=x11; +filldraw stroke z20e--z21e; % crossbar +penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,20,21,88,89); endchar; + +lhchar "Italic ligature ffi"; +beginchar(oct"036", +if monospace: 7.75u# else: 11.75u# fi +.5max(1.5u#,stem#)+.5max(3.5u#,2flare#) + +4letter_fit#,asc_height#,desc_depth#); +italcorr max(asc_height#*slant+.5stem#-2u#,1/3x_height#*slant+.5hair#+.5u#); +normal_adjust_fit(0,0); pickup fine.nib; +z98-z88=z99-z89=z14-z4=z15-z5=(if monospace: 3u else: 5u fi +2letter_fit,0); +numeric theta,mid_f; +mid_f=.5[x88,x99]=.5(w-if monospace: 2.25u else: 4.25u fi -2letter_fit); +x89-x88=u; +y98=h; y99=-d; theta=angle(z88-z89); +pos21(stem,0); rt x21r=hround(w-2.5u+.5stem); +x22=x21; x24=w; hook_out(22,23,24); % closing hook +pos0(flare,0); pos1(hair,0); pos2(vair,90); +pos3(.5[hair,stem],180); pos4(stem,theta+90); +pos5(stem,theta-90); pos6(.5[hair,stem],0); +pos7(vair,-90); pos8(hair,-180); pos9(flare,-180); +if monospace: rt x1r=hround(mid_f+u); +else: rt x1r=hround(mid_f+1.75u); fi +if monospace: lft x8r=hround -.65u; +else: lft x8r=hround-.35u; fi +x2=.5[x1,x4]; x7=.6[x8,x5]; +y9-.5flare=vround -.85d; y2-y0=y9-y7; top y2r=h+oo; bot y7r=-d-oo; +y4=.25[x_height,h]; y5=.5[-d,y4]; +z4=whatever[z88,z89]; z5=whatever[z88,z89]; +x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7]; +bulb(2,1,0); bulb(7,8,9); % left bulbs +filldraw stroke z2e{left}...z3e...{z89-z88}z4e; % upper middle arc +filldraw z4r--z5l--z5r--z4l--cycle; % left stem +filldraw stroke z5e{z89-z88}...z6e...{left}z7e; % lower left arc +pos10(flare,0); pos11(hair,0); pos12(vair,90); +pos13(.5[hair,stem],180); pos14(stem,theta+90); +pos15(stem,theta-90); pos16(.5[hair,stem],0); +pos17(vair,-90); pos18(hair,-180); pos19(flare,-180); +x11r=x21r; lft x18r=hround(mid_f-1.25u); x12=.5[x11,x14]; x17=.5[x18,x15]; +x13=.8[x12+x14-x98,x98]; x16=.8[x17+x15-x99,x99]; +y10+.5flare=vround .85[x_height,h]; +y2=y12; y3=y13; y6=y16; y7=y17; y9=y19; +bulb(12,11,10); bulb(17,18,19); % right bulbs +filldraw stroke z12e{left}...z13e...{z99-z98}z14e; % upper right arc +filldraw z14r--z15l--z15r--z14l--cycle; % middle stem +filldraw stroke z15e{z99-z98}...z16e...{left}z17e; % lower middle arc +top y21=x_height; filldraw stroke z21e--z22e; % right stem +pickup crisp.nib; pos30(bar,90); pos31(bar,90); +top y30r=top y31r=x_height; +lft x30=lft x4r-.5stem-u; x31=x21; +filldraw stroke z30e--z31e; % crossbar +penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19, + 20,21,22,23,24,30,31,88,89,98,99); endchar; + +lhchar "Italic ligature ffl"; +beginchar(oct"037", + if monospace: 8u# else: 12u# fi +.5max(1.5u#,stem#)+.5max(3.5u#,2flare#) + +4letter_fit#,asc_height#,desc_depth#); +italcorr max(asc_height#*slant+.5stem#-2u#,1/3x_height#*slant+.5hair#+.5u#); +normal_adjust_fit(0,0); pickup fine.nib; +z98-z88=z99-z89=z14-z4=z15-z5=(if monospace: 3u else: 5u fi+2letter_fit,0); +numeric theta,mid_f; +mid_f=.5[x88,x99]=.5(w-if monospace: 2u else: 4.5u fi-2letter_fit); x89-x88=u; +y98=h; y99=-d; theta=angle(z88-z89); +pos21(stem,0); rt x21r=hround(w-2.5u+.5stem); +x22=x21; x24=w; hook_out(22,23,24); % closing hook +pos0(flare,0); pos1(hair,0); pos2(vair,90); +pos3(.5[hair,stem],180); pos4(stem,theta+90); +pos5(stem,theta-90); pos6(.5[hair,stem],0); +pos7(vair,-90); pos8(hair,-180); pos9(flare,-180); +if monospace: rt x1r=hround(mid_f+u); +else: rt x1r=hround(mid_f+1.25u); fi +lft x8r=hround-.35u; +x2=.5[x1,x4]; x7=.6[x8,x5]; +y9-.5flare=vround -.85d; y2-y0=y9-y7; top y2r=h+oo; bot y7r=-d-oo; +y4=.25[x_height,h]; y5=.5[-d,y4]; +z4=whatever[z88,z89]; z5=whatever[z88,z89]; +x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7]; +bulb(2,1,0); bulb(7,8,9); % left bulbs +filldraw stroke z2e{left}...z3e...{z89-z88}z4e; % upper middle arc +filldraw z4r--z5l--z5r--z4l--cycle; % left stem +filldraw stroke z5e{z89-z88}...z6e...{left}z7e; % lower left arc +pos10(flare,0); pos11(hair,0); pos12(vair,90); +pos13(.5[hair,stem],180); pos14(stem,theta+90); +pos15(stem,theta-90); pos16(.5[hair,stem],0); +pos17(vair,-90); pos18(hair,-180); pos19(flare,-180); rt x11r=lft x21l; +lft x18r=hround(mid_f-1.25u); x12=.5[x11,x14]; x17=.5[x18,x15]; +x13=.8[x12+x14-x98,x98]; x16=.8[x17+x15-x99,x99]; +y0=y10; y2=y12; y3=y13; y6=y16; y7=y17; y9=y19; +bulb(12,11,10); bulb(17,18,19); % right bulbs +filldraw stroke z12e{left}...z13e...{z99-z98}z14e; % upper right arc +filldraw z14r--z15l--z15r--z14l--cycle; % middle stem +filldraw stroke z15e{z99-z98}...z16e...{left}z17e; % lower middle arc +top y21=h; filldraw stroke z21e--z22e; % right stem +pickup crisp.nib; pos30(bar,90); pos31(bar,90); +top y30r=top y31r=x_height; +lft x30=lft x4r-.5stem-u; x31=x21; +filldraw stroke z30e--z31e; % crossbar +penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19, + 20,21,22,23,24,30,31,88,89,98,99); endchar; + endinput; %end of file diff --git a/Master/texmf-dist/fonts/source/lh/base/lgiligff.mf b/Master/texmf-dist/fonts/source/lh/base/lgiligff.mf deleted file mode 100644 index 648b9fbb69f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/base/lgiligff.mf +++ /dev/null @@ -1,242 +0,0 @@ -% -% lgilig.mf -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% roman dotless i,j -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Special letters -% -% ff-ligs -% - -LHver_check(3,4); % like |version_check| in ec - -numeric itc; % modified italic correction on `f' and `ff' -itc=(asc_height#-x_height#)*slant+.75u#; - -lhchar "Italic ligature ff"; -beginchar(oct"033", -%if monospace: 12u# else: -(5u#+max(1.5u#,stem#)+max(3.5u#,2flare#))+2letter_fit#, % fi, - asc_height#,desc_depth#); -italcorr asc_height#*slant+.75u#; -normal_adjust_fit(0,0); pickup fine.nib; -z98-z88=z99-z89=z14-z4=z15-z5=(if monospace: 4.3u else: 4.8u fi +2letter_fit,0); -.5[x88,x99]=.5w-.1u; x89-x88=u; y98=h; y99=-d; -numeric theta; theta=angle(z88-z89); -pos0(flare,0); pos1(hair,0); pos2(vair,90); -pos3(.5[hair,stem],180); pos4(stem,theta+90); -pos5(stem,theta-90); pos6(.5[hair,stem],0); -pos7(vair,-90); pos8(hair,-180); pos9(flare,-180); -if monospace: rt x1r=hround(.5w+.75u); -else: - rt x1r=hround(.5w+1.25u); -fi -%if monospace: lft x8r=hround-.35u; -%else: -lft x8r=hround-.35u; -%fi -x2=.5[x1,x4]; x7=.6[x8,x5]; -y9-.5flare=vround -.85d; y2-y0=y9-y7; top y2r=h+oo; bot y7r=-d-oo; -y4=.25[x_height,h]; y5=.5[-d,y4]; -z4=whatever[z88,z89]; z5=whatever[z88,z89]; -x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7]; -bulb(2,1,0); bulb(7,8,9); % left bulbs -filldraw stroke z2e{left}...z3e...{z89-z88}z4e; % upper middle arc -filldraw z4r--z5l--z5r--z4l--cycle; % left stem -filldraw stroke z5e{z89-z88}...z6e...{left}z7e; % lower left arc -pos10(flare,0); pos11(hair,0); pos12(vair,90); -pos13(.5[hair,stem],180); pos14(stem,theta+90); -pos15(stem,theta-90); pos16(.5[hair,stem],0); -pos17(vair,-90); pos18(hair,-180); pos19(flare,-180); -rt x11r=hround(w+.25u); -if monospace: lft x18r=hround(.5w-.75u); -else: lft x18r=hround(.5w-1.25u); fi -x12=.6[x11,x14]; x17=.5[x18,x15]; -x13=.8[x12+x14-x98,x98]; x16=.8[x17+x15-x99,x99]; -y0=y10; y2=y12; y3=y13; y6=y16; y7=y17; y9=y19; -bulb(12,11,10); bulb(17,18,19); % right bulbs -filldraw stroke z12e{left}...z13e...{z99-z98}z14e; % upper right arc -filldraw z14r--z15l--z15r--z14l--cycle; % right stem -filldraw stroke z15e{z99-z98}...z16e...{left}z17e; % lower middle arc -pickup crisp.nib; pos20(bar,90); pos21(bar,90); -top y20r=top y21r=x_height; -lft x20=lft x4r-.5stem-u; rt x21=rt x14l+.5stem+1.5u; -filldraw stroke z20e--z21e; % crossbar -penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19, - 20,21,88,89,98,99); endchar; - -lhchar "Italic ligature fi"; -beginchar(oct"034",if monospace: 4.5u# else: 6.5u# fi +.5max(1.5u#,stem#)+.5max(3.5u#,2flare#) - +2letter_fit#,asc_height#,desc_depth#); -italcorr max(asc_height#*slant+.5stem#-2u#,1/3x_height#*slant+.5hair#+.5u#); -normal_adjust_fit(0,0); pickup fine.nib; -.5[x88,x89]=.5(w-if monospace: 2u else: 4u fi -2letter_fit); x89-x88=u; y88=h; y89=-d; -numeric theta; theta=angle(z88-z89); -pos0(flare,0); pos1(hair,0); pos2(vair,90); -pos3(.5[hair,stem],180); pos4(stem,theta+90); -pos5(stem,theta-90); pos6(.5[hair,stem],0); -pos7(vair,-90); pos8(hair,-180); pos9(flare,-180); -pos11(stem,0); rt x11r=hround(w-2.5u+.5stem); -x12=x11; x14=w; hook_out(12,13,14); % closing hook -x1r=x11r; lft x8r=hround-.35u; x2=.5[x1,x4]; x7=.6[x8,x5]; -y9-.5flare=vround-.85d; bot y7r=-d-oo; -y0+.5flare=vround(.85[x_height,h]); top y2r=h+oo; -y4=.25[x_height,h]; y5=.5[-d,y4]; -z4=whatever[z88,z89]; z5=whatever[z88,z89]; -x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7]; -bulb(2,1,0); bulb(7,8,9); % bulbs -filldraw stroke z2e{left}...z3e...{z89-z88}z4e; % upper arc -filldraw z4r--z5l--z5r--z4l--cycle; % left stem -filldraw stroke z5e{z89-z88}...z6e...{left}z7e; % lower arc -top y11=x_height; filldraw stroke z11e--z12e; % right stem -pickup crisp.nib; pos20(bar,90); pos21(bar,90); -top y20r=top y21r=x_height; -lft x20=lft x4r-.5stem-u; x21=x11; -filldraw stroke z20e--z21e; % crossbar -penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,20,21,88,89); endchar; - -lhchar "Italic ligature fl"; -beginchar(oct"035",if monospace: 5u# else: 7u# fi +.5max(1.5u#,stem#)+.5max(3.5u#,2flare#) - +2letter_fit#,asc_height#,desc_depth#); -italcorr max(asc_height#*slant+.5stem#-2u#,1/3x_height#*slant+.5hair#+.5u#); -normal_adjust_fit(0,0); pickup fine.nib; -.5[x88,x89]=.5(w-if monospace: 3.5u else: 4.5u fi -2letter_fit); -x89-x88=u; y88=h; y89=-d; -numeric theta; theta=angle(z88-z89); -pos0(flare,0); pos1(hair,0); pos2(vair,90); -pos3(.5[hair,stem],180); pos4(stem,theta+90); -pos5(stem,theta-90); pos6(.5[hair,stem],0); -pos7(vair,-90); pos8(hair,-180); pos9(flare,-180); -pos11(stem,0); rt x11r=hround(w-2.5u+.5stem); rt x1r=lft x11l; -x12=x11; x14=w; hook_out(12,13,14); % closing hook -if monospace: lft x8r=hround-.55u; -else: lft x8r=hround-.35u; fi -x2=.5[x1,x4]; x7=.6[x8,x5]; -y9-.5flare=vround -.85d; y2-y0=y9-y7; top y2r=h+oo; bot y7r=-d-oo; -y4=.25[x_height,h]; y5=.5[-d,y4]; -z4=whatever[z88,z89]; z5=whatever[z88,z89]; -x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7]; -bulb(2,1,0); bulb(7,8,9); % bulbs -filldraw stroke z2e{left}...z3e...{z89-z88}z4e; % upper arc -filldraw z4r--z5l--z5r--z4l--cycle; % left stem -filldraw stroke z5e{z89-z88}...z6e...{left}z7e; % lower arc -top y11=h; filldraw stroke z11e--z12e; % right stem -pickup crisp.nib; pos20(bar,90); pos21(bar,90); -top y20r=top y21r=x_height; -lft x20=lft x4r-.5stem-u; x21=x11; -filldraw stroke z20e--z21e; % crossbar -penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,20,21,88,89); endchar; - -lhchar "Italic ligature ffi"; -beginchar(oct"036", -if monospace: 7.75u# else: 11.75u# fi +.5max(1.5u#,stem#)+.5max(3.5u#,2flare#) - +4letter_fit#,asc_height#,desc_depth#); -italcorr max(asc_height#*slant+.5stem#-2u#,1/3x_height#*slant+.5hair#+.5u#); -normal_adjust_fit(0,0); pickup fine.nib; -z98-z88=z99-z89=z14-z4=z15-z5=(if monospace: 3u else: 5u fi +2letter_fit,0); -numeric theta,mid_f; -mid_f=.5[x88,x99]=.5(w-if monospace: 2.25u else: 4.25u fi -2letter_fit); -x89-x88=u; -y98=h; y99=-d; theta=angle(z88-z89); -pos21(stem,0); rt x21r=hround(w-2.5u+.5stem); -x22=x21; x24=w; hook_out(22,23,24); % closing hook -pos0(flare,0); pos1(hair,0); pos2(vair,90); -pos3(.5[hair,stem],180); pos4(stem,theta+90); -pos5(stem,theta-90); pos6(.5[hair,stem],0); -pos7(vair,-90); pos8(hair,-180); pos9(flare,-180); -if monospace: rt x1r=hround(mid_f+u); -else: rt x1r=hround(mid_f+1.75u); fi -if monospace: lft x8r=hround -.65u; -else: lft x8r=hround-.35u; fi -x2=.5[x1,x4]; x7=.6[x8,x5]; -y9-.5flare=vround -.85d; y2-y0=y9-y7; top y2r=h+oo; bot y7r=-d-oo; -y4=.25[x_height,h]; y5=.5[-d,y4]; -z4=whatever[z88,z89]; z5=whatever[z88,z89]; -x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7]; -bulb(2,1,0); bulb(7,8,9); % left bulbs -filldraw stroke z2e{left}...z3e...{z89-z88}z4e; % upper middle arc -filldraw z4r--z5l--z5r--z4l--cycle; % left stem -filldraw stroke z5e{z89-z88}...z6e...{left}z7e; % lower left arc -pos10(flare,0); pos11(hair,0); pos12(vair,90); -pos13(.5[hair,stem],180); pos14(stem,theta+90); -pos15(stem,theta-90); pos16(.5[hair,stem],0); -pos17(vair,-90); pos18(hair,-180); pos19(flare,-180); -x11r=x21r; lft x18r=hround(mid_f-1.25u); x12=.5[x11,x14]; x17=.5[x18,x15]; -x13=.8[x12+x14-x98,x98]; x16=.8[x17+x15-x99,x99]; -y10+.5flare=vround .85[x_height,h]; -y2=y12; y3=y13; y6=y16; y7=y17; y9=y19; -bulb(12,11,10); bulb(17,18,19); % right bulbs -filldraw stroke z12e{left}...z13e...{z99-z98}z14e; % upper right arc -filldraw z14r--z15l--z15r--z14l--cycle; % middle stem -filldraw stroke z15e{z99-z98}...z16e...{left}z17e; % lower middle arc -top y21=x_height; filldraw stroke z21e--z22e; % right stem -pickup crisp.nib; pos30(bar,90); pos31(bar,90); -top y30r=top y31r=x_height; -lft x30=lft x4r-.5stem-u; x31=x21; -filldraw stroke z30e--z31e; % crossbar -penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19, - 20,21,22,23,24,30,31,88,89,98,99); endchar; - -lhchar "Italic ligature ffl"; -beginchar(oct"037", - if monospace: 8u# else: 12u# fi +.5max(1.5u#,stem#)+.5max(3.5u#,2flare#) - +4letter_fit#,asc_height#,desc_depth#); -italcorr max(asc_height#*slant+.5stem#-2u#,1/3x_height#*slant+.5hair#+.5u#); -normal_adjust_fit(0,0); pickup fine.nib; -z98-z88=z99-z89=z14-z4=z15-z5=(if monospace: 3u else: 5u fi+2letter_fit,0); -numeric theta,mid_f; -mid_f=.5[x88,x99]=.5(w-if monospace: 2u else: 4.5u fi-2letter_fit); x89-x88=u; -y98=h; y99=-d; theta=angle(z88-z89); -pos21(stem,0); rt x21r=hround(w-2.5u+.5stem); -x22=x21; x24=w; hook_out(22,23,24); % closing hook -pos0(flare,0); pos1(hair,0); pos2(vair,90); -pos3(.5[hair,stem],180); pos4(stem,theta+90); -pos5(stem,theta-90); pos6(.5[hair,stem],0); -pos7(vair,-90); pos8(hair,-180); pos9(flare,-180); -if monospace: rt x1r=hround(mid_f+u); -else: rt x1r=hround(mid_f+1.25u); fi -lft x8r=hround-.35u; -x2=.5[x1,x4]; x7=.6[x8,x5]; -y9-.5flare=vround -.85d; y2-y0=y9-y7; top y2r=h+oo; bot y7r=-d-oo; -y4=.25[x_height,h]; y5=.5[-d,y4]; -z4=whatever[z88,z89]; z5=whatever[z88,z89]; -x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7]; -bulb(2,1,0); bulb(7,8,9); % left bulbs -filldraw stroke z2e{left}...z3e...{z89-z88}z4e; % upper middle arc -filldraw z4r--z5l--z5r--z4l--cycle; % left stem -filldraw stroke z5e{z89-z88}...z6e...{left}z7e; % lower left arc -pos10(flare,0); pos11(hair,0); pos12(vair,90); -pos13(.5[hair,stem],180); pos14(stem,theta+90); -pos15(stem,theta-90); pos16(.5[hair,stem],0); -pos17(vair,-90); pos18(hair,-180); pos19(flare,-180); rt x11r=lft x21l; -lft x18r=hround(mid_f-1.25u); x12=.5[x11,x14]; x17=.5[x18,x15]; -x13=.8[x12+x14-x98,x98]; x16=.8[x17+x15-x99,x99]; -y0=y10; y2=y12; y3=y13; y6=y16; y7=y17; y9=y19; -bulb(12,11,10); bulb(17,18,19); % right bulbs -filldraw stroke z12e{left}...z13e...{z99-z98}z14e; % upper right arc -filldraw z14r--z15l--z15r--z14l--cycle; % middle stem -filldraw stroke z15e{z99-z98}...z16e...{left}z17e; % lower middle arc -top y21=h; filldraw stroke z21e--z22e; % right stem -pickup crisp.nib; pos30(bar,90); pos31(bar,90); -top y30r=top y31r=x_height; -lft x30=lft x4r-.5stem-u; x31=x21; -filldraw stroke z30e--z31e; % crossbar -penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19, - 20,21,22,23,24,30,31,88,89,98,99); endchar; - -endinput; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgitalp.mf b/Master/texmf-dist/fonts/source/lh/base/lgitalp.mf index 4300d00c534..66f9b9289c2 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgitalp.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgitalp.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -25,7 +25,7 @@ % * Spanish open question mark moved out % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec iff not wncoding:% lhchar "Italic ampersand"; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgocyrac.mf b/Master/texmf-dist/fonts/source/lh/base/lgocyrac.mf index 9965a9cf47c..63613d40b59 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgocyrac.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgocyrac.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -45,7 +45,7 @@ % tmatem % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Cyrillic sign thousands"; % ss uses SlavTeX form cyrchar(thousands,if serifs:8u# else:7u# fi,x_height#,desc_depth#); @@ -91,7 +91,7 @@ _zero:=1; _one:=2; _two:=3; _three:=4; _four:=5; _five:=6; _six:=7; % pickup fine.nib; numeric stem[]; -stem0=if serifs: .8[hair,stem] else: fudged.hair-4stem_corr fi; +stem0=max(currentbreadth+eps,if serifs: .8[hair,stem] else: fudged.hair-4stem_corr fi); pos[_one](stem0,0); pos[_two](stem0,0); pos[_three](stem0,0); pos[_four](stem0,0); numeric middle_weight; @@ -260,6 +260,7 @@ cyrchar(pneuac,9u#,min(asc_height#,2x_height#),0); italcorr asc_height#*slant+.5dot_size#-2u#; adjust_fit(0,0); old_u:=u; u:=.75u; +x_move:=0; % classic acute if serifs: pickup crisp.nib; x1+.5fudged.stem=hround(w-2u)+x_move; x2=2/3[x1,w+x_move-x1+(w+x_move-9u)]; @@ -438,32 +439,41 @@ y_move:=x_height+oo; old_u:=u; u:=u*(acc_height/x_height); ll=hround(.5w-5.25u); rr=hround(.5w+3.25u); clearxy; % -if serifs: +if hefty or (1/3hh<=1): + pickup pencircle scaled .5 fine; + pos1(max(currentbreadth+eps,if hefty: min(1/3 hh,2/3vair) else: flare fi),80); + pos2(max(currentbreadth+eps,if hefty: min(1/3 hh,2/3vair) else: vair fi),90); + pos3(max(currentbreadth+eps,if is_egyptian: 2/3 fi curve),180); + pos4(max(currentbreadth+eps,if hefty: min(1/3 hh,2/3vair) else: vair fi),270); + pos5(max(currentbreadth+.5+eps,if hefty: min(1/3 hh,2/3vair)+eps else: flare fi),275); + rt x1r=hround(rr-1.1u); x2=x4=.55[x3,x1]; + lft x3r=ll+hround max(u,2u-.5curve); rt x5r=hround(rr-.9u); + top y1r=vround max(2/3hh+.25flare-eps,.9hh+oo)+y_move; + top y2r=hh+oo+y_move; y3=.52hh+y_move; + bot y4r=o+y_move+eps; + bot y5r=bot y4r+vround min(1/3hh-.25flare+eps,.15[oo,hh]); + 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 +else: pickup fine.nib; pos1(hair,0); pos2(vair,90); pos3(curve,180); pos4(vair',270); pos5(hair,360); - rt x1r=rt x5r=hround(rr-u); lft x3r=hround(ll+u); x2=x4=.55[x3,x1]; + rt x1r=rt x5r=hround(rr-u); lft x3r=hround(ll+u); + x2=x4=min(x1l-eps,.55[x3,x1]); top y2r=hh+oo+y_move; bot y4r=o+y_move; y3=.5[y2,y4]; - bot y1=min(vround max(.65hh,.75hh-.5vair),bot y2l-eps)+y_move; + bot y1=vround min(max(.65hh,.75hh-.5vair),bot y2l-eps)+y_move; y5=max(good.y (.95(hh-y1)+y_move),y4l+eps-y_move)+y_move; (x2l',y2l)=whatever[z2r,z1l]; x2l:=min(x2l',x2l+.5u); (x4l',y4l)=whatever[z4r,z5l]; x4l:=min(x4l',x4l+.5u); - filldraw stroke z1e{x2-x1,10(y2-y1)} + filldraw stroke z1e{x2-x1,5(y2-y1)} ...pulled_arc.e(2,3) & pulled_arc.e(3,4)...{up}z5e; % arc pos6(.3[fine.breadth,cap_hair],0); x6r=x1r; top y6=hh+oo+y_move; x1r-x1'=2cap_curve-fine; y1'=y1; path upper_arc; upper_arc=z1{x2-x1,10(y2-y1)}..z2{left}; numeric t; t=xpart(upper_arc intersectiontimes (z6l--z1')); filldraw z1r--z6r--z6l--subpath(t,0) of upper_arc--cycle; % barb -else: - pickup fine.nib; pos1(flare,80); pos2(vair,90); - pos3(curve,180); pos4(vair,270); pos5(flare,275); - rt x1r=hround(rr-1.1u); x2=x4=.55[x3,x1]; - lft x3r=ll+hround max(u,2u-.5cap_curve); rt x5r=hround(rr-.9u); - top y1r=vround .9hh+oo+y_move; top y2r=hh+oo+y_move; y3=.5hh+y_move; - bot y4r=o+y_move+eps; bot y5r=vround .15[oo,hh]+y_move; 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); fi % arc and terminals -endgroup; +fi +penlabels(1,2,3,4,5); endgroup; penlabels(1,2,3,4); endchar; @@ -490,22 +500,27 @@ bot y[_one]=bot y[_three]= bot y[_four]l=min(bot y[_one]-.5y_move,x_height+o+.5y_move)-eps; x[_four]=w+eps; forsuffixes e=l,r: path p; p=z[_two]e{right}...{(x[_three]-x[_one]),-7acc_height}z[_three]e; - z[_three]'e=point .8 of p; endfor + z[_three]'e=point 2/3 of p; endfor filldraw stroke z[_one]e{(x[_three]-x[_one]),7acc_height}... z[_two]e{right}... {direction .8 of p}z[_three]'e...{right}z[_four]e; % stroke %%% %tlo_d -stem2:=1/3[hair,fudged.stem]; -if not serifs: stem2:=max(fine.breadth,1/2[thin_join,vair]); -stem1:=max(fine.breadth,thin_join); fi -pos5(stem2,90); pos6(stem2,90); pos5'(stem1,90); pos7(stem1,-15); pos8(stem1,0); +stem2:=1/3[hair,fudged.stem]; pickup pencircle scaled if hefty: .5 fi fine; +if not serifs: stem2:=max(currentbreadth+eps,1/2[thin_join,vair]); +stem1:=max(currentbreadth+eps,thin_join); fi +pos5(max(currentbreadth+eps,if is_egyptian: 2/3 fi stem2),90); +pos6(max(currentbreadth+eps,if is_egyptian: 2/3 fi stem2),90); +pos5'(max(currentbreadth+eps,if hefty:1/2 fi stem1),90); +pos7(max(currentbreadth+eps,if hefty: 1/2 fi stem1),-15); +pos8(max(currentbreadth+eps,if hefty: 1/2 fi stem1),0); bot y5'l=bot y[_four]l; top y5r=top y6r=top y5'r; -z8l=z[_three]'l; x8-x[_four]=x7-x8; bot y7=bot y[_four]l; +z8l=z[_three]'l; +x8-x[_four]-eps=x7l-x8l; top y7l=min(top y5'r,y8)-eps; rt x6=rt x[_four]+eps; lft x5=lft x7l-eps; x5'=.5[x5,x6]; -filldraw stroke z7e..{dir75}z8e; -filldraw z6r--z5r--z5l{up}...z5'l...{down}z6l--cycle; -penlabels(1,2,3,4); endchar; +filldraw stroke z7e{right}..{dir60}z8e; %left "stem" +filldraw z6r--z5r--z5l{up}...z5'l...{down}z6l--cycle; % "floor" +penlabels(1,2,3,4,5,6,7,8); endchar; lhchar "Cyrillic accent titlo with letter o"; cyrchar(tlo_o,10u#,min(asc_height#,2x_height#),0); % @@ -547,7 +562,10 @@ y_move:=x_height+oo; old_u:=u; u:=u*(acc_height/x_height); ll=hround(.5w-4.5u); rr=hround(.5w+3u); clearxy; % -penpos1(vair,90); penpos3(vair,-90); penpos2(curve,180); penpos4(curve,0); +penpos1(if hefty: min(1/4 hh,1/3vair) else: vair fi,90); +penpos3(if hefty: min(1/4 hh,1/3vair) else: vair fi,-90); +penpos2(if is_egyptian: 2/3 fi curve,180); +penpos4(if is_egyptian: 2/3 fi curve,0); x2r=hround max(ll+.5u,ll+1.25u-.5curve); x4r=rr-(ll-x2r); x1=x3=.5[x2r,x4r]; y1r=hh+oo+y_move; y3r=o+y_move+eps; y2=y4=.5[o,hh]-.5vair_corr+y_move; y2l:=y4l:=.52[o,hh]+y_move; @@ -595,19 +613,25 @@ y_move:=x_height+oo; old_u:=u; u:=u*(acc_height/x_height); ll=hround(.5w-4u); rr=hround(.5w+3u); clearxy; % -pickup if serifs: tiny else: fine fi nib; -pos1(stem2,0); pos2(stem2,0); +pickup pencircle scaled if hefty: .5 fi fine; +pos1(max(currentbreadth+eps, if is_egyptian: 2/3 fi stem2),0); +pos2(max(currentbreadth+eps, if is_egyptian: 2/3 fi stem2),0); lft x1l=lft x2l=hround (ll+2.5u-.5stem2); top y1=hh+y_move; bot y2=o+y_move+eps; filldraw stroke z1e--z2e; % stem -pickup if serifs: crisp else: fine fi nib; -pos3(vair,90); pos4(vair,0); -top y3r=hh+y_move; x3=x1; rt x4r=hround(rr-.45u); -y4=good.y(y3l-if serifs: .15 fi beak)-eps; -arm(3,4,e,beak_darkness,.2beak_jut); % upper arm and beak -if serifs: save slab; slab:=max(crisp.breadth,Vround(vair-2vair_corr)); % lower.slab +if not hefty: pickup if serifs: crisp else: fine fi nib; fi +pos3(max(currentbreadth+eps, if hefty: min(1/3 hh,1/2stem2) else: vair fi),90); +pos4(max(currentbreadth+eps, if hefty: min(1/3 hh,1/2stem2) else: vair fi),0); +top y3r=hh+y_move; x3=x1; rt x4r=hround max(x3+vair+eps,rr-.45u)+eps; +y4=good.y(y3l-if serifs: 1/6 fi beak)-eps; +if hefty or (1/6beak<=1): filldraw stroke z3e--(x4r,y3e); +else: +arm(3,4,e,beak_darkness,.2beak_jut-eps); fi % upper arm and beak +if serifs and (not hefty): + save slab; slab:=vair; old_crisp:=crisp; crisp:=.5crisp; % lower.slab nodish_serif(1,2,a,1/3,.2jut,b,1/3,.1jut); % upper serif - slab:=vair; % lower.slab - dish_serif(2,1,c,1/3,.2jut,d,1/3,.2jut); fi % lower serif + dish_serif(2,1,c,1/3,.2jut,d,1/3,.2jut); % lower serif + crisp:=old_crisp; numeric old_crisp; +fi endgroup; penlabels(1,2,3,4); endchar; @@ -641,7 +665,7 @@ filldraw stroke z[_one]e{(x[_three]-x[_one]),7acc_height}... %%% %tlo_r begingroup -stem2:=1/3[hair,fudged.stem]; +stem2:=max(fine.breadth,1/3[hair,fudged.stem]-2stem_corr); if not serifs: stem2:=max(fine.breadth,1/2[thin_join,vair]); stem1:=max(fine.breadth,thin_join); fi save curve; curve:=stem2; @@ -652,31 +676,33 @@ y_move:=x_height+oo; old_u:=u; u:=u*(acc_height/x_height); ll=hround(.5w-4.75u); rr=hround(.5w+3.25u); clearxy; % -pickup if serifs: tiny else: fine fi nib; -pos2(stem2,0); pos3'(stem2,0); +pickup pencircle scaled if hefty: .5 fi fine; +pos2(max(currentbreadth+eps,if is_egyptian: 2/3 fi stem2),0); +pos3'(max(currentbreadth+eps,if is_egyptian: 2/3 fi stem2),0); lft x2l=hround(ll+2.5u-.5stem2); bot y2=o+y_move+eps; y3'=min(hh+1.5oo+y_move-vair-eps,1/3[.55hh,hh]+y_move); rt x3'r=rt x2r; z3'=z3; filldraw stroke z2e--z3'e; %stem -pickup fine.nib; -pos3(stem2,180); pos4(vair,90); -pos5(curve,0); pos6(vair,-90); pos7(if hefty: thin_join else: hair fi,-180); -numeric edge; edge=rt x2r; +pos3(max(currentbreadth+eps,if is_egyptian: 2/3 fi stem2),180); +pos4(max(currentbreadth+eps,if is_egyptian: .5 fi vair),90); +pos5(max(currentbreadth+eps,if is_egyptian: 2/3 fi stem2),0); +pos6(max(currentbreadth+eps,if is_egyptian: .5 fi vair),-90); +pos7(max(currentbreadth+eps,if is_egyptian: 1/3stem2 else: hair fi),-180); x4l=rr-(.5(rr-ll)-.25serif_fit)+.5u; top y4r=hh+1.5oo+y_move; rt x5r=hround min(rr-1.35u+.5curve,rr-.6u); y5=.25[hh,oo]+y_move; -x6l=x4l-.2u; bot y6r=max(.4[oo,hh],.45[oo,hh]-oo)+y_move; -rt x7l=tiny.rt x2r; y7=min(y3,y6+y4-y3); +x6l=x4l-.2u; bot y6r=max(1/4[oo,hh],1/3[oo,hh]-oo)+y_move-eps; +rt x7l=rt x2r; y7=min(y3,y6+y4-y3); (x,y4r)=whatever[z3l,z4l]; x4r:=min(x,.5[x5r,x4]); (x',y6r)=whatever[z7l,z6l]; x6r:=min(x',.5[x5r,x6]); filldraw stroke z3e{up}...{right}z4e&super_arc.e(4,5) &super_arc.e(5,6)&z6e{left}...{up}z7e; % bowl -if serifs: save slab; slab:=max(crisp.breadth,Vround(vair-2vair_corr)); % lower.slab +if serifs and (not hefty): save slab; slab:=tiny+eps; % lower.slab dish_serif(2,3',b,1/3,.2jut,c,1/3,.2jut); fi % lower serif -endgroup; -penlabels(1,2,3,4); endchar; +penlabels(1,2,3,4,5,6,7); endgroup; +penlabels(1,2,3,4,5,6,7); endchar; % % Number symbols % -lhchar"Cyrillic Tma number symbol"; +lhchar"Cyrillic Tma number symbol (ten thousands)"; cyrchar(tma,20u#,body_height#,max(paren_depth#,desc_depth#)); autorounded; adjust_fit(if monospace:-3u#,-3u# else: 0,0 fi); pickup rule.nib; @@ -685,7 +711,7 @@ lft x6=hround u; x2=w-x6; top y8=h+o; bot y4=-d-o; circle_points; draw_circle; % circle penlabels(1,2,3,4,5,6,7,8); endchar; -lhchar"Cyrillic Legion number symbol"; +lhchar"Cyrillic Legion number symbol (hundred thousands)"; cyrchar(legion,20u#,body_height#,max(paren_depth#,desc_depth#)); autorounded; adjust_fit(if monospace:-3u#,-3u# else: 0,0 fi); pickup rule.nib; @@ -699,7 +725,7 @@ enddef; temp(1); temp(2); temp(3); temp(4); temp(5); temp(6); temp(7); temp(8); penlabels(1,2,3,4,5,6,7,8); endchar; -lhchar"Cyrillic Leodr number symbol"; +lhchar"Cyrillic Leodr number symbol (million)"; cyrchar(leodr,20u#,body_height#,max(paren_depth#,desc_depth#)); autorounded; adjust_fit(if monospace:-3u#,-3u# else: 0,0 fi); pickup rule.nib; @@ -718,7 +744,7 @@ temp(1,6); temp(2,7); temp(3,8); temp(4,1); temp(5,2); temp(6,3); temp(7,4); temp(8,5); penlabels(1,2,3,4,5,6,7,8); endchar; -lhchar"Cyrillic Vran number symbol"; +lhchar"Cyrillic Vran number symbol (ten millions)"; cyrchar(vran,20u#,body_height#,max(paren_depth#,desc_depth#)); autorounded; adjust_fit(if monospace:-3u#,-3u# else: 0,0 fi); pickup rule.nib; @@ -732,7 +758,7 @@ enddef; temp(1); temp(2); temp(3); temp(4); temp(5); temp(6); temp(7); temp(8); penlabels(1,2,3,4,5,6,7,8); endchar; -lhchar "Cyrillic koloda number symbol"; +lhchar "Cyrillic koloda number symbol (hundred millions)"; cyrchar(koloda,18u#,body_height#,max(paren_depth#,desc_depth#));% italcorr h#*slant+.5vair#-1.5u#; adjust_fit(if monospace:-3u#,-3u# else: 0,0 fi); @@ -760,7 +786,7 @@ filldraw stroke (z[_three]e+(-u,0))--z[_three]e{down}...z[_two]e{left} ...{up}z[_one]e--(z[_one]e+(u,0)); % stroke penlabels(1,2,3); endchar; -lhchar"Cyrillic Tma Tem number symbol"; +lhchar"Cyrillic Tma Tem number symbol (billion/milliard)"; cyrchar(tmatem,20u#,body_height#,max(paren_depth#,desc_depth#)); autorounded; adjust_fit(if monospace:-3u#,-3u# else: 0,0 fi); pickup rule.nib; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgpunct.mf b/Master/texmf-dist/fonts/source/lh/base/lgpunct.mf index c87fde4ebde..eafc803ca90 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgpunct.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgpunct.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -36,7 +36,7 @@ % "60 ` % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Exclamation point"; beginchar("!",5u#+width_adj#,asc_height#,0); diff --git a/Master/texmf-dist/fonts/source/lh/base/lgrdigit.mf b/Master/texmf-dist/fonts/source/lh/base/lgrdigit.mf index 23b5a724aa5..405477e49da 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgrdigit.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgrdigit.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -21,7 +21,7 @@ % numerals 0 .. 9 % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec % All digits have the same height, width, depth, and italic correction. diff --git a/Master/texmf-dist/fonts/source/lh/base/lgrlig.mf b/Master/texmf-dist/fonts/source/lh/base/lgrlig.mf index b1b5b50f363..e4f8889db40 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgrlig.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgrlig.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -22,16 +22,10 @@ % % i_dotl "19 i dotless % j_dotl "1a j dotless -% ff-ligs (lgrligff.mf) +% ff-ligs % -LHver_check(3,4); % like |version_check| in ec - -if (roman_ec=true) and (old_cyr=false): - -input lgrligff; - -fi % roman_ec +LHver_check(3,5); % like |version_check| in ec lhchar "Lowercase Cyrillic letter dotless i"; cyrchar(i_dotl,5u#,x_height#,0); @@ -73,5 +67,164 @@ else: pickup fine.nib; pos2'(stem',0); z2'=z2; & term.e(6,7,left,1,4); fi % arc and terminal penlabels(1,2,5,6,7); endchar; +if (roman_ec=true) and (old_cyr=false): %relax +else: endinput \\; fi + +numeric itc#; % modified italic correction on `f' and `ff' +itc#=if serifs: max(0,flare#-.25u#) else: 1.25u# fi; + +lhchar "The ligature fi"; +beginchar(oct"034",10u#+2letter_fit#,asc_height#,0); +italcorr asc_height#*slant-serif_fit#+.5if serifs:stem# else:dot_size# fi-2u#; +normal_adjust_fit(0,serif_fit#); +pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem'); +pos11(stem',0); rt x11r=hround(w-2.5u+.5stem'); +pos12(stem',0); x11=x12; bot y12=0; +pickup fine.nib; numeric bulb_diam, inner_jut; +if serifs: bulb_diam=hround 1/4[.8[stem,flare],dot_size]; + pos2(bulb_diam,0); x2r=x12r; + y2+.5bulb_diam=.8[x_height,h+oo]; top y11=x_height+min(oo,serif_drop); + if rt x1r+jut+.5u+2<=lft x11l-jut: inner_jut=jut; + else: rt x1r+inner_jut+.5u+2=lft x11l-inner_jut; fi +else: bulb_diam=max(stem,dot_size); + pos2(6/7[vair,flare],90); top y2r=h; rt x2=hround 5.3u; + pickup tiny.nib; pos13(bulb_diam,0); pos14(bulb_diam,90); + x13=x11-.5; top y14r=min(2x_height,h+1); top y11=x_height; + if bot y14l-x_height<tiny: y14l:=min(y14r-eps,y11+2tiny); fi + x13=x14; y13=.5[y14l,y14r]; dot(13,14); % dot +fi; % this is the ligature we're drawing +f_stroke(1,2,a,b,c,jut,inner_jut); % left stem, arc, terminal, serif +pickup tiny.nib; filldraw stroke z11e--z12e; % right stem +pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround .5u-1; +pos3(bar,90); pos4(bar,90); +if serifs: x4=x11; % bar will overlap upper right serif + sloped_serif.l(11,12,d,1/3,jut,min(oo,serif_drop)); % upper right serif + dish_serif(12,11,e,1/3,inner_jut,f,1/3,jut); % lower right serif +else: rt x4= hround 5.3u; fi +pickup crisp.nib; filldraw stroke z3e--z4e; % bar +penlabels(1,2,3,4,11,12,13,14); endchar; + +lhchar "The ligature ff"; +beginchar(oct"033",10.5u#+2letter_fit#,asc_height#,0); +italcorr asc_height#*slant+if serifs:flare#-.25u# else: 1.25u# fi; +normal_adjust_fit(0,0); +pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem'); +pos11(stem',0); rt x11r=hround(w-3u+.5stem'); +pickup fine.nib; numeric bulb_diam, inner_jut; +if serifs: bulb_diam=hround .8[stem,flare]; + pos2(bulb_diam,0); pos12(bulb_diam,0); + rt x2r=hround(rt x11r-stem_corr); lft x12l=hround(w-.75u+.5); + y2+.5bulb_diam=.85[x_height,h+oo]; y12+.5bulb_diam=.9[x_height,h+oo]; + if rt x1r+jut+.5u+2<=lft x11l-jut: inner_jut=jut; + else: rt x1r+inner_jut+.5u+2=lft x11l-inner_jut; fi +else: pos2(5/7[vair,flare],90); top y2r=h; rt x2=hround 6.25u; + pos12(5/7[vair,flare],90); y12=y2; rt x12=hround(w+.75u); fi +f_stroke(1,2,a,b,c,jut,inner_jut); % left stem, arc, terminal, serif +f_stroke(11,12,d,e,f,inner_jut,1.25jut); % right stem, arc, terminal, serif +pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround .5u-1; +pos3(bar,90); pos4(bar,90); +rt x4=hround(w-1/3u); +if hefty: pos3'(bar,90); x3'-x1=x4-x11; y3'=y3; + pos4'(bar,90); x4'=x11; y4'=y4; + filldraw stroke z3e--z3'e; filldraw stroke z4'e--z4e; % bars +else: filldraw stroke z3e--z4e; fi % bar +penlabels(1,2,3,4,11,12); endchar; + +lhchar "The ligature fl"; +beginchar(oct"035",10u#+2letter_fit#,asc_height#,0); +italcorr asc_height#*slant-serif_fit#+.5stem#-2u#; +normal_adjust_fit(0,serif_fit#); +pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem'); +pos11(stem',0); rt x11r=hround(w-2.5u+.5stem'); +pos12(stem',0); x11=x12; bot y12=0; top y11=h; +filldraw stroke z11e--z12e; % right stem +pickup fine.nib; numeric bulb_diam, inner_jut; +if serifs: bulb_diam=hround .8[stem,flare]; + pos2(bulb_diam,0); x2r=x11r-stem_corr; + y2+.5bulb_diam=.9[x_height,h+oo]; + sloped_serif.l(11,12,d,1/3,eps,max(serif_drop,oo)); % erase excess at top + if rt x1r+jut+.5u+2<=lft x11l-jut: inner_jut=jut; + else: rt x1r+inner_jut+.5u+2=lft x11l-inner_jut; fi +else: pos2(5/7[vair,flare],90); top y2r=h; rt x2=hround 5.3u; fi +f_stroke(1,2,a,b,c,jut,inner_jut); % left stem, arc, terminal, serif +pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround .5u-1; +pos3(bar,90); pos4(bar,90); +if serifs: x4=x11; + dish_serif(12,11,e,1/3,inner_jut,f,1/3,jut); % lower right serif +else: rt x4= hround 5.3u; fi +pickup crisp.nib; filldraw stroke z3e--z4e; % bar +penlabels(1,2,3,4,11,12); endchar; + +lhchar "The ligature ffi"; +beginchar(oct"036",15u#+4letter_fit#,asc_height#,0); +italcorr asc_height#*slant-serif_fit#+.5if serifs:stem# else:dot_size# fi-2u#; +normal_adjust_fit(0,serif_fit#); +pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem'); +pos11(stem',0); lft x11l=hround(.5w-.5stem'); +pos21(stem',0); rt x21r=hround(w-2.5u+.5stem'); +pos22(stem',0); x21=x22; bot y22=0; +pickup fine.nib; numeric bulb_diam, inner_jut; +if serifs: bulb_diam=hround 1/4[.8[stem,flare],dot_size]; + pos2(bulb_diam,0); x2r=x11r-stem_corr; + pos12(bulb_diam,0); x12r=x21r; + top y21=x_height+min(oo,serif_drop); + y2+.5bulb_diam=.8[x_height,h+oo]; y12=y2; + if rt x1r+jut+.5u+2<=lft x11l-jut: inner_jut=jut; + else: rt x1r+inner_jut+.5u+2=lft x11l-inner_jut; fi +else: bulb_diam=max(stem,dot_size); + pos2(5/7[vair,flare],90); top y2r=h; rt x2=hround 5.75u; + pos12(6/7[vair,flare],90); y12=y2; rt x12=hround(.5w+2.8u); + pickup tiny.nib; pos23(bulb_diam,0); pos24(bulb_diam,90); + x23=x21-.5; top y24r=min(2x_height,h+1); top y21=x_height; + if bot y24l-x_height<tiny: y24l:=min(y24r-eps,y21+2tiny); fi + x23=x24; y23=.5[y24l,y24r]; dot(23,24); fi % dot +f_stroke(1,2,a,b,c,jut,inner_jut); % left stem, arc, terminal, serif +f_stroke(11,12,d,e,f,inner_jut,inner_jut); % middle ditto +pickup tiny.nib; filldraw stroke z21e--z22e; % right stem +pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround.5u-1; +pos3(bar,90); pos4(bar,90); +if serifs: x4=x21; % bar will overlap upper right serif + sloped_serif.l(21,22,g,1/3,jut,min(oo,serif_drop)); % upper right serif + dish_serif(22,21,h,1/3,inner_jut,i,1/3,jut); % lower right serif +else: rt x4=hround(.5w+2.8u); fi +pickup crisp.nib; +if hefty: pos3'(bar,90); x3'-x1=x4-x11; y3'=y3; + pos4'(bar,90); x4'=x11; y4'=y4; + filldraw stroke z3e--z3'e; filldraw stroke z4'e--z4e; % bars +else: filldraw stroke z3e--z4e; fi % bar +penlabels(1,2,3,4,11,12,21,22,23,24); endchar; + +lhchar "The ligature ffl"; +beginchar(oct"037",15u#+4letter_fit#,asc_height#,0); +italcorr asc_height#*slant-serif_fit#+.5stem#-2u#; +normal_adjust_fit(0,serif_fit#); +pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem'); +pos11(stem',0); lft x11l=hround(.5w-.5stem'); +pos21(stem',0); rt x21r=hround(w-2.5u+.5stem'); +pos22(stem',0); x21=x22; bot y22=0; top y21=h; +filldraw stroke z21e--z22e; % right stem +pickup fine.nib; numeric bulb_diam, inner_jut; +if serifs: bulb_diam=hround .8[stem,flare]; + pos2(bulb_diam,0); x2r=x11r-stem_corr; + pos12(bulb_diam,0); x12r=x21r-stem_corr; + y2+.5bulb_diam=.85[x_height,h+oo]; y12+.5bulb_diam=.9[x_height,h+oo]; + sloped_serif.l(21,22,g,1/3,eps,max(serif_drop,oo)); % erase excess at top + if rt x1r+jut+.5u+2<=lft x11l-jut: inner_jut=jut; + else: rt x1r+inner_jut+.5u+2=lft x11l-inner_jut; fi +else: pos2(5/7[vair,flare],90); top y2r=h; rt x2=hround 5.75u; + pos12(5/7[vair,flare],90); y12=y2; rt x12=hround(.5w+2.8u); fi +f_stroke(1,2,a,b,c,jut,inner_jut); % left stem, arc, terminal, serif +f_stroke(11,12,d,e,f,inner_jut,inner_jut); % middle ditto +pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround.5u-1; +pos3(bar,90); pos4(bar,90); +if serifs: dish_serif(22,21,h,1/3,inner_jut,i,1/3,jut); % lower right serif + pickup crisp.nib; x4=x21; +else: rt x4=hround(.5w+2.8u); fi +if hefty: pos3'(bar,90); x3'-x1=x4-x11; y3'=y3; + pos4'(bar,90); x4'=x11; y4'=y4; + filldraw stroke z3e--z3'e; filldraw stroke z4'e--z4e; % bars +else: filldraw stroke z3e--z4e; fi % bar +penlabels(1,2,3,4,11,12,21,22); endchar; + endinput; %end of file diff --git a/Master/texmf-dist/fonts/source/lh/base/lgrligff.mf b/Master/texmf-dist/fonts/source/lh/base/lgrligff.mf deleted file mode 100644 index 0b3256a4054..00000000000 --- a/Master/texmf-dist/fonts/source/lh/base/lgrligff.mf +++ /dev/null @@ -1,184 +0,0 @@ -% -% lgrlig.mf -% -%% Cyrillic font container with T2 encoding beta-support -% -% This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko -% -% This package belongs to the public domain under conditions similar to -% those of D. E. Knuth specified for the Computer Modern family of fonts. -% In particular, only the authors are entitled to modify this file -% and to save it under the same name. -% -% Content: -% -% roman dotless i,j -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Special letters -% -% ff-ligs -% - -LHver_check(3,4); % like |version_check| in ec - -numeric itc#; % modified italic correction on `f' and `ff' -itc#=if serifs: max(0,flare#-.25u#) else: 1.25u# fi; - -lhchar "The ligature fi"; -beginchar(oct"034",10u#+2letter_fit#,asc_height#,0); -italcorr asc_height#*slant-serif_fit#+.5if serifs:stem# else:dot_size# fi-2u#; -normal_adjust_fit(0,serif_fit#); -pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem'); -pos11(stem',0); rt x11r=hround(w-2.5u+.5stem'); -pos12(stem',0); x11=x12; bot y12=0; -pickup fine.nib; numeric bulb_diam, inner_jut; -if serifs: bulb_diam=hround 1/4[.8[stem,flare],dot_size]; - pos2(bulb_diam,0); x2r=x12r; - y2+.5bulb_diam=.8[x_height,h+oo]; top y11=x_height+min(oo,serif_drop); - if rt x1r+jut+.5u+2<=lft x11l-jut: inner_jut=jut; - else: rt x1r+inner_jut+.5u+2=lft x11l-inner_jut; fi -else: bulb_diam=max(stem,dot_size); - pos2(6/7[vair,flare],90); top y2r=h; rt x2=hround 5.3u; - pickup tiny.nib; pos13(bulb_diam,0); pos14(bulb_diam,90); - x13=x11-.5; top y14r=min(2x_height,h+1); top y11=x_height; - if bot y14l-x_height<tiny: y14l:=min(y14r-eps,y11+2tiny); fi - x13=x14; y13=.5[y14l,y14r]; dot(13,14); % dot -fi; % this is the ligature we're drawing -f_stroke(1,2,a,b,c,jut,inner_jut); % left stem, arc, terminal, serif -pickup tiny.nib; filldraw stroke z11e--z12e; % right stem -pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround .5u-1; -pos3(bar,90); pos4(bar,90); -if serifs: x4=x11; % bar will overlap upper right serif - sloped_serif.l(11,12,d,1/3,jut,min(oo,serif_drop)); % upper right serif - dish_serif(12,11,e,1/3,inner_jut,f,1/3,jut); % lower right serif -else: rt x4= hround 5.3u; fi -pickup crisp.nib; filldraw stroke z3e--z4e; % bar -penlabels(1,2,3,4,11,12,13,14); endchar; - -lhchar "The ligature ff"; -beginchar(oct"033",10.5u#+2letter_fit#,asc_height#,0); -italcorr asc_height#*slant+if serifs:flare#-.25u# else: 1.25u# fi; -normal_adjust_fit(0,0); -pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem'); -pos11(stem',0); rt x11r=hround(w-3u+.5stem'); -pickup fine.nib; numeric bulb_diam, inner_jut; -if serifs: bulb_diam=hround .8[stem,flare]; - pos2(bulb_diam,0); pos12(bulb_diam,0); - rt x2r=hround(rt x11r-stem_corr); lft x12l=hround(w-.75u+.5); - y2+.5bulb_diam=.85[x_height,h+oo]; y12+.5bulb_diam=.9[x_height,h+oo]; - if rt x1r+jut+.5u+2<=lft x11l-jut: inner_jut=jut; - else: rt x1r+inner_jut+.5u+2=lft x11l-inner_jut; fi -else: pos2(5/7[vair,flare],90); top y2r=h; rt x2=hround 6.25u; - pos12(5/7[vair,flare],90); y12=y2; rt x12=hround(w+.75u); fi -f_stroke(1,2,a,b,c,jut,inner_jut); % left stem, arc, terminal, serif -f_stroke(11,12,d,e,f,inner_jut,1.25jut); % right stem, arc, terminal, serif -pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround .5u-1; -pos3(bar,90); pos4(bar,90); -rt x4=hround(w-1/3u); -if hefty: pos3'(bar,90); x3'-x1=x4-x11; y3'=y3; - pos4'(bar,90); x4'=x11; y4'=y4; - filldraw stroke z3e--z3'e; filldraw stroke z4'e--z4e; % bars -else: filldraw stroke z3e--z4e; fi % bar -penlabels(1,2,3,4,11,12); endchar; - -lhchar "The ligature fl"; -beginchar(oct"035",10u#+2letter_fit#,asc_height#,0); -italcorr asc_height#*slant-serif_fit#+.5stem#-2u#; -normal_adjust_fit(0,serif_fit#); -pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem'); -pos11(stem',0); rt x11r=hround(w-2.5u+.5stem'); -pos12(stem',0); x11=x12; bot y12=0; top y11=h; -filldraw stroke z11e--z12e; % right stem -pickup fine.nib; numeric bulb_diam, inner_jut; -if serifs: bulb_diam=hround .8[stem,flare]; - pos2(bulb_diam,0); x2r=x11r-stem_corr; - y2+.5bulb_diam=.9[x_height,h+oo]; - sloped_serif.l(11,12,d,1/3,eps,max(serif_drop,oo)); % erase excess at top - if rt x1r+jut+.5u+2<=lft x11l-jut: inner_jut=jut; - else: rt x1r+inner_jut+.5u+2=lft x11l-inner_jut; fi -else: pos2(5/7[vair,flare],90); top y2r=h; rt x2=hround 5.3u; fi -f_stroke(1,2,a,b,c,jut,inner_jut); % left stem, arc, terminal, serif -pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround .5u-1; -pos3(bar,90); pos4(bar,90); -if serifs: x4=x11; - dish_serif(12,11,e,1/3,inner_jut,f,1/3,jut); % lower right serif -else: rt x4= hround 5.3u; fi -pickup crisp.nib; filldraw stroke z3e--z4e; % bar -penlabels(1,2,3,4,11,12); endchar; - -lhchar "The ligature ffi"; -beginchar(oct"036",15u#+4letter_fit#,asc_height#,0); -italcorr asc_height#*slant-serif_fit#+.5if serifs:stem# else:dot_size# fi-2u#; -normal_adjust_fit(0,serif_fit#); -pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem'); -pos11(stem',0); lft x11l=hround(.5w-.5stem'); -pos21(stem',0); rt x21r=hround(w-2.5u+.5stem'); -pos22(stem',0); x21=x22; bot y22=0; -pickup fine.nib; numeric bulb_diam, inner_jut; -if serifs: bulb_diam=hround 1/4[.8[stem,flare],dot_size]; - pos2(bulb_diam,0); x2r=x11r-stem_corr; - pos12(bulb_diam,0); x12r=x21r; - top y21=x_height+min(oo,serif_drop); - y2+.5bulb_diam=.8[x_height,h+oo]; y12=y2; - if rt x1r+jut+.5u+2<=lft x11l-jut: inner_jut=jut; - else: rt x1r+inner_jut+.5u+2=lft x11l-inner_jut; fi -else: bulb_diam=max(stem,dot_size); - pos2(5/7[vair,flare],90); top y2r=h; rt x2=hround 5.75u; - pos12(6/7[vair,flare],90); y12=y2; rt x12=hround(.5w+2.8u); - pickup tiny.nib; pos23(bulb_diam,0); pos24(bulb_diam,90); - x23=x21-.5; top y24r=min(2x_height,h+1); top y21=x_height; - if bot y24l-x_height<tiny: y24l:=min(y24r-eps,y21+2tiny); fi - x23=x24; y23=.5[y24l,y24r]; dot(23,24); fi % dot -f_stroke(1,2,a,b,c,jut,inner_jut); % left stem, arc, terminal, serif -f_stroke(11,12,d,e,f,inner_jut,inner_jut); % middle ditto -pickup tiny.nib; filldraw stroke z21e--z22e; % right stem -pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround.5u-1; -pos3(bar,90); pos4(bar,90); -if serifs: x4=x21; % bar will overlap upper right serif - sloped_serif.l(21,22,g,1/3,jut,min(oo,serif_drop)); % upper right serif - dish_serif(22,21,h,1/3,inner_jut,i,1/3,jut); % lower right serif -else: rt x4=hround(.5w+2.8u); fi -pickup crisp.nib; -if hefty: pos3'(bar,90); x3'-x1=x4-x11; y3'=y3; - pos4'(bar,90); x4'=x11; y4'=y4; - filldraw stroke z3e--z3'e; filldraw stroke z4'e--z4e; % bars -else: filldraw stroke z3e--z4e; fi % bar -penlabels(1,2,3,4,11,12,21,22,23,24); endchar; - -lhchar "The ligature ffl"; -beginchar(oct"037",15u#+4letter_fit#,asc_height#,0); -italcorr asc_height#*slant-serif_fit#+.5stem#-2u#; -normal_adjust_fit(0,serif_fit#); -pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem'); -pos11(stem',0); lft x11l=hround(.5w-.5stem'); -pos21(stem',0); rt x21r=hround(w-2.5u+.5stem'); -pos22(stem',0); x21=x22; bot y22=0; top y21=h; -filldraw stroke z21e--z22e; % right stem -pickup fine.nib; numeric bulb_diam, inner_jut; -if serifs: bulb_diam=hround .8[stem,flare]; - pos2(bulb_diam,0); x2r=x11r-stem_corr; - pos12(bulb_diam,0); x12r=x21r-stem_corr; - y2+.5bulb_diam=.85[x_height,h+oo]; y12+.5bulb_diam=.9[x_height,h+oo]; - sloped_serif.l(21,22,g,1/3,eps,max(serif_drop,oo)); % erase excess at top - if rt x1r+jut+.5u+2<=lft x11l-jut: inner_jut=jut; - else: rt x1r+inner_jut+.5u+2=lft x11l-inner_jut; fi -else: pos2(5/7[vair,flare],90); top y2r=h; rt x2=hround 5.75u; - pos12(5/7[vair,flare],90); y12=y2; rt x12=hround(.5w+2.8u); fi -f_stroke(1,2,a,b,c,jut,inner_jut); % left stem, arc, terminal, serif -f_stroke(11,12,d,e,f,inner_jut,inner_jut); % middle ditto -pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround.5u-1; -pos3(bar,90); pos4(bar,90); -if serifs: dish_serif(22,21,h,1/3,inner_jut,i,1/3,jut); % lower right serif - pickup crisp.nib; x4=x21; -else: rt x4=hround(.5w+2.8u); fi -if hefty: pos3'(bar,90); x3'-x1=x4-x11; y3'=y3; - pos4'(bar,90); x4'=x11; y4'=y4; - filldraw stroke z3e--z3'e; filldraw stroke z4'e--z4e; % bars -else: filldraw stroke z3e--z4e; fi % bar -penlabels(1,2,3,4,11,12,21,22); endchar; - -endinput; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgromp.mf b/Master/texmf-dist/fonts/source/lh/base/lgromp.mf index c1475195d1f..4458ff6166f 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgromp.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgromp.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -25,7 +25,7 @@ % * Spanish open question mark moved out % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec iff not wncoding:% lhchar "Ampersand"; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgrusi.mf b/Master/texmf-dist/fonts/source/lh/base/lgrusi.mf index f08f332bfae..85f12850d60 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgrusi.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgrusi.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -23,7 +23,7 @@ % and n_width (russian letter n) at the end of `cyrchar...' line) % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Italic Russian letter a"; cyrchar(a,9u#,x_height#,0); diff --git a/Master/texmf-dist/fonts/source/lh/base/lgrusl.mf b/Master/texmf-dist/fonts/source/lh/base/lgrusl.mf index e03c302404f..83f1a9688d3 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgrusl.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgrusl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -23,7 +23,7 @@ % and n_width (russian letter n) at the end of `cyrchar...' line) % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec if kapitel: input lgcrusl; fi @@ -426,7 +426,7 @@ if hefty: numeric upper_notch,lower_notch; upper_notch=y6-cap_notch_cut-eps; lower_notch=y5+cap_notch_cut+eps; if monospace: x5r =rt x1r; x6l =lft x3l; y5=vround(vair'+eps); y6=vround(h-vair-eps); - alpha1=diag_ratio(1,stem1,y6-y5,x5r-x6l); + alpha1=diag_ratio(1,stem1,y5-y6,x5r-x6l); penpos5(min(2fudged.stem,alpha1*stem1),0); penpos6(min(2fudged.stem,alpha1*stem1),0); x5'=lft x1l; z5'=whatever[z5l,z6l]; x6'=rt x4r; z6'=whatever[z5r,z6r]; @@ -479,7 +479,7 @@ if hefty: numeric upper_notch,lower_notch; upper_notch=y6-cap_notch_cut-eps; lower_notch=y5+cap_notch_cut+eps; if monospace: x5r =rt x1r; x6l =lft x3l; y5=vround(vair'+eps); y6=vround(h-vair-eps); - alpha1=diag_ratio(1,stem1,y6-y5,x5r-x6l); + alpha1=diag_ratio(1,stem1,y5-y6,x5r-x6l); penpos5(min(2fudged.stem,alpha1*stem1),0); penpos6(min(2fudged.stem,alpha1*stem1),0); x5'=lft x1l; z5'=whatever[z5l,z6l]; x6'=rt x4r; z6'=whatever[z5r,z6r]; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgrusu.mf b/Master/texmf-dist/fonts/source/lh/base/lgrusu.mf index 0ff385ef871..80766c6a9cf 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgrusu.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgrusu.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Uppercase Russian letter A"; cyrchar(A,13u#,cap_height#,0); @@ -373,7 +373,7 @@ if hefty: numeric upper_notch,lower_notch; upper_notch=y6-cap_notch_cut-eps; lower_notch=y5+cap_notch_cut+eps; if monospace: x5r =rt x1r; x6l =lft x3l; y5=vround(slab+eps); y6=vround(h-slab-eps); - alpha1=diag_ratio(1,stem1,y6-y5,x5r-x6l); + alpha1=diag_ratio(1,stem1,y5-y6,x5r-x6l); penpos5(min(2fudged.cap_stem,alpha1*stem1),0); penpos6(min(2fudged.cap_stem,alpha1*stem1),0); x5'=lft x1l; z5'=whatever[z5l,z6l]; x6'=rt x4r; z6'=whatever[z5r,z6r]; @@ -422,7 +422,7 @@ if hefty: numeric upper_notch,lower_notch; upper_notch=y6-cap_notch_cut-eps; lower_notch=y5+cap_notch_cut+eps; if monospace: x5r =rt x1r; x6l =lft x3l; y5=vround(slab+eps); y6=vround(h-slab-eps); - alpha1=diag_ratio(1,stem1,y6-y5,x5r-x6l); + alpha1=diag_ratio(1,stem1,y5-y6,x5r-x6l); penpos5(min(2fudged.cap_stem,alpha1*stem1),0); penpos6(min(2fudged.cap_stem,alpha1*stem1),0); x5'=lft x1l; z5'=whatever[z5l,z6l]; x6'=rt x4r; z6'=whatever[z5r,z6r]; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2comi.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2comi.mf index a0320e98e13..12fef153d3e 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2comi.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2comi.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -43,7 +43,7 @@ % fita - - - - "b0 - - "1d Old Slav Fita % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Italic Cyrillic letter tshe (soft t - looks like barred h)"; cyrchar(tshe,9u#,asc_height#,0); @@ -374,12 +374,6 @@ filldraw stroke z2e--z3e; % stem lowercase_umlaut(0,0, 6,7,8,9); penlabels(0,1,2,3,4,5,8,9); endchar; -if old_cyr: -lhchar "Italic Cyrillic letter ng - ligature enghe"; -cyrcharmoving(ng); -fi\\; - -iff not old_cyr: lhchar "Italic Cyrillic letter ng - ligature enghe"; cyrchar(ng,10u#,x_height#,0); italcorr x_height#*slant+.5stem#-u#; %tau diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2coml.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2coml.mf index fd047b31d23..b2cef9e2514 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2coml.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2coml.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -43,7 +43,9 @@ % fita - - - - "b0 - - "1d Old Slav Fita % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec + +if concrete: input lgcyrcl; fi % Cyrillic concrete letters lhchar "Lowercase Cyrillic letter tshe (soft t - looks like barred h)"; cyrchar(tshe,10u#,asc_height#,0); @@ -161,6 +163,7 @@ else: & z6e{left}..z7e; fi % arc and terminal penlabels(1,2,3,4,5,6,7); endchar; +iff not concrete:% lhchar "Lowercase Cyrillic letter lje (soft l)"; cyrchar(lje,10u# % if not serifs:+.5width_adj# fi % dl_width;n_width ,x_height#,0); diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2comu.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2comu.mf index 5b03fcbce65..a0c2ea50ec0 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2comu.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2comu.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -43,7 +43,9 @@ % FITA - - - - - "90 - - "15 Old Slav Fita % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec + +if concrete: input lgcyrcu; fi % Cyrillic concrete letters lhchar "Uppercase Cyrillic letter TSHE (Soft T - like Th)"; cyrchar(TSHE,13u#,cap_height#,0); @@ -147,6 +149,8 @@ if slitex: fi %%%%% penlabels(1,2,3,4,5,6,7,8); endchar; +%for recognizing fontdimen 15 +if enc_name="X2": font_cap_stem cap_stem#; fi lhchar "Uppercase Cyrillic letter LAT_J (as Latin J)"; cyrchar(LAT_J,9u#,cap_height#,0); @@ -199,6 +203,7 @@ fi uppercase_umlaut(0,0, 9,10,11,12); penlabels(1,2,3,4,5,6,7,8, 9,10,11,12); endchar; +iff not concrete:% lhchar "Uppercase Cyrillic letter LJE (Soft L)"; cyrchar(LJE,13.5u#,cap_height#,0); % DL_width:N_width if is_small_cap: getcharcode(lje); fi; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2loi.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2loi.mf index 6a3c662c4ca..c13577b0877 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2loi.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2loi.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -63,7 +63,7 @@ % r_tl - - - "bb Er with tail % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec iff knuthian_ae:% lhchar "Italic Cyrillic letter ae - ligature ae"; @@ -167,7 +167,7 @@ cyrbulb(7,8,9); enddef; ogonek_breadth:=xvair; numeric tt; % the time... - tt=if hefty: 2.8 else: 2.6 fi+eps; + tt=if hefty: 2.8 else: 2.7 fi+eps; join_angle=angle((direction tt of p.r) rotated 180); ogonek_pos=point tt of p.r+.5(the_pen-fine)* unitvector((direction tt of p.r) rotated 90)-(ogonek_breadth-the_pen,0); @@ -598,14 +598,11 @@ filldraw circ_stroke z6e--z7'e; % right stem filldraw stroke z10e--z11e; % bar %%% pos12(vair,-90); pos13(hair,-180); pos14(flare,-180); pos5(stem,0); -x5=x3; bot y5=-1/3d; bot y12r=-d-oo; y14-.5flare=-vround.9d; -%x6=w-11/3u; lft x7r=min(x4-4u,lft x7r+x6-x7l+5u-eps); -%x12=(x3+2.5u-.5stem)-10/3u; lft x13r=min(x3-10/3u,lft x13r+x12-x13l+13/3u-eps);%!!! +x5=x3; bot y5=-1/3d; bot y12r=-d-oo; y14=-vround min(.9d+.5flare,y3)-eps; x12=(x3+2.5u-.5stem)-9/3u; lft x14r=min(x3-8/3u,lft x13r+x12-x13l+11/3u-eps);%!!! -%filldraw circ_stroke z3e--z5e{down}...{left}z12e; % right stem and hook forsuffixes e=l,r: - z12'e=((0,y14)--(w,y14)) intersectionpoint - (z5e{down}...{left}z12e); endfor + z12'e=((-u,y14)--(w+u,y14)) intersectionpoint + (z3e--z5e{down}...{left}z12e); endfor if lft x12'l>rt x14l+max(1,hround(1/3vair+.5)): filldraw stroke z3e--z5e{down}...{left}z12e; % right stem and hook else: @@ -616,8 +613,7 @@ x12=(x3+2.5u-.5stem)-9/3u; lft x14r=min(x3-8/3u,lft x13r+x12-x13l+11/3u-eps);%!! bulb(12,13,14); % bulb penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar; -iff serifs: -lhchar "Lowercase Cyrillic letter delta - Lowercase Greek delta"; +lhchar "Italic Cyrillic letter delta - looks like lowercase Greek delta"; cyrchar(delta,8u#,asc_height#,0); italcorr .9asc_height#*slant+.5hair#-1.5u#; adjust_fit(0,0); pickup fine.nib; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2lol.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2lol.mf index 640e6f715f8..4365d7d50f7 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2lol.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2lol.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -52,7 +52,7 @@ % r_tl - - - "bb Er with tail % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Lowercase Cyrillic letter ae - ligature ae"; cyrchar(ae,13u#,x_height#,0); @@ -231,6 +231,7 @@ easy_ogonek(the_pen,9,10,11); % ogonek %%% penlabels(0,1,2,3,4,5,6,7,8, 9,10,11); endchar; +iff not concrete:% iff not specific:% lhchar "Lowercase Cyrillic letter k_vcrs - ka vcrossed (`roman')"; cyrchar(k_vcrs,11.5u# if not serifs:+.5width_adj# fi, @@ -293,11 +294,12 @@ numeric middle_weight; middle_weight=max(currentbreadth+eps,.6[thin_join,vair]); pos9(middle_weight,0); pos11(middle_weight,0); lft x9l=lft x11l= - hround max(tiny.rt x1r+1,max(x5l-middle_weight,.5[tiny.rt x1r,x5l])); + hround max(tiny.rt x1r+1,max(x5l-middle_weight,.5[tiny.rt x1r,x5l])); top y11-bot y9=.5x_height; .52[y9,y11]=.5[y7l,y7r]; filldraw stroke z9e--z11e; % cross bar penlabels(1,2,3,4,5,6,7,8,9,10,11); endchar; +iff not concrete:% iff not specific:% lhchar "Lowercase Cyrillic letter k_hcrs - ka hcrossed (`roman')"; cyrchar(k_hcrs,10u#,asc_height#,0); % n_width @@ -362,6 +364,7 @@ lft x7=hround 1/3u-serif_fit; filldraw stroke z7e--z8e; % cross bar penlabels(1,2,3,4,5,6, 7,8); endchar; +iff not concrete:% lhchar "Lowercase Cyrillic letter l_dsc - el descender"; cyrchar(l_dsc,10u# % if not serifs:+.5width_adj# fi % dl_width;n_width ,x_height#,if is_ogonek: desc_depth# else: sbeak# fi); %ldesc/og_depth @@ -413,23 +416,18 @@ if serifs: nodish_serif(3,0,e,1/3,1.05jut,f,1/3,inner_jut); % upper left serif filldraw z.c0--z.c1--z.f1--z.f0--cycle; fi % upper inter_serif bar %%%%% -% lowercase descender/ogonek -if is_ogonek: - endgroup; - def the_pen= - if known ogonek_pen: ogonek_pen elseif serifs: tiny else: fine fi - enddef; - % |stem| was drawn by |tiny| pen, hence |tiny| in the following equation: - ogonek_pos=(x2 if not serifs: l fi,.5the_pen) - if serifs and not is_egyptian: +(.5xvair,0) fi; - easy_ogonek(the_pen,7,8,9); % ogonek +% lowercase descender/saam tail +slab:=vair; % lower.slab +numeric right_jut; +right_jut=if serifs: max(limit_dist,1.1jut) else: hround (r-rt x2r-.5u) fi; +if unic: + %saam tail + serif(2,1,v,1/3,-jut); + siam_serif(2,1,w,1/3,right_jut); else: - slab:=vair; % lower.slab - numeric right_jut; - right_jut=if serifs: max(limit_dist,1.1jut) else: hround (r-rt x2r-.5u) fi; r_serif(2,1,o,1/3,jut,p,1/3,beak_darkness,right_jut,.6beak_jut); % lower right descender - endgroup; fi +endgroup; penlabels(1,2,3,4,5,6, 7,8,9);endchar; lhchar "Lowercase Cyrillic letter m_dsc - m descender"; @@ -479,8 +477,8 @@ if serifs: if rt x2r+jut+.5u+1+eps+.5stem3<=lft x4l-.5stem3-jut: inner_jut=jut; else: rt x2r+inner_jut+.5u+1+eps+.5stem3=lft x4l-.5stem3-inner_jut; fi slab:=Vround(vair-vair_corr); % lower.slab - serif(1,2,a,1/3,-jut); % upper left serif - serif(3,4,d,1/3,jut); % upper right serif + serif(1,2,a,1/3,-jut); % upper left serif + serif(3,4,d,1/3,jut); % upper right serif slab:=vair; % lower.slab dish_serif(2,1,b,1/2,jut,c,1/2,jut)(dark); % lower left serif if is_ogonek: @@ -488,23 +486,18 @@ if serifs: fi fi %%%%% -% lowercase descender/ogonek -if is_ogonek: - endgroup; - def the_pen= - if known ogonek_pen: ogonek_pen elseif serifs: tiny else: fine fi - enddef; - % |stem| was drawn by |tiny| pen, hence |tiny| in the following equation: - ogonek_pos=(x4 if not serifs: l fi,.5the_pen) - if serifs and not is_egyptian: +(.5xvair,0) fi; - easy_ogonek(the_pen,9,10,11); % ogonek +% lowercase descender/saam tail +slab:=vair; % lower.slab +numeric right_jut; +right_jut=if serifs: max(limit_dist,1.1jut) else: hround (r-rt x4r-.5u) fi; +if unic: + %saam tail + serif(4,3,v,1/3,-jut); + siam_serif(4,3,w,1/3,right_jut); else: - slab:=vair; % lower.slab - numeric right_jut; - right_jut=if serifs: max(limit_dist,1.1jut) else: hround (r-rt x4r-.5u) fi; r_serif(4,3,o,1/3,jut,p,1/3,beak_darkness,right_jut,.6beak_jut); % lower right descender - endgroup; fi +endgroup; penlabels(0,1,1',2,3,3',4,5,6,7,8, 9,10,11); endchar; lhchar "Lowercase Cyrillic letter abh_ha - Abkhazian ha"; @@ -520,10 +513,12 @@ interim superness:=hein_super; x2r=hround max(.5u,1.25u-.5curve); %o x4r=w-x2r; x1=x3=x6=.5w; y1r=h+vround 1.5oo; y3r=-oo; y2=y4=.5h-vair_corr; y2l:=.52h; -y7=-1/3d; rt x7=hround(w-.5u); penpos7(.7[thin_join,vair],270); -y6=.5y5r; penpos6(mid_curve,180); +y7=vround -1/3d-eps; rt x7=hround(w-.5u)+eps; penpos7(.7[thin_join,vair],270); +penpos6(mid_curve,180); x5=if serifs:.5[x6,x4]else:.5[x6,x4]fi; -y5r=.5[y4,y1]; penpos5(.7[thin_join,vair],90); +y5r=vround max(.5[y4,y1],y4+.7[thin_join,vair])+eps; +penpos5(.7[thin_join,vair],90); +y6=vround min(.5y5r,y5l-.5)-eps; fill stroke pulled_super_arc.e(1,2)(.5superpull) & pulled_super_arc.e(2,3)(.5superpull) & pulled_super_arc.e(3,4)(.5superpull) % 3/4 bowl @@ -560,12 +555,12 @@ if serifs: if rt x1r+jut+.5u+1<=lft x3l-jut: inner_jut1=jut; % stay for tail serif else: rt x1r+inner_jut1+.5u+1=lft x3l-inner_jut1; fi save slab; slab:=vair; % lower.slab - dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut1); % lower left serif - %dish_serif(4,3,g,1/3,inner_jut1,h,1/3,jut); %!!! % lower right serif + dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut1); % lower left serif + %dish_serif(4,3,g,1/3,inner_jut1,h,1/3,jut); %!!! % lower right serif inner_jut2=min(.5(lft x3l-rt x1r)-eps,.5jut); slab:=Vround(vair-vair_corr); % lower.slab - nodish_serif(1,2,a,1/3,jut,b,1/3,inner_jut2); % upper left serif - nodish_serif(3,4,e,1/3,inner_jut2,f,1/3,jut); % upper right serif + nodish_serif(1,2,a,1/3,jut,b,1/3,inner_jut2); % upper left serif + nodish_serif(3,4,e,1/3,inner_jut2,f,1/3,jut); % upper right serif filldraw z.b0--z.b1--z.e1--z.e0--cycle; % upper inter_serif bar else: lft x1'= lft x1l; top y1'r=h; pos1'(vair,90); @@ -818,10 +813,10 @@ if serifs: else: rt x1r+inner_jut+.5u+1=lft x3l-inner_jut; fi %%% save slab; slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(1,2,a,1/3,jut,b,1/3,inner_jut); % upper left serif - dish_serif(3,4,e,1/3,inner_jut,f,1/3,jut); % upper right serif + dish_serif(1,2,a,1/3,jut,b,1/3,inner_jut); % upper left serif + dish_serif(3,4,e,1/3,inner_jut,f,1/3,jut); % upper right serif slab:=vair; % lower.slab - dish_serif(4,3,g,1/3,inner_jut,h,1/3,jut); % lower right serif + dish_serif(4,3,g,1/3,inner_jut,h,1/3,jut); % lower right serif else: fill stroke pulled_arc.e(2',5) & z5e{right}...{right}z6e; fi % arc %%%%% @@ -926,7 +921,7 @@ if serifs: pos[_two](vair',-90); pos[_three](hair,-180); pos[_four](bulb_diam,-180); x[_two]=.5[x[_one],x[_three]r]; - bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=-.85d; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; z[_three]r=z[_four]r; %rt x[_four]l=floor x[_zero]-1.5u if monospace: / expansion_factor fi); %2.5u lft x[_four]r=-1/6u if monospace: / expansion_factor fi; %2.5u @@ -934,7 +929,7 @@ if serifs: x[_two]r:=max(x,.5[x[_three]r,x[_two]]); forsuffixes e=l,r: z[_one]'e=((0,y[_four])--(w,y[_four])) intersectionpoint - (pulled_arc.e([_one],[_two])); endfor + (z[_five]e--pulled_arc.e([_one],[_two])); endfor if lft x[_one]'l>rt x[_four]l+max(1,1/3vair+.5): filldraw stroke z[_five]e--pulled_arc.e([_one],[_two]); else: @@ -1043,11 +1038,11 @@ if serifs: numeric inner_jut; if rt x2r+jut+.5u+1+eps+.5stem3<=lft x4l-.5stem3-jut: inner_jut=jut; else: rt x2r+inner_jut+.5u+1+eps+.5stem3=lft x4l-.5stem3-inner_jut; fi save slab; slab:=Vround(vair-vair_corr); % lower.slab - serif(1,2,a,1/3,-jut); % upper left serif - serif(3,4,d,1/3,jut); % upper right serif + serif(1,2,a,1/3,-jut); % upper left serif + serif(3,4,d,1/3,jut); % upper right serif slab:=vair; % lower.slab - dish_serif(2,1,b,1/2,jut,c,1/2,jut)(dark); fi % lower left serif - %dish_serif(4,3,e,1/3,jut,f,1/3,jut); fi %!!! % lower right serif + dish_serif(2,1,b,1/2,jut,c,1/2,jut)(dark); fi % lower left serif + %dish_serif(4,3,e,1/3,jut,f,1/3,jut); fi %!!! % lower right serif %%%%% % l_tail(4); _zero:=4; @@ -1064,7 +1059,7 @@ if serifs: pos[_two](vair',-90); pos[_three](hair,-180); pos[_four](bulb_diam,-180); x[_two]=.5[x[_one],x[_three]r]; - bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=-.85d; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; z[_three]r=z[_four]r; rt x[_four]l=max(x[_zero]l-bulb_diam, floor x[_zero]-2.5u if monospace: / expansion_factor fi); @@ -1182,7 +1177,7 @@ arm(3,4,e,beak_darkness,.4beak_jut); % upper arm and beak save slab; % lower.slab if serifs: slab:=Vround(vair-vair_corr); % lower.slab - nodish_serif(1,2,a,1/3,jut,b,1/3,.5jut); % upper serif + nodish_serif(1,2,a,1/3,jut,b,1/3,.5jut); % upper serif if is_ogonek: slab:=vair; % lower.slab dish_serif(2,1,c,1/3,jut,d,1/3,1.25jut); fi %!!! % lower serif @@ -1246,10 +1241,10 @@ if serifs: if rt x3'r+jut+.5u+1<=lft x4'l-jut-xjut: inner_jut2=jut; else: rt x3'r+inner_jut2+.5u+1=lft x4'l-inner_jut2-xjut; fi save slab; slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(1',4,a,1/3,outer_jut,b,2/3,inner_jut1); % upper left serif + dish_serif(1',4,a,1/3,outer_jut,b,2/3,inner_jut1); % upper left serif dish_serif(2',3,e,2/3,inner_jut1+xjut,f,1/2,outer_jut+xjut)(dark); % upper right serif slab:=vair; % lower.slab - dish_serif(4',1,c,2/3,inner_jut2,d,1/3,outer_jut); % lower right serif + dish_serif(4',1,c,2/3,inner_jut2,d,1/3,outer_jut); % lower right serif dish_serif(3',2,g,1/2,outer_jut+xjut,h,2/3,inner_jut2+xjut)(dark); fi % lower left serif %%%%% % hstroke @@ -1267,7 +1262,7 @@ if serifs: save slab; slab:=Vround(vair-vair_corr); % lower.slab sloped_serif.l(1,2,a,1/3,outer_jut,serif_drop); % upper serif slab:=vair; % lower.slab - nodish_serif(2,1,c,1/3,jut,d,1/3,.5jut); fi % lower serif + nodish_serif(2,1,c,1/3,jut,d,1/3,.5jut); fi % lower serif %%% % lsftsn_bowl(2); _zero:=2; @@ -1314,7 +1309,7 @@ if hefty: numeric upper_notch,lower_notch; upper_notch=y6-cap_notch_cut-eps; lower_notch=y5+cap_notch_cut+eps; if monospace: x5r =rt x1r; x6l =lft x3l; y5=vround(vair'+eps); y6=vround(h-vair-eps); - alpha1=diag_ratio(1,stem1,y6-y5,x5r-x6l); + alpha1=diag_ratio(1,stem1,y5-y6,x5r-x6l); penpos5(min(2fudged.stem,alpha1*stem1),0); penpos6(min(2fudged.stem,alpha1*stem1),0); x5'=lft x1l; z5'=whatever[z5l,z6l]; x6'=rt x4r; z6'=whatever[z5r,z6r]; @@ -1341,30 +1336,25 @@ if serifs: if rt x1r+jut+.5u+1<=lft x3l-jut: inner_jut=jut; else: rt x1r+inner_jut+.5u+1=lft x3l-inner_jut; fi save slab; slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(1,2,a,1/3,jut,b,1/3,inner_jut); % upper left serif - dish_serif(3,4,e,1/3,inner_jut,f,1/3,jut); % upper right serif + dish_serif(1,2,a,1/3,jut,b,1/3,inner_jut); % upper left serif + dish_serif(3,4,e,1/3,inner_jut,f,1/3,jut); % upper right serif slab:=vair; % lower.slab - dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); % lower left serif + dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); % lower left serif if is_ogonek: dish_serif(4,3,g,1/3,inner_jut,h,1/3,jut); fi % lower right serif fi % lowercase descender -if is_ogonek: - endgroup; - def the_pen= - if known ogonek_pen: ogonek_pen elseif serifs: tiny else: fine fi - enddef; - % |stem| was drawn by |tiny| pen, hence |tiny| in the following equation: - ogonek_pos=(x4 if not serifs: l fi,.5the_pen) - if serifs and not is_egyptian: +(.5xvair,0) fi; - easy_ogonek(the_pen,14,15,16); % ogonek +if not serifs: inner_jut:=0; fi +slab:=vair; % lower.slab +right_jut:=if serifs: max(limit_dist,1.1jut) else: hround (r-rt x4r-.5u) fi; +if unic: + %saam tail + serif(4,3,v,1/3,-jut); + siam_serif(4,3,w,1/3,right_jut); else: - if not serifs: inner_jut:=0; fi - slab:=vair; % lower.slab - right_jut:=if serifs: max(limit_dist,1.1jut) else: hround (r-rt x4r-.5u) fi; r_serif(4,3,g,1/3,inner_jut,h,1/3,beak_darkness,right_jut,.6beak_jut); % lower right descender - endgroup; fi +endgroup; %%%%% % the accent h:=full_h; cbreve(.5w,0, 7,8,9,10,11,12,13); diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2lou.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2lou.mf index 2b4dfdf2490..91dd1af7a91 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2lou.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2lou.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -31,12 +31,14 @@ % M_dsc "4c L - - "88 Em with descender % ABH_HA "4e N - - "97 Abkhasian kha % P_tl "4f O - - "80 Pe with tail +% % R_dsc "50 P - - "85 Er with descender % LAT_Q "51 Q - - - Latin letter Q % T_dsc "52 R - - "82 Te with descender % TETSE "54 T - - "81 Ligature Te-Tse % CH_vcrs "56 V "97 - - Che vertically crossed % LAT_W "57 W - - - Latin letter W +% % N_ltl "1c - - "99 En with left tail % DELTA "1e - "86 - Delta % M_tl - - - "8e Em with tail @@ -44,12 +46,13 @@ % S_acrs - - - "91 Es acute crossed % G_crsdsc - - "80 - Ghe crossed with descender % H_hcrs - - "94 - Kha horisontally crossed +% % SEMISN - - - "93 Semi Soft Sign % I_shdsc - - - "94 I Short with descender % R_tl - - - "9b Er with tail % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Uppercase Cyrillic letter AE - ligature AE"; cyrchar(AE,16u#,cap_height#,0); @@ -222,6 +225,7 @@ else: easy_ogonek(the_pen,9,10,11); % ogonek penlabels(0,1,2,3,4,5,6,7,8, 9,10,11); endchar; +iff not concrete:% iff not specific:% lhchar "Uppercase Cyrillic letter K_vcrs - KA vcrossed (`roman')"; cyrchar(K_vcrs,15u# if not serifs:+.5width_adj# fi, % N_width+1.5u @@ -277,6 +281,7 @@ top y11-bot y9=.5cap_height; .52[y9,y11]=y7; filldraw stroke z9e--z11e; % cross bar penlabels(1,2,3,4,5,6,7,8,9,10,11); endchar; +iff not concrete:% iff not specific:% lhchar "Uppercase Cyrillic letter K_hcrs - KA hcrossed (`roman')"; cyrchar(K_hcrs,13.5u#,cap_height#,0); % N_width @@ -326,18 +331,19 @@ if serifs: pickup crisp.nib; numeric outer_jut; outer_jut=if serifs: max(limit_dist,1.1cap_jut) else: 1.8u fi; pos7(bar,90); pos8(bar,90); -top y7r=top y8r=vround (min(.5[x_height,h]+.5bar,h-max(bracket,1.2slab))-eps); +top y7r=top y8r=vround (min(1/3[x_height,h]+.5bar,h-max(bracket,1.2slab))-eps); x7=x1r+1.15outer_jut; x8=hround 1/3u-cap_serif_fit; filldraw stroke z7e--z8e; % cross bar penlabels(1,2,3,4,5,6, 7,8); endchar; +iff not concrete:% lhchar "Uppercase Cyrillic letter L_dsc - EL descender"; cyrchar(L_dsc,13.5u#,cap_height#, % DL_width:N_width if is_ogonek: desc_depth# else: cap_sbeak# fi); %udesc/og_depth if is_small_cap: getcharcode(l_dsc); fi italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); adjust_fit(cap_serif_fit# if not serifs: - +\\.5(cap_stem#-u#),.5(cap_stem#-u#)+ else:,fi\\ cap_serif_fit#); %D_adj + +\\.5(cap_stem#-u#),.5(cap_stem#-u#)+ else:,fi\\ cap_serif_fit#); %D_adj % upper_l; pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); rt x1r=rt x2r=w-hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; @@ -385,19 +391,15 @@ if serifs: nodish_serif(3,0,e,1/3,1.05cap_jut,f,1/3,inner_jut); % upper left serif filldraw z.c0--z.c1--z.f1--z.f0--cycle; fi % upper inter_serif bar %%%%% -% uppercase descender/ogonek -if is_ogonek: - def the_pen=if known ogonek_pen: ogonek_pen - elseif serifs: tiny elseif is_bold: fisp else: fine fi - enddef; - % |diag_end| refers to |tiny| pen, hence |tiny| in the following equation: - ogonek_pos=(x2 if not serifs: l if is_bold: +.75tiny fi\\ fi,.5the_pen) - if serifs and not is_egyptian: +(.5xvair,0) fi; - easy_ogonek(the_pen,7,8,9); % ogonek +% uppercase descender/saam tail +numeric right_jut; +right_jut= + if serifs: max(limit_dist,cap_jut) else: hround (r-rt x2r-.65u) fi; +if unic: + %saam tail + serif(2,1,v,1/3,-cap_jut); + siam_serif(2,1,w,1/3,right_jut); else: - numeric right_jut; - right_jut= - if serifs: max(limit_dist,1.1cap_jut) else: hround (r-rt x2r-.65u) fi; r_serif(2,1,x,1/3,cap_jut,y,1/3,beak_darkness,right_jut,beak_jut); % lower right descender fi penlabels(1,2,3,4,5,6, 7,8,9); endchar; @@ -452,18 +454,14 @@ if serifs: dish_serif(4,3,e,1/3,cap_jut,f,1/3,cap_jut); fi %!!! % lower right serif fi %%%%% -% uppercase descender/ogonek -if is_ogonek: - def the_pen=if known ogonek_pen: ogonek_pen - elseif serifs: tiny elseif is_bold: fisp else: fine fi - enddef; - % |diag_end| refers to |tiny| pen, hence |tiny| in the following equation: - ogonek_pos=(x4 if not serifs: l if is_bold: +.4tiny fi\\ fi,.5the_pen) - if serifs and not is_egyptian: +(.5xvair,0) fi; - easy_ogonek(the_pen,9,10,11); % ogonek +% uppercase descender/saam tail +numeric right_jut; +right_jut=if serifs: max(limit_dist,1.1cap_jut) else: hround (r-rt x4r-.65u) fi; +if unic: + %saam tail + serif(4,3,v,1/3,-cap_jut); + siam_serif(4,3,w,1/3,right_jut); else: - numeric right_jut; - right_jut=if serifs: max(limit_dist,1.1cap_jut) else: hround (r-rt x4r-.65u) fi; r_serif(4,3,x,1/3,cap_jut,y,1/3,beak_darkness,right_jut,beak_jut); % lower right descender fi penlabels(0,1,1',2,3,3',4,5,6,7,8, 9,10,11); endchar; @@ -865,14 +863,14 @@ if serifs: pos[_two](vair',-90); pos[_three](hair,-180); pos[_four](bulb_diam,-180); x[_two]=.5[x[_one],x[_three]r]; - bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=-.85d; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; z[_three]r=z[_four]r; %rt x[_four]l=floor x[_zero]-2u if monospace: / expansion_factor fi;%2.5u lft x[_four]r=-1/3u if monospace: / expansion_factor fi;%2.5u %filldraw stroke z[_five]e--pulled_arc.e([_one],[_two]); forsuffixes e=l,r: z[_one]'e=((0,y[_four])--(w,y[_four])) intersectionpoint - (pulled_arc.e([_one],[_two])); endfor + (z[_five]e--pulled_arc.e([_one],[_two])); endfor if lft x[_one]'l>rt x[_four]l+max(1,.5vair+.5): filldraw stroke z[_five]e--pulled_arc.e([_one],[_two]); else: @@ -1004,7 +1002,7 @@ if serifs: pos[_two](vair',-90); pos[_three](hair,-180); pos[_four](bulb_diam,-180); x[_two]=.5[x[_one],x[_three]r]; - bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=-.85d; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; z[_three]r=z[_four]r; rt x[_four]l=floor x[_zero]-2.5u if monospace: / expansion_factor fi; filldraw stroke z[_five]e--pulled_arc.e([_one],[_two]); @@ -1267,7 +1265,7 @@ if hefty: numeric upper_notch,lower_notch; upper_notch=y6-cap_notch_cut-eps; lower_notch=y5+cap_notch_cut+eps; if monospace: x5r =rt x1r; x6l =lft x3l; y5=vround(slab+eps); y6=vround(h-slab-eps); - alpha1=diag_ratio(1,stem1,y6-y5,x5r-x6l); + alpha1=diag_ratio(1,stem1,y5-y6,x5r-x6l); penpos5(min(2fudged.cap_stem,alpha1*stem1),0); penpos6(min(2fudged.cap_stem,alpha1*stem1),0); x5'=lft x1l; z5'=whatever[z5l,z6l]; x6'=rt x4r; z6'=whatever[z5r,z6r]; @@ -1299,19 +1297,15 @@ if serifs: dish_serif(4,3,g,1/3,inner_jut,h,1/3,cap_jut); fi % lower right serif fi %%% -% uppercase descender/ogonek -if is_ogonek: - def the_pen=if known ogonek_pen: ogonek_pen - elseif serifs: tiny elseif is_bold: fisp else: fine fi - enddef; - % |diag_end| refers to |tiny| pen, hence |tiny| in the following equation: - ogonek_pos=(x4 if not serifs: l if is_bold: +.75tiny fi\\ fi,.5the_pen) - if serifs and not is_egyptian: +(.5xvair,0) fi; - easy_ogonek(the_pen,14,15,16); % ogonek +% uppercase descender/saam tail +if not serifs: inner_jut:=0; fi +numeric right_jut; +right_jut=if serifs: max(limit_dist,1.1cap_jut) else: hround (r-rt x4r-.65u) fi; +if unic: + %saam tail + serif(4,3,v,1/3,-inner_jut); + siam_serif(4,3,w,1/3,right_jut); else: - if not serifs: inner_jut:=0; fi - numeric right_jut; - right_jut=if serifs: max(limit_dist,1.1cap_jut) else: hround (r-rt x4r-.65u) fi; r_serif(4,3,g,1/3,inner_jut,h,1/3,beak_darkness,right_jut,beak_jut); % lower right descender fi %%%%% diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2slvi.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2slvi.mf index 47078c5937d..b01b35ab11e 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2slvi.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2slvi.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -50,7 +50,7 @@ % narrow_e used eps % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Italic Cyrillic letter ligature az - old a"; cyrcharmoving(az); @@ -59,10 +59,93 @@ lhchar "Italic Cyrillic letter ligature i_az - iot az"; cyrcharmoving(i_az); lhchar "Italic Cyrillic letter l_yus - little yus"; -cyrcharmoving(l_yus); +%cyrcharmoving(l_yus);%restored for Unicode +cyrchar(l_yus,11u#,x_height#,0); +italcorr 1/3x_height#*slant+.5hair#+.5u#; +adjust_fit(if monospace:-.5u# else:.5u# fi, %wbulb_adj + 0); +% ital_amod; +pickup fine.nib; pos1(vair,-90); pos2(hair,0); pos3(hair,0); pos4(vair,-90); +pos5(hair,-180); pos6(flare,-180); +pos1'(stem,180); pos10(stem,0); +top y1l=h+oo; x1=.5[x3,x1']; x2=x3=3u; y3=.35h; y2=.75h; +bot y4r=-oo; x4=lft x6r+flare; y6-.5flare=.1h; lft x6r=-.25u; z5r=z6r; +y1'=.8h; x1'=x7; z10=z1'; +rt x7r=hround(w-2.5u+.5stem); +bulb(4,5,6); % bulb +x9=w; hook_out(7,8,9); % closing hook +filldraw stroke z10e--z7e; % tie +filldraw stroke pulled_arc.e(4,3) & super_arc.e(3,1) + & super_arc.e(1,1'); % right stem +% stem&bar +pos11(vair,90); pos12(vair,90); +z11=((l,bar_height)..(w,bar_height)) intersectionpoint + (pulled_arc.r(4,3) & super_arc.r(3,1)); +z12=((0,bar_height)..(w,bar_height)) intersectionpoint (z10l..z7l); +filldraw stroke z11e--z12e; % bar +numeric stem[]; stem1=max(fine.breadth+eps,.7[thin_join,stem]); +pos13(stem1,0); pos14(stem1,0); +x13=x14=.5[x11,x12]; y13=y12; y14-.5stem1=0; +filldraw circ_stroke z14e--z13e; % stem +%%% +penlabels(1,1',2,3,4,5,6,7,8,9,11,11',14,15); +endchar; lhchar "Italic Cyrillic letter il_yus - iotfied little yus"; -cyrcharmoving(il_yus); +%cyrcharmoving(il_yus);%restored for Unicode +cyrchar(il_yus,11u#,x_height#,0); +italcorr 1/3x_height#*slant+.5hair#+.5u#; +adjust_fit(if monospace: 3.5u#+else: 4.5u#+fi.5u#, + if monospace:-1.5u# else:0 fi); %rstem_adj +% ital_amod;iot +pickup fine.nib; pos1(vair,-90); pos2(hair,0); pos3(hair,0); pos4(vair,-90); +pos5(hair,-180); pos6(flare,-180); +pos1'(stem,180); pos10(stem,0); +top y1l=h+oo; x1=.5[x3,x1']; x2=x3=3u-eps; y3=.35h; y2=.75h; +bot y4r=-oo; lft x6r=-.25u; +x4=min(lft x6r+flare,lft x3l-eps); y6-.5flare=.1h; z5r=z6r; +y1'=min(.8h,bot y1l)-eps; z10=z1'; +rt x7r=hround (w-2.5u+.5stem)+eps; +x1'=x7; +bulb(4,5,6); % bulb +% right_stem; +_one:=7; _two:=8; _three:=9; +if monospace: pos[_three](vair,90); pos[_one](stem,0); + x[_three]=good.x .5[x[_one],w]; bot y[_three]l=0; y[_one]=1/3h; + filldraw stroke z[_one]e{down}...{right}z[_three]e; % terminal +else: x[_three]=w; hook_out([_one],[_two],[_three]); fi % opening hook +filldraw stroke z10e--z7e; % tie +if lft x1'r<x1: lft x1'r:=x1+eps; fi +filldraw stroke pulled_arc.e(4,3) & + super_arc.e(3,1) & super_arc.e(1,1'); % right stem +% stem&bar +pos11(vair,90); pos12(vair,90); +z11=((l,bar_height)..(w,bar_height)) intersectionpoint + (pulled_arc.r(4,3) & super_arc.r(3,1)); +z12=((0,bar_height)..(w,bar_height)) intersectionpoint (z10l..z7l); +filldraw stroke z11e--z12e; % bar +numeric stem[]; stem1=max(fine.breadth+eps,.7[thin_join,stem]); +pos13(stem1,0); pos14(stem1,0); +x13=x14=.5[x11,x12]; y13=y12; y14-.5stem1=0; +filldraw circ_stroke z14e--z13e; % stem +%%% +% i half +_one:=15; _two:=16; _three:=17; _four:=18; _five:=19; _six:=20; +% +pos[_four](stem,0); +lft x[_four]l=l+letter_fit if not monospace: +hround(2.5u-.5stem) fi; +y[_four]-.5stem=-oo; x[_three]=x[_four]; +if monospace: + pos[_three](stem,0); top y[_three]=h; +else: + x[_one]=l+letter_fit; hook_in([_one],[_two],[_three]); fi % opening hook +filldraw circ_stroke z[_four]e--z[_three]e; % stem +pos[_five](vair,90); pos[_six](vair,90); %!!! +x[_five]=x[_four]; x[_six]=x11; y[_five]=y[_six]=bar_height; %!!! +filldraw stroke z[_five]e--z[_six]e; % bar %!!! +%%% +penlabels(1,1',2,3,4,5,6,7,8,9,11,12,13,14,15,16,17,18,19,20); +endchar; lhchar "Italic Cyrillic letter gerv - Glagolic letter"; cyrcharmoving(gerv); @@ -113,16 +196,168 @@ lhchar "Italic Cyrillic letter izhe"; cyrcharmoving(izhe); lhchar "Italic Cyrillic letter omga - omega"; -cyrcharmoving(omga); +%cyrcharmoving(omga);%restored for Unicode +cyrchar(omga,11u#,x_height#,0); +italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.15u# fi; %o+.35u +adjust_fit(if monospace:-.35u#,-.35u# else:0,0 fi); %bowl_adj +% ital_omega; +pickup fine.nib; pos2(stem,-180); lft x2r=hround.5u; y2=y4=y6=y8=bar_height; +pos3(vair,-90); pos4(hair,0); pos5(vair,90); +pos6(hair,180); pos7(vair,270); pos8(stem,360); +bot y3r=bot y7r=-oo; top y5r=vround(.2[y4,h]+.5vair); +x3=.5[x2,x4]; x7+.25u=.5[x6,x8]; rt x8r=hround(w-.5u); +x5+.5stem=hround(.5[x2l,x8l]+.5stem)+eps; +x5=.5[x4,x6]; rt x4r-lft x6r=min(stem,2hair)+2eps; +y1+.5hair=h+oo; x1=min(x2l+1.25u,lft x6r); x9=w-x1; y9=y1; +pos1(hair,angle(2(x1-x2),y1-y2)+90); pos9(hair,-angle(2(x1-x2),y1-y2)+90); +if x4l<x6l: x4l:=x6l:=x5; fi +filldraw stroke z1e...z2e{down}...z3e{right} + ...{up}z4e...{left}z5e; % left arc +filldraw stroke z5e{left}...z6e{down}... + z7e{right}...{up}z8e...z9e; % right arc +%%% +penlabels(1,2,3,4,5,6,7,8,9); endchar; lhchar "Italic Cyrillic letter omga_rnd - omega round"; -cyrcharmoving(omga_rnd); +%cyrcharmoving(omga_rnd);%restored for Unicode +cyrchar(omga_rnd,11u#,x_height#,0); %f width +italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi; +adjust_fit(if monospace:0,0 else:-.35u#,-.35u#fi); pickup fine.nib; +pos1(vair,90); pos2(curve,180); pos3(vair,270); pos4(curve,360); +interim superness:=1.075 superness; % +x1=x3=.5w; lft x2r=hround(1.5u-.5curve); x4=w-x2; +top y1r=h+oo; y2=y4=.5[y1,y3]; bot y3r=-oo; +filldraw stroke pulled_arc.e(1,2) & pulled_arc.e(2,3) + & pulled_arc.e(3,4) & pulled_arc.e(4,1); % bowl +pickup crisp.nib; +% dots +numeric bulb_diam; bulb_diam=hround 7/8[hair,flare]; +z5=z1r; z6=z3r; x5'=x6'=x1; pos5(bulb_diam,0); pos6(bulb_diam,0); +bot y5'=max(.5h+1,bot y1l-.7bulb_diam); +top y6'=min(.5h-1,top y3l+.7bulb_diam); +pos6'(min(bulb_diam,.7[hair,fudged.stem]),0); +pos5'(min(bulb_diam,.7[hair,fudged.stem]),0); +filldraw circ_stroke z5e--z5'e; filldraw circ_stroke z6e--z6'e; %dots +penlabels(1,2,3,4); endchar; lhchar "Italic Cyrillic letter ot - omega with te accent"; -cyrcharmoving(ot); +%cyrcharmoving(ot);%restored for Unicode +cyrchar(ot,11u#,x_height#+acc_height#,0); +italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.15u# fi; %o+.35u +adjust_fit(if monospace:-.35u#,-.35u# else:0,0 fi); %bowl_adj +full_h:=h; h:=x_height; +% ital_omega; +pickup fine.nib; pos2(stem,-180); lft x2r=hround.5u; y2=y4=y6=y8=bar_height; +pos3(vair,-90); pos4(hair,0); pos5(vair,90); +pos6(hair,180); pos7(vair,270); pos8(stem,360); +bot y3r=bot y7r=-oo; top y5r=vround(.2[y4,h]+.5vair); +x3=.5[x2,x4]; x7+.25u=.5[x6,x8]; rt x8r=hround(w-.5u); +x5+.5stem=hround(.5[x2l,x8l]+.5stem)+eps; +x5=.5[x4,x6]; rt x4r-lft x6r=min(stem,2hair)+2eps; +y1+.5hair=h+oo; x1=min(x2l+1.25u,lft x6r); x9=w-x1; y9=y1; +pos1(hair,angle(2(x1-x2),y1-y2)+90); pos9(hair,-angle(2(x1-x2),y1-y2)+90); +if x4l<x6l: x4l:=x6l:=x5; fi +filldraw stroke z1e...z2e{down}...z3e{right} + ...{up}z4e...{left}z5e; % left arc +filldraw stroke z5e{left}...z6e{down}... + z7e{right}...{up}z8e...z9e; % right arc +%%% +% the accent +%%%%% +% the accent +% low_te(16); +_zero:=5; +_one:=10; _two:=11; _three:=12; _four:=13; +_five:=14; _six:=15; _seven:=16; _eight:=17; _nine:=18; +% +if serifs: pickup crisp.nib; + else: pickup pencircle scaled min(.5fine,.15vair); fi +numeric stem[]; stem1=if hefty: fudged.hair-2stem_corr else: .7[vair,stem] fi; +stem2=if serifs: vair else: max(currentbreadth+eps,.6[thin_join,vair]) fi; +stem3=if serifs: hair else: max(currentbreadth+eps,.6[thin_join,vair]) fi; +pos[_one](stem1,0); pos[_two](stem1,0); +lft x[_one]l=lft x[_two]l=hround(x[_zero]-.5stem1); +numeric mid_thickness; +mid_thickness=vround if serifs:1/4 else: 1/3 fi[vair,stem]; +bot y[_two]=bot y[_four]=bot y[_five]= + vround max(h+o+max(tiny,.5mid_thickness),1/3[h,h+acc_height]+o-.5mid_thickness); +top y[_one]=top y[_three]r=max(h+acc_height,bot y[_two]+1.5vair); +filldraw stroke z[_one]e--z[_two]e; % stem +pos[_three](stem2,90); pos[_four](stem3,0); pos[_five](stem3,180); +x[_three]=x[_one]; +rt x[_four]r=hround(x[_zero]+2.5u if monospace:/expansion_factor fi+.5vair); +x[_four]-x[_three]=x[_three]-x[_five]; +z[_four]'=beak_darkness[(x[_four]l,y[_three]l), + .5[(x[_one]r,y[_three]l),z[_four]l] ]; +z[_five]'=beak_darkness[(x[_five]l,y[_three]l), + .5[(x[_one]l,y[_three]l),z[_five]l] ]; +filldraw z[_four]r--z[_four]l{up}...z[_four]' + ...{left}(x[_one]r,y[_three]l)--(x[_one]r,y[_three]l){left}...z[_five]' + ...{down}z[_five]l--z[_five]r--- + (x[_five]r,y[_three]r)---(x[_four]r,y[_three]r)---cycle; +%%% +penlabels(1,2,3,4,5,6,7,8,9); endchar; -lhchar "Italic Cyrillic letter omga_tlo"; -cyrcharmoving(omga_tlo); +lhchar "Italic Cyrillic letter omga_tlo - omega titlo"; +%cyrcharmoving(omga_tlo);%restored for Unicode +cyrchar(omga_tlo,11u#,x_height#+acc_height#,0); +italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.15u# fi; %o+.35u +adjust_fit(if monospace:-.35u#,-.35u# else:0,0 fi); %bowl_adj +full_h:=h; h:=x_height; +% ital_omega; +pickup fine.nib; pos2(stem,-180); lft x2r=hround.5u; y2=y4=y6=y8=bar_height; +pos3(vair,-90); pos4(hair,0); pos5(vair,90); +pos6(hair,180); pos7(vair,270); pos8(stem,360); +bot y3r=bot y7r=-oo; top y5r=vround(.2[y4,h]+.5vair); +x3=.5[x2,x4]; x7+.25u=.5[x6,x8]; rt x8r=hround(w-.5u); +x5+.5stem=hround(.5[x2l,x8l]+.5stem)+eps; +x5=.5[x4,x6]; rt x4r-lft x6r=min(stem,2hair)+2eps; +y1+.5hair=h+oo; x1=min(x2l+1.25u,lft x6r); x9=w-x1; y9=y1; +pos1(hair,angle(2(x1-x2),y1-y2)+90); pos9(hair,-angle(2(x1-x2),y1-y2)+90); +if x4l<x6l: x4l:=x6l:=x5; fi +filldraw stroke z1e...z2e{down}...z3e{right} + ...{up}z4e...{left}z5e; % left arc +filldraw stroke z5e{left}...z6e{down}... + z7e{right}...{up}z8e...z9e; % right arc +%%% +% the accent +h:=full_h; +% low_palatal(expr .5w+u,0,-o); +x_center:=.5w+u; x_move:=0; y_move:=-o; +_one:=10; _two:=11; _three:=12; _four:=13; +_five:=14; _six:=15; _seven:=16; _eight:=17; _nine:=18; +% +% frown part +pickup fine.nib; numeric frown_width,flare_width; +frown_width=max(fine.breadth,.6[thin_join,vair]); +flare_width=max(fine.breadth,.5[thin_join,flare]); +penpos[_one](frown_width,180); penpos[_three](frown_width,0); +penpos[_two](frown_width,90); +top y[_two]r=y_move+x_height+max(if serifs:.75 fi acc_height,frown_width+1); +x[_two]=x_center-u; lft x[_one]r=hround(x[_two]-1.5u-0.5frown_width); +rt x[_three]r=hround(x[_two]+1.5u+0.5frown_width); +bot y[_one]=bot y[_three]=y_move+vround + max(x_height+oo+tiny,1/3[x_height,h]+oo-.5frown_width); +%fill stroke z[_one]e{up}...z[_two]e{right}...{down}z[_three]e; % stroke +% tilde part +penpos[_five](frown_width,180); penpos[_seven](frown_width,90); +penpos[_seven]'(flare_width,0); +bot y[_six]l=y[_two]r+.5flare_width; +rt x[_five]l=x[_one]r-.5flare_width; +x[_six]=x[_two]+.25u; x[_six]-x[_five]l=x[_seven]'l-x[_six]; +rt x[_seven]=max(x[_six]+5.5u + if monospace:/expansion_factor fi,x[_three]r+.5frown_width); +penpos[_six](flare_width,90); +bot y[_five]=bot y[_seven]'=bot y[_one]; bot y[_seven]l=x_height+oo; +forsuffixes e=l,r: path p.e; +p.e=(x[_five]e,y[_five]e+.5fine){up} + ...z[_six]e{right}...{down}z[_seven]'e; endfor +fill subpath(0,1.5) of p.l..tension.85.. + {right}(x[_seven]l-.5fine,y[_seven]l) + ...z[_seven]...(x[_seven]r-.5fine,y[_seven]r){left} + ..tension.85..reverse subpath(0,1.6) of p.r...z[_five]...cycle; % stroke +%%% +penlabels(1,2,3,4,5,6,7,8,9); endchar; lhchar "Italic Cyrillic letter koppa (looks like c with tail)"; cyrchar(koppa,8u#,x_height#,desc_depth#); @@ -141,7 +376,50 @@ ellipse_set(2l,3l,4l,5l); ellipse_set(2r,3r,4r,5r); penlabels(0,1,2,3,4,5,6); endchar; lhchar "Italic Cyrillic letter uk"; -cyrcharmoving(uk); +%cyrcharmoving(uk);%restored for Unicode +cyrchar(uk,9.75u#,asc_height#,0); +italcorr asc_height#*slant-.5u#; +adjust_fit(0,0); +% ital_uk; +numeric top_thickness,mid_thickness,bot_thickness,upper_side,lower_side,theta; +top_thickness=max(fine.breadth,vround(slab-2vair_corr)); +bot_thickness=max(fine.breadth,vround(slab-vair_corr)); +x0=.5w; y0=if hefty:bar_height else:.7x_height fi; %h;%%%%%%%%%%%%%% +pickup fine.nib; theta=90-angle(20u,h); slope:=-h/20u; +upper_side=max(fine.breadth+eps,hround(.5[hair,stem]-stem_corr)); +lower_side=hround(.5[hair,stem]+stem_corr); +if lower_side>1.2upper_side: upper_side:=lower_side; fi +pos1(top_thickness,-90); pos6(bot_thickness,-90); +x1=x6=.5w; top y1l=h+o; bot y6r=-o; pos0(cap_stem,theta); +lft x2l=w-rt x8l=hround 1.25u; lft x7r=w-rt x5r=hround 1.75u; + x2r-x2l=stem-fine; x5r-x5l=lower_side-fine;%%%%%%%%%%% +ellipse_set(1l,2l,3l,0l); ellipse_set(1r,2r,3r,0r); +ellipse_set(6l,5l,4l,0l); ellipse_set(6r,5r,4r,0r); +numeric tau; tau=max(.8,.20710678/(superness-.5)); +y2r:=vround(y2l+max(1,serif_drop)+eps); +filldraw stroke z2e{down} + ..z3e---z4e..z5e{down}..tension atleast tau..z6e{left}; % S stroke +pos7(lower_side,180); pos8(upper_side,180); +y7=.5[y5l,y5r]; y8=.5[y2l,y2r]; pos9(vair,90); z9=z0; +filldraw stroke z8e{down} + ..tension atleast tau and atleast 1..{-18u,-.618h}z9e; % upper right stroke +filldraw stroke z6e{left}..tension atleast tau..z7e{up} + ..tension atleast tau and atleast 1..{18u,.5h}z9e;% lower left stroke +% italic bulb +z8'=z8; pos8'(upper_side,0); +y1'+.5curve=h+oo; x1'=x8-max(u,.5u+.5curve); %+.5curve%y8+(x_height-bar_height); %%%%%%%%%%% +numeric theta; theta=angle(4(x8'-x1'),y8'-y1'); pos1'(curve,theta+90); +filldraw z1'l{dir theta}..tension atleast 1 and 1..{down}z8'l + --z8'r{up}...{-dir theta}z1'r..cycle; % bulb +% from sloped serif +if serif_drop>0: + pos12(slab,90); lft x12=x2l-.5jut-eps; y12r=y2r-serif_drop; z14=z2l; + filldraw z2r--z12r--z12l{right} + ...1/3[(x14,y12l),.5[z12l,z14] ]{z14-z12l} + ...{down}z14--(x2r,y14)--cycle; % sloped serif +fi +%%%%% +penlabels(0,1,2,3,4,5,6,7,8,9); endchar; lhchar "Italic Cyrillic letter cherv - old che"; cyrcharmoving(cherv); @@ -180,10 +458,92 @@ lhchar "Italic Cyrillic letter shta - old sh"; cyrcharmoving(shta); lhchar "Italic Cyrillic letter ib_yus - iot big yus"; -cyrcharmoving(ib_yus); +%cyrcharmoving(ib_yus);%restored for Unicode +cyrchar(ib_yus,9u#,x_height#,0); +italcorr 1/3x_height#*slant+.5hair#+.5u#; %h +adjust_fit(if monospace: 4u#+else: 5u#+fi w#-5u#, + if monospace:-1.5u# else:0 fi); %rstem_adj +% ital_yus;iot +% itop_yus; +pickup fine.nib; +penpos1(fudged.stem,0); penpos2(fudged.hair,0); +penpos3(fudged.stem,0); penpos4(fudged.hair,0); +w-x2r=.24w; x2-x3=x3-x1; y1=h; y2=y1; y3=y4=bar_height; +x3l=hround(2.5u-.5stem); x3r=x4r; +z0=whatever[z4l,z2l]=whatever[z1r,z3r]; +if hefty: y0:=bar_height+.5fine; + fill z3l--diag_end(3l,1l,1,1,1r,3r){z3r-z1r} + ...{down}(x0-.5,y0)..(x0+.5,y0){up}... + {z2l-z4l}diag_end(4l,2l,1,1,2r,4r)--z4r--cycle; % diagonals +else: fill z3l--diag_end(3l,1l,1,1,1r,3r)--z0-- + diag_end(4l,2l,1,1,2r,4r)--z4r--cycle; fi % diagonals +penpos5(fudged.stem,0); x5=x3; y5-.5stem=-oo; +fill circ_stroke z5e--z3e; %middle stem +z6'r=z1; z7'r=z2; +z7'l=whatever[z4l,z2l]; z6'l=whatever[z1r,z3r]; y6'l=y7'l=vround(y1-vair)-eps; +if x7'l<x6'l: x7'l:=x6'l+eps; fi +fill stroke z6'e--z7'e; % upper bar +% bowls +pos8(vair,90); pos9(stem,0); pos10(vair,90); pos11(hair,180); +pos12(stem,180); pos13(vair,90); pos14(hair,0); z8=z3; +x11=hround(w+.5hair-eps)-.5hair; x11-x3=x3-x14; y11=y14=1/3x_height; +lft x9l=hround(w-2.75u-.5stem); x9-x3=x3-x12; y9=y12=1/2y8; +x10=hround(w-1.2u); x10-x3=x3-x13; +bot y10l=bot y13l=if monospace: 0 else:-oo fi; +filldraw stroke if not monospace:z14e{down}... fi + z13e{right}...z12e{up}...z8e{right}...z9e{down}...z10e{right} + if not monospace:...{up}z11e fi; % left lower diagonal +%%% +% i half +_one:=15; _two:=16; _three:=17; _four:=18; _five:=19; _six:=20; +% +pos[_four](stem,0); +lft x[_four]l=l+letter_fit if not monospace: +hround(2.5u-.5stem) fi; +y[_four]-.5stem=-oo; x[_three]=x[_four]; +if monospace: + pos[_three](stem,0); top y[_three]=h; +else: + x[_one]=l+letter_fit; hook_in([_one],[_two],[_three]); fi % opening hook +filldraw circ_stroke z[_four]e--z[_three]e; % stem +pos[_five](vair,90); pos[_six](vair,90); %!!! +x[_five]=x[_four]; x[_six]=x8; y[_five]=y[_six]=bar_height; %!!! +filldraw stroke z[_five]e--z[_six]e; % bar %!!! +%%% +penlabels(1,2,3,4,5,6,7,8,9,11,12,13,14,15,16,17,178,19,20); endchar; lhchar "Italic Cyrillic letter i_est - iot est (IC with mid-line)"; -cyrcharmoving(i_est); +%cyrcharmoving(i_est);%restored for Unicode +cyrchar(i_est,8u#,x_height#,0); +italcorr if math_fitting:1/3x_height#*slant else:x_height#*slant-.5u# fi; %c+.5u +adjust_fit(if monospace: 3u# else: 4.5u# fi +0.2u#,0); +% ital_ukre;iot +pickup fine.nib; pos0(flare,0); pos1(hair,0); pos2(vair,90); +pos3(curve,180); pos4(vair,270); pos5(hair,320); +x2=x4=.5(w+u); rt x1r=max(rt x2,hround(w-.5u))+eps; +lft x3r=hround(1.5u-.5curve); x5r=good.x(w-eps); x6=x5; +y1=.5[bar_height,h]; top y2r=h+oo; bulb(2,1,0); % bulb +bot y4r=-oo; y3=.5[y2,y4]; top y5l=vround .5bar_height; y6=bar_height; +path p; p=z4{right}..z5..z6; +filldraw stroke pulled_arc.e(2,3) + & pulled_arc.e(3,4)...{direction 1 of p}z5e; % arc +pos7(vair,90); +y7=bar_height; rt x7=hround max(rt x2+1+eps,lft x0l-eps); +% i half +_one:=8; _two:=9; _three:=10; _four:=11; _five:=12; _six:=13; +% +pos[_four](stem,0); +lft x[_four]l=l+letter_fit if not monospace: +hround(2.5u-.5stem) fi; +y[_four]-.5stem=-oo; x[_three]=x[_four]; +if monospace: + pos[_three](stem,0); top y[_three]=h; +else: + x[_one]=l+letter_fit; hook_in([_one],[_two],[_three]); fi % opening hook +filldraw circ_stroke z[_four]e--z[_three]e; % stem +pos[_five](vair,90); pos[_six](vair,90); %!!! +x[_five]=x[_four]; x[_six]=x7; y[_five]=y[_six]=bar_height; %!!! +filldraw stroke z[_five]e--z[_six]e; % bar %!!! +%%% +penlabels(1,1',2,3,4,5,6,7,8,9,10,11,12); endchar; lhchar "Italic Cyrillic letter vnarrow_e"; cyrcharmoving(vnarrow_e); diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2slvl.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2slvl.mf index 0db9b511d50..8fd935adc20 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2slvl.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2slvl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -51,7 +51,7 @@ % narrow_e used eps % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Lowercase Cyrillic letter az - old a"; cyrchar(az,9u#,x_height#,0); @@ -159,8 +159,8 @@ else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals penpos5(whatever,angle(z2-z1)); z5=whatever[z1,z2]; penpos6(whatever,angle(z3-z4)); z6=whatever[z3,z4]; y6=y5; -if hefty: y5r else: y5 fi =.5y0; -y5r-y5l=y6r-y6l=.6[thin_join,vair]; +if hefty: y5r else: y5 fi =.5y0; y5r-y5l=y6r-y6l=.6[thin_join,vair]; +forsuffixes $=l,r: if x5$>x6$: x5$:=x6$-eps; fi endfor; penstroke z5e--z6e; % bar line pickup tiny.nib; x7=.5[x5,x6]; top y7=y5; bot y8=0; pos7(max(tiny.breadth+eps,.7[thin_join,stem]),0); @@ -199,8 +199,8 @@ else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals penpos5(whatever,angle(z2-z1)); z5=whatever[z1,z2]; penpos6(whatever,angle(z3-z4)); z6=whatever[z3,z4]; y6=y5; -if hefty: y5r else: y5 fi =.5y0; -y5r-y5l=y6r-y6l=.6[thin_join,vair]; +if hefty: y5r else: y5 fi =.5y0; y5r-y5l=y6r-y6l=.6[thin_join,vair]; +forsuffixes $=l,r: if x5$>x6$: x5$:=x6$-eps; fi endfor; penstroke z5e--z6e; % bar line pickup tiny.nib; x7=.5[x5,x6]; top y7=y5; bot y8=0; pos7(max(tiny.breadth+eps,.7[thin_join,stem]),0); @@ -381,7 +381,8 @@ if serifs: pos1(hair,180); pos0(flare,180); pos2'(vair,90); z2'=z2; penpos16(.25[vair,curve],angle(z16-z14)+90); z15l=z14l+whatever*(z14-z15); (x15r,y)=z14r+whatever*(z14-z15); fill stroke z15e--z14e{z16r-z14}..{.5right}z16e; % diagonals -else: pos1(min(right_curve,1.2flare)-.2tiny,175); pos2'(vair,90); +else: pos1(max(currentbreadth+eps,min(right_curve,1.2flare)-.2tiny),175); + pos2'(vair,90); z2'=z2; y1l=max(.76h,top y5r+eps); filldraw stroke z1e{x2-x1,5(y2-y1)}...{right}z2'e; pos10(vair,45); @@ -592,7 +593,7 @@ _one:=8; _two:=9; _three:=10; _four:=11; _five:=12; % if serifs: pickup crisp.nib; else: pickup pencircle scaled min(.5fine,.15vair); fi -numeric stem[]; stem1=if hefty: fudged.hair-2stem_corr else: .7[vair,stem] fi; +numeric stem[]; stem1=max(currentbreadth+eps,if hefty: fudged.hair-2stem_corr else: .7[vair,stem] fi); stem2=if serifs: vair else: max(currentbreadth+eps,.6[thin_join,vair]) fi; stem3=if serifs: hair else: max(currentbreadth+eps,.6[thin_join,vair]) fi; pos[_one](stem1,0); pos[_two](stem1,0); @@ -760,7 +761,7 @@ else: bot_thickness=vair'; upper_side=max(fine.breadth,hround(.3[vair',stem]-stem_corr)); lower_side=hround(.3[vair',stem]+stem_corr); fi - x0=.5w; y0=if serifs:.7x_height else:bar_height fi; %h;%%%%%%%%%%%%%% + x0=.5w; y0=if hefty:bar_height else:.7x_height fi; %h;%%%%%%%%%%%%%% pickup fine.nib; theta=90-angle(20u,h); slope:=-h/20u; if lower_side>1.2upper_side: upper_side:=lower_side; fi pos1(top_thickness,-90); pos6(bot_thickness,-90); @@ -772,7 +773,7 @@ x5r-x5l=lower_side-fine; ellipse_set(1l,2l,3l,0l); ellipse_set(1r,2r,3r,0r); ellipse_set(6l,5l,4l,0l); ellipse_set(6r,5r,4r,0r); numeric tau; tau=max(.8,.20710678/(superness-.5)); -y2r:=vround(y2l+serif_drop+eps); +y2r:=vround(y2l+max(1,serif_drop)+eps); filldraw stroke z2e{down} ..z3e---z4e..z5e{down}..tension atleast tau..z6e{left}; % S stroke pos7(lower_side,180); pos8(upper_side,180); @@ -789,11 +790,13 @@ if serifs: filldraw z1'l{dir theta}..tension atleast 1 and 1..{down}z8'l --z8'r{up}...{-dir theta}z1'r..cycle; % bulb % from sloped serif - pos12(slab,90); lft x12=hround(x2l-.5jut-.5-eps); - y12r=vround(y2r-serif_drop-eps); z14=(x2l,min(y2l-.5,y12)-eps); - filldraw z2r--z12r--z12l{right} - ...1/3[(x14,y12l),.5[z12l,z14] ]{z14-z12l} - ...{down}z14--(x2r,y14)--cycle; % sloped serif + if serif_drop>0: + pos12(slab,90); lft x12=hround(x2l-max(1,.5jut)-.5-eps); + top y12r=vround(y2r-max(0,serif_drop)-eps); z14=(x2l,min(y2l-.5,y12)-eps); + filldraw z2r--z12r--z12l{right} + ...1/3[(x14,y12l),.5[z12l,z14] ]{z14-z12l} + ...{down}z14--(x2r,y14)--cycle; % sloped serif + fi else: pos10(flare,225); x10r=x1; y10l=h+oo; filldraw stroke z8e{up}...z10e; fi %%%%% diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2slvu.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2slvu.mf index 167cc669c6c..f418564a0ff 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2slvu.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2slvu.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -50,7 +50,7 @@ % NARROW_E used EPS % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Uppercase Cyrillic letter ligature AZ - OLD A"; cyrchar(AZ,12u#,cap_height#,0); @@ -146,8 +146,9 @@ else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals penpos5(whatever,angle(z2-z1)); z5=whatever[z1r,z2r]; penpos6(whatever,angle(z3-z4)); z6=whatever[z3l,z4l]; y6=y5; -if hefty: y5r else: y5 fi =.5y0; -y5r-y5l=y6r-y6l=cap_band; penstroke z5e--z6e; % bar line +if hefty: y5r else: y5 fi =.5y0; y5r-y5l=y6r-y6l=cap_band; +forsuffixes $=l,r: if x5$>x6$: x5$:=x6$-eps; fi endfor; +penstroke z5e--z6e; % bar line pickup tiny.nib; x7=.5[x5,x6]; top y7=y5; x8=x7; bot y8=0; pos7(max(currentbreadth+eps,.5[cap_band,cap_stem]),0); @@ -186,10 +187,11 @@ if y0<h-cap_notch_cut: y0:=h-cap_notch_cut; ...{up}z0+.5left--cycle; % left and right diagonals else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals -penpos5(whatever,angle(z2-z1)); z5=whatever[z1r,z2r]; -penpos6(whatever,angle(z3-z4)); z6=whatever[z3l,z4l]; y6=y5; -if hefty: y5r else: y5 fi =.5y0; -y5r-y5l=y6r-y6l=cap_band; penstroke z5e--z6e; % bar line +penpos5(whatever,angle(z2-z1)); z5=whatever[z1r,z2r]-(eps,0); +penpos6(whatever,angle(z3-z4)); z6=whatever[z3l,z4l]+(eps,0); y6=y5; +if hefty: y5r else: y5 fi =.5y0; y5r-y5l=y6r-y6l=cap_band; +forsuffixes $=l,r: if x5$>x6$: x5$:=x6$-eps; fi endfor; +penstroke z5e--z6e; % bar line pickup tiny.nib; x7=.5[x5,x6]; top y7=y5; x8=x7; bot y8=0; pos7(max(currentbreadth+eps,.5[cap_band,cap_stem]),0); @@ -369,7 +371,7 @@ if serifs: pos0(flare+(cap_stem-stem),180); pos1(cap_hair,180); pos16(.25[vair,curve],angle(z16-z14)+90); z15l=z14l+whatever*(z14-z15); z15r=z14r+whatever*(z14-z15); filldraw stroke z15e--z14e{z16r-z14}..{.5right}z16e; % hachek -else: y1=.8h; pos1(min(cap_hair,1.2flare)-.2tiny,170); +else: y1=.8h; pos1(max(currentbreadth+eps,min(cap_hair,1.2flare)-.2tiny),170); filldraw stroke z1e{x2-x1,10(y2-y1)}...{right}z2e; % upper bowl pos10(middle_weight,45); filldraw stroke z10e{left}...z9e{z8e-z9e}; % tail @@ -467,8 +469,8 @@ if serifs: y1=h-vround max(.1fig_height+.5flare,.15fig_height-.5flare)+o; x5=(.5w+eps); rt x1r=hround min(.5w-max( - if monospace:.67u,.55stem else:u,.7stem fi)+eps,lft x5l-1); - x2=x4+if monospace:-fi.25u=hround (.67[lft x3r,rt x1r]); + if monospace:.67u,.55stem else:u,.7stem fi),lft x5l-1)+eps; + x2=x4+if monospace:-fi.25u=hround min(.67[lft x3r,rt x1r],rt x1r-.5)-eps; {{less_tense; bulb(2,1,0)}}; % bulb y5=max(good.y(.5bar_height-.9),y4l+vair'); (x,y4l)=whatever[z4r,z5l]; x4l:=min(x,x4l+.5u); @@ -563,8 +565,8 @@ if serifs: y1=h-vround max(.1fig_height+.5flare,.15fig_height-.5flare)+o; x5=(.5w+eps); rt x1r=hround min(.5w-max( - if monospace:.67u,.55stem else:u,.7stem fi)+eps,lft x5l-1); - x2=x4+if monospace:-fi.25u=hround (.67[lft x3r,rt x1r]); + if monospace:.67u,.55stem else:u,.7stem fi),lft x5l-1)+eps; + x2=x4+if monospace:-fi.25u=hround min(.67[lft x3r,rt x1r],rt x1r-.5)-eps; {{less_tense; bulb(2,1,0)}}; % bulb y5=max(good.y(.5bar_height-.9),y4l+vair'); (x,y4l)=whatever[z4r,z5l]; x4l:=min(x,x4l+.5u); @@ -614,7 +616,7 @@ _one:=8; _two:=9; _three:=10; _four:=11; _five:=12; % if serifs: pickup crisp.nib; else: pickup pencircle scaled min(.5fine,.15vair); fi -numeric stem[]; stem1=if hefty: fudged.hair-2stem_corr else: .7[vair,stem] fi; +numeric stem[]; stem1=max(currentbreadth+eps,if hefty: fudged.hair-2stem_corr else: .7[vair,stem] fi); stem2=if serifs: vair else: max(currentbreadth+eps,.6[thin_join,vair]) fi; stem3=if serifs: hair else: max(currentbreadth+eps,.6[thin_join,vair]) fi; pos[_one](stem1,0); pos[_two](stem1,0); @@ -661,8 +663,8 @@ if serifs: top y2r=h+o; bot y4r=-o; lft x3r=hround u; y3=.5[y2,y4]; y1=h-vround max(.1fig_height+.5flare,.15fig_height-.5flare)+o; x5=(.5w+eps); rt x1r=hround min(.5w-max( - if monospace:.67u,.55stem else:u,.7stem fi)+eps,lft x5l-1); - x2=x4+if monospace:-fi.25u=hround (.67[lft x3r,rt x1r]); + if monospace:.67u,.55stem else:u,.7stem fi),lft x5l-1)+eps; + x2=x4+if monospace:-fi.25u=hround min(.67[lft x3r,rt x1r],rt x1r-.5)-eps; {{less_tense; bulb(2,1,0)}}; % bulb y5=max(good.y(.5bar_height-.9),y4l+vair'); (x,y4l)=whatever[z4r,z5l]; x4l:=min(x,x4l+.5u); diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2upi.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2upi.mf index dd84a7f08c0..a53f7cb3af8 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2upi.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2upi.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -51,7 +51,7 @@ % schwa "ba "ba "ba "ba Schwa % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Italic Cyrillic letter g_hcrs - ghe hcrossed"; % italic shape cyrchar(g_hcrs,6.25u#,x_height#,0); @@ -256,7 +256,7 @@ pair delta; delta=penoffset z3-z2 of currentpen; fill top lft z1l--z2l+delta---z3l+delta..lft z3l---lft z4l..bot z4l ---bot rt z4r--z3r-delta---z2r-delta..rt z2r---rt z1r..top z1r ---cycle; % diagonal -pickup crisp.nib; pos5(arm_thickness1,90); pos6(hair,180); +pickup crisp.nib; pos5(max(currentbreadth+eps,arm_thickness1),90); pos6(hair,180); top y5r=h; x5=x1; lft x6r=hround .75u; bot y6=2/3x_height-.5fine;%max(good.y(top y5r-vair-beak/1.4)-eps,y3+1) arm(5,6,a,beak_darkness,-.4beak_jut); % upper arm and beak diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2upl.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2upl.mf index 39e06c0fed2..cb22ea99ce2 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2upl.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2upl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -46,7 +46,7 @@ % schwa "ba "ba "ba "ba Schwa % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Lowercase Cyrillic letter g_hcrs - ghe hcrossed"; cyrchar(g_hcrs,8u#-.5width_adj#,x_height#,0); @@ -61,9 +61,9 @@ top y3r=h; x3=x1; rt x4r=hround(w-.45u); y4=good.y(y3l-beak/1.4)-eps; arm(3,4,e,beak_darkness,.4beak_jut); % upper arm and beak if serifs: save slab; slab:=Vround(vair-vair_corr); % lower.slab - nodish_serif(1,2,a,1/3,jut,b,1/3,.5jut); % upper serif + nodish_serif(1,2,a,1/3,jut,b,1/3,.5jut); % upper serif slab:=vair; % lower.slab - dish_serif(2,1,c,1/3,jut,d,1/3,1.25jut); fi % lower serif + dish_serif(2,1,c,1/3,jut,d,1/3,1.25jut); fi % lower serif %%%%% % hstroke bar_stroke(hround 1/3u-serif_fit,tiny.rt x1r+1.8u); @@ -193,17 +193,18 @@ if serifs: if rt x2r+jut+.5u+1<=lft x4l-jut: inner_jut=jut; else: rt x2r+jut+.5u+1=lft x4l-inner_jut; fi save slab; slab:=vair; % lower.slab - dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower left serif + dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower left serif dish_serif(4,3,e,1/3,inner_jut,f,1/3,jut); fi % lower right serif penlabels(1,2,3,4); endchar; +iff not concrete:% iff not specific:% lhchar "Lowercase Cyrillic letter zh_dsc - zhe descender (`roman')"; cyrchar(zh_dsc,if serifs:10u# else:9.5u# fi % zhk_width: n_width;keng_width ,x_height#,if is_ogonek: desc_depth# else: sbeak# fi); %ldesc/og_depth italcorr x_height#*slant-.2u#; adjust_fit(w#-5u#+ %zhr_adj - if monospace: 0 else: serif_fit# fi, %wlett_adj + if monospace: 0 else: serif_fit# fi, %wlett_adj if monospace: 0 else: serif_fit# fi); %wlett_adj begingroup % lowerr_zh; @@ -217,7 +218,7 @@ filldraw stroke z1e--z2e; % stem save slab; % lower.slab if serifs: slab:=Vround(vair-vair_corr);% lower.slab - dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif + dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif slab:=vair; % lower.slab dish_serif(2,1,c,1/3,jut,d,1/3,jut); fi% lower stem serif % k_rbowl;zh%monospace:+.25u @@ -402,6 +403,7 @@ penlabels(1,2,3,4,5,6,7,8,9,10,12,13); endchar; % Ukrainian i moved up for LH font +iff not concrete:% iff not specific:% lhchar "Lowercase Cyrillic letter k_dsc - ka descender (`roman')"; cyrchar(k_dsc,if serifs:10u# else:9.5u# fi % zhk_width: n_width;keng_width @@ -418,7 +420,7 @@ filldraw stroke z1e--z2e; % stem save slab; % lower.slab if serifs: slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif + dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif slab:=vair; % lower.slab dish_serif(2,1,c,1/3,jut,d,1/3,jut); fi% lower stem serif % k_rbowl; @@ -474,6 +476,7 @@ else: fi penlabels(1,2,3,4,5,6); endchar; +iff not concrete:% iff not specific:% lhchar "Lowercase Cyrillic letter k_beak - ka beak (`roman')"; cyrchar(k_beak,if serifs:10u# else:9.5u# fi % zhk_width: n_width;keng_width @@ -601,11 +604,12 @@ if serifs: else: rt x2r+inner_jut+.5u+1=x[_three]r; fi save slab; slab:=Vround(vair-vair_corr); % lower.slab dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif - dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif + dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif slab:=vair; % lower.slab dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); fi % lower stem serif penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar; +iff not concrete:% lhchar "Lowercase Cyrillic letter l_tl - el tail"; cyrchar(l_tl,10u# % if not serifs:+.5width_adj# fi % dl_width;n_width ,x_height#,desc_depth#); @@ -646,7 +650,7 @@ else: if serifs: x0=x3; y0=0; numeric inner_jut; inner_jut=min(.5(lft x1l-rt x3r)-eps,.5jut); - %dish_serif(2,1,a,1/3,jut,b,1/3,jut); %!!! %lower right serif + %dish_serif(2,1,a,1/3,jut,b,1/3,jut); %!!! %lower right serif save slab; slab:=Vround(vair-vair_corr); %lower.slab nodish_serif(1,2,c,1/3,inner_jut,d,1/3,jut); % upper right serif nodish_serif(3,0,e,1/3,1.05jut,f,1/3,inner_jut); % upper left serif @@ -667,7 +671,7 @@ if serifs: pos[_two](vair',-90); pos[_three](hair,-180); pos[_four](bulb_diam,-180); x[_two]=.5[x[_one],x[_three]r]; - bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=-.85d; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; z[_three]r=z[_four]r; rt x[_four]l=max(x[_zero]l-bulb_diam, floor x[_zero]-2.5u if monospace: / expansion_factor fi); @@ -706,10 +710,10 @@ if rt x1r+jut+.5u+1<=lft x3l-jut: inner_jut=jut; save slab; % lower.slab if serifs: slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(1,2,a,1/3,jut,b,1/3,inner_jut); % upper left serif - dish_serif(3,4,e,1/3,inner_jut,f,1/3,jut); % upper right serif + dish_serif(1,2,a,1/3,jut,b,1/3,inner_jut); % upper left serif + dish_serif(3,4,e,1/3,inner_jut,f,1/3,jut); % upper right serif slab:=vair; % lower.slab - dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); % lower left serif + dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); % lower left serif if is_ogonek: dish_serif(4,3,g,1/3,inner_jut,h,1/3,jut); fi %!!! % lower right serif fi @@ -732,6 +736,49 @@ else: fi penlabels(1,2,3,4,5,6, 7,8,9); endchar; +lhchar "Lowercase Cyrillic letter n_stl - saam en with tail"; +cyrchar(n_stl,10u# if not serifs:+.5width_adj# fi,x_height#, % n_width + if is_ogonek: desc_depth# else: sbeak# fi); %ldesc/og_depth +italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut +adjust_fit(serif_fit#, + serif_fit# if not serifs:+.5(stem#-u#) fi) %dl_adj +begingroup +% lower_n; +pickup tiny.nib; pos1(fudged.stem,0); pos2(fudged.stem,0); +pos3(fudged.stem,0); pos4(fudged.stem,0); +lft x1l=lft x2l=hround(2.5u-.5fudged.stem-eps); x3=x4=w-x1; +top y1=top y3=h; bot y2=bot y4=0; +filldraw stroke z1e--z2e; % left stem +filldraw stroke z3e--z4e; % right stem +bar_stroke(x1,x3); % bar +%%% +numeric inner_jut,right_jut; % for cyr_serif +if rt x1r+jut+.5u+1<=lft x3l-jut: inner_jut=jut; + else: rt x1r+inner_jut+.5u+1=lft x3l-inner_jut; fi +save slab; % lower.slab +if serifs: + slab:=Vround(vair-vair_corr); % lower.slab + dish_serif(1,2,a,1/3,jut,b,1/3,inner_jut); % upper left serif + dish_serif(3,4,e,1/3,inner_jut,f,1/3,jut); % upper right serif + slab:=vair; % lower.slab + dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); % lower left serif + if is_ogonek: + dish_serif(4,3,g,1/3,inner_jut,h,1/3,jut); fi %!!! % lower right serif +fi +%%%%% +% lowercase descender/saam tail +slab:=vair; % lower.slab +right_jut=if serifs: max(limit_dist,1.1jut) else: hround (r-rt x4r-.5u) fi; +if unic: + %saam tail + serif(4,3,v,1/3,-inner_jut); + siam_serif(4,3,w,1/3,right_jut); +else: + r_serif(4,3,o,1/3,inner_jut,p,1/3,beak_darkness,right_jut,.6beak_jut); % lower right descender +fi +endgroup; +penlabels(1,2,3,4,5,6, 7,8,9); endchar; + lhchar "Lowercase Cyrillic letter n_tl - en tail"; cyrchar(n_tl,10u# if not serifs:+.5width_adj# fi,x_height#,desc_depth#); % n_width italcorr .5x_height#*slant+min(.5curve#-.85u#,-.1u#); %p @@ -750,10 +797,10 @@ if serifs: if rt x1r+jut+.5u+1<=lft x3l-jut: inner_jut=jut; else: rt x1r+inner_jut+.5u+1=lft x3l-inner_jut; fi save slab; slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(1,2,a,1/3,jut,b,1/3,inner_jut); % upper left serif + dish_serif(1,2,a,1/3,jut,b,1/3,inner_jut); % upper left serif dish_serif(3,4,e,1/3,inner_jut,f,1/3,jut); % upper right serif slab:=vair; % lower.slab - dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); fi % lower left serif + dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); fi % lower left serif %dish_serif(4,3,g,1/3,inner_jut,h,1/3,jut); fi %!!! % lower right serif %%%%% % l_tail(4); @@ -771,7 +818,7 @@ if serifs: pos[_two](vair',-90); pos[_three](hair,-180); pos[_four](bulb_diam,-180); x[_two]=.5[x[_one],x[_three]r]; - bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=-.85d; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; z[_three]r=z[_four]r; rt x[_four]l=max(x[_zero]l-bulb_diam, floor x[_zero]-2.5u if monospace: / expansion_factor fi); @@ -869,10 +916,10 @@ if serifs: prime_points_inside(1,2); prime_points_inside(4,3); prime_points_inside(6,5); if rt x1'r+jut+.5u+1<=lft x4'l-jut: inner_jut=jut; else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi - dish_serif(6',5,e,1/3,jut,f,1/3,jut); % lower serif + dish_serif(6',5,e,1/3,jut,f,1/3,jut); % lower serif save slab; slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); % upper left serif - dish_serif(4',3,c,.6,inner_jut,d,1/2,outer_jut)(dark); fi % upper right serif + dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); % upper left serif + dish_serif(4',3,c,.6,inner_jut,d,1/2,outer_jut)(dark); fi % upper right serif %%%%% penlabels(0,1,2,3,4,5,6); endchar; @@ -904,10 +951,10 @@ if serifs: prime_points_inside(1,2); prime_points_inside(4,3); prime_points_inside(6,5); if rt x1'r+jut+.5u+1<=lft x4'l-jut: inner_jut=jut; else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi - dish_serif(6',5,e,1/3,jut,f,1/3,jut); % lower serif + dish_serif(6',5,e,1/3,jut,f,1/3,jut); % lower serif save slab; slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); % upper left serif - dish_serif(4',3,c,.6,inner_jut,d,1/2,outer_jut)(dark); fi % upper right serif + dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); % upper left serif + dish_serif(4',3,c,.6,inner_jut,d,1/2,outer_jut)(dark); fi % upper right serif %%%%% % hcross pickup crisp.nib; pos7(bar,90); pos8(bar,90); @@ -955,11 +1002,11 @@ if serifs: if rt x1'r+jut+.5u+1<=lft x2'l-jut-xjut: inner_jut1=jut; else: rt x1'r+inner_jut1+.5u+1=lft x2'l-inner_jut1-xjut; fi slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(1',4,a,1/3,outer_jut,b,2/3,inner_jut1); % upper left serif + dish_serif(1',4,a,1/3,outer_jut,b,2/3,inner_jut1); % upper left serif dish_serif(2',3,e,2/3,inner_jut1+xjut,f,1/2,outer_jut+xjut)(dark); % upper right serif slab:=vair; % lower.slab if is_ogonek: - dish_serif(4',1,c,2/3,inner_jut2,d,1/3,outer_jut); % lower right serif + dish_serif(4',1,c,2/3,inner_jut2,d,1/3,outer_jut); % lower right serif fi dish_serif(3',2,g,1/2,outer_jut+xjut,h,2/3,inner_jut2+xjut)(dark); fi % lower left serif %%%%% @@ -1021,13 +1068,12 @@ if serifs: if rt x1'r+jut+.5u+1<=lft x2'l-jut-xjut: inner_jut1=jut; else: rt x1'r+inner_jut1+.5u+1=lft x2'l-inner_jut1-xjut; fi save slab; slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(1',4,a,1/3,outer_jut,b,2/3,inner_jut1); % upper left serif + dish_serif(1',4,a,1/3,outer_jut,b,2/3,inner_jut1); % upper left serif dish_serif(2',3,e,2/3,inner_jut1+xjut,f,1/2,outer_jut+xjut)(dark); % upper right serif slab:=vair; % lower.slab - %dish_serif(4',1,c,2/3,inner_jut2,d,1/3,outer_jut); % lower right serif + %dish_serif(4',1,c,2/3,inner_jut2,d,1/3,outer_jut); % lower right serif dish_serif(3',2,g,1/2,outer_jut+xjut,h,2/3,inner_jut2+xjut)(dark); fi % lower left serif %%%%% -%%%%% % l_tail(4);x_tail _zero:=4; _one:=7; _two:=8; _three:=9; _four:=10; @@ -1035,16 +1081,17 @@ _one:=7; _two:=8; _three:=9; _four:=10; % x_ pickup fine.nib; stem3=hround (max(fine.breadth,.5[stem1,x[_zero]r-x[_zero]l])); -x[_one]'r=x4r; +x[_one]'r=hround x4r+eps; penpos[_one]'(stem3,0); pos[_one](stem3,0); z[_one]=z[_one]'; -bot y[_one]=max(-1/3d,-d+vair')-eps; -(x[_one]'l,y54')=whatever[z4l,z4l+dir angle(z4l-if serifs:z1l else:z34'fi)]; +bot y[_one]=max(-1/3d,min(y[_zero]r-.5,-d+vair'))-eps; +(x[_one]'l,y54')=whatever[z[_zero]l,z[_zero]l+ + dir angle(z[_zero]l-if serifs: z1l else: z34'fi)]; z54'=(x[_one]'l,y54'); -fill z54l{z4r-z1r} - ..controls (z54').. +fill z54l{z[_zero]r-z1r} + ..controls (x54'+eps,y54'+eps).. {down}z[_one]'l--z[_one]'r{up} - ..controls (z4r).. - {z1r-z4r}z54r--cycle; %link + ..controls (x[_zero]r+eps,y[_zero]r+eps).. + {z1r-z[_zero]r}z54r--cycle; %link % _x if serifs: numeric bulb_diam; @@ -1052,7 +1099,7 @@ if serifs: pos[_two](vair',-90); pos[_three](hair,-180); pos[_four](bulb_diam,-180); x[_two]=.5[x[_one],x[_three]r]; - bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=-.85d; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; z[_three]r=z[_four]r; rt x[_four]l=max(x[_one]l-bulb_diam,%!!! floor x[_one]-2.5u if monospace: / expansion_factor fi);%!!! @@ -1067,6 +1114,7 @@ else: filldraw stroke super_arc.e([_one],[_two])%!!! & term.e([_two],[_three],left,.8,4); fi %%% +%r:=r-.5jut; %x_tl adjustment penlabels(0,1,2,3,4,54,54',5,6,7',8); endchar; lhchar "Lowercase Cyrillic letter ch_ldsc - che left descender"; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2upu.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2upu.mf index bc7c6cefb98..b5520e23f55 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2upu.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2upu.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=2 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -45,7 +45,7 @@ % SCHWA "9a "9a "9a "9a Schwa % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Uppercase Cyrillic letter G_hcrs - GHE hcrossed"; cyrchar(G_hcrs,if monospace: 9u# else: 11u# fi-width_adj#, %G_width @@ -192,6 +192,7 @@ if serifs: dish_serif(4,3,e,1/3,inner_jut,f,1/3,cap_jut); fi % lower left serif penlabels(1,2,3,4); endchar; +iff not concrete:% iff not specific:% lhchar "Uppercase Cyrillic letter ZH_dsc - ZHE descender (`roman')"; cyrchar(ZH_dsc,13.5u#,cap_height#, % N_width @@ -376,6 +377,7 @@ penlabels(1,2,3,4,5,6,7,8,9,10,12,13); endchar; % Ukrainian i moved up for LH font +iff not concrete:% iff not specific:% lhchar "Uppercase Cyrillic letter K_dsc - KA descender (`roman')"; cyrchar(K_dsc,13.5u#,cap_height#, % N_width @@ -440,6 +442,7 @@ else: fi penlabels(1,2,3,4,5,6, 7,8,9); endchar; +iff not concrete:% iff not specific:% lhchar "Uppercase Cyrillic letter K_beak - KA beak (`roman')"; cyrchar(K_beak,13.5u#,cap_height#,0); % N_width @@ -566,6 +569,7 @@ if serifs: dish_serif(2,1,c,1/3,cap_jut,d,1/3,inner_jut); fi % lower stem serif penlabels(1,2,3,4,5,6, 7,8,9,10,11,12,13,14); endchar; +iff not concrete:% lhchar "Uppercase Cyrillic letter L_tl - EL tail"; cyrchar(L_tl,13.5u#,cap_height#,desc_depth#); % DL_width:N_width if is_small_cap: getcharcode(l_tl); fi @@ -632,7 +636,7 @@ if serifs: pos[_two](vair',-90); pos[_three](hair,-180); pos[_four](bulb_diam,-180); x[_two]=.5[x[_one],x[_three]r]; - bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=-.85d; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; z[_three]r=z[_four]r; rt x[_four]l=floor x[_zero]-2.5u if monospace: / expansion_factor fi; filldraw stroke z[_five]e--pulled_arc.e([_one],[_two]); @@ -694,6 +698,50 @@ else: fi penlabels(1,2,3,4,5,6); endchar; +lhchar "Uppercase Cyrillic letter N_stl - saam EN with tail"; +cyrchar(N_stl,13.5u#,cap_height#, + if is_ogonek: desc_depth# else: cap_sbeak# fi); %udesc/og_depth +if is_small_cap: getcharcode(n_stl); fi +italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); +adjust_fit(cap_serif_fit#, + cap_serif_fit# if not serifs:+.5(cap_stem#-u#) fi); %DL_adj +% upper_n; +pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); +pos3(cap_stem,0); pos4(cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); x3=x4=w-x1; +top y1=top y3=h; bot y2=bot y4=0; +filldraw stroke z1e--z2e; % left stem +filldraw stroke z3e--z4e; % right stem +penpos5(cap_bar,90); penpos6(cap_bar,90); +x5=x1; x6=x3; y5=y6=.52h; +fill stroke z5e--z6e; % bar +%%% +if serifs: + numeric inner_jut; + if rt x1r+cap_jut+.5u+1<=lft x3l-cap_jut: inner_jut=cap_jut; + else: rt x1r+inner_jut+.5u+1=lft x3l-inner_jut; fi + dish_serif(1,2,a,1/3,cap_jut,b,1/3,inner_jut); % upper left serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,inner_jut); % lower left serif + dish_serif(3,4,e,1/3,inner_jut,f,1/3,cap_jut); % upper right serif + if is_ogonek: + dish_serif(4,3,g,1/3,inner_jut,h,1/3,cap_jut); fi % lower right serif +fi +%%%%% +% uppercase descender/saam tail +numeric right_jut; +right_jut=if serifs: max(limit_dist,1.1cap_jut) else: hround (r-rt x4r-.65u) fi; +if not serifs: + numeric arm_thickness; arm_thickness=vround(slab-vair_corr); + save slab; slab:=arm_thickness; fi %bottom.desc.slab +if unic: + %saam tail + serif(4,3,v,1/3,-cap_jut); + siam_serif(4,3,w,1/3,right_jut); +else: + r_serif(4,3,x,1/3,cap_jut,y,1/3,beak_darkness,right_jut,beak_jut); % lower right descender +fi +penlabels(1,2,3,4,5,6); endchar; + lhchar "Uppercase Cyrillic letter N_tl - EN tail"; cyrchar(N_tl,13.5u#,cap_height#,desc_depth#); if is_small_cap: getcharcode(n_tl); fi @@ -734,7 +782,7 @@ if serifs: pos[_two](vair',-90); pos[_three](hair,-180); pos[_four](bulb_diam,-180); x[_two]=.5[x[_one],x[_three]r]; - bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=-.85d; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; z[_three]r=z[_four]r; rt x[_four]l=floor x[_zero]-2.5u if monospace: / expansion_factor fi; filldraw stroke z[_five]e--pulled_arc.e([_one],[_two]); @@ -905,7 +953,7 @@ cyrchar(H_dsc,13u#,cap_height#, if is_ogonek: desc_depth# else: cap_sbeak# fi); %udesc/og_depth if is_small_cap: getcharcode(h_dsc); fi italcorr cap_height#*slant-.25u#; -adjust_fit(cap_serif_fit#,cap_serif_fit#); +adjust_fit(cap_serif_fit#,cap_serif_fit#); %ZhDL_adj % upper_h; numeric stem[],outer_jut,xjut,alpha[]; stem1=cap_stem-2stem_corr; stem2=min(cap_hair,stem1); @@ -982,7 +1030,7 @@ alpha1=diag_ratio(1,stem1,h,x4r-x1l); alpha2=diag_ratio(1,stem2,h,x2r-x3l); penpos1(alpha1*stem1,0); penpos2(alpha2*stem2,0); penpos3(alpha2*stem2,0); penpos4(alpha1*stem1,0); -numeric t; t=slab+bracket; +numeric t; t=slab+bracket+eps; forsuffixes e=l,r: z54e=(((0,t)--(w,t)) intersectionpoint (z4e--z1e)); endfor; if hefty: z0=whatever[z1,z4]=whatever[z2,z3]; @@ -1019,16 +1067,16 @@ _one:=7; _two:=8; _three:=9; _four:=10; % X_ pickup fine.nib; stem3=hround (max(fine.breadth,.5[stem1,x[_zero]r-x[_zero]l])); -x[_one]'r=x[_zero]r; +x[_one]'r=hround x[_zero]r+eps; penpos[_one]'(stem3,0); pos[_one](stem3,0); z[_one]=z[_one]'; -bot y[_one]=max(-1/3d-eps,-d+if serifs: vair'else: slab fi); -(x[_one]'l,y54')=whatever[z4l,z4l+dir angle(z4l-if serifs:z1l else:z34'fi)]; -z54'=(x[_one]'l,y54'); -fill z54l{z4r-z1r} - ..controls (z54').. +bot y[_one]=vround max(-1/3d,min(y[_zero]r-.5,-d+if serifs: vair'else: slab fi))-eps; +(x[_one]'l,y54')=whatever[z4l,z4l+dir angle(z4l-if serifs:z1l else: z34'fi)]; +z54'=(x[_one]'l+eps,y54'+eps); +fill z54l{z[_zero]r-z1r} + ..controls (x54'+eps,y54'+eps).. {down}z[_one]'l--z[_one]'r{up} - ..controls (z4r).. - {z1r-z4r}z54r--cycle; %link + ...%controls (x[_one]'r+eps,y[_zero]+eps).. + {z1r-z[_zero]r}z54r--cycle; %link % _X if serifs: numeric bulb_diam; @@ -1036,7 +1084,7 @@ if serifs: pos[_two](vair',-90); pos[_three](hair,-180); pos[_four](bulb_diam,-180); x[_two]=.5[x[_one],x[_three]r]; - bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=-.85d; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; z[_three]r=z[_four]r; rt x[_four]l=floor x[_one]-2.5u if monospace: / expansion_factor fi;%!!! filldraw stroke pulled_arc.e([_one],[_two]);%!!! @@ -1048,6 +1096,7 @@ else: filldraw stroke super_arc.e([_one],[_two])%!!! & term.e([_two],[_three],left,.8,4); fi %%% +%r:=r-.5cap_jut; %X_tl adjustment penlabels(0,1,2,3,4,12,13,24,34,54,54', 5,6,7',8); endchar; lhchar "Uppercase Cyrillic letter CH_ldsc - CHE left descender"; diff --git a/Master/texmf-dist/fonts/source/lh/base/lkligtbl.mf b/Master/texmf-dist/fonts/source/lh/base/lkligtbl.mf index 0214dc8cc72..8a4de7d8049 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lkligtbl.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lkligtbl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) A.Berdnikov % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec if known loaded_lgligtbl: endinput; fi loaded_lgligtbl:=1; % if known this file has been loaded diff --git a/Master/texmf-dist/fonts/source/lh/base/llbligtb.mf b/Master/texmf-dist/fonts/source/lh/base/llbligtb.mf new file mode 100644 index 00000000000..1fe8c4f6ffa --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/base/llbligtb.mf @@ -0,0 +1,231 @@ +% +% llbligtb.mf +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Lig & kern data for Roman font (T2 CMBRIGHT) +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +LHver_check(3,5); % like |version_check| in ec + +% +% addtitional kern value +% +numeric itc#; % modified italic correction on `f' and `ff'%exrlig +itc#=if serifs: max(0,flare#-.25u#) else: 1.25u# fi; + +%>>>!!! +ligtable + "f": "i"=:oct"034", + "f"=:oct"033", + "l"=:oct"035", + "'" kern itc#, + "`" kern itc#, + oct"020" kern itc#, + oct"021" kern itc#, + "?" kern itc#, + "!" kern itc#, + ")" kern itc#, + "]" kern itc#; +ligtable + oct"033": % ff + "i"=:oct"036", + "l"=:oct"037", + "'" kern itc#, + "`" kern itc#, + oct"020" kern itc#, + oct"021" kern itc#, + "?" kern itc#, + "!" kern itc#, + ")" kern itc#, + "]" kern itc#; +%<<<!!! + +ligtable "k": + "W" kern kk#, %!!! + "V" kern kk#, %!!! + if serifs: + "v": "a" kern -u#, + fi\\ + "w": "e" kern k#, + "a" kern k#, + "o" kern k#, + "c" kern k#; + +ligtable "P": "A" kern kk#, + "y": "o" kern k#, + "e" kern k#, + "a" kern k#, + "." kern kk#, + "," kern kk#; + +ligtable "F": + "V": + "W": if serifs: + "o" kern kk#, + "e" kern kk#, + "u" kern kk#, + "r" kern kk#, + "a" kern kk#, + "A" kern kkk#, + %>>>!!! + "y" kern kk#, + "v" kern kk#, + "s" kern kk#, + "c" kern kk#, + "d" kern kk#, + "g" kern kk#, + "m" kern kk#, + "n" kern kk#, + "p" kern kk#, + "w" kern kk#, + "z" kern kk#, + %<<<!!! + else: + "o" kern k#, + "e" kern k#, + "u" kern k#, + "r" kern k#, + "a" kern k#, + "A" kern kk#, + %>>>!!! + "y" kern k#, + "v" kern k#, + "s" kern k#, + "c" kern k#, + "d" kern k#, + "g" kern k#, + "m" kern k#, + "n" kern k#, + "p" kern k#, + "w" kern k#, + "z" kern k#, + %<<<!!! + fi +% "K": + "X": + "O" kern k#, + "C" kern k#, + "G" kern k#, + "Q" kern k#; + +%>>>!!! + ligtable "K": if serifs: + "v" kern kk#, + "w" kern k#, + else: + "v" kern k#, + fi + "o" kern k#, + "C" kern k#, + "G" kern k#, + "Q" kern k#; +%<<<!!! + +ligtable "T": "y" kern if serifs: k# else: kk# fi, + "Y": "e" kern kk#, + "o" kern kk#, + "r" kern kk#, + "a" kern kk#, + "A" kern kk#, + %>>>!!! + "n" kern kk#, + oct"031" kern kk#, % \i + "c" kern kk#, + "d" kern kk#, + "g" kern kk#, + "p" kern kk#, + "s" kern kk#, + "v" kern kk#, + "w" kern kk#, + "x" kern kk#, + "z" kern kk#, + %<<<!!! + "u" kern kk#; + +ligtable "O": + "D": "X" kern k#, + "W" kern k#, + "A" kern k#, + "V" kern k#, + "Y" kern k#; + +if serifs: + ligtable "h": + "m": + "n": + %>>>!!! + "W" kern kk#, "V" kern kk#, + %<<<!!! + "t" kern k#, + "u" kern k#, + "b" kern k#, + "y" kern k#, + "v" kern k#, + "w" kern k#; + + ligtable "c": "h" kern k#, + "k" kern k#; +fi + +ligtable "o": + "b": + "p": + if known bx_kerning: % (CMBR) + "e" kern -k#, + "o" kern -k#, + "d" kern -k#, + "c" kern -k#, + "q" kern -k#, + fi + "x" kern k#, + "a": if serifs: "v" kern k#, + "j" kern u#, + else: "r" kern k#, fi + "t": "y" kern k#, + "u": "w" kern k#; + +ligtable "A": + %>>>!!! + "y" kern if serifs: kk# else: k# fi, + "v" kern if serifs: kkk# else: k# fi, + "w" kern if serifs: kk# else: k# fi, + "c" kern k#, + "d" kern k#, + "e" kern k#, + "o" kern k#, + "q" kern k#, + %<<<!!! + if serifs: "R": fi\\ "t" kern k#, + "C" kern k#, + "O" kern k#, + "G" kern k#, + "U" kern k#, + "Q" kern k#, + "L": "T" kern kk#, + "Y" kern kk#, + "V" kern kkk#, + "W" kern kkk#; + +ligtable "g": "j" kern -k#; % logjam + +ligtable "I": "I" kern -k#; % Richard III + +%>>>!!! +ligtable "e": "V" kern kk#; % eV +%<<<!!! + +endinput; +%end of file diff --git a/Master/texmf-dist/fonts/source/lh/base/llcligtb.mf b/Master/texmf-dist/fonts/source/lh/base/llcligtb.mf index b787c738898..c19b449c1c5 100644 --- a/Master/texmf-dist/fonts/source/lh/base/llcligtb.mf +++ b/Master/texmf-dist/fonts/source/lh/base/llcligtb.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; % three degrees of kerning diff --git a/Master/texmf-dist/fonts/source/lh/base/lliligtb.mf b/Master/texmf-dist/fonts/source/lh/base/lliligtb.mf index 9b71320faca..c88521b31d6 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lliligtb.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lliligtb.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec % % addtitional kern value diff --git a/Master/texmf-dist/fonts/source/lh/base/llmligtb.mf b/Master/texmf-dist/fonts/source/lh/base/llmligtb.mf index d48f1497b4b..8dfc5f1b2ba 100644 --- a/Master/texmf-dist/fonts/source/lh/base/llmligtb.mf +++ b/Master/texmf-dist/fonts/source/lh/base/llmligtb.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -36,7 +36,7 @@ % `` % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec if known spanish_shriek: % for CM fonts only diff --git a/Master/texmf-dist/fonts/source/lh/base/llrligtb.mf b/Master/texmf-dist/fonts/source/lh/base/llrligtb.mf index 886553d2bb6..3c1d53ab94c 100644 --- a/Master/texmf-dist/fonts/source/lh/base/llrligtb.mf +++ b/Master/texmf-dist/fonts/source/lh/base/llrligtb.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec % % addtitional kern value diff --git a/Master/texmf-dist/fonts/source/lh/base/llvligtb.mf b/Master/texmf-dist/fonts/source/lh/base/llvligtb.mf index 902ea7a956a..b5dc5de6d73 100644 --- a/Master/texmf-dist/fonts/source/lh/base/llvligtb.mf +++ b/Master/texmf-dist/fonts/source/lh/base/llvligtb.mf @@ -7,10 +7,10 @@ % Version 3.1 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -19,7 +19,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec % The following ligatures are integrated: % @@ -90,7 +90,18 @@ if (altcoding and (ligs <> 0)) % for CM setlig ([ASCII","],CYR_.baseqq); % ",," endligtable; -fi % ligatures for cyrillic quotes +% ligatures for closing cyrillic quotes in CM + beginligtable + labelchar ([oct"134"]); + setlig ([ASCII"`"],CYR_.grqq); % "```" + endligtable; + + beginligtable + labelchar ([oct"042"]); + setlig ([ASCII"'"],CYR_.grqq); % "'''" + endligtable; + +fi k#:=-.5u#; ku#:=-1u#; kk#:=-1.5u#; kkk#:=-2u#; % four degrees of kerning @@ -116,6 +127,7 @@ if genmode="ex": beginligtable labelchar ([oct"021"]); %ec:'' +% setlig ([ASCII"'"],[oct"020"]); % "'''" - CM compatibility setkern [2u#] ([oct"047"], %' [oct"021"]);%ec:'' setkern [-kk#] (boundarychar); diff --git a/Master/texmf-dist/fonts/source/lh/base/lwnligs.mf b/Master/texmf-dist/fonts/source/lh/base/lwnligs.mf index ce7d9b745f2..9e0d4445e56 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lwnligs.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lwnligs.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec % ligatures for cyrillic quotes beginligtable diff --git a/Master/texmf-dist/fonts/source/lh/base/lxpseudo.mf b/Master/texmf-dist/fonts/source/lh/base/lxpseudo.mf index aa7d9f921f3..5422fe60046 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lxpseudo.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lxpseudo.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -24,13 +24,15 @@ % parameters with different values at each occuerence (like |theta|). % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec % Diameters of dots % numeric idot_diam#,udot_diam#,pdot_diam#; -idot_diam#=max(dot_size#,cap_curve#); % dot of letters `i' and `j' -udot_diam#=max(dot_size#,cap_curve#); % umlaut dots +if ebbase<>1: %(CMBRIGHT) + idot_diam#=max(dot_size#,cap_curve#); % dot of letters `i' and `j' + udot_diam#=max(dot_size#,cap_curve#); % umlaut dots +fi pdot_diam#=if monospace: 5/4 fi\\ dot_size#; % punctuation dots @@ -57,8 +59,11 @@ vardef limit_dist=5/4u enddef; numeric lc_trema_height#; % lc_trema_height# = min(cap_height#,9/7x_height#+.5max(dot_size#,cap_curve#)); -lc_trema_height# = min(cap_height#,9/7hi.x_height#+max(dot_size#,cap_curve#)); - +if ebbase=1: %(CMBRIGHT) + lc_trema_height# = min(cap_height#,x_height#+ldot_height#); +else: + lc_trema_height# = min(cap_height#,9/7hi.x_height#+max(dot_size#,cap_curve#)); +fi % More parametrisations for accents from csaccent.mf (csfonts): @@ -86,6 +91,12 @@ numeric cap_accent_height, cap_accent_height#; cap_accent_height# = cap_height# + acc_height#; def pseudo_setup = + if ebbase=1:%(CMBRIGHT) + idot_diam:=stem'; + idot_diam#:=stem'/hppp; + udot_diam:=min(stem', hround(.85dot_size)); + udot_diam#:=udot_diam/hppp; + fi define_whole_blacker_pixels(idot_diam,udot_diam,pdot_diam); define_whole_vertical_pixels(lc_trema_height); define_whole_vertical_pixels(uc_acc_height,lc_acute_height, diff --git a/Master/texmf-dist/fonts/source/lh/base/lycyracc.mf b/Master/texmf-dist/fonts/source/lh/base/lycyracc.mf index 053856c787d..1e6c6e03348 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lycyracc.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lycyracc.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -21,7 +21,7 @@ % Accents for capital letters % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec % A dirty trick, better left unseen. |cap_height| and |cap_height#| % are restored at the end of this file. diff --git a/Master/texmf-dist/fonts/source/lh/base/lypseudo.mf b/Master/texmf-dist/fonts/source/lh/base/lypseudo.mf index 6deb4ac793d..aef1672edc8 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lypseudo.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lypseudo.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec % This file contains pseudoparameters which are not entered in the % parameter files, but are computed from the initial parameter set. @@ -29,8 +29,10 @@ LHver_check(3,4); % like |version_check| in ec % Diameters of dots % numeric idot_diam#,udot_diam#,pdot_diam#; -idot_diam#=max(dot_size#,cap_curve#); % dot of letters `i' and `j' -udot_diam#=max(dot_size#,cap_curve#); % umlaut dots +if ebbase<>1: %(CMBRIGHT) + idot_diam#=max(dot_size#,cap_curve#); % dot of letters `i' and `j' + udot_diam#=max(dot_size#,cap_curve#); % umlaut dots +fi pdot_diam#=if monospace: 5/4 fi\\ dot_size#; % punctuation dots % |limit_dist| is used in |put_cross| @@ -65,6 +67,12 @@ numeric cap_accent_height, cap_accent_height#; cap_accent_height# = acc_height# + hi.x_height#; def pseudo_setup= + if ebbase=1:%(CMBRIGHT) + idot_diam:=stem'; + idot_diam#:=stem'/hppp; + udot_diam:=min(stem', hround(.85dot_size)); + udot_diam#:=udot_diam/hppp; + fi define_whole_blacker_pixels(idot_diam,udot_diam,pdot_diam); define_whole_vertical_pixels(uc_acc_height,lc_acute_height, lc_hachek_height); diff --git a/Master/texmf-dist/fonts/source/lh/base/nodraw.mf b/Master/texmf-dist/fonts/source/lh/base/nodraw.mf index ee9ee949671..57ac4dd2fb3 100644 --- a/Master/texmf-dist/fonts/source/lh/base/nodraw.mf +++ b/Master/texmf-dist/fonts/source/lh/base/nodraw.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 -% (c) O.Lapko +% Version 3.5 // Patchlevel=0 +% (c) A.Khodulev % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec def addto text t = enddef; % Draw nothing def filldraw text t = enddef; @@ -68,10 +68,10 @@ def big_tilde = enddef; def labels text t = enddef; def penlabels text t = enddef; +endinput; vardef bar_stroke(expr left_jut,right_jut) = enddef; vardef cyr_serif(suffix $,$$,@) % serif at |z$| for stroke from |z$$| (expr darkness,beak_darkness,jut,beak_jut) = enddef; -endinput; %end of file diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/ccb10.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/ccb10.mf new file mode 100644 index 00000000000..fcb92867aa6 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/ccb10.mf @@ -0,0 +1 @@ +input cmb10;
\ No newline at end of file diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx10.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx10.mf new file mode 100644 index 00000000000..088edd32ffd --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx10.mf @@ -0,0 +1 @@ +input cmbx10; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx5.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx5.mf new file mode 100644 index 00000000000..03d4329223d --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx5.mf @@ -0,0 +1 @@ +input cmbx5; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx6.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx6.mf new file mode 100644 index 00000000000..6c7a19a8b97 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx6.mf @@ -0,0 +1 @@ +input cmbx6; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx7.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx7.mf new file mode 100644 index 00000000000..a5787e3f398 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx7.mf @@ -0,0 +1 @@ +input cmbx7; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx8.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx8.mf new file mode 100644 index 00000000000..87ab0bd507e --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx8.mf @@ -0,0 +1 @@ +input cmbx8; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx9.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx9.mf new file mode 100644 index 00000000000..c1795573b1e --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbx9.mf @@ -0,0 +1 @@ +input cmbx9; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/ccbxsl10.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbxsl10.mf new file mode 100644 index 00000000000..7d984a83712 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbxsl10.mf @@ -0,0 +1 @@ +input cmbxsl10;
\ No newline at end of file diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/ccbxti10.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbxti10.mf new file mode 100644 index 00000000000..03bd5f3285c --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/ccbxti10.mf @@ -0,0 +1 @@ +input cmbxti10;
\ No newline at end of file diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/concb10pt.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/concb10pt.mf new file mode 100644 index 00000000000..4f974484a74 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/concb10pt.mf @@ -0,0 +1,80 @@ +5 concb10pt.mf - modified cmb10.mf (follows idea of ecc package) + +% Computer Modern Bold Roman 10 point +if unknown cmbase: input cmbase fi + +%font_identifier:="CMB"; font_size 10pt#; + +u#:=20/36pt#; % unit width +width_adj#:=10/36pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=6/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#:=247/36pt#; % height of caps +fig_height#:=232/36pt#; % height of numerals +x_height#:=160/36pt#; % height of lowercase without ascenders +math_axis#:=90/36pt#; % axis of symmetry for math symbols +bar_height#:=85/36pt#; % height of crossbar in lowercase e +comma_depth#:=70/36pt#; % depth of comma below baseline +desc_depth#:=70/36pt#; % depth of lowercase descenders +acc_height#:=75/36pt#; +dot_height#:=66/36pt#; + +crisp#:=0pt#; % diameter of serif corners +tiny#:=13/36pt#; % diameter of rounded corners +fine#:=10/36pt#; % diameter of sharply rounded corners +thin_join#:=10/36pt#; % width of extrafine details +hair#:=17/36pt#; % lowercase hairline breadth +stem#:=41/36pt#; % lowercase stem breadth +curve#:=46/36pt#; % lowercase curve breadth +ess#:=38/36pt#; % breadth in middle of lowercase s +flare#:=45/36pt#; % diameter of bulbs or breadth of terminals +dot_size#:=56/36pt#; % diameter of dots +cap_hair#:=19/36pt#; % uppercase hairline breadth +cap_stem#:=51/36pt#; % uppercase stem breadth +cap_curve#:=55/36pt#; % uppercase curve breadth +cap_ess#:=53/36pt#; % breadth in middle of uppercase s +rule_thickness#:=.6pt#; % thickness of lines in math symbols + +dish#:=1/36pt#; % amount erased at top or bottom of serifs +bracket#:=10/36pt#; % vertical distance from serif base to tangent +jut#:=25/36pt#; % protrusion of lowercase serifs +cap_jut#:=34/36pt#; % protrusion of uppercase serifs +beak_jut#:=11/36pt#; % horizontal protrusion of beak serifs +beak#:=70/36pt#; % vertical protrusion of beak serifs +vair#:=13/36pt#; % vertical diameter of hairlines +notch_cut#:=10pt#; % maximum breadth above or below notches +bar#:=17/36pt#; % lowercase bar thickness +slab#:=17/36pt#; % serif and arm thickness +cap_bar#:=17/36pt#; % uppercase bar thickness +cap_band#:=17/36pt#; % uppercase thickness above/below lobes +cap_notch_cut#:=10pt#; % max breadth above/below uppercase notches +serif_drop#:=3/36pt#; % vertical drop of sloped serifs +stem_corr#:=2/36pt#; % for small refinements of stem breadth +vair_corr#:=1.5/36pt#; % for small refinements of hairline height +apex_corr#:=0pt#; % extra width at diagonal junctions + +o#:=4/36pt#; % amount of overshoot for curves +apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions + +%slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +fudge:=1; % factor applied to weights of heavy characters +math_spread:=.5; % extra openness of math symbols +superness:=8/11; % parameter for superellipses +superpull:=1/8; % extra openness inside bowls +beak_darkness:=.4; % 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? + +%generate roman % switch to the driver file +endinput; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/concbx10pt.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx10pt.mf new file mode 100644 index 00000000000..c0418da5f17 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx10pt.mf @@ -0,0 +1,80 @@ +% concbx10pt.mf - modified cmbx10.mf (follows idea of ecc package) + +% Computer Modern Bold Extended Roman 10 point +if unknown cmbase: input cmbase fi + +%font_identifier:="CMBX"; font_size 10pt#; + +u#:=23/36pt#; % unit width +width_adj#:=11/36pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=7/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#:=247/36pt#; % height of caps +fig_height#:=232/36pt#; % height of numerals +x_height#:=160/36pt#; % height of lowercase without ascenders +math_axis#:=90/36pt#; % axis of symmetry for math symbols +bar_height#:=85/36pt#; % height of crossbar in lowercase e +comma_depth#:=70/36pt#; % depth of comma below baseline +desc_depth#:=70/36pt#; % depth of lowercase descenders +acc_height#:=75/36pt#; +dot_height#:=66/36pt#; + +crisp#:=0pt#; % diameter of serif corners +tiny#:=13/36pt#; % diameter of rounded corners +fine#:=10/36pt#; % diameter of sharply rounded corners +thin_join#:=10/36pt#; % width of extrafine details +hair#:=17/36pt#; % lowercase hairline breadth +stem#:=41/36pt#; % lowercase stem breadth +curve#:=46/36pt#; % lowercase curve breadth +ess#:=38/36pt#; % breadth in middle of lowercase s +flare#:=45/36pt#; % diameter of bulbs or breadth of terminals +dot_size#:=56/36pt#; % diameter of dots +cap_hair#:=19/36pt#; % uppercase hairline breadth +cap_stem#:=51/36pt#; % uppercase stem breadth +cap_curve#:=55/36pt#; % uppercase curve breadth +cap_ess#:=53/36pt#; % breadth in middle of uppercase s +rule_thickness#:=.6pt#; % thickness of lines in math symbols + +dish#:=1/36pt#; % amount erased at top or bottom of serifs +bracket#:=10/36pt#; % vertical distance from serif base to tangent +jut#:=25/36pt#; % protrusion of lowercase serifs +cap_jut#:=39/36pt#; % protrusion of uppercase serifs +beak_jut#:=11/36pt#; % horizontal protrusion of beak serifs +beak#:=70/36pt#; % vertical protrusion of beak serifs +vair#:=13/36pt#; % vertical diameter of hairlines +notch_cut#:=10pt#; % maximum breadth above or below notches +bar#:=17/36pt#; % lowercase bar thickness +slab#:=17/36pt#; % serif and arm thickness +cap_bar#:=17/36pt#; % uppercase bar thickness +cap_band#:=17/36pt#; % uppercase thickness above/below lobes +cap_notch_cut#:=10pt#; % max breadth above/below uppercase notches +serif_drop#:=3/36pt#; % vertical drop of sloped serifs +stem_corr#:=2/36pt#; % for small refinements of stem breadth +vair_corr#:=1.5/36pt#; % for small refinements of hairline height +apex_corr#:=0pt#; % extra width at diagonal junctions + +o#:=4/36pt#; % amount of overshoot for curves +apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions + +%slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +fudge:=1; % factor applied to weights of heavy characters +math_spread:=.5; % extra openness of math symbols +superness:=8/11; % parameter for superellipses +superpull:=1/8; % extra openness inside bowls +beak_darkness:=.4; % 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? + +%generate roman % switch to the driver file +endinput; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/concbx12pt.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx12pt.mf new file mode 100644 index 00000000000..6111d1b02ec --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx12pt.mf @@ -0,0 +1,80 @@ +% concbx12pt.mf - modified cmbx12.mf (follows idea of ecc package) + +% Computer Modern Bold Extended Roman 12 point +if unknown cmbase: input cmbase fi + +%font_identifier:="CMBX"; font_size 12pt#; + +u#:=27/36pt#; % unit width +width_adj#:=13/36pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=8/36pt#; % extra sidebar near uppercase serifs +letter_fit#:=0pt#; % extra space added to all sidebars + +body_height#:=324/36pt#; % height of tallest characters +asc_height#:=300/36pt#; % height of lowercase ascenders +cap_height#:=296.4/36pt#; % height of caps +fig_height#:=278.4/36pt#; % height of numerals +x_height#:=192/36pt#; % height of lowercase without ascenders +math_axis#:=108/36pt#; % axis of symmetry for math symbols +bar_height#:=102/36pt#; % height of crossbar in lowercase e +comma_depth#:=84/36pt#; % depth of comma below baseline +desc_depth#:=84/36pt#; % depth of lowercase descenders +acc_height#:=75/36pt#; +dot_height#:=66/36pt#; + +crisp#:=0pt#; % diameter of serif corners +tiny#:=13/36pt#; % diameter of rounded corners +fine#:=10/36pt#; % diameter of sharply rounded corners +thin_join#:=10.5/36pt#; % width of extrafine details +hair#:=18.3/36pt#; % lowercase hairline breadth +stem#:=47/36pt#; % lowercase stem breadth +curve#:=52/36pt#; % lowercase curve breadth +ess#:=44/36pt#; % breadth in middle of lowercase s +flare#:=51/36pt#; % diameter of bulbs or breadth of terminals +dot_size#:=62/36pt#; % diameter of dots +cap_hair#:=20/36pt#; % uppercase hairline breadth +cap_stem#:=57/36pt#; % uppercase stem breadth +cap_curve#:=61/36pt#; % uppercase curve breadth +cap_ess#:=59/36pt#; % breadth in middle of uppercase s +rule_thickness#:=.66pt#; % thickness of lines in math symbols + +dish#:=1/36pt#; % amount erased at top or bottom of serifs +bracket#:=12/36pt#; % vertical distance from serif base to tangent +jut#:=30/36pt#; % protrusion of lowercase serifs +cap_jut#:=46/36pt#; % protrusion of uppercase serifs +beak_jut#:=12.4/36pt#; % horizontal protrusion of beak serifs +beak#:=84/36pt#; % vertical protrusion of beak serifs +vair#:=14.3/36pt#; % vertical diameter of hairlines +notch_cut#:=12pt#; % maximum breadth above or below notches +bar#:=18.5/36pt#; % lowercase bar thickness +slab#:=18.5/36pt#; % serif and arm thickness +cap_bar#:=18.5/36pt#; % uppercase bar thickness +cap_band#:=18.5/36pt#; % uppercase thickness above/below lobes +cap_notch_cut#:=12pt#; % max breadth above/below uppercase notches +serif_drop#:=3.6/36pt#; % vertical drop of sloped serifs +stem_corr#:=2/36pt#; % for small refinements of stem breadth +vair_corr#:=1.5/36pt#; % for small refinements of hairline height +apex_corr#:=0pt#; % extra width at diagonal junctions + +o#:=5/36pt#; % amount of overshoot for curves +apex_o#:=4/36pt#; % amount of overshoot for diagonal junctions + +%slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +fudge:=1; % factor applied to weights of heavy characters +math_spread:=.4; % extra openness of math symbols +superness:=8/11; % parameter for superellipses +superpull:=1/8; % extra openness inside bowls +beak_darkness:=.4; % 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? + +%generate roman % switch to the driver file +endinput; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/concbx5pt.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx5pt.mf new file mode 100644 index 00000000000..4bc8d85159f --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx5pt.mf @@ -0,0 +1,80 @@ +% concbx5pt.mf - cmbx5.mf (follows idea of ecc package) + +% Computer Modern Bold Extended Roman 5 point +if unknown cmbase: input cmbase fi + +%font_identifier:="CMBX"; font_size 5pt#; + +u#:=14.5/36pt#; % unit width +width_adj#:=7/36pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=3/36pt#; % extra sidebar near uppercase serifs +letter_fit#:=3/36pt#; % extra space added to all sidebars + +body_height#:=135/36pt#; % height of tallest characters +asc_height#:=125/36pt#; % height of lowercase ascenders +cap_height#:=123.5/36pt#; % height of caps +fig_height#:=116/36pt#; % height of numerals +x_height#:=80/36pt#; % height of lowercase without ascenders +math_axis#:=45/36pt#; % axis of symmetry for math symbols +bar_height#:=40/36pt#; % height of crossbar in lowercase e +comma_depth#:=35/36pt#; % depth of comma below baseline +desc_depth#:=35/36pt#; % depth of lowercase descenders +acc_height#:=42.5/36pt#; +dot_height#:=42/36pt#; + +crisp#:=0pt#; % diameter of serif corners +tiny#:=9/36pt#; % diameter of rounded corners +fine#:=8/36pt#; % diameter of sharply rounded corners +thin_join#:=8/36pt#; % width of extrafine details +hair#:=15/36pt#; % lowercase hairline breadth +stem#:=24/36pt#; % lowercase stem breadth +curve#:=27/36pt#; % lowercase curve breadth +ess#:=19/36pt#; % breadth in middle of lowercase s +flare#:=27/36pt#; % diameter of bulbs or breadth of terminals +dot_size#:=31/36pt#; % diameter of dots +cap_hair#:=17/36pt#; % uppercase hairline breadth +cap_stem#:=28/36pt#; % uppercase stem breadth +cap_curve#:=31/36pt#; % uppercase curve breadth +cap_ess#:=24/36pt#; % breadth in middle of uppercase s +rule_thickness#:=.43pt#; % thickness of lines in math symbols + +dish#:=.7/36pt#; % amount erased at top or bottom of serifs +bracket#:=5/36pt#; % vertical distance from serif base to tangent +jut#:=13/36pt#; % protrusion of lowercase serifs +cap_jut#:=19/36pt#; % protrusion of uppercase serifs +beak_jut#:=7/36pt#; % horizontal protrusion of beak serifs +beak#:=25/36pt#; % vertical protrusion of beak serifs +vair#:=10/36pt#; % vertical diameter of hairlines +notch_cut#:=5pt#; % maximum breadth above or below notches +bar#:=12/36pt#; % lowercase bar thickness +slab#:=12/36pt#; % serif and arm thickness +cap_bar#:=12/36pt#; % uppercase bar thickness +cap_band#:=12/36pt#; % uppercase thickness above/below lobes +cap_notch_cut#:=5pt#; % max breadth above/below uppercase notches +serif_drop#:=1.5/36pt#; % vertical drop of sloped serifs +stem_corr#:=1.5/36pt#; % for small refinements of stem breadth +vair_corr#:=1/36pt#; % for small refinements of hairline height +apex_corr#:=9/36pt#; % extra width at diagonal junctions + +o#:=3/36pt#; % amount of overshoot for curves +apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions + +%slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +fudge:=1; % factor applied to weights of heavy characters +math_spread:=1.5; % extra openness of math symbols +superness:=8/11; % parameter for superellipses +superpull:=1/8; % extra openness inside bowls +beak_darkness:=.4; % 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? + +%generate roman % switch to the driver file +endinput; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/concbx6pt.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx6pt.mf new file mode 100644 index 00000000000..d7e9ab27499 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx6pt.mf @@ -0,0 +1,80 @@ +% concbx6pt.mf - modified cmbx6.mf (follows idea of ecc package) + +% Computer Modern Bold Extended Roman 6 point +if unknown cmbase: input cmbase fi + +%font_identifier:="CMBX"; font_size 6pt#; + +u#:=16.2/36pt#; % unit width +width_adj#:=7.8/36pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=3.8/36pt#; % extra sidebar near uppercase serifs +letter_fit#:=2/36pt#; % extra space added to all sidebars + +body_height#:=162/36pt#; % height of tallest characters +asc_height#:=150/36pt#; % height of lowercase ascenders +cap_height#:=148.2/36pt#; % height of caps +fig_height#:=139.2/36pt#; % height of numerals +x_height#:=96/36pt#; % height of lowercase without ascenders +math_axis#:=54/36pt#; % axis of symmetry for math symbols +bar_height#:=49/36pt#; % height of crossbar in lowercase e +comma_depth#:=42/36pt#; % depth of comma below baseline +desc_depth#:=42/36pt#; % depth of lowercase descenders +acc_height#:=49/36pt#; +dot_height#:=46.6/36pt#; + +crisp#:=0pt#; % diameter of serif corners +tiny#:=10/36pt#; % diameter of rounded corners +fine#:=9/36pt#; % diameter of sharply rounded corners +thin_join#:=9/36pt#; % width of extrafine details +hair#:=15.4/36pt#; % lowercase hairline breadth +stem#:=28/36pt#; % lowercase stem breadth +curve#:=31/36pt#; % lowercase curve breadth +ess#:=25/36pt#; % breadth in middle of lowercase s +flare#:=31/36pt#; % diameter of bulbs or breadth of terminals +dot_size#:=36/36pt#; % diameter of dots +cap_hair#:=18/36pt#; % uppercase hairline breadth +cap_stem#:=33/36pt#; % uppercase stem breadth +cap_curve#:=36/36pt#; % uppercase curve breadth +cap_ess#:=31/36pt#; % breadth in middle of uppercase s +rule_thickness#:=.47pt#; % thickness of lines in math symbols + +dish#:=.8/36pt#; % amount erased at top or bottom of serifs +bracket#:=6/36pt#; % vertical distance from serif base to tangent +jut#:=15/36pt#; % protrusion of lowercase serifs +cap_jut#:=23/36pt#; % protrusion of uppercase serifs +beak_jut#:=7.8/36pt#; % horizontal protrusion of beak serifs +beak#:=36/36pt#; % vertical protrusion of beak serifs +vair#:=11/36pt#; % vertical diameter of hairlines +notch_cut#:=6pt#; % maximum breadth above or below notches +bar#:=13/36pt#; % lowercase bar thickness +slab#:=13/36pt#; % serif and arm thickness +cap_bar#:=13/36pt#; % uppercase bar thickness +cap_band#:=13/36pt#; % uppercase thickness above/below lobes +cap_notch_cut#:=6pt#; % max breadth above/below uppercase notches +serif_drop#:=1.8/36pt#; % vertical drop of sloped serifs +stem_corr#:=1.6/36pt#; % for small refinements of stem breadth +vair_corr#:=1.1/36pt#; % for small refinements of hairline height +apex_corr#:=5/36pt#; % extra width at diagonal junctions + +o#:=3/36pt#; % amount of overshoot for curves +apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions + +%slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +fudge:=1; % factor applied to weights of heavy characters +math_spread:=1.3; % extra openness of math symbols +superness:=8/11; % parameter for superellipses +superpull:=1/8; % extra openness inside bowls +beak_darkness:=.4; % 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? + +%generate roman % switch to the driver file +endinput; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/concbx7pt.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx7pt.mf new file mode 100644 index 00000000000..37cd2a8b3ee --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx7pt.mf @@ -0,0 +1,80 @@ +% concbx7pt.mf - cmbx7.mf (follows idea of ecc package) + +% Computer Modern Bold Extended Roman 7 point +if unknown cmbase: input cmbase fi + +%font_identifier:="CMBX"; font_size 7pt#; + +u#:=17.9/36pt#; % unit width +width_adj#:=8.6/36pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=4.6/36pt#; % extra sidebar near uppercase serifs +letter_fit#:=1/36pt#; % extra space added to all sidebars + +body_height#:=189/36pt#; % height of tallest characters +asc_height#:=175/36pt#; % height of lowercase ascenders +cap_height#:=172.9/36pt#; % height of caps +fig_height#:=162.4/36pt#; % height of numerals +x_height#:=112/36pt#; % height of lowercase without ascenders +math_axis#:=63/36pt#; % axis of symmetry for math symbols +bar_height#:=58/36pt#; % height of crossbar in lowercase e +comma_depth#:=49/36pt#; % depth of comma below baseline +desc_depth#:=49/36pt#; % depth of lowercase descenders +acc_height#:=55.5/36pt#; +dot_height#:=51.2/36pt#; + +crisp#:=0pt#; % diameter of serif corners +tiny#:=11/36pt#; % diameter of rounded corners +fine#:=9/36pt#; % diameter of sharply rounded corners +thin_join#:=9/36pt#; % width of extrafine details +hair#:=15.8/36pt#; % lowercase hairline breadth +stem#:=32/36pt#; % lowercase stem breadth +curve#:=35/36pt#; % lowercase curve breadth +ess#:=29/36pt#; % breadth in middle of lowercase s +flare#:=35/36pt#; % diameter of bulbs or breadth of terminals +dot_size#:=41/36pt#; % diameter of dots +cap_hair#:=18/36pt#; % uppercase hairline breadth +cap_stem#:=38/36pt#; % uppercase stem breadth +cap_curve#:=41/36pt#; % uppercase curve breadth +cap_ess#:=37/36pt#; % breadth in middle of uppercase s +rule_thickness#:=.51pt#; % thickness of lines in math symbols + +dish#:=.9/36pt#; % amount erased at top or bottom of serifs +bracket#:=7/36pt#; % vertical distance from serif base to tangent +jut#:=17/36pt#; % protrusion of lowercase serifs +cap_jut#:=27/36pt#; % protrusion of uppercase serifs +beak_jut#:=8.6/36pt#; % horizontal protrusion of beak serifs +beak#:=46/36pt#; % vertical protrusion of beak serifs +vair#:=11.5/36pt#; % vertical diameter of hairlines +notch_cut#:=7pt#; % maximum breadth above or below notches +bar#:=14/36pt#; % lowercase bar thickness +slab#:=14/36pt#; % serif and arm thickness +cap_bar#:=14/36pt#; % uppercase bar thickness +cap_band#:=14/36pt#; % uppercase thickness above/below lobes +cap_notch_cut#:=7pt#; % max breadth above/below uppercase notches +serif_drop#:=2.1/36pt#; % vertical drop of sloped serifs +stem_corr#:=1.7/36pt#; % for small refinements of stem breadth +vair_corr#:=1.2/36pt#; % for small refinements of hairline height +apex_corr#:=2/36pt#; % extra width at diagonal junctions + +o#:=3/36pt#; % amount of overshoot for curves +apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions + +%slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +fudge:=1; % factor applied to weights of heavy characters +math_spread:=1.1; % extra openness of math symbols +superness:=8/11; % parameter for superellipses +superpull:=1/8; % extra openness inside bowls +beak_darkness:=.4; % 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? + +%generate roman % switch to the driver file +endinput; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/concbx8pt.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx8pt.mf new file mode 100644 index 00000000000..69d26fd98e2 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx8pt.mf @@ -0,0 +1,80 @@ +% concbx8pt.mf - modofied cmbx8.mf (follows idea of ecc package) + +% Computer Modern Bold Extended Roman 8 point +if unknown cmbase: input cmbase fi + +%font_identifier:="CMBX"; font_size 8pt#; + +u#:=19.6/36pt#; % unit width +width_adj#:=9.4/36pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=5.4/36pt#; % extra sidebar near uppercase serifs +letter_fit#:=0pt#; % extra space added to all sidebars + +body_height#:=216/36pt#; % height of tallest characters +asc_height#:=200/36pt#; % height of lowercase ascenders +cap_height#:=197.6/36pt#; % height of caps +fig_height#:=185.6/36pt#; % height of numerals +x_height#:=128/36pt#; % height of lowercase without ascenders +math_axis#:=72/36pt#; % axis of symmetry for math symbols +bar_height#:=67/36pt#; % height of crossbar in lowercase e +comma_depth#:=56/36pt#; % depth of comma below baseline +desc_depth#:=56/36pt#; % depth of lowercase descenders +acc_height#:=62/36pt#; +dot_height#:=56/36pt#; + +crisp#:=0pt#; % diameter of serif corners +tiny#:=12/36pt#; % diameter of rounded corners +fine#:=10/36pt#; % diameter of sharply rounded corners +thin_join#:=10/36pt#; % width of extrafine details +hair#:=16.2/36pt#; % lowercase hairline breadth +stem#:=35/36pt#; % lowercase stem breadth +curve#:=39/36pt#; % lowercase curve breadth +ess#:=32/36pt#; % breadth in middle of lowercase s +flare#:=39/36pt#; % diameter of bulbs or breadth of terminals +dot_size#:=46/36pt#; % diameter of dots +cap_hair#:=19/36pt#; % uppercase hairline breadth +cap_stem#:=43/36pt#; % uppercase stem breadth +cap_curve#:=46/36pt#; % uppercase curve breadth +cap_ess#:=43/36pt#; % breadth in middle of uppercase s +rule_thickness#:=.54pt#; % thickness of lines in math symbols + +dish#:=1/36pt#; % amount erased at top or bottom of serifs +bracket#:=8/36pt#; % vertical distance from serif base to tangent +jut#:=19/36pt#; % protrusion of lowercase serifs +cap_jut#:=31/36pt#; % protrusion of uppercase serifs +beak_jut#:=9.4/36pt#; % horizontal protrusion of beak serifs +beak#:=55/36pt#; % vertical protrusion of beak serifs +vair#:=12/36pt#; % vertical diameter of hairlines +notch_cut#:=8pt#; % maximum breadth above or below notches +bar#:=15/36pt#; % lowercase bar thickness +slab#:=15/36pt#; % serif and arm thickness +cap_bar#:=15/36pt#; % uppercase bar thickness +cap_band#:=15/36pt#; % uppercase thickness above/below lobes +cap_notch_cut#:=8pt#; % max breadth above/below uppercase notches +serif_drop#:=2.4/36pt#; % vertical drop of sloped serifs +stem_corr#:=1.8/36pt#; % for small refinements of stem breadth +vair_corr#:=1.3/36pt#; % for small refinements of hairline height +apex_corr#:=0pt#; % extra width at diagonal junctions + +o#:=4/36pt#; % amount of overshoot for curves +apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions + +%slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +fudge:=1; % factor applied to weights of heavy characters +math_spread:=.9; % extra openness of math symbols +superness:=8/11; % parameter for superellipses +superpull:=1/8; % extra openness inside bowls +beak_darkness:=.4; % 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? + +%generate roman % switch to the driver file +endinput; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/concbx9pt.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx9pt.mf new file mode 100644 index 00000000000..3456b8848d0 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/concbx9pt.mf @@ -0,0 +1,80 @@ +% concbx9pt.mf - modified cmbx9.mf (follows idea of ecc package) + +% Computer Modern Bold Extended Roman 9 point +if unknown cmbase: input cmbase fi + +%font_identifier:="CMBX"; font_size 9pt#; + +u#:=21.3/36pt#; % unit width +width_adj#:=10.2/36pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=6.2/36pt#; % extra sidebar near uppercase serifs +letter_fit#:=0pt#; % extra space added to all sidebars + +body_height#:=243/36pt#; % height of tallest characters +asc_height#:=225/36pt#; % height of lowercase ascenders +cap_height#:=222.3/36pt#; % height of caps +fig_height#:=208.8/36pt#; % height of numerals +x_height#:=144/36pt#; % height of lowercase without ascenders +math_axis#:=81/36pt#; % axis of symmetry for math symbols +bar_height#:=76/36pt#; % height of crossbar in lowercase e +comma_depth#:=63/36pt#; % depth of comma below baseline +desc_depth#:=63/36pt#; % depth of lowercase descenders +acc_height#:=68.5/36pt#; +dot_height#:=60.4/36pt#; + +crisp#:=0pt#; % diameter of serif corners +tiny#:=13/36pt#; % diameter of rounded corners +fine#:=10/36pt#; % diameter of sharply rounded corners +thin_join#:=10/36pt#; % width of extrafine details +hair#:=16.6/36pt#; % lowercase hairline breadth +stem#:=38/36pt#; % lowercase stem breadth +curve#:=43/36pt#; % lowercase curve breadth +ess#:=35/36pt#; % breadth in middle of lowercase s +flare#:=42/36pt#; % diameter of bulbs or breadth of terminals +dot_size#:=51/36pt#; % diameter of dots +cap_hair#:=19/36pt#; % uppercase hairline breadth +cap_stem#:=47/36pt#; % uppercase stem breadth +cap_curve#:=51/36pt#; % uppercase curve breadth +cap_ess#:=48/36pt#; % breadth in middle of uppercase s +rule_thickness#:=.57pt#; % thickness of lines in math symbols + +dish#:=1/36pt#; % amount erased at top or bottom of serifs +bracket#:=9/36pt#; % vertical distance from serif base to tangent +jut#:=22/36pt#; % protrusion of lowercase serifs +cap_jut#:=35/36pt#; % protrusion of uppercase serifs +beak_jut#:=10.2/36pt#; % horizontal protrusion of beak serifs +beak#:=63/36pt#; % vertical protrusion of beak serifs +vair#:=12.5/36pt#; % vertical diameter of hairlines +notch_cut#:=9pt#; % maximum breadth above or below notches +bar#:=16/36pt#; % lowercase bar thickness +slab#:=16/36pt#; % serif and arm thickness +cap_bar#:=16/36pt#; % uppercase bar thickness +cap_band#:=16/36pt#; % uppercase thickness above/below lobes +cap_notch_cut#:=9pt#; % max breadth above/below uppercase notches +serif_drop#:=2.7/36pt#; % vertical drop of sloped serifs +stem_corr#:=1.9/36pt#; % for small refinements of stem breadth +vair_corr#:=1.4/36pt#; % for small refinements of hairline height +apex_corr#:=0pt#; % extra width at diagonal junctions + +o#:=4/36pt#; % amount of overshoot for curves +apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions + +%slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +fudge:=1; % factor applied to weights of heavy characters +math_spread:=.7; % extra openness of math symbols +superness:=8/11; % parameter for superellipses +superpull:=1/8; % extra openness inside bowls +beak_darkness:=.4; % 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? + +%generate roman % switch to the driver file +endinput; diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/concbxti10.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/concbxti10.mf new file mode 100644 index 00000000000..2c996349958 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/concbxti10.mf @@ -0,0 +1,78 @@ +% THIS IS THE OFFICIAL COMPUTER MODERN SOURCE FILE cmbxti10.mf BY D E KNUTH. +% IT MUST NOT BE MODIFIED IN ANY WAY UNLESS THE FILE NAME IS CHANGED! + +% Computer Modern Bold Extended Text Italic 10 point +if unknown cmbase: input cmbase fi + +%font_identifier:="CMBXTI"; font_size 10pt#; + +u#:=21.2/36pt#; % unit width +width_adj#:=11/36pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=7/36pt#; % extra sidebar near uppercase serifs +letter_fit#:=11/36pt#; % extra space added to all sidebars + +body_height#:=270/36pt#; % height of tallest characters +asc_height#:=250/36pt#; % height of lowercase ascenders +cap_height#:=247/36pt#; % height of caps +fig_height#:=232/36pt#; % height of numerals +x_height#:=160/36pt#; % height of lowercase without ascenders +math_axis#:=90/36pt#; % axis of symmetry for math symbols +bar_height#:=85/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#:=13/36pt#; % diameter of serif corners +tiny#:=13/36pt#; % diameter of rounded corners +fine#:=10/36pt#; % diameter of sharply rounded corners +thin_join#:=10/36pt#; % width of extrafine details +hair#:=20/36pt#; % lowercase hairline breadth +stem#:=38/36pt#; % lowercase stem breadth +curve#:=43/36pt#; % lowercase curve breadth +ess#:=35/36pt#; % breadth in middle of lowercase s +flare#:=42/36pt#; % diameter of bulbs or breadth of terminals +dot_size#:=53/36pt#; % diameter of dots +cap_hair#:=22/36pt#; % uppercase hairline breadth +cap_stem#:=49/36pt#; % uppercase stem breadth +cap_curve#:=52/36pt#; % uppercase curve breadth +cap_ess#:=50/36pt#; % breadth in middle of uppercase s +rule_thickness#:=.6pt#; % thickness of lines in math symbols + +dish#:=1/36pt#; % amount erased at top or bottom of serifs +bracket#:=10/36pt#; % vertical distance from serif base to tangent +jut#:=27/36pt#; % protrusion of lowercase serifs +cap_jut#:=39/36pt#; % protrusion of uppercase serifs +beak_jut#:=10/36pt#; % horizontal protrusion of beak serifs +beak#:=70/36pt#; % vertical protrusion of beak serifs +vair#:=13/36pt#; % vertical diameter of hairlines +notch_cut#:=10pt#; % maximum breadth above or below notches +bar#:=17/36pt#; % lowercase bar thickness +slab#:=17/36pt#; % serif and arm thickness +cap_bar#:=17/36pt#; % uppercase bar thickness +cap_band#:=17/36pt#; % uppercase thickness above/below lobes +cap_notch_cut#:=10pt#; % max breadth above/below uppercase notches +serif_drop#:=3/36pt#; % vertical drop of sloped serifs +stem_corr#:=2/36pt#; % for small refinements of stem breadth +vair_corr#:=1.5/36pt#; % for small refinements of hairline height +apex_corr#:=0pt#; % extra width at diagonal junctions + +o#:=6/36pt#; % amount of overshoot for curves +apex_o#:=6/36pt#; % amount of overshoot for diagonal junctions + +%slant:=.25; % tilt ratio $(\Delta x/\Delta y)$ +fudge:=1; % factor applied to weights of heavy characters +math_spread:=.5; % extra openness of math symbols +superness:=8/11; % parameter for superellipses +superpull:=1/8; % extra openness inside bowls +beak_darkness:=.4; % 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:=true; % 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? + +generate textit % switch to the driver file diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/concc9pt.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/concc9pt.mf new file mode 100644 index 00000000000..cf794ee43c8 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/concc9pt.mf @@ -0,0 +1,75 @@ +% concc9.mf - modified ccslc9.mf (follows idea of ecc package) + +% Concrete Slanted Condensed Roman 9 point +if unknown cmbase: input cmbase fi + +u#:=16/36pt#; % unit width +width_adj#:=0pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=2/36pt#; % extra sidebar near uppercase serifs +letter_fit#:=0pt#; % extra space added to all sidebars + +body_height#:=243/36pt#; % height of tallest characters +asc_height#:=225/36pt#; % height of lowercase ascenders +cap_height#:=221.4/36pt#; % height of caps +fig_height#:=208.8/36pt#; % height of numerals +x_height#:=155/36pt#; % height of lowercase without ascenders +math_axis#:=81/36pt#; % axis of symmetry for math symbols +bar_height#:=85/36pt#; % height of crossbar in lowercase e +comma_depth#:=63/36pt#; % depth of comma below baseline +desc_depth#:=63/36pt#; % depth of lowercase descenders + +crisp#:=0pt#; % diameter of serif corners +tiny#:=9/36pt#; % diameter of rounded corners +fine#:=6/36pt#; % diameter of sharply rounded corners +thin_join#:=13/36pt#; % width of extrafine details +hair#:=16/36pt#; % lowercase hairline breadth +stem#:=22/36pt#; % lowercase stem breadth +curve#:=23/36pt#; % lowercase curve breadth +ess#:=25/36pt#; % breadth in middle of lowercase s +flare#:=28/36pt#; % diameter of bulbs or breadth of terminals +dot_size#:=35/36pt#; % diameter of dots +cap_hair#:=16/36pt#; % uppercase hairline breadth +cap_stem#:=23/36pt#; % uppercase stem breadth +cap_curve#:=24/36pt#; % uppercase curve breadth +cap_ess#:=23/36pt#; % breadth in middle of uppercase s +rule_thickness#:=.38pt#; % thickness of lines in math symbols + +dish#:=0/36pt#; % amount erased at top or bottom of serifs +bracket#:=5/36pt#; % vertical distance from serif base to tangent +jut#:=15/36pt#; % protrusion of lowercase serifs +cap_jut#:=16/36pt#; % protrusion of uppercase serifs +beak_jut#:=9.2/36pt#; % horizontal protrusion of beak serifs +beak#:=63/36pt#; % vertical protrusion of beak serifs +vair#:=15/36pt#; % vertical diameter of hairlines +notch_cut#:=27/36pt#; % maximum breadth above or below notches +bar#:=15/36pt#; % lowercase bar thickness +slab#:=15/36pt#; % serif and arm thickness +cap_bar#:=15/36pt#; % uppercase bar thickness +cap_band#:=15/36pt#; % uppercase thickness above/below lobes +cap_notch_cut#:=.9pt#; % max breadth above/below uppercase notches +serif_drop#:=3.6/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#:=4/36pt#; % amount of overshoot for curves +apex_o#:=3/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:=.2; % extra openness of math symbols +superness:=8/11; % parameter for superellipses +superpull:=1/15; % extra openness inside bowls +beak_darkness:=5/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? + +%generate roman % switch to the driver file diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/eob10.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/eob10.mf new file mode 100644 index 00000000000..a675945a2fd --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/eob10.mf @@ -0,0 +1,14 @@ +% T2*/X2 encodings +% Bold Faced font with concrete Russian letters +% based on cmb10 + +if unknown exbase: input exbase fi + +font_identifier:="EOB"; font_size 10pt#; + +input concb10pt; +slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +math_fitting:=false; % should math-mode spacing be used? + +generate exroman; % switch to the driver file + diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/eobx10.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/eobx10.mf new file mode 100644 index 00000000000..319182ad506 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/eobx10.mf @@ -0,0 +1,14 @@ +% T2*/X2 encodings +% Bold Faced font with concrete Russian letters +% based on cmbx10 + +if unknown exbase: input exbase fi + +font_identifier:="EOBX"; font_size 10pt#; + +input concbx10pt; +slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +math_fitting:=false; % should math-mode spacing be used? + +generate exroman; % switch to the driver file + diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/eobx5.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/eobx5.mf new file mode 100644 index 00000000000..784c9dcf3b3 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/eobx5.mf @@ -0,0 +1,14 @@ +% T2*/X2 encodings +% Bold Faced font with concrete Russian letters +% based on cmbx5 + +if unknown exbase: input exbase fi + +font_identifier:="EOBX"; font_size 5pt#; + +input concbx5pt; +slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +math_fitting:=false; % should math-mode spacing be used? + +generate exroman; % switch to the driver file + diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/eobx6.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/eobx6.mf new file mode 100644 index 00000000000..5fed3f69be9 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/eobx6.mf @@ -0,0 +1,14 @@ +% T2*/X2 encodings +% Bold Faced font with concrete Russian letters +% based on cmbx6 + +if unknown exbase: input exbase fi + +font_identifier:="EOBX"; font_size 6pt#; + +input concbx6pt; +slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +math_fitting:=false; % should math-mode spacing be used? + +generate exroman % switch to the driver file + diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/eobx7.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/eobx7.mf new file mode 100644 index 00000000000..53abbdf4464 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/eobx7.mf @@ -0,0 +1,14 @@ +% T2*/X2 encodings +% Bold Faced font with concrete Russian letters +% based on cmbx7 + +if unknown exbase: input exbase fi + +font_identifier:="EOBX"; font_size 7pt#; + +input concbx7pt; +slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +math_fitting:=false; % should math-mode spacing be used? + +generate exroman; % switch to the driver file + diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/eobx8.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/eobx8.mf new file mode 100644 index 00000000000..1a138f70af8 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/eobx8.mf @@ -0,0 +1,14 @@ +% T2*/X2 encodings +% Bold Faced font with concrete Russian letters +% based on cmbx8 + +if unknown exbase: input exbase fi + +font_identifier:="EOBX"; font_size 8pt#; + +input concbx8pt; +slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +math_fitting:=false; % should math-mode spacing be used? + +generate exroman; % switch to the driver file + diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/eobx9.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/eobx9.mf new file mode 100644 index 00000000000..e3beea071e1 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/eobx9.mf @@ -0,0 +1,14 @@ +% T2*/X2 encodings +% Bold Faced font with concrete Russian letters +% based on cmbx9 + +if unknown exbase: input exbase fi + +font_identifier:="EOBX"; font_size 9pt#; + +input concbx9pt; +slant:=0; % tilt ratio $(\Delta x/\Delta y)$ +math_fitting:=false; % should math-mode spacing be used? + +generate exroman; % switch to the driver file + diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/eobxsl10.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/eobxsl10.mf new file mode 100644 index 00000000000..47940cf4ae9 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/eobxsl10.mf @@ -0,0 +1,14 @@ +% T2*/X2 encodings +% Bold Faced font with concrete Russian letters +% based on cmbxsl10 (cmbx10) + +if unknown exbase: input exbase fi + +font_identifier:="EOBXSL"; font_size 10pt#; + +input concbx10pt; +slant:=1/6; % tilt ratio $(\Delta x/\Delta y)$ +math_fitting:=false; % should math-mode spacing be used? + +generate exroman; % switch to the driver file + diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/eobxti10.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/eobxti10.mf new file mode 100644 index 00000000000..ce54d1f9dd8 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/eobxti10.mf @@ -0,0 +1,14 @@ +% T2*/X2 encodings +% Bold Faced font with concrete Russian letters +% based on cmbxsl10 (cmbx10) + +if unknown exbase: input exbase fi + +font_identifier:="EOBXTI"; font_size 10pt#; + +input concbx10pt; +slant:=1/6; % tilt ratio $(\Delta x/\Delta y)$ +math_fitting:=false; % should math-mode spacing be used? + +generate extextit; % switch to the driver file + diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/eoslc9.mf b/Master/texmf-dist/fonts/source/lh/lh-conc/eoslc9.mf new file mode 100644 index 00000000000..2997a9b5513 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/eoslc9.mf @@ -0,0 +1,14 @@ +% T2*/X2 encodings +% Condenced Slanted concrete +% based on cccslc9 + +if unknown exbase: input exbase fi + +font_identifier:="EOSLC"; font_size 9pt#; + +input concc9pt; +slant:=1/6; % tilt ratio $(\Delta x/\Delta y)$ +math_fitting:=false; % should math-mode spacing be used? + +generate exroman; % switch to the driver file + diff --git a/Master/texmf-dist/fonts/source/lh/lh-conc/readme.txt b/Master/texmf-dist/fonts/source/lh/lh-conc/readme.txt new file mode 100644 index 00000000000..5c588a8bfb2 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/lh-conc/readme.txt @@ -0,0 +1,9 @@ +"Sources" for bold faced fonts +(based on cmb10, cmbx*, cmbxsl10) +with concrete shapes of letters +CYRD, CYRL, CYRZH, CYRK, CYRYA +and modified lettershapes for +other Cyrillic-writing languages + +Missed font ccslc9 for graffiti +(concrete condenced slanted font) diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/ilhcsc10.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/ilhcsc10.mf deleted file mode 100644 index 85786a4c0f2..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/ilhcsc10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilhcsc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/ilhtt8.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/ilhtt8.mf deleted file mode 100644 index 1ffcaa04eac..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/ilhtt8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilhtt8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/illhss8.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/illhss8.mf deleted file mode 100644 index 2400cc13d72..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/illhss8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is illhss8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=4 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/illhssb8.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/illhssb8.mf deleted file mode 100644 index 3b3ba635583..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/illhssb8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is illhssb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=4 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/illhssi8.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/illhssi8.mf deleted file mode 100644 index 54d652a7a1b..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/illhssi8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is illhssi8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=4 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr10.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr10.mf deleted file mode 100644 index 114d6ce21b6..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lhbr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr17.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr17.mf deleted file mode 100644 index 7aeaeccd844..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr17.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lhbr17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr8.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr8.mf deleted file mode 100644 index feec49dcfa1..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lhbr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr9.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr9.mf deleted file mode 100644 index 3398af350ca..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr9.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lhbr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrbx10.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrbx10.mf deleted file mode 100644 index decd3f0be1b..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrbx10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lhbrbx10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl10.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl10.mf deleted file mode 100644 index 09e0d670452..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lhbrsl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl17.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl17.mf deleted file mode 100644 index d748716fd1d..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl17.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lhbrsl17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl8.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl8.mf deleted file mode 100644 index c2c890098ec..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lhbrsl8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl9.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl9.mf deleted file mode 100644 index af79f872c2b..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl9.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lhbrsl9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhccsc10.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhccsc10.mf deleted file mode 100644 index 2e7867dcd65..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhccsc10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lhccsc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcodes.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcodes.mf deleted file mode 100644 index 85ffe5a1958..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcodes.mf +++ /dev/null @@ -1,87 +0,0 @@ -% This is lhcodes.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -CYR_.A := hex"80"; -CYR_.a := hex"a0"; -CYR_.B := hex"81"; -CYR_.b := hex"a1"; -CYR_.V := hex"82"; -CYR_.v := hex"a2"; -CYR_.G := hex"83"; -CYR_.g := hex"a3"; -CYR_.D := hex"84"; -CYR_.d := hex"a4"; -CYR_.E := hex"85"; -CYR_.e := hex"a5"; -CYR_.ZH := hex"86"; -CYR_.zh := hex"a6"; -CYR_.Z := hex"87"; -CYR_.z := hex"a7"; -CYR_.I := hex"88"; -CYR_.i := hex"a8"; -CYR_.I_shrt := hex"89"; -CYR_.i_shrt := hex"a9"; -CYR_.K := hex"8a"; -CYR_.k := hex"aa"; -CYR_.L := hex"8b"; -CYR_.l := hex"ab"; -CYR_.M := hex"8c"; -CYR_.m := hex"ac"; -CYR_.N := hex"8d"; -CYR_.n := hex"ad"; -CYR_.O := hex"8e"; -CYR_.o := hex"ae"; -CYR_.P := hex"8f"; -CYR_.p := hex"af"; -CYR_.R := hex"90"; -CYR_.r := hex"e0"; -CYR_.S := hex"91"; -CYR_.s := hex"e1"; -CYR_.T := hex"92"; -CYR_.t := hex"e2"; -CYR_.U := hex"93"; -CYR_.u := hex"e3"; -CYR_.F := hex"94"; -CYR_.f := hex"e4"; -CYR_.H := hex"95"; -CYR_.h := hex"e5"; -CYR_.C := hex"96"; -CYR_.c := hex"e6"; -CYR_.CH := hex"97"; -CYR_.ch := hex"e7"; -CYR_.SH := hex"98"; -CYR_.sh := hex"e8"; -CYR_.SHCH := hex"99"; -CYR_.shch := hex"e9"; -CYR_.HRDSN := hex"9a"; -CYR_.hrdsn := hex"ea"; -CYR_.ERY := hex"9b"; -CYR_.ery := hex"eb"; -CYR_.SFTSN := hex"9c"; -CYR_.sftsn := hex"ec"; -CYR_.EREV := hex"9d"; -CYR_.erev := hex"ed"; -CYR_.YU := hex"9e"; -CYR_.yu := hex"ee"; -CYR_.YA := hex"9f"; -CYR_.ya := hex"ef"; -CYR_.YO := hex"f0"; -CYR_.yo := hex"f1"; -CYR_.LAT_I := hex"f6"; -CYR_.lat_i := hex"f7"; -CYR_.G_up := hex"f2"; -CYR_.g_up := hex"f3"; -CYR_.UKR_I := hex"f8"; -CYR_.ukr_i := hex"f9"; -CYR_.U_shrt := hex"fa"; -CYR_.u_shrt := hex"fb"; -CYR_.UKR_E := hex"f4"; -CYR_.ukr_e := hex"f5"; -CYR_.dash := hex"c4"; -CYR_.No := hex"fc"; -CYR_.currency := hex"c5"; -CYR_.baseqq := hex"ff"; -CYR_.flqq := hex"fd"; -CYR_.frqq := hex"fe"; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr10.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr10.mf deleted file mode 100644 index 40e7aa708bd..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lhcr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr5.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr5.mf deleted file mode 100644 index 262c0003bae..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr5.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lhcr5.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr6.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr6.mf deleted file mode 100644 index 3fb02019815..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr6.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lhcr6.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr7.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr7.mf deleted file mode 100644 index 710eebf080c..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr7.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lhcr7.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr8.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr8.mf deleted file mode 100644 index f5c8babc796..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lhcr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr9.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr9.mf deleted file mode 100644 index 70c37152c0d..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lhcr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcsl10.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcsl10.mf deleted file mode 100644 index a582491c286..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcsl10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lhcsl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcsl9.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcsl9.mf deleted file mode 100644 index 13f51240b13..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcsl9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lhcsl9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcslc9.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcslc9.mf deleted file mode 100644 index 96e91dff167..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcslc9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lhcslc9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcti10.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcti10.mf deleted file mode 100644 index 4db2347c24a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhcti10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lhcti10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhliker.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhliker.mf deleted file mode 100644 index 9ecb744dbf2..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhliker.mf +++ /dev/null @@ -1,1197 +0,0 @@ -% This is lhliker.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - - -beginligtable - labelchar ( - CYR_.HRDSN - ,CYR_.SFTSN - ); - setkern [k#] ( - CYR_.ZH - ,CYR_.H - ); - labelchar ( - CYR_.A - if serifs: - fi - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.S - ,CYR_.UKR_E - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.CH - ); - if serifs: - setkern [kk#] ( - CYR_.U - ,CYR_.U_shrt - ); - else: - setkern [k#] ( - CYR_.U - ,CYR_.U_shrt - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.ch - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.u - ,CYR_.u_shrt - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ); - setkern [kk#] ( - CYR_.ch - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.k - ,CYR_.n - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.ukr_i - ,CYR_.lat_i - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ); - fi - fi - endligtable; - -if concrete: - - beginligtable - labelchar ( CYR_.D ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.S - ,CYR_.UKR_E - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.CH - ); - if serifs: - setkern [kk#] ( - CYR_.U - ,CYR_.U_shrt - ); - else: - setkern [k#] ( - CYR_.U - ,CYR_.U_shrt - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.ch - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.u - ,CYR_.u_shrt - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.t - ,CYR_.hrdsn - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.k - ,CYR_.n - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.ukr_i - ,CYR_.lat_i - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ); - fi - fi - endligtable; - - - beginligtable - labelchar ( CYR_.L ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.S - ,CYR_.UKR_E - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.CH - ); - if serifs: - setkern [kk#] ( - CYR_.U - ,CYR_.U_shrt - ); - else: - setkern [k#] ( - CYR_.U - ,CYR_.U_shrt - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.ch - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.u - ,CYR_.u_shrt - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.t - ,CYR_.hrdsn - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.k - ,CYR_.n - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.ukr_i - ,CYR_.lat_i - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ); - fi - fi - endligtable; - -fi - -beginligtable - labelchar ( CYR_.K ); - labelchar ( - CYR_.ZH - ,CYR_.H - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.S - ,CYR_.UKR_E - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ); - else: - setkern [k#] ( - CYR_.ch - ); - if ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ); - fi - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.O - ,CYR_.F - ,CYR_.YU - ,CYR_.EREV - ); - setkern [k#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - ,CYR_.ZH - ,CYR_.H - ,CYR_.U - ,CYR_.U_shrt - if serifs: - ,CYR_.YA - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - fi - ,CYR_.zh - ,CYR_.h - ,CYR_.u - ,CYR_.u_shrt - if serifs: - ,CYR_.ya - fi - ); - elseif ROMANfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( CYR_.T ); - labelchar ( - CYR_.G - ); - setkern [kk#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - fi - ); - if not concrete: - if serifs: - setkern [k#] ( - CYR_.L - ); - else: - setkern [-u#] ( - CYR_.L - ); - fi - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - fi - ,CYR_.zh - ,CYR_.h - ,CYR_.u - ,CYR_.u_shrt - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.f - ); - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [kk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.hrdsn - ,CYR_.l - ,CYR_.m - ,CYR_.g_up - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.G_up - ); - setkern [kk#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - fi - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.S - ,CYR_.UKR_E - ); - if not concrete: - if serifs: - setkern [k#] ( - CYR_.L - ); - else: - setkern [-u#] ( - CYR_.L - ); - fi - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - fi - ,CYR_.zh - ,CYR_.h - ,CYR_.u - ,CYR_.u_shrt - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.f - ); - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.hrdsn - ,CYR_.l - ,CYR_.m - ,CYR_.g_up - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.U - ,CYR_.U_shrt - ); - if serifs: - setkern [kk#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - fi - ,CYR_.YA - ); - if not concrete: - setkern [-u#] ( - CYR_.D - ,CYR_.L - ); - fi - else: - setkern [k#] ( - CYR_.A - ); - setkern [-u#] ( - CYR_.D - ,CYR_.L - ); - fi - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.S - ,CYR_.UKR_E - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - fi - if serifs: - ,CYR_.ya - fi - ); - setkern [kk#] ( - if concrete: - CYR_.d - ,CYR_.l - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ); - else: - if serifs: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.ukr_e - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.ukr_e - ); - fi - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.hrdsn - ,CYR_.l - ,CYR_.m - ,CYR_.g_up - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.R - ); - setkern [kk#] ( - CYR_.A - ,CYR_.D - ,CYR_.L - if serifs: - ,CYR_.YA - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - fi - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.e - ,CYR_.yo - ); - setkern [kk#] ( - CYR_.d - ,CYR_.l - ); - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.LAT_I - ,CYR_.UKR_I - ); - setkern [-k#] ( - CYR_.LAT_I - ,CYR_.UKR_I - ); - endligtable; - -if TITLEfont: endinput \\ fi; - -if SmallCapsfont: - - u#:=lower.u#; - k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; - - - - beginligtable - labelchar ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - fi - if SmallCapsfont: - fi - if SmallCapsfont: - fi - if serifs: - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.ch - ); - setkern [kk#] ( - CYR_.u - ,CYR_.u_shrt - ); - endligtable; - - if concrete: - - - beginligtable - labelchar ( CYR_.d ); - setkern [k#] ( - CYR_.o - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.ch - ); - setkern [kk#] ( - CYR_.u - ,CYR_.u_shrt - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.o - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.ch - ); - setkern [kk#] ( - CYR_.u - ,CYR_.u_shrt - ); - endligtable; - - fi - - - beginligtable - labelchar ( CYR_.k ); - labelchar ( - CYR_.zh - ,CYR_.h - ); - setkern [k#] ( - CYR_.o - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.o - ,CYR_.f - ,CYR_.b - ,CYR_.yu - ,CYR_.erev - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.zh - ,CYR_.h - ,CYR_.u - ,CYR_.u_shrt - if serifs: - ,CYR_.ya - fi - ); - endligtable; - - - beginligtable - labelchar ( CYR_.t ); - labelchar ( - CYR_.g - ,CYR_.g_up - ,CYR_.r - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.d - ,CYR_.l - if serifs: - ,CYR_.ya - fi - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ,CYR_.u_shrt - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.d - ,CYR_.l - if serifs: - ,CYR_.ya - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.lat_i - ,CYR_.ukr_i - ); - setkern [-k#] ( - CYR_.lat_i - ,CYR_.ukr_i - ); - endligtable; - -else: - - if ROMANfont: - - - beginligtable - labelchar ( - CYR_.a - ); - setkern [k#] ( - CYR_.ch - ,CYR_.u - ,CYR_.u_shrt - if serifs: - fi - ); - endligtable; - - if concrete: - - beginligtable - labelchar ( CYR_.d ); - setkern [k#] ( - CYR_.o - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.ch - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.o - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.ch - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ); - endligtable; - - fi - - beginligtable - labelchar ( CYR_.t ); - labelchar ( - CYR_.g - ,CYR_.g_up - if kapitel: - ,CYR_.r - fi - ); - if serifs: - setkern [k#] ( - CYR_.a - ); - fi - setkern [k#] ( - CYR_.d - ,CYR_.l - if kapitel: - ,CYR_.a - fi - ,CYR_.ya - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - - beginligtable - labelchar ( CYR_.k ); - labelchar ( - CYR_.zh - ,CYR_.h - ); - setkern [k#] ( - CYR_.a - ); - setkern [k#] ( - CYR_.o - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.e - ,CYR_.yo - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.lat_i - ); - setkern [-k#] ( - CYR_.ukr_i - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.ukr_i - ); - setkern [-k#] ( - CYR_.lat_i - ); - setkern [-kk#] ( - CYR_.ukr_i - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ,CYR_.u_shrt - ); - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.e - ,CYR_.yo - ,CYR_.ya - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ); - setkern [-u#] ( - CYR_.d - ,CYR_.l - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - else: - - - beginligtable - labelchar ( CYR_.e ); - labelchar ( - CYR_.yo - ); - setkern [-u#] ( - CYR_.f - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.g_up - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.g_up - ); - setkern [kkk#] ( - CYR_.l - ,CYR_.m - ,CYR_.g_up - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.ukr_i - ); - labelchar ( - CYR_.lat_i - ); - setkern [-k#] ( - CYR_.ukr_i - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.g_up - ,CYR_.hrdsn - ); - setkern [kk#] ( - CYR_.ch - ); - endligtable; - - fi - - - beginligtable - labelchar ( - CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - fi - if SmallCapsfont: - fi - if SmallCapsfont: - fi - if kapitel: - ,CYR_.a - fi - ); - if ROMANfont: - setkern [-u#] ( - CYR_.u - ,CYR_.u_shrt - ); - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ); - if concrete: - setkern [k#] ( - CYR_.d - ,CYR_.l - ); - fi - else: - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.g_up - ,CYR_.hrdsn - ); - fi - setkern [kk#] ( - CYR_.ch - ); - setkern [k#] ( - CYR_.o - ,CYR_.f - ,CYR_.ukr_e - ); - endligtable; - - - beginligtable - labelchar ( CYR_.s ); - labelchar ( - CYR_.o - ,CYR_.b - ,CYR_.yu - ,CYR_.r - ,CYR_.f - ,CYR_.erev - ); - if ROMANfont: - setkern [k#] ( - CYR_.d - ,CYR_.zh - ,CYR_.h - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [-u#] ( - CYR_.f - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.g_up - ); - fi - endligtable; - -fi diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhsltl10.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhsltl10.mf deleted file mode 100644 index 6d7bd755f68..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhsltl10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lhsltl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhtl10.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/lhtl10.mf deleted file mode 100644 index 4126b52b632..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/lhtl10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lhtl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/llhss8.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/llhss8.mf deleted file mode 100644 index bbefe708596..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/llhss8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is llhss8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/llhssb8.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/llhssb8.mf deleted file mode 100644 index 577a78a0e6e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/llhssb8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is llhssb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-lcy/llhssi8.mf b/Master/texmf-dist/fonts/source/lh/lh-lcy/llhssi8.mf deleted file mode 100644 index 663178c989e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-lcy/llhssi8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is llhssi8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/ilwnss8.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/ilwnss8.mf deleted file mode 100644 index 23a9b1acd17..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/ilwnss8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilwnss8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=4 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/ilwnssb8.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/ilwnssb8.mf deleted file mode 100644 index bbd9e5dc022..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/ilwnssb8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilwnssb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=4 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/ilwnssi8.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/ilwnssi8.mf deleted file mode 100644 index 3d06ed00815..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/ilwnssi8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilwnssi8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=4 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/iwncsc10.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/iwncsc10.mf deleted file mode 100644 index 16c8d42fb00..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/iwncsc10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is iwncsc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/iwntt8.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/iwntt8.mf deleted file mode 100644 index 02dff70aa4a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/iwntt8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is iwntt8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/lwnss8.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/lwnss8.mf deleted file mode 100644 index 5296b05404a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/lwnss8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lwnss8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/lwnssb8.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/lwnssb8.mf deleted file mode 100644 index 052f3f1bee0..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/lwnssb8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lwnssb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/lwnssi8.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/lwnssi8.mf deleted file mode 100644 index ddf6ca479d1..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/lwnssi8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lwnssi8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr10.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr10.mf deleted file mode 100644 index 55c76b74f7f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is wnbr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr17.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr17.mf deleted file mode 100644 index e921b2f71af..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr17.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is wnbr17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr8.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr8.mf deleted file mode 100644 index 04e4397f5d6..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is wnbr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr9.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr9.mf deleted file mode 100644 index 68df450071a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr9.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is wnbr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrbx10.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrbx10.mf deleted file mode 100644 index f115cb90d16..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrbx10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is wnbrbx10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl10.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl10.mf deleted file mode 100644 index 9758e80a9bc..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is wnbrsl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl17.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl17.mf deleted file mode 100644 index 1e326bd1dde..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl17.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is wnbrsl17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl8.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl8.mf deleted file mode 100644 index 86879e80567..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is wnbrsl8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl9.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl9.mf deleted file mode 100644 index 9a3271e4ca5..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl9.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is wnbrsl9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnccsc10.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wnccsc10.mf deleted file mode 100644 index 4ca28ece2a7..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnccsc10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is wnccsc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncodes.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wncodes.mf deleted file mode 100644 index 170d0cd5b6d..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncodes.mf +++ /dev/null @@ -1,103 +0,0 @@ -% This is wncodes.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -CYR_.A := hex"41"; -CYR_.a := hex"61"; -CYR_.B := hex"42"; -CYR_.b := hex"62"; -CYR_.V := hex"56"; -CYR_.v := hex"76"; -CYR_.G := hex"47"; -CYR_.g := hex"67"; -CYR_.D := hex"44"; -CYR_.d := hex"64"; -CYR_.E := hex"45"; -CYR_.e := hex"65"; -CYR_.ZH := hex"11"; -CYR_.zh := hex"19"; -CYR_.Z := hex"5a"; -CYR_.z := hex"7a"; -CYR_.I := hex"49"; -CYR_.i := hex"69"; -CYR_.I_shrt := hex"12"; -CYR_.i_shrt := hex"1a"; -CYR_.K := hex"4b"; -CYR_.k := hex"6b"; -CYR_.L := hex"4c"; -CYR_.l := hex"6c"; -CYR_.M := hex"4d"; -CYR_.m := hex"6d"; -CYR_.N := hex"4e"; -CYR_.n := hex"6e"; -CYR_.O := hex"4f"; -CYR_.o := hex"6f"; -CYR_.P := hex"50"; -CYR_.p := hex"70"; -CYR_.R := hex"52"; -CYR_.r := hex"72"; -CYR_.S := hex"53"; -CYR_.s := hex"73"; -CYR_.T := hex"54"; -CYR_.t := hex"74"; -CYR_.U := hex"55"; -CYR_.u := hex"75"; -CYR_.F := hex"46"; -CYR_.f := hex"66"; -CYR_.H := hex"48"; -CYR_.h := hex"68"; -CYR_.C := hex"43"; -CYR_.c := hex"63"; -CYR_.CH := hex"51"; -CYR_.ch := hex"71"; -CYR_.SH := hex"58"; -CYR_.sh := hex"78"; -CYR_.SHCH := hex"57"; -CYR_.shch := hex"77"; -CYR_.HRDSN := hex"5f"; -CYR_.hrdsn := hex"7f"; -CYR_.ERY := hex"59"; -CYR_.ery := hex"79"; -CYR_.SFTSN := hex"5e"; -CYR_.sftsn := hex"7e"; -CYR_.EREV := hex"03"; -CYR_.erev := hex"0b"; -CYR_.YU := hex"10"; -CYR_.yu := hex"18"; -CYR_.YA := hex"17"; -CYR_.ya := hex"1f"; -CYR_.YO := hex"13"; -CYR_.yo := hex"1b"; -CYR_.DJE := hex"06"; -CYR_.dje := hex"0e"; -CYR_.TSHE := hex"07"; -CYR_.tshe := hex"0f"; -CYR_.LAT_I := hex"04"; -CYR_.lat_i := hex"0c"; -CYR_.LAT_J := hex"4a"; -CYR_.lat_j := hex"6a"; -CYR_.LJE := hex"01"; -CYR_.lje := hex"09"; -CYR_.NJE := hex"00"; -CYR_.nje := hex"08"; -CYR_.LAT_S := hex"16"; -CYR_.lat_s := hex"1e"; -CYR_.DZHE := hex"02"; -CYR_.dzhe := hex"0a"; -CYR_.YAT := hex"23"; -CYR_.yat := hex"2b"; -CYR_.IZH := hex"14"; -CYR_.izh := hex"1c"; -CYR_.UKR_E := hex"05"; -CYR_.ukr_e := hex"0d"; -CYR_.Aacute := hex"26"; -CYR_.Aumlaut := hex"20"; -CYR_.Abreve := hex"40"; -CYR_.Acyrbreve := hex"24"; -CYR_.i_dotl := hex"3d"; -CYR_.No := hex"7d"; -CYR_.flqq := hex"3c"; -CYR_.frqq := hex"3e"; -CYR_.FITA := hex"15"; -CYR_.fita := hex"1d"; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr10.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr10.mf deleted file mode 100644 index e4d3f4c214a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is wncr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr5.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr5.mf deleted file mode 100644 index 45ef606df38..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr5.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is wncr5.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr6.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr6.mf deleted file mode 100644 index 0d89a230c73..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr6.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is wncr6.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr7.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr7.mf deleted file mode 100644 index 2a8520f5357..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr7.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is wncr7.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr8.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr8.mf deleted file mode 100644 index aa8b7bb32bd..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is wncr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr9.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr9.mf deleted file mode 100644 index 88fd6cd5680..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncr9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is wncr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncsl10.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wncsl10.mf deleted file mode 100644 index bcfac2c8dfe..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncsl10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is wncsl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncsl9.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wncsl9.mf deleted file mode 100644 index cab9f41bc07..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncsl9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is wncsl9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncslc9.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wncslc9.mf deleted file mode 100644 index a327ad049b0..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncslc9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is wncslc9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncti10.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wncti10.mf deleted file mode 100644 index 494535f2c69..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wncti10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is wncti10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnliker.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wnliker.mf deleted file mode 100644 index 54be45ccd61..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnliker.mf +++ /dev/null @@ -1,1543 +0,0 @@ -% This is wnliker.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -beginligtable - labelchar ([ASCII"["]); - setlig ([ASCII"["],CYR_.flqq); endligtable; - -beginligtable - labelchar ([ASCII"]"]); - setlig ([ASCII"]"],CYR_.frqq); endligtable; - -if not concrete: - beginligtable - labelchar (CYR_.D); - setlig([ASCII "1"],CYR_.DJE); - setlig([ASCII "2"],CYR_.DZHE); setlig([ASCII "3"],CYR_.LAT_S); - setlig([ASCII "J"],CYR_.DJE); setlig([ASCII "j"],CYR_.DJE); - endligtable; - - beginligtable - labelchar (CYR_.L); - setlig([ASCII "1"],CYR_.LJE); - setlig([ASCII "J"],CYR_.LJE); setlig([ASCII "j"],CYR_.LJE); - endligtable; -fi - -beginligtable - labelchar (CYR_.Z); - setlig([ASCII "1"],CYR_.ZH); - setlig([ASCII "H"],CYR_.ZH); setlig([ASCII "h"],CYR_.ZH); -endligtable; - -beginligtable - labelchar (CYR_.E); - setlig([ASCII "0"],CYR_.YO); - setlig([ASCII "1"],CYR_.EREV); setlig([ASCII "2"],CYR_.UKR_E); -endligtable; - -beginligtable - labelchar (CYR_.S); - setlig([ASCII "H"],CYR_.SH); setlig([ASCII "h"],CYR_.SH); -endligtable; - -beginligtable - labelchar (CYR_.C); - setlig([ASCII "1"],CYR_.TSHE); - setlig([ASCII "H"],CYR_.CH); setlig([ASCII "h"],CYR_.CH); -endligtable; - -if not TITLEfont: - - if SmallCapsfont: - - beginligtable - labelchar (CYR_.z); - setlig([ASCII "1"],CYR_.zh); setlig([ASCII "h"],CYR_.zh); - endligtable; - - beginligtable - labelchar (CYR_.e); - setlig([ASCII "0"],CYR_.yo); setlig([ASCII "1"],CYR_.erev); - setlig([ASCII "2"],CYR_.ukr_e); - endligtable; - - beginligtable - labelchar (CYR_.s); - setlig([ASCII "h"],CYR_.sh); - endligtable; - - beginligtable - labelchar (CYR_.c); - setlig([ASCII "1"],CYR_.tshe); setlig([ASCII "h"],CYR_.ch); - endligtable; - - else: - - beginligtable - labelchar (CYR_.z); - setlig([ASCII "1"],CYR_.zh); setlig([ASCII "h"],CYR_.zh); - endligtable; - - beginligtable - labelchar (CYR_.c); - setlig([ASCII "1"],CYR_.tshe); setlig([ASCII "h"],CYR_.ch); - endligtable; - - if ROMANfont: - - beginligtable - labelchar (CYR_.e); - setlig([ASCII "0"],CYR_.yo); setlig([ASCII "1"],CYR_.erev); - setlig([ASCII "2"],CYR_.ukr_e); - endligtable; - - else: - - beginligtable - labelchar (CYR_.k); setlig([ASCII "h"],CYR_.h); - endligtable; - - beginligtable - labelchar (CYR_.t); setlig([ASCII "s"],CYR_.c); - endligtable; - - fi - - fi - - if not concrete: - beginligtable - labelchar (CYR_.d); - setlig([ASCII "1"],CYR_.dje); setlig([ASCII "2"],CYR_.dzhe); - setlig([ASCII "3"],CYR_.lat_s); setlig([ASCII "j"],CYR_.dje); - endligtable; - - if ROMANfont: - beginligtable - labelchar (CYR_.l); - setlig([ASCII "1"],CYR_.lje); setlig([ASCII "j"],CYR_.lje); - endligtable; - fi - - fi - - - beginligtable - labelchar (CYR_.i); - setlig([ASCII "0"],CYR_.i_shrt); setlig([ASCII "1"],CYR_.lat_i); - endligtable; - - beginligtable - labelchar (CYR_.n); - setlig([ASCII "1"],CYR_.nje); setlig([ASCII "j"],CYR_.nje); - endligtable; - - beginligtable - labelchar (CYR_.lat_j); - setlig([ASCII "1"],CYR_.ya); setlig([ASCII "2"],CYR_.yu); - endligtable; - - beginligtable - labelchar ([ASCII "p"]); - setlig([ASCII "1"],CYR_.sftsn); setlig([ASCII "2"],CYR_.hrdsn); - endligtable; - - beginligtable - labelchar ([ASCII "7"]); - setlig([ASCII "h"],CYR_.shch); - endligtable; - - beginligtable - labelchar ([ASCII "x"]); - setlig([ASCII "q"],CYR_.shch); setlig([ASCII "c"],[ASCII "7"]); - endligtable; - - beginligtable - labelchar ([ASCII "y"]); - setlig([ASCII "a"],CYR_.ya); setlig([ASCII "u"],CYR_.yu); - endligtable; - -fi - -beginligtable - labelchar (CYR_.I); - setlig([ASCII "0"],CYR_.I_shrt); setlig([ASCII "1"],CYR_.LAT_I); -endligtable; - -beginligtable - labelchar (CYR_.N); - setlig([ASCII "0"],CYR_.No); setlig([ASCII "1"],CYR_.NJE); - setlig([ASCII "J"],CYR_.NJE); setlig([ASCII "j"],CYR_.NJE); -endligtable; - -beginligtable - labelchar (CYR_.LAT_J); - setlig([ASCII "1"],CYR_.YA); setlig([ASCII "2"],CYR_.YU); -endligtable; - -beginligtable - labelchar ([ASCII "P"]); - setlig([ASCII "1"],CYR_.SFTSN); setlig([ASCII "2"],CYR_.HRDSN); -endligtable; - -beginligtable - labelchar ([ASCII "6"]); - setlig([ASCII "h"],CYR_.SHCH); setlig([ASCII "H"],CYR_.SHCH); -endligtable; - -beginligtable - labelchar ([ASCII "X"]); - setlig([ASCII "Q"],CYR_.SHCH); setlig([ASCII "q"],CYR_.SHCH); - setlig([ASCII "C"],[ASCII "6"]); setlig([ASCII "c"],[ASCII "6"]); -endligtable; - -beginligtable - labelchar ([ASCII "Y"]); - setlig([ASCII "A"],CYR_.YA); setlig([ASCII "a"],CYR_.YA); - setlig([ASCII "U"],CYR_.YU); setlig([ASCII "u"],CYR_.YU); -endligtable; - - - -beginligtable - labelchar ( - CYR_.HRDSN - ,CYR_.SFTSN - ,CYR_.DJE - ,CYR_.LJE - ,CYR_.NJE - ,CYR_.YAT - ); - setkern [k#] ( - CYR_.ZH - ,CYR_.H - ); - labelchar ( - CYR_.A - if serifs: - fi - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.FITA - ,CYR_.S - ,CYR_.UKR_E - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.DJE - ,CYR_.TSHE - ,CYR_.YAT - ,CYR_.CH - ); - if serifs: - setkern [kk#] ( - CYR_.U - ); - setkern [kkk#] ( - CYR_.IZH - ); - else: - setkern [k#] ( - CYR_.U - ); - setkern [kk#] ( - CYR_.IZH - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.ch - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.dje - ,CYR_.tshe - ,CYR_.u - ); - setkern [kkk#] ( - CYR_.izh - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ); - setkern [kk#] ( - CYR_.ch - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.izh - ,CYR_.k - ,CYR_.n - ,CYR_.nje - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.yat - ,CYR_.lat_i - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ); - fi - fi - endligtable; - -if concrete: - - beginligtable - labelchar ( CYR_.D ); - setlig([ASCII "1"],CYR_.DJE); - setlig([ASCII "2"],CYR_.DZHE); setlig([ASCII "3"],CYR_.LAT_S); - setlig([ASCII "J"],CYR_.DJE); setlig([ASCII "j"],CYR_.DJE); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.FITA - ,CYR_.S - ,CYR_.UKR_E - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.DJE - ,CYR_.TSHE - ,CYR_.YAT - ,CYR_.CH - ); - if serifs: - setkern [kk#] ( - CYR_.U - ); - setkern [kkk#] ( - CYR_.IZH - ); - else: - setkern [k#] ( - CYR_.U - ); - setkern [kk#] ( - CYR_.IZH - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.ch - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.dje - ,CYR_.tshe - ,CYR_.u - ); - setkern [kkk#] ( - CYR_.izh - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.izh - ,CYR_.k - ,CYR_.n - ,CYR_.nje - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.yat - ,CYR_.lat_i - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ); - fi - fi - endligtable; - - - beginligtable - labelchar ( CYR_.L ); - setlig([ASCII "1"],CYR_.LJE); setlig([ASCII "J"],CYR_.LJE); - setlig([ASCII "j"],CYR_.LJE); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.FITA - ,CYR_.S - ,CYR_.UKR_E - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.DJE - ,CYR_.TSHE - ,CYR_.YAT - ,CYR_.CH - ); - if serifs: - setkern [kk#] ( - CYR_.U - ); - setkern [kkk#] ( - CYR_.IZH - ); - else: - setkern [k#] ( - CYR_.U - ); - setkern [kk#] ( - CYR_.IZH - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.ch - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.dje - ,CYR_.tshe - ,CYR_.u - ); - setkern [kkk#] ( - CYR_.izh - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.izh - ,CYR_.k - ,CYR_.n - ,CYR_.nje - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.yat - ,CYR_.lat_i - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ); - fi - fi - endligtable; - -fi - -beginligtable - labelchar ( CYR_.K ); - setlig([ASCII "H"],CYR_.H); setlig([ASCII "h"],CYR_.H); - labelchar ( - CYR_.ZH - ,CYR_.H - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.FITA - ,CYR_.S - ,CYR_.UKR_E - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ); - else: - setkern [k#] ( - CYR_.ch - ); - if ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ); - fi - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.O - ,CYR_.F - ,CYR_.FITA - ,CYR_.YU - ,CYR_.EREV - ); - setkern [k#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - ,CYR_.ZH - ,CYR_.H - ,CYR_.U - ,CYR_.IZH - if serifs: - ,CYR_.YA - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - fi - ,CYR_.zh - ,CYR_.h - ,CYR_.u - ,CYR_.izh - if serifs: - ,CYR_.ya - fi - ); - elseif ROMANfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( CYR_.T ); - setlig([ASCII "S"],CYR_.C); setlig([ASCII "s"],CYR_.C); - labelchar ( - CYR_.G - ); - setkern [kk#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - fi - ); - if not concrete: - if serifs: - setkern [k#] ( - CYR_.L - ,CYR_.LJE - ); - else: - setkern [-u#] ( - CYR_.L - ,CYR_.LJE - ); - fi - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - fi - ,CYR_.zh - ,CYR_.h - ,CYR_.u - ,CYR_.izh - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.fita - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.f - ); - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [kk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.izh - ,CYR_.hrdsn - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.IZH - ); - if serifs: - setkern [kkk#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - fi - ,CYR_.YA - ); - else: - setkern [kk#] ( - CYR_.A - ); - setkern [-u#] ( - CYR_.D - ,CYR_.L - ,CYR_.LJE - ); - fi - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.FITA - ,CYR_.S - ,CYR_.UKR_E - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - fi - if serifs: - ,CYR_.ya - fi - ); - setkern [kk#] ( - if concrete: - CYR_.d - ,CYR_.l - ,CYR_.lje - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ); - else: - if serifs: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.fita - ,CYR_.e - ,CYR_.yo - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.fita - ,CYR_.e - ,CYR_.yo - ); - fi - if ROMANfont: - if serifs: - setkern [kkk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - fi - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.izh - ,CYR_.hrdsn - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.U - ); - if serifs: - setkern [kk#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - fi - ,CYR_.YA - ); - if not concrete: - setkern [-u#] ( - CYR_.D - ,CYR_.L - ,CYR_.LJE - ); - fi - else: - setkern [k#] ( - CYR_.A - ); - setkern [-u#] ( - CYR_.D - ,CYR_.L - ,CYR_.LJE - ); - fi - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.FITA - ,CYR_.S - ,CYR_.UKR_E - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - fi - if serifs: - ,CYR_.ya - fi - ); - setkern [kk#] ( - if concrete: - CYR_.d - ,CYR_.l - ,CYR_.lje - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ); - else: - if serifs: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.fita - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.ukr_e - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.fita - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.ukr_e - ); - fi - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.izh - ,CYR_.hrdsn - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.R - ); - setkern [kk#] ( - CYR_.A - ,CYR_.D - ,CYR_.L - ,CYR_.LJE - if serifs: - ,CYR_.YA - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - fi - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.fita - ,CYR_.e - ,CYR_.yo - ); - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ); - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.LAT_I - ); - setkern [-k#] ( - CYR_.LAT_I - ); - endligtable; - -if TITLEfont: endinput \\ fi; - -if SmallCapsfont: - - u#:=lower.u#; - k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; - - - - beginligtable - labelchar ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - ,CYR_.dje - fi - ,CYR_.lje - ,CYR_.nje - ,CYR_.yat - if SmallCapsfont: - fi - if SmallCapsfont: - fi - if serifs: - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.dje - ,CYR_.tshe - ,CYR_.ch - ); - setkern [kk#] ( - CYR_.u - ); - setkern [kkk#] ( - CYR_.izh - ); - endligtable; - - if concrete: - - - beginligtable - labelchar ( CYR_.d ); - setlig([ASCII "1"],CYR_.dje); setlig([ASCII "2"],CYR_.dzhe); - setlig([ASCII "3"],CYR_.lat_s); setlig([ASCII "j"],CYR_.dje); - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.dje - ,CYR_.tshe - ,CYR_.ch - ); - setkern [kk#] ( - CYR_.u - ); - setkern [kkk#] ( - CYR_.izh - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setlig([ASCII "1"],CYR_.lje); setlig([ASCII "j"],CYR_.lje); - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.dje - ,CYR_.tshe - ,CYR_.ch - ); - setkern [kk#] ( - CYR_.u - ); - setkern [kkk#] ( - CYR_.izh - ); - endligtable; - - fi - - - beginligtable - labelchar ( CYR_.k ); - setlig([ASCII "h"],CYR_.h); - labelchar ( - CYR_.zh - ,CYR_.h - ); - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.b - ,CYR_.yu - ,CYR_.erev - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.zh - ,CYR_.h - ,CYR_.u - ,CYR_.izh - if serifs: - ,CYR_.ya - fi - ); - endligtable; - - - beginligtable - labelchar ( CYR_.t ); - setlig([ASCII "s"],CYR_.C); - labelchar ( - CYR_.g - ,CYR_.r - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.lje - if serifs: - ,CYR_.ya - fi - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.lje - if serifs: - ,CYR_.ya - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.izh - ); - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if serifs: - ,CYR_.ya - fi - ); - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ); - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.s - ,CYR_.ukr_e - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.lat_i - ); - setkern [-k#] ( - CYR_.lat_i - ); - endligtable; - -else: - - if ROMANfont: - - - beginligtable - labelchar ( - CYR_.a - ); - setkern [k#] ( - CYR_.ch - ,CYR_.u - if serifs: - ,CYR_.izh - fi - ); - endligtable; - - if concrete: - - beginligtable - labelchar ( CYR_.d ); - setlig([ASCII "1"],CYR_.dje); setlig([ASCII "2"],CYR_.dzhe); - setlig([ASCII "3"],CYR_.lat_s); setlig([ASCII "j"],CYR_.dje); - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.ch - ,CYR_.u - ,CYR_.izh - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setlig([ASCII "1"],CYR_.lje); setlig([ASCII "j"],CYR_.lje); - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.ch - ,CYR_.u - ,CYR_.izh - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ); - endligtable; - - fi - - beginligtable - labelchar ( CYR_.t ); - setlig([ASCII "s"],CYR_.c); - labelchar ( - CYR_.g - if kapitel: - ,CYR_.r - fi - ); - if serifs: - setkern [k#] ( - CYR_.a - ); - fi - setkern [k#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - if kapitel: - ,CYR_.a - fi - ,CYR_.ya - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - - beginligtable - labelchar ( CYR_.k ); - setlig([ASCII "h"],CYR_.h); - labelchar ( - CYR_.zh - ,CYR_.h - ); - setkern [k#] ( - CYR_.a - ); - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.e - ,CYR_.yo - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ,CYR_.izh - ); - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.fita - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.e - ,CYR_.yo - ,CYR_.ya - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ); - setkern [-u#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - else: - - - beginligtable - labelchar ( CYR_.e ); - setlig([ASCII "0"],CYR_.yo); setlig([ASCII "1"],CYR_.erev); -setlig([ASCII "2"],CYR_.ukr_e); - labelchar ( - CYR_.yo - ); - setkern [-u#] ( - CYR_.f - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.izh - ); - setkern [kk#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setlig([ASCII "1"],CYR_.lje); setlig([ASCII "j"],CYR_.lje); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.izh - ,CYR_.hrdsn - ); - setkern [kk#] ( - CYR_.ch - ); - endligtable; - - fi - - - beginligtable - labelchar ( - CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - ,CYR_.dje - fi - ,CYR_.lje - ,CYR_.nje - ,CYR_.yat - if SmallCapsfont: - fi - if SmallCapsfont: - fi - if kapitel: - ,CYR_.a - fi - ); - if ROMANfont: - setkern [-u#] ( - CYR_.u - ,CYR_.izh - ); - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ); - if concrete: - setkern [k#] ( - CYR_.d - ,CYR_.l - ); - fi - else: - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.izh - ,CYR_.hrdsn - ); - fi - setkern [kk#] ( - CYR_.ch - ); - setkern [k#] ( - CYR_.o - ,CYR_.fita - ,CYR_.f - ,CYR_.ukr_e - ); - endligtable; - - - beginligtable - labelchar ( CYR_.s ); - setlig([ASCII "h"],CYR_.sh); - labelchar ( - CYR_.o - ,CYR_.fita - ,CYR_.b - ,CYR_.yu - ,CYR_.r - ,CYR_.f - ,CYR_.erev - ); - if ROMANfont: - setkern [k#] ( - CYR_.d - ,CYR_.zh - ,CYR_.h - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [-u#] ( - CYR_.f - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ); - fi - endligtable; - -fi diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnsltl10.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wnsltl10.mf deleted file mode 100644 index c768eec4a0c..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wnsltl10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is wnsltl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-ot2/wntl10.mf b/Master/texmf-dist/fonts/source/lh/lh-ot2/wntl10.mf deleted file mode 100644 index 37246ec44c9..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-ot2/wntl10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is wntl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/ilalb8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/ilalb8.mf deleted file mode 100644 index 676f5d84965..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/ilalb8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilalb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/ilali8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/ilali8.mf deleted file mode 100644 index f74a709c37e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/ilali8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilali8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/ilalo8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/ilalo8.mf deleted file mode 100644 index f0a33eb5d14..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/ilalo8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilalo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/ilalq8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/ilalq8.mf deleted file mode 100644 index e77dbb14d31..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/ilalq8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilalq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/ilaltt8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/ilaltt8.mf deleted file mode 100644 index 65a7ed7fdcc..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/ilaltt8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilaltt8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labbx10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labbx10.mf deleted file mode 100644 index 38ee6d17ab9..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labbx10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labbx10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmo10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labmo10.mf deleted file mode 100644 index f518f6ccb19..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmo10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labmo10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmo17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labmo17.mf deleted file mode 100644 index 0250c415437..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmo17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labmo17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmo8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labmo8.mf deleted file mode 100644 index 523404f68d0..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmo8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labmo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmo9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labmo9.mf deleted file mode 100644 index e6ce8b20c85..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmo9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labmo9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmr10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labmr10.mf deleted file mode 100644 index 08155f26ad9..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmr10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labmr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmr17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labmr17.mf deleted file mode 100644 index 4202b450199..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmr17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labmr17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmr8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labmr8.mf deleted file mode 100644 index 8cb0ac9da8f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmr8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labmr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmr9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labmr9.mf deleted file mode 100644 index 67de25168d5..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labmr9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labmr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labso10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labso10.mf deleted file mode 100644 index f18f4d3abd8..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labso10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labso10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labso17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labso17.mf deleted file mode 100644 index 658a6d2a23f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labso17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labso17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labso8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labso8.mf deleted file mode 100644 index 109b8584c0c..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labso8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labso8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labso9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labso9.mf deleted file mode 100644 index bce07add583..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labso9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labso9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labsr10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labsr10.mf deleted file mode 100644 index 8086929b025..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labsr10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labsr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labsr17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labsr17.mf deleted file mode 100644 index 7221224a068..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labsr17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labsr17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labsr8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labsr8.mf deleted file mode 100644 index bd1362e9b49..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labsr8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labsr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labsr9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labsr9.mf deleted file mode 100644 index c460b1629bb..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labsr9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labsr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labtl10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labtl10.mf deleted file mode 100644 index 1721459c433..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labtl10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labtl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input exbase; def cmbright=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/labto10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/labto10.mf deleted file mode 100644 index e297aa8ab2e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/labto10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is labto10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input exbase; def cmbright=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/lacodes.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/lacodes.mf deleted file mode 100644 index 1d1c51aa000..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/lacodes.mf +++ /dev/null @@ -1,158 +0,0 @@ -% This is lacodes.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -CYR_.A := hex"c0"; -CYR_.a := hex"e0"; -CYR_.B := hex"c1"; -CYR_.b := hex"e1"; -CYR_.V := hex"c2"; -CYR_.v := hex"e2"; -CYR_.G := hex"c3"; -CYR_.g := hex"e3"; -CYR_.D := hex"c4"; -CYR_.d := hex"e4"; -CYR_.E := hex"c5"; -CYR_.e := hex"e5"; -CYR_.ZH := hex"c6"; -CYR_.zh := hex"e6"; -CYR_.Z := hex"c7"; -CYR_.z := hex"e7"; -CYR_.I := hex"c8"; -CYR_.i := hex"e8"; -CYR_.I_shrt := hex"c9"; -CYR_.i_shrt := hex"e9"; -CYR_.K := hex"ca"; -CYR_.k := hex"ea"; -CYR_.L := hex"cb"; -CYR_.l := hex"eb"; -CYR_.M := hex"cc"; -CYR_.m := hex"ec"; -CYR_.N := hex"cd"; -CYR_.n := hex"ed"; -CYR_.O := hex"ce"; -CYR_.o := hex"ee"; -CYR_.P := hex"cf"; -CYR_.p := hex"ef"; -CYR_.R := hex"d0"; -CYR_.r := hex"f0"; -CYR_.S := hex"d1"; -CYR_.s := hex"f1"; -CYR_.T := hex"d2"; -CYR_.t := hex"f2"; -CYR_.U := hex"d3"; -CYR_.u := hex"f3"; -CYR_.F := hex"d4"; -CYR_.f := hex"f4"; -CYR_.H := hex"d5"; -CYR_.h := hex"f5"; -CYR_.C := hex"d6"; -CYR_.c := hex"f6"; -CYR_.CH := hex"d7"; -CYR_.ch := hex"f7"; -CYR_.SH := hex"d8"; -CYR_.sh := hex"f8"; -CYR_.SHCH := hex"d9"; -CYR_.shch := hex"f9"; -CYR_.HRDSN := hex"da"; -CYR_.hrdsn := hex"fa"; -CYR_.ERY := hex"db"; -CYR_.ery := hex"fb"; -CYR_.SFTSN := hex"dc"; -CYR_.sftsn := hex"fc"; -CYR_.EREV := hex"dd"; -CYR_.erev := hex"fd"; -CYR_.YU := hex"de"; -CYR_.yu := hex"fe"; -CYR_.YA := hex"df"; -CYR_.ya := hex"ff"; -CYR_.YO := hex"9c"; -CYR_.yo := hex"bc"; -CYR_.AE := hex"8c"; -CYR_.ae := hex"ac"; -CYR_.DJE := hex"82"; -CYR_.dje := hex"a2"; -CYR_.TSHE := hex"83"; -CYR_.tshe := hex"a3"; -CYR_.K_vcrs := hex"8b"; -CYR_.k_vcrs := hex"ab"; -CYR_.LJE := hex"87"; -CYR_.lje := hex"a7"; -CYR_.NJE := hex"9b"; -CYR_.nje := hex"bb"; -CYR_.LAT_S := hex"8f"; -CYR_.lat_s := hex"af"; -CYR_.DZHE := hex"96"; -CYR_.dzhe := hex"b6"; -CYR_.CH_vcrs := hex"97"; -CYR_.ch_vcrs := hex"b7"; -CYR_.G_up := hex"80"; -CYR_.g_up := hex"a0"; -CYR_.G_hcrs := hex"81"; -CYR_.g_hcrs := hex"a1"; -CYR_.SHHA := hex"84"; -CYR_.shha := hex"a4"; -CYR_.ZH_dsc := hex"85"; -CYR_.zh_dsc := hex"a5"; -CYR_.Z_dsc := hex"86"; -CYR_.z_dsc := hex"a6"; -CYR_.UKR_I := hex"88"; -CYR_.ukr_i := hex"a8"; -CYR_.K_dsc := hex"89"; -CYR_.k_dsc := hex"a9"; -CYR_.K_beak := hex"8a"; -CYR_.k_beak := hex"aa"; -CYR_.N_dsc := hex"8d"; -CYR_.n_dsc := hex"ad"; -CYR_.NG := hex"8e"; -CYR_.ng := hex"ae"; -CYR_.OTLD := hex"90"; -CYR_.otld := hex"b0"; -CYR_.S_dsc := hex"91"; -CYR_.s_dsc := hex"b1"; -CYR_.U_shrt := hex"92"; -CYR_.u_shrt := hex"b2"; -CYR_.Y := hex"93"; -CYR_.y := hex"b3"; -CYR_.Y_hcrs := hex"94"; -CYR_.y_hcrs := hex"b4"; -CYR_.H_dsc := hex"95"; -CYR_.h_dsc := hex"b5"; -CYR_.CH_rdsc := hex"98"; -CYR_.ch_rdsc := hex"b8"; -CYR_.UKR_E := hex"99"; -CYR_.ukr_e := hex"b9"; -CYR_.SCHWA := hex"9a"; -CYR_.schwa := hex"ba"; -CYR_.Agrave := hex"00"; -CYR_.Aacute := hex"01"; -CYR_.Ahat := hex"02"; -CYR_.Atilde := hex"03"; -CYR_.Aumlaut := hex"04"; -CYR_.Aacute_dbl := hex"05"; -CYR_.Aring := hex"06"; -CYR_.Ahachek := hex"07"; -CYR_.Abreve := hex"08"; -CYR_.Abar := hex"09"; -CYR_.Adot := hex"0a"; -CYR_.Acedilla := hex"0b"; -CYR_.Aogonek := hex"0c"; -CYR_.palochka := hex"0d"; -CYR_.angle_left := hex"0e"; -CYR_.angle_right := hex"0f"; -CYR_.Afrown := hex"12"; -CYR_.Agrave_dbl := hex"13"; -CYR_.Acyrbreve := hex"14"; -CYR_.dash := hex"16"; -CYR_.wordmark := hex"17"; -CYR_.pmzero := hex"18"; -CYR_.i_dotl := hex"19"; -CYR_.j_dotl := hex"1a"; -CYR_.dbl_quotes := hex"22"; -CYR_.No := hex"9d"; -CYR_.currency := hex"9e"; -CYR_.section := hex"9f"; -CYR_.baseqq := hex"bd"; -CYR_.flqq := hex"be"; -CYR_.frqq := hex"bf"; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/lalb8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/lalb8.mf deleted file mode 100644 index c156bf0cb00..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/lalb8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lalb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/lali8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/lali8.mf deleted file mode 100644 index 0b56c2dc294..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/lali8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lali8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laliker.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laliker.mf deleted file mode 100644 index 5f25c8d1103..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laliker.mf +++ /dev/null @@ -1,1616 +0,0 @@ -% This is laliker.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - - -beginligtable - labelchar ( - CYR_.HRDSN - ,CYR_.SFTSN - ,CYR_.DJE - ,CYR_.LJE - ,CYR_.NJE - ,CYR_.SHHA - ); - setkern [k#] ( - CYR_.ZH - ,CYR_.ZH_dsc - ,CYR_.H - ,CYR_.H_dsc - ); - labelchar ( - CYR_.A - if serifs: - fi - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.DJE - ,CYR_.TSHE - ,CYR_.K_beak - ,CYR_.CH - ,CYR_.CH_rdsc - ,CYR_.CH_vcrs - ,CYR_.Y - ,CYR_.Y_hcrs - ); - if serifs: - setkern [kk#] ( - CYR_.U - ,CYR_.U_shrt - ); - else: - setkern [k#] ( - CYR_.U - ,CYR_.U_shrt - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.dje - ,CYR_.tshe - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.k - ,CYR_.k_dsc - ,CYR_.k_vcrs - ,CYR_.n - ,CYR_.nje - ,CYR_.n_dsc - ,CYR_.ng - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.ukr_i - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ); - fi - fi - endligtable; - -if concrete: - - beginligtable - labelchar ( CYR_.D ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.DJE - ,CYR_.TSHE - ,CYR_.K_beak - ,CYR_.CH - ,CYR_.CH_rdsc - ,CYR_.CH_vcrs - ,CYR_.Y - ,CYR_.Y_hcrs - ); - if serifs: - setkern [kk#] ( - CYR_.U - ,CYR_.U_shrt - ); - else: - setkern [k#] ( - CYR_.U - ,CYR_.U_shrt - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.dje - ,CYR_.tshe - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.k - ,CYR_.k_dsc - ,CYR_.k_vcrs - ,CYR_.n - ,CYR_.nje - ,CYR_.n_dsc - ,CYR_.ng - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.ukr_i - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ); - fi - fi - endligtable; - - - beginligtable - labelchar ( CYR_.L ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.DJE - ,CYR_.TSHE - ,CYR_.K_beak - ,CYR_.CH - ,CYR_.CH_rdsc - ,CYR_.CH_vcrs - ,CYR_.Y - ,CYR_.Y_hcrs - ); - if serifs: - setkern [kk#] ( - CYR_.U - ,CYR_.U_shrt - ); - else: - setkern [k#] ( - CYR_.U - ,CYR_.U_shrt - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.dje - ,CYR_.tshe - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.k - ,CYR_.k_dsc - ,CYR_.k_vcrs - ,CYR_.n - ,CYR_.nje - ,CYR_.n_dsc - ,CYR_.ng - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.ukr_i - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ); - fi - fi - endligtable; - -fi - -beginligtable - labelchar ( CYR_.K ); - labelchar ( - CYR_.K_dsc - ,CYR_.K_vcrs - ,CYR_.K_beak - ,CYR_.ZH - ,CYR_.ZH_dsc - ,CYR_.H - ,CYR_.H_dsc - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ); - else: - setkern [k#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - if ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ); - fi - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.YU - ,CYR_.EREV - ,CYR_.SCHWA - ); - setkern [k#] ( - CYR_.A - ,CYR_.AE - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - ,CYR_.ZH - ,CYR_.ZH_dsc - ,CYR_.H - ,CYR_.H_dsc - ,CYR_.Y - ,CYR_.Y_hcrs - ,CYR_.U - ,CYR_.U_shrt - if serifs: - ,CYR_.YA - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - fi - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - if serifs: - ,CYR_.ya - fi - ); - elseif ROMANfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( CYR_.T ); - labelchar ( - CYR_.G - ,CYR_.G_hcrs - ,CYR_.NG - ); - setkern [kk#] ( - CYR_.A - ,CYR_.AE - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - fi - ); - if not concrete: - if serifs: - setkern [k#] ( - CYR_.L - ,CYR_.LJE - ); - else: - setkern [-u#] ( - CYR_.L - ,CYR_.LJE - ); - fi - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - fi - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.f - ); - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - else: - setkern [kk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.G_up - ); - setkern [kk#] ( - CYR_.A - ,CYR_.AE - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - fi - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ); - if not concrete: - if serifs: - setkern [k#] ( - CYR_.L - ,CYR_.LJE - ); - else: - setkern [-u#] ( - CYR_.L - ,CYR_.LJE - ); - fi - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - fi - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.f - ); - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.Y - ,CYR_.Y_hcrs - ); - setkern [kk#] ( - CYR_.A - ,CYR_.AE - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - fi - ); - if not concrete: - setkern [-u#] ( - CYR_.L - ,CYR_.LJE - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - fi - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.e - ,CYR_.yo - ); - if ROMANfont: - if serifs: - setkern [kkk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - else: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - fi - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.U - ,CYR_.U_shrt - ); - if serifs: - setkern [kk#] ( - CYR_.A - ,CYR_.AE - if concrete: - ,CYR_.D - ,CYR_.L - fi - ,CYR_.YA - ); - if not concrete: - setkern [-u#] ( - CYR_.D - ,CYR_.L - ,CYR_.LJE - ); - fi - else: - setkern [k#] ( - CYR_.A - ,CYR_.AE - ); - setkern [-u#] ( - CYR_.D - ,CYR_.L - ,CYR_.LJE - ); - fi - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - fi - if serifs: - ,CYR_.ya - fi - ); - setkern [kk#] ( - if concrete: - CYR_.d - ,CYR_.l - ,CYR_.lje - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ); - else: - if serifs: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ); - fi - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.R - ); - setkern [kk#] ( - CYR_.A - ,CYR_.AE - ,CYR_.D - ,CYR_.L - ,CYR_.LJE - if serifs: - ,CYR_.YA - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - fi - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.e - ,CYR_.yo - ); - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ); - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.UKR_I - ); - setkern [-k#] ( - CYR_.UKR_I - ); - endligtable; - -if TITLEfont: endinput \\ fi; - -if SmallCapsfont: - - u#:=lower.u#; - k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; - - - - beginligtable - labelchar ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - ,CYR_.dje - fi - ,CYR_.lje - ,CYR_.nje - if SmallCapsfont: - ,CYR_.shha - fi - if SmallCapsfont: - fi - if serifs: - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.dje - ,CYR_.tshe - ,CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [kk#] ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - endligtable; - - if concrete: - - - beginligtable - labelchar ( CYR_.d ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.dje - ,CYR_.tshe - ,CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [kk#] ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.dje - ,CYR_.tshe - ,CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [kk#] ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - endligtable; - - fi - - - beginligtable - labelchar ( CYR_.k ); - labelchar ( - CYR_.k_dsc - ,CYR_.k_vcrs - ,CYR_.k_beak - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.b - ,CYR_.yu - ,CYR_.erev - ,CYR_.schwa - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - if serifs: - ,CYR_.ya - fi - ); - endligtable; - - - beginligtable - labelchar ( CYR_.t ); - labelchar ( - CYR_.g - ,CYR_.g_up - ,CYR_.g_hcrs - ,CYR_.ng - ,CYR_.r - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.lje - if serifs: - ,CYR_.ya - fi - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.lje - if serifs: - ,CYR_.ya - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.ukr_i - ); - setkern [-k#] ( - CYR_.ukr_i - ); - endligtable; - -else: - - if ROMANfont: - - - beginligtable - labelchar ( - CYR_.a - ); - setkern [k#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - if serifs: - fi - ); - endligtable; - - if concrete: - - beginligtable - labelchar ( CYR_.d ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - endligtable; - - fi - - beginligtable - labelchar ( CYR_.t ); - labelchar ( - CYR_.g - ,CYR_.g_up - ,CYR_.g_hcrs - ,CYR_.ng - if kapitel: - ,CYR_.r - fi - ); - if serifs: - setkern [k#] ( - CYR_.a - ); - fi - setkern [k#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ,CYR_.ya - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - - beginligtable - labelchar ( CYR_.k ); - labelchar ( - CYR_.k_dsc - ,CYR_.k_vcrs - ,CYR_.k_beak - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ); - setkern [k#] ( - CYR_.a - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.e - ,CYR_.yo - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.ukr_i - ); - setkern [-kk#] ( - CYR_.ukr_i - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.e - ,CYR_.yo - ,CYR_.ya - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ); - setkern [-u#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - else: - - - beginligtable - labelchar ( CYR_.e ); - labelchar ( - CYR_.yo - ); - setkern [-u#] ( - CYR_.f - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.g_up - ); - setkern [kkk#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.y - ,CYR_.y_hcrs - ); - setkern [kk#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.ukr_i - ); - setkern [-k#] ( - CYR_.dje - ,CYR_.tshe - ); - setkern [-k#] ( - CYR_.ukr_i - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.hrdsn - ,CYR_.k_beak - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - endligtable; - - fi - - - beginligtable - labelchar ( - CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - ,CYR_.dje - fi - ,CYR_.lje - ,CYR_.nje - if SmallCapsfont: - ,CYR_.shha - fi - if SmallCapsfont: - fi - if kapitel: - ,CYR_.a - fi - ); - if ROMANfont: - setkern [-u#] ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.k_beak - ); - if concrete: - setkern [k#] ( - CYR_.d - ,CYR_.l - ); - fi - else: - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.hrdsn - ,CYR_.k_beak - ); - fi - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s_dsc - ,CYR_.ukr_e - ); - endligtable; - - - beginligtable - labelchar ( CYR_.s ); - labelchar ( - CYR_.o - ,CYR_.otld - ,CYR_.b - ,CYR_.yu - ,CYR_.r - ,CYR_.f - ,CYR_.erev - ,CYR_.schwa - ); - if ROMANfont: - setkern [k#] ( - CYR_.d - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - else: - setkern [-u#] ( - CYR_.f - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ); - fi - endligtable; - -fi diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/lalo8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/lalo8.mf deleted file mode 100644 index 13707f618c7..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/lalo8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lalo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/lalq8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/lalq8.mf deleted file mode 100644 index 7bf55dbd983..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/lalq8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lalq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laltt8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laltt8.mf deleted file mode 100644 index dae607c70ad..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laltt8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is laltt8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laocc10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laocc10.mf deleted file mode 100644 index db3c8473622..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laocc10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laocc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm10.mf deleted file mode 100644 index bb385a8f86d..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laorm10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm5.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm5.mf deleted file mode 100644 index 6286ab88cd5..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm5.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laorm5.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm6.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm6.mf deleted file mode 100644 index fd46f35f176..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm6.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laorm6.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm7.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm7.mf deleted file mode 100644 index 6d52cd3443f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm7.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laorm7.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm8.mf deleted file mode 100644 index e1e6c87bbdf..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laorm8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm9.mf deleted file mode 100644 index e5317c4a2b8..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laorm9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laorm9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl10.mf deleted file mode 100644 index a47e2b1e713..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laosl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl5.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl5.mf deleted file mode 100644 index 23f08722727..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl5.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laosl5.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl6.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl6.mf deleted file mode 100644 index 20c358dfc34..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl6.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laosl6.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl7.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl7.mf deleted file mode 100644 index c14dfe9d591..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl7.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laosl7.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl8.mf deleted file mode 100644 index 519a569598e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laosl8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl9.mf deleted file mode 100644 index 535786bbf43..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laosl9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laosl9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laoti10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laoti10.mf deleted file mode 100644 index afb67644de2..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laoti10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is laoti10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/laqi8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/laqi8.mf deleted file mode 100644 index 0af5309ff89..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/laqi8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is laqi8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/lasq8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/lasq8.mf deleted file mode 100644 index 92addce05a7..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/lasq8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lasq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2a/lassdc10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2a/lassdc10.mf deleted file mode 100644 index 119328dc6cb..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2a/lassdc10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lassdc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/ilblb8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/ilblb8.mf deleted file mode 100644 index da4b4fbcdca..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/ilblb8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilblb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/ilbli8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/ilbli8.mf deleted file mode 100644 index 57f7648bfb2..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/ilbli8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilbli8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/ilblo8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/ilblo8.mf deleted file mode 100644 index 0ed44ba97fb..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/ilblo8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilblo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/ilblq8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/ilblq8.mf deleted file mode 100644 index 0951fe56119..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/ilblq8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilblq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/ilbltt8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/ilbltt8.mf deleted file mode 100644 index 559f31b8250..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/ilbltt8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilbltt8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbbx10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbbx10.mf deleted file mode 100644 index e63fd32a245..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbbx10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbbx10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo10.mf deleted file mode 100644 index f60ad1e8678..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbmo10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo17.mf deleted file mode 100644 index b9ce7efbc6f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbmo17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo8.mf deleted file mode 100644 index 01979cb6454..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbmo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo9.mf deleted file mode 100644 index 8baed6acd8d..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbmo9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr10.mf deleted file mode 100644 index 7d6029cffc5..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbmr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr17.mf deleted file mode 100644 index aab3bc5437d..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbmr17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr8.mf deleted file mode 100644 index 6d7ddcccd06..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbmr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr9.mf deleted file mode 100644 index cb476351cf7..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbmr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso10.mf deleted file mode 100644 index b65b27bd7e3..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbso10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso17.mf deleted file mode 100644 index 7bfc0c7dba8..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbso17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso8.mf deleted file mode 100644 index 7014fdc6639..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbso8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso9.mf deleted file mode 100644 index 5cc76798375..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbso9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr10.mf deleted file mode 100644 index eded8b2eb2b..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbsr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr17.mf deleted file mode 100644 index 5e17bd8098b..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbsr17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr8.mf deleted file mode 100644 index 3586001a309..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbsr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr9.mf deleted file mode 100644 index 455f3d2ee32..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbsr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbtl10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbtl10.mf deleted file mode 100644 index 281f455b9f4..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbtl10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbtl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input exbase; def cmbright=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbto10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbto10.mf deleted file mode 100644 index 008c328d7c5..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbbto10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbbto10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input exbase; def cmbright=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbcodes.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbcodes.mf deleted file mode 100644 index 97a5025df75..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbcodes.mf +++ /dev/null @@ -1,158 +0,0 @@ -% This is lbcodes.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -CYR_.A := hex"c0"; -CYR_.a := hex"e0"; -CYR_.B := hex"c1"; -CYR_.b := hex"e1"; -CYR_.V := hex"c2"; -CYR_.v := hex"e2"; -CYR_.G := hex"c3"; -CYR_.g := hex"e3"; -CYR_.D := hex"c4"; -CYR_.d := hex"e4"; -CYR_.E := hex"c5"; -CYR_.e := hex"e5"; -CYR_.ZH := hex"c6"; -CYR_.zh := hex"e6"; -CYR_.Z := hex"c7"; -CYR_.z := hex"e7"; -CYR_.I := hex"c8"; -CYR_.i := hex"e8"; -CYR_.I_shrt := hex"c9"; -CYR_.i_shrt := hex"e9"; -CYR_.K := hex"ca"; -CYR_.k := hex"ea"; -CYR_.L := hex"cb"; -CYR_.l := hex"eb"; -CYR_.M := hex"cc"; -CYR_.m := hex"ec"; -CYR_.N := hex"cd"; -CYR_.n := hex"ed"; -CYR_.O := hex"ce"; -CYR_.o := hex"ee"; -CYR_.P := hex"cf"; -CYR_.p := hex"ef"; -CYR_.R := hex"d0"; -CYR_.r := hex"f0"; -CYR_.S := hex"d1"; -CYR_.s := hex"f1"; -CYR_.T := hex"d2"; -CYR_.t := hex"f2"; -CYR_.U := hex"d3"; -CYR_.u := hex"f3"; -CYR_.F := hex"d4"; -CYR_.f := hex"f4"; -CYR_.H := hex"d5"; -CYR_.h := hex"f5"; -CYR_.C := hex"d6"; -CYR_.c := hex"f6"; -CYR_.CH := hex"d7"; -CYR_.ch := hex"f7"; -CYR_.SH := hex"d8"; -CYR_.sh := hex"f8"; -CYR_.SHCH := hex"d9"; -CYR_.shch := hex"f9"; -CYR_.HRDSN := hex"da"; -CYR_.hrdsn := hex"fa"; -CYR_.ERY := hex"db"; -CYR_.ery := hex"fb"; -CYR_.SFTSN := hex"dc"; -CYR_.sftsn := hex"fc"; -CYR_.EREV := hex"dd"; -CYR_.erev := hex"fd"; -CYR_.YU := hex"de"; -CYR_.yu := hex"fe"; -CYR_.YA := hex"df"; -CYR_.ya := hex"ff"; -CYR_.YO := hex"9c"; -CYR_.yo := hex"bc"; -CYR_.L_dsc := hex"8a"; -CYR_.l_dsc := hex"aa"; -CYR_.LJE := hex"88"; -CYR_.lje := hex"a8"; -CYR_.NJE := hex"99"; -CYR_.nje := hex"b9"; -CYR_.DELTA := hex"86"; -CYR_.delta := hex"a6"; -CYR_.S_acrs := hex"91"; -CYR_.s_acrs := hex"b1"; -CYR_.G_crsdsc := hex"80"; -CYR_.g_crsdsc := hex"a0"; -CYR_.H_hcrs := hex"94"; -CYR_.h_hcrs := hex"b4"; -CYR_.G_hcrs := hex"81"; -CYR_.g_hcrs := hex"a1"; -CYR_.G_dsc := hex"82"; -CYR_.g_dsc := hex"a2"; -CYR_.G_tl := hex"83"; -CYR_.g_tl := hex"a3"; -CYR_.SHHA := hex"84"; -CYR_.shha := hex"a4"; -CYR_.ZH_dsc := hex"85"; -CYR_.zh_dsc := hex"a5"; -CYR_.ABH_DZE := hex"87"; -CYR_.abh_dze := hex"a7"; -CYR_.K_dsc := hex"89"; -CYR_.k_dsc := hex"a9"; -CYR_.K_tl := hex"8b"; -CYR_.k_tl := hex"ab"; -CYR_.L_tl := hex"8c"; -CYR_.l_tl := hex"ac"; -CYR_.N_dsc := hex"8d"; -CYR_.n_dsc := hex"ad"; -CYR_.NG := hex"8e"; -CYR_.ng := hex"ae"; -CYR_.N_tl := hex"8f"; -CYR_.n_tl := hex"af"; -CYR_.OTLD := hex"90"; -CYR_.otld := hex"b0"; -CYR_.U_shrt := hex"92"; -CYR_.u_shrt := hex"b2"; -CYR_.Y := hex"93"; -CYR_.y := hex"b3"; -CYR_.H_dsc := hex"95"; -CYR_.h_dsc := hex"b5"; -CYR_.H_tl := hex"96"; -CYR_.h_tl := hex"b6"; -CYR_.CH_ldsc := hex"97"; -CYR_.ch_ldsc := hex"b7"; -CYR_.CH_rdsc := hex"98"; -CYR_.ch_rdsc := hex"b8"; -CYR_.SCHWA := hex"9a"; -CYR_.schwa := hex"ba"; -CYR_.EPS := hex"9b"; -CYR_.eps := hex"bb"; -CYR_.Agrave := hex"00"; -CYR_.Aacute := hex"01"; -CYR_.Ahat := hex"02"; -CYR_.Atilde := hex"03"; -CYR_.Aumlaut := hex"04"; -CYR_.Aacute_dbl := hex"05"; -CYR_.Aring := hex"06"; -CYR_.Ahachek := hex"07"; -CYR_.Abreve := hex"08"; -CYR_.Abar := hex"09"; -CYR_.Adot := hex"0a"; -CYR_.Acedilla := hex"0b"; -CYR_.Aogonek := hex"0c"; -CYR_.palochka := hex"0d"; -CYR_.angle_left := hex"0e"; -CYR_.angle_right := hex"0f"; -CYR_.Afrown := hex"12"; -CYR_.Agrave_dbl := hex"13"; -CYR_.Acyrbreve := hex"14"; -CYR_.dash := hex"16"; -CYR_.wordmark := hex"17"; -CYR_.pmzero := hex"18"; -CYR_.i_dotl := hex"19"; -CYR_.j_dotl := hex"1a"; -CYR_.dbl_quotes := hex"22"; -CYR_.No := hex"9d"; -CYR_.currency := hex"9e"; -CYR_.section := hex"9f"; -CYR_.baseqq := hex"bd"; -CYR_.flqq := hex"be"; -CYR_.frqq := hex"bf"; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lblb8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lblb8.mf deleted file mode 100644 index 5cf4d34c44e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lblb8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lblb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbli8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbli8.mf deleted file mode 100644 index ff992e8b4ec..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbli8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lbli8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbliker.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbliker.mf deleted file mode 100644 index 47b1e9c82a7..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbliker.mf +++ /dev/null @@ -1,1359 +0,0 @@ -% This is lbliker.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - - -beginligtable - labelchar ( - CYR_.HRDSN - ,CYR_.SFTSN - ,CYR_.LJE - ,CYR_.NJE - ,CYR_.SHHA - ); - setkern [k#] ( - CYR_.ZH - ,CYR_.ZH_dsc - ,CYR_.H - ,CYR_.H_dsc - ,CYR_.H_hcrs - ,CYR_.H_tl - ); - labelchar ( - CYR_.A - if serifs: - fi - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.S - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.CH - ,CYR_.CH_ldsc - ,CYR_.CH_rdsc - ,CYR_.Y - ); - if serifs: - setkern [kk#] ( - CYR_.U - ,CYR_.U_shrt - ); - else: - setkern [k#] ( - CYR_.U - ,CYR_.U_shrt - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.y - ,CYR_.k - ,CYR_.k_dsc - ,CYR_.k_tl - ,CYR_.n - ,CYR_.nje - ,CYR_.n_dsc - ,CYR_.n_tl - ,CYR_.ng - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ); - fi - fi - endligtable; - -if concrete: - - beginligtable - labelchar ( CYR_.D ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.S - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.CH - ,CYR_.CH_ldsc - ,CYR_.CH_rdsc - ,CYR_.Y - ); - if serifs: - setkern [kk#] ( - CYR_.U - ,CYR_.U_shrt - ); - else: - setkern [k#] ( - CYR_.U - ,CYR_.U_shrt - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.t - ,CYR_.hrdsn - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.y - ,CYR_.k - ,CYR_.k_dsc - ,CYR_.k_tl - ,CYR_.n - ,CYR_.nje - ,CYR_.n_dsc - ,CYR_.n_tl - ,CYR_.ng - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ); - fi - fi - endligtable; - - - beginligtable - labelchar ( CYR_.L ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.S - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.CH - ,CYR_.CH_ldsc - ,CYR_.CH_rdsc - ,CYR_.Y - ); - if serifs: - setkern [kk#] ( - CYR_.U - ,CYR_.U_shrt - ); - else: - setkern [k#] ( - CYR_.U - ,CYR_.U_shrt - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.t - ,CYR_.hrdsn - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.y - ,CYR_.k - ,CYR_.k_dsc - ,CYR_.k_tl - ,CYR_.n - ,CYR_.nje - ,CYR_.n_dsc - ,CYR_.n_tl - ,CYR_.ng - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ); - fi - fi - endligtable; - -fi - -beginligtable - labelchar ( CYR_.K ); - labelchar ( - CYR_.K_dsc - ,CYR_.ZH - ,CYR_.ZH_dsc - ,CYR_.H - ,CYR_.H_dsc - ,CYR_.H_hcrs - ,CYR_.H_tl - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.S - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ); - else: - setkern [k#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ); - if ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ); - fi - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.YU - ,CYR_.EREV - ,CYR_.SCHWA - ); - setkern [k#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - ,CYR_.ZH - ,CYR_.ZH_dsc - ,CYR_.H - ,CYR_.H_dsc - ,CYR_.H_hcrs - ,CYR_.H_tl - ,CYR_.Y - ,CYR_.U - ,CYR_.U_shrt - if serifs: - ,CYR_.YA - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_hcrs - ,CYR_.h_tl - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - if serifs: - ,CYR_.ya - fi - ); - elseif ROMANfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( CYR_.T ); - labelchar ( - CYR_.G - ,CYR_.G_hcrs - ,CYR_.NG - ,CYR_.G_dsc - ,CYR_.G_crsdsc - ); - setkern [kk#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - fi - ); - if not concrete: - if serifs: - setkern [k#] ( - CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - else: - setkern [-u#] ( - CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_hcrs - ,CYR_.h_tl - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.f - ); - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [kk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.hrdsn - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.l_dsc - ,CYR_.l_tl - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.Y - ); - setkern [kk#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - fi - ); - if not concrete: - setkern [-u#] ( - CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_hcrs - ,CYR_.h_tl - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.e - ,CYR_.yo - ); - if ROMANfont: - if serifs: - setkern [kkk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - fi - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.hrdsn - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.l_dsc - ,CYR_.l_tl - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.U - ,CYR_.U_shrt - ); - if serifs: - setkern [kk#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - fi - ,CYR_.YA - ); - if not concrete: - setkern [-u#] ( - CYR_.D - ,CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - else: - setkern [k#] ( - CYR_.A - ); - setkern [-u#] ( - CYR_.D - ,CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.S - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - fi - if serifs: - ,CYR_.ya - fi - ); - setkern [kk#] ( - if concrete: - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ); - else: - if serifs: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ); - fi - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.hrdsn - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.l_dsc - ,CYR_.l_tl - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.R - ); - setkern [kk#] ( - CYR_.A - ,CYR_.D - ,CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - if serifs: - ,CYR_.YA - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - fi - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.e - ,CYR_.yo - ); - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ); - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - -if TITLEfont: endinput \\ fi; - -if SmallCapsfont: - - u#:=lower.u#; - k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; - - - - beginligtable - labelchar ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - fi - ,CYR_.lje - ,CYR_.nje - if SmallCapsfont: - ,CYR_.shha - fi - if SmallCapsfont: - fi - if serifs: - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ); - setkern [kk#] ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ); - endligtable; - - if concrete: - - - beginligtable - labelchar ( CYR_.d ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ); - setkern [kk#] ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ); - setkern [kk#] ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ); - endligtable; - - fi - - - beginligtable - labelchar ( CYR_.k ); - labelchar ( - CYR_.k_dsc - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_hcrs - ,CYR_.h_tl - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.b - ,CYR_.yu - ,CYR_.erev - ,CYR_.schwa - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_hcrs - ,CYR_.h_tl - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - if serifs: - ,CYR_.ya - fi - ); - endligtable; - - - beginligtable - labelchar ( CYR_.t ); - labelchar ( - CYR_.g - ,CYR_.g_hcrs - ,CYR_.ng - ,CYR_.g_dsc - ,CYR_.g_crsdsc - ,CYR_.r - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - if serifs: - ,CYR_.ya - fi - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - if serifs: - ,CYR_.ya - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ,CYR_.s - ); - endligtable; - -else: - - if ROMANfont: - - - beginligtable - labelchar ( - CYR_.a - ); - setkern [k#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - if serifs: - fi - ); - endligtable; - - if concrete: - - beginligtable - labelchar ( CYR_.d ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.s - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.s - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ); - endligtable; - - fi - - beginligtable - labelchar ( CYR_.t ); - labelchar ( - CYR_.g - ,CYR_.g_hcrs - ,CYR_.ng - ,CYR_.g_dsc - ,CYR_.g_crsdsc - if kapitel: - ,CYR_.r - fi - ); - if serifs: - setkern [k#] ( - CYR_.a - ); - fi - setkern [k#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - if kapitel: - ,CYR_.a - fi - ,CYR_.ya - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - - beginligtable - labelchar ( CYR_.k ); - labelchar ( - CYR_.k_dsc - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_hcrs - ,CYR_.h_tl - ); - setkern [k#] ( - CYR_.a - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.s - ,CYR_.e - ,CYR_.yo - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ); - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.s - ,CYR_.e - ,CYR_.yo - ,CYR_.ya - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ); - setkern [-u#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - else: - - - beginligtable - labelchar ( CYR_.e ); - labelchar ( - CYR_.yo - ); - setkern [-u#] ( - CYR_.f - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.l_dsc - ,CYR_.l_tl - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.y - ); - setkern [kk#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.l_dsc - ,CYR_.l_tl - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.y - ,CYR_.hrdsn - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ); - endligtable; - - fi - - - beginligtable - labelchar ( - CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - fi - ,CYR_.lje - ,CYR_.nje - if SmallCapsfont: - ,CYR_.shha - fi - if SmallCapsfont: - fi - if kapitel: - ,CYR_.a - fi - ); - if ROMANfont: - setkern [-u#] ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ); - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ); - if concrete: - setkern [k#] ( - CYR_.d - ,CYR_.l - ); - fi - else: - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.y - ,CYR_.hrdsn - ); - fi - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.f - ); - endligtable; - - - beginligtable - labelchar ( CYR_.s ); - labelchar ( - CYR_.o - ,CYR_.otld - ,CYR_.b - ,CYR_.yu - ,CYR_.r - ,CYR_.f - ,CYR_.erev - ,CYR_.schwa - ); - if ROMANfont: - setkern [k#] ( - CYR_.d - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_hcrs - ,CYR_.h_tl - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [-u#] ( - CYR_.f - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.l_dsc - ,CYR_.l_tl - ); - fi - endligtable; - -fi diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lblo8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lblo8.mf deleted file mode 100644 index 707ccbf19e6..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lblo8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lblo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lblq8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lblq8.mf deleted file mode 100644 index 1ceacee8d89..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lblq8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lblq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbltt8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbltt8.mf deleted file mode 100644 index ebf7ac9d957..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbltt8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lbltt8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbocc10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbocc10.mf deleted file mode 100644 index ded219a64e9..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbocc10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbocc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm10.mf deleted file mode 100644 index bd0a6ac8e7a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lborm10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm5.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm5.mf deleted file mode 100644 index 93b1a452531..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm5.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lborm5.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm6.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm6.mf deleted file mode 100644 index 4ba1b86d6b8..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm6.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lborm6.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm7.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm7.mf deleted file mode 100644 index baf7901be18..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm7.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lborm7.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm8.mf deleted file mode 100644 index f31ce23c4b3..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lborm8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm9.mf deleted file mode 100644 index 25e724e4d36..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lborm9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lborm9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl10.mf deleted file mode 100644 index c1cb39c2187..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbosl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl5.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl5.mf deleted file mode 100644 index 2edda93f141..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl5.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbosl5.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl6.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl6.mf deleted file mode 100644 index 4f56320a64a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl6.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbosl6.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl7.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl7.mf deleted file mode 100644 index 85e9f38edc2..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl7.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbosl7.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl8.mf deleted file mode 100644 index 4aac6bb6211..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbosl8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl9.mf deleted file mode 100644 index b52fd290c58..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lbosl9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lboti10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lboti10.mf deleted file mode 100644 index 1aaf47d2dc9..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lboti10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lboti10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbqi8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbqi8.mf deleted file mode 100644 index 9a6d85a3663..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbqi8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lbqi8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbsq8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbsq8.mf deleted file mode 100644 index 04b9d48a243..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbsq8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lbsq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbssdc10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2b/lbssdc10.mf deleted file mode 100644 index fe7a7c967a2..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2b/lbssdc10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lbssdc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/ilclb8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/ilclb8.mf deleted file mode 100644 index 3b3b65bd6d6..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/ilclb8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilclb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/ilcli8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/ilcli8.mf deleted file mode 100644 index 43b99d090ec..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/ilcli8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilcli8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/ilclo8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/ilclo8.mf deleted file mode 100644 index 06971e8be0d..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/ilclo8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilclo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/ilclq8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/ilclq8.mf deleted file mode 100644 index f98f2a15cab..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/ilclq8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilclq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/ilcltt8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/ilcltt8.mf deleted file mode 100644 index 2059ade24ae..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/ilcltt8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ilcltt8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbbx10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbbx10.mf deleted file mode 100644 index c2686cc6252..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbbx10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbbx10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo10.mf deleted file mode 100644 index c20aa5af744..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbmo10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo17.mf deleted file mode 100644 index b230059346f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbmo17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo8.mf deleted file mode 100644 index d63735866f4..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbmo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo9.mf deleted file mode 100644 index d238c9c04ca..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbmo9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr10.mf deleted file mode 100644 index 318194ffeff..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbmr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr17.mf deleted file mode 100644 index 6ccfec36bd1..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbmr17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr8.mf deleted file mode 100644 index 5e0466c317f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbmr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr9.mf deleted file mode 100644 index e2c95f357fe..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbmr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso10.mf deleted file mode 100644 index 71ee414b7f2..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbso10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso17.mf deleted file mode 100644 index 571097529b0..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbso17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso8.mf deleted file mode 100644 index 3f5e05e0240..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbso8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso9.mf deleted file mode 100644 index ae8dc5502dc..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbso9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr10.mf deleted file mode 100644 index 1c57584d4ba..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbsr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr17.mf deleted file mode 100644 index 6b10983d85a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbsr17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr8.mf deleted file mode 100644 index 3c05248549e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbsr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr9.mf deleted file mode 100644 index 994d2d08e3f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbsr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbtl10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbtl10.mf deleted file mode 100644 index 2837342d7e5..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbtl10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbtl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input exbase; def cmbright=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbto10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbto10.mf deleted file mode 100644 index 5570d7ae44c..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcbto10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcbto10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input exbase; def cmbright=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lccodes.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lccodes.mf deleted file mode 100644 index 9203717da9c..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lccodes.mf +++ /dev/null @@ -1,158 +0,0 @@ -% This is lccodes.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -CYR_.A := hex"c0"; -CYR_.a := hex"e0"; -CYR_.B := hex"c1"; -CYR_.b := hex"e1"; -CYR_.V := hex"c2"; -CYR_.v := hex"e2"; -CYR_.G := hex"c3"; -CYR_.g := hex"e3"; -CYR_.D := hex"c4"; -CYR_.d := hex"e4"; -CYR_.E := hex"c5"; -CYR_.e := hex"e5"; -CYR_.ZH := hex"c6"; -CYR_.zh := hex"e6"; -CYR_.Z := hex"c7"; -CYR_.z := hex"e7"; -CYR_.I := hex"c8"; -CYR_.i := hex"e8"; -CYR_.I_shrt := hex"c9"; -CYR_.i_shrt := hex"e9"; -CYR_.K := hex"ca"; -CYR_.k := hex"ea"; -CYR_.L := hex"cb"; -CYR_.l := hex"eb"; -CYR_.M := hex"cc"; -CYR_.m := hex"ec"; -CYR_.N := hex"cd"; -CYR_.n := hex"ed"; -CYR_.O := hex"ce"; -CYR_.o := hex"ee"; -CYR_.P := hex"cf"; -CYR_.p := hex"ef"; -CYR_.R := hex"d0"; -CYR_.r := hex"f0"; -CYR_.S := hex"d1"; -CYR_.s := hex"f1"; -CYR_.T := hex"d2"; -CYR_.t := hex"f2"; -CYR_.U := hex"d3"; -CYR_.u := hex"f3"; -CYR_.F := hex"d4"; -CYR_.f := hex"f4"; -CYR_.H := hex"d5"; -CYR_.h := hex"f5"; -CYR_.C := hex"d6"; -CYR_.c := hex"f6"; -CYR_.CH := hex"d7"; -CYR_.ch := hex"f7"; -CYR_.SH := hex"d8"; -CYR_.sh := hex"f8"; -CYR_.SHCH := hex"d9"; -CYR_.shch := hex"f9"; -CYR_.HRDSN := hex"da"; -CYR_.hrdsn := hex"fa"; -CYR_.ERY := hex"db"; -CYR_.ery := hex"fb"; -CYR_.SFTSN := hex"dc"; -CYR_.sftsn := hex"fc"; -CYR_.EREV := hex"dd"; -CYR_.erev := hex"fd"; -CYR_.YU := hex"de"; -CYR_.yu := hex"fe"; -CYR_.YA := hex"df"; -CYR_.ya := hex"ff"; -CYR_.YO := hex"9c"; -CYR_.yo := hex"bc"; -CYR_.ABH_CH := hex"91"; -CYR_.abh_ch := hex"b1"; -CYR_.ABH_CH_dsc := hex"92"; -CYR_.abh_ch_dsc := hex"b2"; -CYR_.K_hcrs := hex"8b"; -CYR_.k_hcrs := hex"ab"; -CYR_.L_dsc := hex"8a"; -CYR_.l_dsc := hex"aa"; -CYR_.M_dsc := hex"88"; -CYR_.m_dsc := hex"a8"; -CYR_.ABH_HA := hex"97"; -CYR_.abh_ha := hex"b7"; -CYR_.P_tl := hex"80"; -CYR_.p_tl := hex"a0"; -CYR_.R_dsc := hex"85"; -CYR_.r_dsc := hex"a5"; -CYR_.T_dsc := hex"82"; -CYR_.t_dsc := hex"a2"; -CYR_.TETSE := hex"81"; -CYR_.tetse := hex"a1"; -CYR_.DZHE := hex"96"; -CYR_.dzhe := hex"b6"; -CYR_.SEMISN := hex"93"; -CYR_.semisn := hex"b3"; -CYR_.I_shdsc := hex"94"; -CYR_.i_shdsc := hex"b4"; -CYR_.R_tl := hex"9b"; -CYR_.r_tl := hex"bb"; -CYR_.N_ltl := hex"99"; -CYR_.n_ltl := hex"b9"; -CYR_.R_gcrs := hex"86"; -CYR_.r_gcrs := hex"a6"; -CYR_.M_tl := hex"8e"; -CYR_.m_tl := hex"ae"; -CYR_.G_tl := hex"83"; -CYR_.g_tl := hex"a3"; -CYR_.SHHA := hex"84"; -CYR_.shha := hex"a4"; -CYR_.ABH_DZE := hex"87"; -CYR_.abh_dze := hex"a7"; -CYR_.K_dsc := hex"89"; -CYR_.k_dsc := hex"a9"; -CYR_.L_tl := hex"8c"; -CYR_.l_tl := hex"ac"; -CYR_.N_dsc := hex"8d"; -CYR_.n_dsc := hex"ad"; -CYR_.N_tl := hex"8f"; -CYR_.n_tl := hex"af"; -CYR_.OTLD := hex"90"; -CYR_.otld := hex"b0"; -CYR_.H_dsc := hex"95"; -CYR_.h_dsc := hex"b5"; -CYR_.CH_rdsc := hex"98"; -CYR_.ch_rdsc := hex"b8"; -CYR_.SCHWA := hex"9a"; -CYR_.schwa := hex"ba"; -CYR_.Agrave := hex"00"; -CYR_.Aacute := hex"01"; -CYR_.Ahat := hex"02"; -CYR_.Atilde := hex"03"; -CYR_.Aumlaut := hex"04"; -CYR_.Aacute_dbl := hex"05"; -CYR_.Aring := hex"06"; -CYR_.Ahachek := hex"07"; -CYR_.Abreve := hex"08"; -CYR_.Abar := hex"09"; -CYR_.Adot := hex"0a"; -CYR_.Acedilla := hex"0b"; -CYR_.Aogonek := hex"0c"; -CYR_.palochka := hex"0d"; -CYR_.angle_left := hex"0e"; -CYR_.angle_right := hex"0f"; -CYR_.Afrown := hex"12"; -CYR_.Agrave_dbl := hex"13"; -CYR_.Acyrbreve := hex"14"; -CYR_.dash := hex"16"; -CYR_.wordmark := hex"17"; -CYR_.pmzero := hex"18"; -CYR_.i_dotl := hex"19"; -CYR_.j_dotl := hex"1a"; -CYR_.dbl_quotes := hex"22"; -CYR_.No := hex"9d"; -CYR_.currency := hex"9e"; -CYR_.section := hex"9f"; -CYR_.baseqq := hex"bd"; -CYR_.flqq := hex"be"; -CYR_.frqq := hex"bf"; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lclb8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lclb8.mf deleted file mode 100644 index 8d8e7c89568..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lclb8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lclb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcli8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcli8.mf deleted file mode 100644 index 073c9d7e802..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcli8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lcli8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcliker.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcliker.mf deleted file mode 100644 index d4687ccfb3f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcliker.mf +++ /dev/null @@ -1,1243 +0,0 @@ -% This is lcliker.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - - -beginligtable - labelchar ( - CYR_.HRDSN - ,CYR_.SFTSN - ,CYR_.SEMISN - ,CYR_.P_tl - ,CYR_.SHHA - ); - setkern [k#] ( - CYR_.ZH - ,CYR_.H - ,CYR_.H_dsc - ); - labelchar ( - CYR_.A - if serifs: - fi - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.S - ); - setkern [kk#] ( - CYR_.T - ,CYR_.T_dsc - ,CYR_.HRDSN - ,CYR_.SEMISN - ,CYR_.TETSE - ,CYR_.CH - ,CYR_.CH_rdsc - ,CYR_.ABH_CH - ,CYR_.ABH_CH_dsc - ); - if serifs: - setkern [kk#] ( - CYR_.U - ); - else: - setkern [k#] ( - CYR_.U - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.s - ,CYR_.ch - ,CYR_.ch_rdsc - ); - setkern [kk#] ( - CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ,CYR_.u - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_rdsc - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.tetse - ,CYR_.k - ,CYR_.k_dsc - ,CYR_.n - ,CYR_.n_dsc - ,CYR_.n_tl - ,CYR_.p - ,CYR_.p_tl - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.yu - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ); - fi - fi - endligtable; - -if concrete: - - beginligtable - labelchar ( CYR_.D ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.S - ); - setkern [kk#] ( - CYR_.T - ,CYR_.T_dsc - ,CYR_.HRDSN - ,CYR_.SEMISN - ,CYR_.TETSE - ,CYR_.CH - ,CYR_.CH_rdsc - ,CYR_.ABH_CH - ,CYR_.ABH_CH_dsc - ); - if serifs: - setkern [kk#] ( - CYR_.U - ); - else: - setkern [k#] ( - CYR_.U - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.s - ,CYR_.ch - ,CYR_.ch_rdsc - ); - setkern [kk#] ( - CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ,CYR_.u - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.tetse - ,CYR_.k - ,CYR_.k_dsc - ,CYR_.n - ,CYR_.n_dsc - ,CYR_.n_tl - ,CYR_.p - ,CYR_.p_tl - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.yu - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ); - fi - fi - endligtable; - - - beginligtable - labelchar ( CYR_.L ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.S - ); - setkern [kk#] ( - CYR_.T - ,CYR_.T_dsc - ,CYR_.HRDSN - ,CYR_.SEMISN - ,CYR_.TETSE - ,CYR_.CH - ,CYR_.CH_rdsc - ,CYR_.ABH_CH - ,CYR_.ABH_CH_dsc - ); - if serifs: - setkern [kk#] ( - CYR_.U - ); - else: - setkern [k#] ( - CYR_.U - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.s - ,CYR_.ch - ,CYR_.ch_rdsc - ); - setkern [kk#] ( - CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ,CYR_.u - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.tetse - ,CYR_.k - ,CYR_.k_dsc - ,CYR_.n - ,CYR_.n_dsc - ,CYR_.n_tl - ,CYR_.p - ,CYR_.p_tl - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.yu - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ); - fi - fi - endligtable; - -fi - -beginligtable - labelchar ( CYR_.K ); - labelchar ( - CYR_.K_dsc - ,CYR_.K_hcrs - ,CYR_.ZH - ,CYR_.H - ,CYR_.H_dsc - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.S - ,CYR_.ABH_CH - ,CYR_.ABH_CH_dsc - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.s - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - else: - setkern [k#] ( - CYR_.ch - ,CYR_.ch_rdsc - ); - if ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ); - fi - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.YU - ,CYR_.EREV - ,CYR_.SCHWA - ); - setkern [k#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - ,CYR_.ZH - ,CYR_.H - ,CYR_.H_dsc - ,CYR_.U - if serifs: - ,CYR_.YA - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ,CYR_.zh - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.u - if serifs: - ,CYR_.ya - fi - ); - elseif ROMANfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( CYR_.T ); - labelchar ( - CYR_.T_dsc - ,CYR_.G - ); - setkern [kk#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - fi - ); - if not concrete: - if serifs: - setkern [k#] ( - CYR_.L - ,CYR_.L_tl - ,CYR_.L_dsc - ); - else: - setkern [-u#] ( - CYR_.L - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ,CYR_.zh - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.u - if serifs: - ,CYR_.ya - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.f - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [kk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.hrdsn - ,CYR_.tetse - ,CYR_.l - ,CYR_.m - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ,CYR_.m_tl - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.U - ); - if serifs: - setkern [kk#] ( - CYR_.A - if concrete: - ,CYR_.D - ,CYR_.L - fi - ,CYR_.YA - ); - if not concrete: - setkern [-u#] ( - CYR_.D - ,CYR_.L - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - else: - setkern [k#] ( - CYR_.A - ); - setkern [-u#] ( - CYR_.D - ,CYR_.L - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.S - ,CYR_.ABH_CH - ,CYR_.ABH_CH_dsc - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - fi - if serifs: - ,CYR_.ya - fi - ); - setkern [kk#] ( - if concrete: - CYR_.d - ,CYR_.l - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.s - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - else: - if serifs: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - fi - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.hrdsn - ,CYR_.tetse - ,CYR_.l - ,CYR_.m - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ,CYR_.m_tl - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.R - ,CYR_.R_dsc - ,CYR_.R_gcrs - ); - setkern [kk#] ( - CYR_.A - ,CYR_.D - ,CYR_.L - ,CYR_.L_tl - ,CYR_.L_dsc - if serifs: - ,CYR_.YA - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - fi - if serifs: - ,CYR_.ya - fi - ); - setkern [k#] ( - CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.e - ,CYR_.yo - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.l_tl - ,CYR_.l_dsc - ); - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - -if TITLEfont: endinput \\ fi; - -if SmallCapsfont: - - u#:=lower.u#; - k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; - - - - beginligtable - labelchar ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - fi - ,CYR_.semisn - ,CYR_.p_tl - if SmallCapsfont: - ,CYR_.shha - fi - if SmallCapsfont: - fi - if serifs: - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.s - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ,CYR_.ch - ,CYR_.ch_rdsc - ); - setkern [kk#] ( - CYR_.u - ); - endligtable; - - if concrete: - - - beginligtable - labelchar ( CYR_.d ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.s - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ,CYR_.ch - ,CYR_.ch_rdsc - ); - setkern [kk#] ( - CYR_.u - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.s - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ,CYR_.ch - ,CYR_.ch_rdsc - ); - setkern [kk#] ( - CYR_.u - ); - endligtable; - - fi - - - beginligtable - labelchar ( CYR_.k ); - labelchar ( - CYR_.k_dsc - ,CYR_.k_hcrs - ,CYR_.zh - ,CYR_.h - ,CYR_.h_dsc - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.s - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.b - ,CYR_.yu - ,CYR_.erev - ,CYR_.schwa - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.zh - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.u - if serifs: - ,CYR_.ya - fi - ); - endligtable; - - - beginligtable - labelchar ( CYR_.t ); - labelchar ( - CYR_.t_dsc - ,CYR_.g - ,CYR_.r - ,CYR_.r_dsc - ,CYR_.r_gcrs - ,CYR_.r_tl - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.l_tl - ,CYR_.l_dsc - if serifs: - ,CYR_.ya - fi - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.l_tl - ,CYR_.l_dsc - if serifs: - ,CYR_.ya - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.s - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - -else: - - if ROMANfont: - - - beginligtable - labelchar ( - CYR_.a - ); - setkern [k#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.u - if serifs: - fi - ); - endligtable; - - if concrete: - - beginligtable - labelchar ( CYR_.d ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.s - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ,CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.u - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.s - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ,CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.u - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - - fi - - beginligtable - labelchar ( CYR_.t ); - labelchar ( - CYR_.t_dsc - ,CYR_.g - if kapitel: - ,CYR_.r - fi - ); - if serifs: - setkern [k#] ( - CYR_.a - ); - fi - setkern [k#] ( - CYR_.d - ,CYR_.l - ,CYR_.l_tl - ,CYR_.l_dsc - if kapitel: - ,CYR_.a - fi - ,CYR_.ya - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - - beginligtable - labelchar ( CYR_.k ); - labelchar ( - CYR_.k_dsc - ,CYR_.k_hcrs - ,CYR_.zh - ,CYR_.h - ,CYR_.h_dsc - ); - setkern [k#] ( - CYR_.a - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.s - ,CYR_.e - ,CYR_.yo - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ); - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.s - ,CYR_.e - ,CYR_.yo - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ,CYR_.ya - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ); - setkern [-u#] ( - CYR_.d - ,CYR_.l - ,CYR_.l_tl - ,CYR_.l_dsc - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - else: - - - beginligtable - labelchar ( CYR_.e ); - labelchar ( - CYR_.yo - ); - setkern [-u#] ( - CYR_.f - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ,CYR_.m_tl - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ,CYR_.m_tl - ,CYR_.hrdsn - ,CYR_.tetse - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - - fi - - - beginligtable - labelchar ( - CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - fi - ,CYR_.semisn - ,CYR_.p_tl - if SmallCapsfont: - ,CYR_.shha - fi - if SmallCapsfont: - fi - if kapitel: - ,CYR_.a - fi - ); - if ROMANfont: - setkern [-u#] ( - CYR_.u - ); - setkern [k#] ( - CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.semisn - ,CYR_.tetse - ); - if concrete: - setkern [k#] ( - CYR_.d - ,CYR_.l - ); - fi - else: - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ,CYR_.m_tl - ,CYR_.hrdsn - ,CYR_.tetse - ); - fi - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_rdsc - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ); - endligtable; - - - beginligtable - labelchar ( CYR_.s ); - labelchar ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.b - ,CYR_.yu - ,CYR_.r - ,CYR_.f - ,CYR_.erev - ,CYR_.schwa - ); - if ROMANfont: - setkern [k#] ( - CYR_.d - ,CYR_.zh - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.ya - if kapitel: - ,CYR_.a - fi - ); - else: - setkern [-u#] ( - CYR_.f - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ,CYR_.m_tl - ); - fi - endligtable; - -fi diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lclo8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lclo8.mf deleted file mode 100644 index 12f7d9ba899..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lclo8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lclo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lclq8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lclq8.mf deleted file mode 100644 index 71d19510129..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lclq8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lclq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcltt8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcltt8.mf deleted file mode 100644 index 74329c602d2..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcltt8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lcltt8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcocc10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcocc10.mf deleted file mode 100644 index b72c6d8b991..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcocc10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcocc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm10.mf deleted file mode 100644 index 9e2598b9fbf..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcorm10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm5.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm5.mf deleted file mode 100644 index a61300a2885..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm5.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcorm5.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm6.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm6.mf deleted file mode 100644 index baab2be1e75..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm6.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcorm6.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm7.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm7.mf deleted file mode 100644 index fe5f1e5f308..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm7.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcorm7.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm8.mf deleted file mode 100644 index 86af34226b6..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcorm8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm9.mf deleted file mode 100644 index f0a2ba0bf71..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcorm9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl10.mf deleted file mode 100644 index 3bb86f957b5..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcosl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl5.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl5.mf deleted file mode 100644 index 0b724740208..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl5.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcosl5.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl6.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl6.mf deleted file mode 100644 index 7c38e647447..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl6.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcosl6.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl7.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl7.mf deleted file mode 100644 index e3b29e6fc5c..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl7.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcosl7.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl8.mf deleted file mode 100644 index a343fb0ef46..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcosl8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl9.mf deleted file mode 100644 index 911d79b9e7a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcosl9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcoti10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcoti10.mf deleted file mode 100644 index 0aca48eb5ed..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcoti10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is lcoti10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcqi8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcqi8.mf deleted file mode 100644 index 8cfebc2bd28..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcqi8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lcqi8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcsq8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcsq8.mf deleted file mode 100644 index 6981ef60dd3..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcsq8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lcsq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcssdc10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2c/lcssdc10.mf deleted file mode 100644 index 17925242895..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2c/lcssdc10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is lcssdc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ildlb8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ildlb8.mf deleted file mode 100644 index a3444753916..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ildlb8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ildlb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ildli8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ildli8.mf deleted file mode 100644 index c858cdbbd91..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ildli8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ildli8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ildlo8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ildlo8.mf deleted file mode 100644 index df13f58439a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ildlo8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ildlo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ildlq8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ildlq8.mf deleted file mode 100644 index 220ffc265fe..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ildlq8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ildlq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ildltt8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ildltt8.mf deleted file mode 100644 index a64dc5d90e5..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ildltt8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ildltt8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbbx10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbbx10.mf deleted file mode 100644 index 9bd60bfc6fb..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbbx10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbbx10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo10.mf deleted file mode 100644 index 3edadb2d648..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbmo10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo17.mf deleted file mode 100644 index 66ff6853ff8..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbmo17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo8.mf deleted file mode 100644 index 19c496b060e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbmo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo9.mf deleted file mode 100644 index 45c2fad3f14..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbmo9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr10.mf deleted file mode 100644 index c41199764ae..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbmr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr17.mf deleted file mode 100644 index 0ddfc9095fc..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbmr17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr8.mf deleted file mode 100644 index a25097c38be..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbmr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr9.mf deleted file mode 100644 index 273bbb6c56e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbmr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso10.mf deleted file mode 100644 index c1101079457..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbso10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso17.mf deleted file mode 100644 index aa903bc4884..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbso17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso8.mf deleted file mode 100644 index f9e14f934ad..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbso8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso9.mf deleted file mode 100644 index 6dfae194d4c..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbso9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr10.mf deleted file mode 100644 index 3081c813ede..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbsr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr17.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr17.mf deleted file mode 100644 index c9878bd9d7a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbsr17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr8.mf deleted file mode 100644 index 5c860f386c2..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbsr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr9.mf deleted file mode 100644 index 37eed888243..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbsr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbtl10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbtl10.mf deleted file mode 100644 index 0d5677e0023..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbtl10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbtl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input exbase; def cmbright=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbto10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbto10.mf deleted file mode 100644 index c08b8d1899c..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldbto10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldbto10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input exbase; def cmbright=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldcodes.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldcodes.mf deleted file mode 100644 index 73eb8410f0a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldcodes.mf +++ /dev/null @@ -1,163 +0,0 @@ -% This is ldcodes.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -CYR_.A := hex"c0"; -CYR_.a := hex"e0"; -CYR_.B := hex"c1"; -CYR_.b := hex"e1"; -CYR_.V := hex"c2"; -CYR_.v := hex"e2"; -CYR_.G := hex"c3"; -CYR_.g := hex"e3"; -CYR_.D := hex"c4"; -CYR_.d := hex"e4"; -CYR_.E := hex"c5"; -CYR_.e := hex"e5"; -CYR_.ZH := hex"c6"; -CYR_.zh := hex"e6"; -CYR_.Z := hex"c7"; -CYR_.z := hex"e7"; -CYR_.I := hex"c8"; -CYR_.i := hex"e8"; -CYR_.I_shrt := hex"c9"; -CYR_.i_shrt := hex"e9"; -CYR_.K := hex"ca"; -CYR_.k := hex"ea"; -CYR_.L := hex"cb"; -CYR_.l := hex"eb"; -CYR_.M := hex"cc"; -CYR_.m := hex"ec"; -CYR_.N := hex"cd"; -CYR_.n := hex"ed"; -CYR_.O := hex"ce"; -CYR_.o := hex"ee"; -CYR_.P := hex"cf"; -CYR_.p := hex"ef"; -CYR_.R := hex"d0"; -CYR_.r := hex"f0"; -CYR_.S := hex"d1"; -CYR_.s := hex"f1"; -CYR_.T := hex"d2"; -CYR_.t := hex"f2"; -CYR_.U := hex"d3"; -CYR_.u := hex"f3"; -CYR_.F := hex"d4"; -CYR_.f := hex"f4"; -CYR_.H := hex"d5"; -CYR_.h := hex"f5"; -CYR_.C := hex"d6"; -CYR_.c := hex"f6"; -CYR_.CH := hex"d7"; -CYR_.ch := hex"f7"; -CYR_.SH := hex"d8"; -CYR_.sh := hex"f8"; -CYR_.SHCH := hex"d9"; -CYR_.shch := hex"f9"; -CYR_.HRDSN := hex"da"; -CYR_.hrdsn := hex"fa"; -CYR_.ERY := hex"db"; -CYR_.ery := hex"fb"; -CYR_.SFTSN := hex"dc"; -CYR_.sftsn := hex"fc"; -CYR_.EREV := hex"dd"; -CYR_.erev := hex"fd"; -CYR_.YU := hex"de"; -CYR_.yu := hex"fe"; -CYR_.YA := hex"df"; -CYR_.ya := hex"ff"; -CYR_.YO := hex"9c"; -CYR_.yo := hex"bc"; -CYR_.LAT_S := hex"8f"; -CYR_.lat_s := hex"af"; -CYR_.YAT := hex"93"; -CYR_.yat := hex"b3"; -CYR_.B_YUS := hex"97"; -CYR_.b_yus := hex"b7"; -CYR_.IZH := hex"8a"; -CYR_.izh := hex"aa"; -CYR_.UKR_E := hex"99"; -CYR_.ukr_e := hex"b9"; -CYR_.EPS := hex"9b"; -CYR_.eps := hex"bb"; -CYR_.Agrave := hex"00"; -CYR_.Aacute := hex"01"; -CYR_.Ahat := hex"02"; -CYR_.Atilde := hex"03"; -CYR_.Aumlaut := hex"04"; -CYR_.Aacute_dbl := hex"05"; -CYR_.Aring := hex"06"; -CYR_.Ahachek := hex"07"; -CYR_.Abreve := hex"08"; -CYR_.Abar := hex"09"; -CYR_.Adot := hex"0a"; -CYR_.angle_left := hex"0e"; -CYR_.angle_right := hex"0f"; -CYR_.Afrown := hex"12"; -CYR_.Agrave_dbl := hex"13"; -CYR_.Acyrbreve := hex"14"; -CYR_.dash := hex"16"; -CYR_.pmzero := hex"18"; -CYR_.i_dotl := hex"19"; -CYR_.j_dotl := hex"1a"; -CYR_.dbl_quotes := hex"22"; -CYR_.No := hex"9d"; -CYR_.section := hex"9f"; -CYR_.baseqq := hex"bd"; -CYR_.flqq := hex"be"; -CYR_.frqq := hex"bf"; -CYR_.titlo := hex"0b"; -CYR_.palatal := hex"0c"; -CYR_.paerok := hex"0d"; -CYR_.kamora := hex"17"; -CYR_.psili := hex"1b"; -CYR_.dasia := hex"1c"; -CYR_.zvat := hex"1d"; -CYR_.pneuac := hex"1e"; -CYR_.pneugr := hex"1f"; -CYR_.thousands := hex"9e"; -CYR_.AZ := hex"80"; -CYR_.az := hex"a0"; -CYR_.I_AZ := hex"81"; -CYR_.i_az := hex"a1"; -CYR_.L_YUS := hex"82"; -CYR_.l_yus := hex"a2"; -CYR_.IL_YUS := hex"83"; -CYR_.il_yus := hex"a3"; -CYR_.GERV := hex"84"; -CYR_.gerv := hex"a4"; -CYR_.NASH := hex"85"; -CYR_.nash := hex"a5"; -CYR_.ZEMLA := hex"86"; -CYR_.zemla := hex"a6"; -CYR_.KSI := hex"87"; -CYR_.ksi := hex"a7"; -CYR_.VIZHE := hex"88"; -CYR_.vizhe := hex"a8"; -CYR_.IZHE := hex"89"; -CYR_.izhe := hex"a9"; -CYR_.OMGA := hex"8b"; -CYR_.omga := hex"ab"; -CYR_.OMGA_rnd := hex"8c"; -CYR_.omga_rnd := hex"ac"; -CYR_.OT := hex"8d"; -CYR_.ot := hex"ad"; -CYR_.OMGA_tlo := hex"8e"; -CYR_.omga_tlo := hex"ae"; -CYR_.FITA := hex"90"; -CYR_.fita := hex"b0"; -CYR_.KOPPA := hex"91"; -CYR_.koppa := hex"b1"; -CYR_.UK := hex"92"; -CYR_.uk := hex"b2"; -CYR_.CHERV := hex"94"; -CYR_.cherv := hex"b4"; -CYR_.PSI := hex"95"; -CYR_.psi := hex"b5"; -CYR_.SHTA := hex"96"; -CYR_.shta := hex"b6"; -CYR_.IB_YUS := hex"98"; -CYR_.ib_yus := hex"b8"; -CYR_.I_EST := hex"9a"; -CYR_.i_est := hex"ba"; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldlb8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldlb8.mf deleted file mode 100644 index 8142c5b560d..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldlb8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is ldlb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldli8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldli8.mf deleted file mode 100644 index 78e34cbc215..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldli8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is ldli8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldliker.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldliker.mf deleted file mode 100644 index cefe39cefa1..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldliker.mf +++ /dev/null @@ -1,1572 +0,0 @@ -% This is ldliker.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - - -beginligtable - labelchar ( - CYR_.HRDSN - ,CYR_.SFTSN - ,CYR_.YAT - ); - setkern [k#] ( - CYR_.ZH - ,CYR_.H - ); - labelchar ( - CYR_.A - ,CYR_.L_YUS - ,CYR_.IL_YUS - if serifs: - ,CYR_.B_YUS - ,CYR_.IB_YUS - fi - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OMGA - ,CYR_.OMGA_tlo - ,CYR_.OT - ,CYR_.PSI - ,CYR_.FITA - ,CYR_.OMGA_rnd - ,CYR_.S - ,CYR_.UKR_E - ,CYR_.KOPPA - ,CYR_.AZ - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.YAT - ,CYR_.CH - ,CYR_.CHERV - ); - if serifs: - setkern [kk#] ( - CYR_.U - ); - setkern [kkk#] ( - CYR_.IZH - ); - else: - setkern [k#] ( - CYR_.U - ); - setkern [kk#] ( - CYR_.IZH - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ,CYR_.ch - ,CYR_.cherv - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.u - ); - setkern [kkk#] ( - CYR_.izh - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.cherv - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.izh - ,CYR_.k - ,CYR_.n - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.yat - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ); - fi - fi - endligtable; - -if concrete: - - beginligtable - labelchar ( CYR_.D ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OMGA - ,CYR_.OMGA_tlo - ,CYR_.OT - ,CYR_.PSI - ,CYR_.FITA - ,CYR_.OMGA_rnd - ,CYR_.S - ,CYR_.UKR_E - ,CYR_.KOPPA - ,CYR_.AZ - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.YAT - ,CYR_.CH - ,CYR_.CHERV - ); - if serifs: - setkern [kk#] ( - CYR_.U - ); - setkern [kkk#] ( - CYR_.IZH - ); - else: - setkern [k#] ( - CYR_.U - ); - setkern [kk#] ( - CYR_.IZH - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ,CYR_.ch - ,CYR_.cherv - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.u - ); - setkern [kkk#] ( - CYR_.izh - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.cherv - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.izh - ,CYR_.k - ,CYR_.n - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.yat - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ); - fi - fi - endligtable; - - - beginligtable - labelchar ( CYR_.L ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OMGA - ,CYR_.OMGA_tlo - ,CYR_.OT - ,CYR_.PSI - ,CYR_.FITA - ,CYR_.OMGA_rnd - ,CYR_.S - ,CYR_.UKR_E - ,CYR_.KOPPA - ,CYR_.AZ - ); - setkern [kk#] ( - CYR_.T - ,CYR_.HRDSN - ,CYR_.YAT - ,CYR_.CH - ,CYR_.CHERV - ); - if serifs: - setkern [kk#] ( - CYR_.U - ); - setkern [kkk#] ( - CYR_.IZH - ); - else: - setkern [k#] ( - CYR_.U - ); - setkern [kk#] ( - CYR_.IZH - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ,CYR_.ch - ,CYR_.cherv - ); - setkern [kk#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.u - ); - setkern [kkk#] ( - CYR_.izh - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.cherv - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.izh - ,CYR_.k - ,CYR_.n - ,CYR_.p - ,CYR_.t - ,CYR_.yu - ,CYR_.yat - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ); - fi - fi - endligtable; - -fi - -beginligtable - labelchar ( CYR_.K ); - labelchar ( - CYR_.ZH - ,CYR_.H - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OMGA - ,CYR_.OMGA_tlo - ,CYR_.OT - ,CYR_.PSI - ,CYR_.FITA - ,CYR_.OMGA_rnd - ,CYR_.S - ,CYR_.UKR_E - ,CYR_.KOPPA - ,CYR_.AZ - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ); - else: - setkern [k#] ( - CYR_.ch - ,CYR_.cherv - ); - if ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ); - fi - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.O - ,CYR_.F - ,CYR_.OMGA - ,CYR_.OMGA_tlo - ,CYR_.OT - ,CYR_.PSI - ,CYR_.FITA - ,CYR_.OMGA_rnd - ,CYR_.YU - ,CYR_.EREV - ); - setkern [k#] ( - CYR_.A - ,CYR_.L_YUS - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - ,CYR_.ZH - ,CYR_.H - ,CYR_.U - ,CYR_.IZH - if serifs: - ,CYR_.YA - ,CYR_.B_YUS - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.l_yus - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - fi - ,CYR_.zh - ,CYR_.h - ,CYR_.u - ,CYR_.izh - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - elseif ROMANfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.l_yus - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( CYR_.T ); - labelchar ( - CYR_.G - ); - setkern [kk#] ( - CYR_.A - ,CYR_.L_YUS - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - ,CYR_.B_YUS - fi - ); - if not concrete: - if serifs: - setkern [k#] ( - CYR_.L - ); - else: - setkern [-u#] ( - CYR_.L - ); - fi - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.l_yus - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - fi - ,CYR_.zh - ,CYR_.h - ,CYR_.u - ,CYR_.izh - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ,CYR_.f - ,CYR_.psi - ); - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.l_yus - ); - else: - setkern [kk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.izh - ,CYR_.hrdsn - ,CYR_.l - ,CYR_.m - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.IZH - ); - if serifs: - setkern [kkk#] ( - CYR_.A - ,CYR_.L_YUS - if concrete: - ,CYR_.D - ,CYR_.L - fi - ,CYR_.YA - ,CYR_.B_YUS - ); - else: - setkern [kk#] ( - CYR_.A - ,CYR_.L_YUS - ); - setkern [-u#] ( - CYR_.D - ,CYR_.L - ); - fi - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OMGA - ,CYR_.OMGA_tlo - ,CYR_.OT - ,CYR_.PSI - ,CYR_.FITA - ,CYR_.OMGA_rnd - ,CYR_.S - ,CYR_.UKR_E - ,CYR_.KOPPA - ,CYR_.AZ - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.l_yus - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - fi - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - setkern [kk#] ( - if concrete: - CYR_.d - ,CYR_.l - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ); - else: - if serifs: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.e - ,CYR_.yo - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.e - ,CYR_.yo - ); - fi - if ROMANfont: - if serifs: - setkern [kkk#] ( - CYR_.d - ,CYR_.l - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.l_yus - ); - else: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.l_yus - ); - fi - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.izh - ,CYR_.hrdsn - ,CYR_.l - ,CYR_.m - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.U - ); - if serifs: - setkern [kk#] ( - CYR_.A - ,CYR_.L_YUS - if concrete: - ,CYR_.D - ,CYR_.L - fi - ,CYR_.YA - ,CYR_.B_YUS - ); - if not concrete: - setkern [-u#] ( - CYR_.D - ,CYR_.L - ); - fi - else: - setkern [k#] ( - CYR_.A - ,CYR_.L_YUS - ); - setkern [-u#] ( - CYR_.D - ,CYR_.L - ); - fi - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OMGA - ,CYR_.OMGA_tlo - ,CYR_.OT - ,CYR_.PSI - ,CYR_.FITA - ,CYR_.OMGA_rnd - ,CYR_.S - ,CYR_.UKR_E - ,CYR_.KOPPA - ,CYR_.AZ - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.l_yus - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - fi - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - setkern [kk#] ( - if concrete: - CYR_.d - ,CYR_.l - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ); - else: - if serifs: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ); - fi - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.l_yus - ); - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.izh - ,CYR_.hrdsn - ,CYR_.l - ,CYR_.m - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.R - ,CYR_.CHERV - ); - setkern [kk#] ( - CYR_.A - ,CYR_.L_YUS - ,CYR_.D - ,CYR_.L - if serifs: - ,CYR_.YA - ,CYR_.B_YUS - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.l_yus - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - fi - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.e - ,CYR_.yo - ); - setkern [kk#] ( - CYR_.d - ,CYR_.l - ); - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.VIZHE - ); - setkern [-k#] ( - CYR_.VIZHE - ); - endligtable; - -if TITLEfont: endinput \\ fi; - -if SmallCapsfont: - - u#:=lower.u#; - k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; - - - - beginligtable - labelchar ( - if kapitel: - CYR_.a - fi - ,CYR_.l_yus - ,CYR_.il_yus - ,CYR_.a - ,CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - fi - ,CYR_.yat - if SmallCapsfont: - fi - if SmallCapsfont: - fi - if serifs: - ,CYR_.b_yus - ,CYR_.ib_yus - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.ch - ,CYR_.cherv - ); - setkern [kk#] ( - CYR_.u - ); - setkern [kkk#] ( - CYR_.izh - ); - endligtable; - - if concrete: - - - beginligtable - labelchar ( CYR_.d ); - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.ch - ,CYR_.cherv - ); - setkern [kk#] ( - CYR_.u - ); - setkern [kkk#] ( - CYR_.izh - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.ch - ,CYR_.cherv - ); - setkern [kk#] ( - CYR_.u - ); - setkern [kkk#] ( - CYR_.izh - ); - endligtable; - - fi - - - beginligtable - labelchar ( CYR_.k ); - labelchar ( - CYR_.zh - ,CYR_.h - ); - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.b - ,CYR_.yu - ,CYR_.erev - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.l_yus - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.zh - ,CYR_.h - ,CYR_.u - ,CYR_.izh - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - endligtable; - - - beginligtable - labelchar ( CYR_.t ); - labelchar ( - CYR_.g - ,CYR_.r - ,CYR_.cherv - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.l_yus - ,CYR_.a - ,CYR_.d - ,CYR_.l - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.l_yus - ,CYR_.a - ,CYR_.d - ,CYR_.l - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.izh - ); - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.l_yus - ,CYR_.a - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - setkern [kk#] ( - CYR_.d - ,CYR_.l - ); - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.izhe - ); - setkern [-k#] ( - CYR_.izhe - ); - endligtable; - -else: - - if ROMANfont: - - - beginligtable - labelchar ( - CYR_.a - ); - setkern [k#] ( - CYR_.ch - ,CYR_.cherv - ,CYR_.u - if serifs: - ,CYR_.izh - fi - ); - endligtable; - - if concrete: - - beginligtable - labelchar ( CYR_.d ); - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.ch - ,CYR_.cherv - ,CYR_.u - ,CYR_.izh - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.cherv - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.ch - ,CYR_.cherv - ,CYR_.u - ,CYR_.izh - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.cherv - ); - endligtable; - - fi - - beginligtable - labelchar ( CYR_.t ); - labelchar ( - CYR_.g - if kapitel: - ,CYR_.r - fi - ); - if serifs: - setkern [k#] ( - CYR_.a - ); - fi - setkern [k#] ( - CYR_.d - ,CYR_.l - if kapitel: - ,CYR_.a - fi - ,CYR_.l_yus - ,CYR_.ya - ,CYR_.b_yus - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - - beginligtable - labelchar ( CYR_.k ); - labelchar ( - CYR_.zh - ,CYR_.h - ); - setkern [k#] ( - CYR_.a - ); - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ,CYR_.e - ,CYR_.yo - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ,CYR_.izh - ); - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ,CYR_.e - ,CYR_.yo - ,CYR_.ya - ,CYR_.b_yus - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.l_yus - ); - setkern [-u#] ( - CYR_.d - ,CYR_.l - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - else: - - - beginligtable - labelchar ( CYR_.e ); - labelchar ( - CYR_.yo - ); - setkern [-u#] ( - CYR_.f - ,CYR_.psi - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.izh - ); - setkern [kk#] ( - CYR_.l - ,CYR_.m - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.izh - ,CYR_.hrdsn - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.cherv - ); - endligtable; - - fi - - - beginligtable - labelchar ( - CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - fi - ,CYR_.yat - if SmallCapsfont: - fi - if SmallCapsfont: - fi - if kapitel: - ,CYR_.a - fi - ,CYR_.l_yus - ,CYR_.il_yus - ); - if ROMANfont: - setkern [-u#] ( - CYR_.u - ,CYR_.izh - ); - setkern [k#] ( - CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ); - if concrete: - setkern [k#] ( - CYR_.d - ,CYR_.l - ); - fi - else: - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.izh - ,CYR_.hrdsn - ); - fi - setkern [kk#] ( - CYR_.ch - ,CYR_.cherv - ); - setkern [k#] ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.f - ,CYR_.psi - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ); - endligtable; - - - beginligtable - labelchar ( CYR_.s ); - labelchar ( - CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.b - ,CYR_.yu - ,CYR_.r - ,CYR_.f - ,CYR_.psi - ,CYR_.erev - ); - if ROMANfont: - setkern [k#] ( - CYR_.d - ,CYR_.zh - ,CYR_.h - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.l_yus - ); - else: - setkern [-u#] ( - CYR_.f - ,CYR_.psi - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ); - fi - endligtable; - - - beginligtable - labelchar ( - CYR_.b_yus - ,CYR_.ib_yus - ); - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.omga - ,CYR_.omga_tlo - ,CYR_.ot - ,CYR_.fita - ,CYR_.omga_rnd - ,CYR_.s - ,CYR_.ukr_e - ,CYR_.koppa - ,CYR_.az - ,CYR_.e - ,CYR_.yo - ,CYR_.t - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.izh - ,CYR_.u - ); - endligtable; - -fi diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldlo8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldlo8.mf deleted file mode 100644 index db1e812e299..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldlo8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is ldlo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldlq8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldlq8.mf deleted file mode 100644 index 9110a0d417a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldlq8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is ldlq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldltt8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldltt8.mf deleted file mode 100644 index 587d48cd2c5..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldltt8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is ldltt8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldocc10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldocc10.mf deleted file mode 100644 index c72fda9deb2..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldocc10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldocc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm10.mf deleted file mode 100644 index 9bc194e3409..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldorm10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm5.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm5.mf deleted file mode 100644 index d3ab721f8de..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm5.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldorm5.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm6.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm6.mf deleted file mode 100644 index 0bc57eeb728..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm6.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldorm6.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm7.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm7.mf deleted file mode 100644 index 242eb841dcc..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm7.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldorm7.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm8.mf deleted file mode 100644 index e7241ff700e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldorm8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm9.mf deleted file mode 100644 index af978073dc9..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldorm9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl10.mf deleted file mode 100644 index 6dc90ca8efe..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldosl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl5.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl5.mf deleted file mode 100644 index 7125b6627c1..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl5.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldosl5.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl6.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl6.mf deleted file mode 100644 index 6621a5b6932..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl6.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldosl6.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl7.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl7.mf deleted file mode 100644 index c546f051018..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl7.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldosl7.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl8.mf deleted file mode 100644 index e974badac9f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldosl8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl9.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl9.mf deleted file mode 100644 index 04a20ff266a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldosl9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldoti10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldoti10.mf deleted file mode 100644 index 1a68d8aad15..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldoti10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is ldoti10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldqi8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldqi8.mf deleted file mode 100644 index 1d9c535dbd7..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldqi8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is ldqi8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldsq8.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldsq8.mf deleted file mode 100644 index 4f7538bdeb9..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldsq8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is ldsq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldssdc10.mf b/Master/texmf-dist/fonts/source/lh/lh-t2d/ldssdc10.mf deleted file mode 100644 index a75cfa2e97f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-t2d/ldssdc10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is ldssdc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/irxlb8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/irxlb8.mf deleted file mode 100644 index e69e562c057..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/irxlb8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is irxlb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/irxli8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/irxli8.mf deleted file mode 100644 index 70bcfd03956..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/irxli8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is irxli8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/irxlo8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/irxlo8.mf deleted file mode 100644 index 0a50610e1de..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/irxlo8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is irxlo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/irxlq8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/irxlq8.mf deleted file mode 100644 index 4f1404d7fbb..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/irxlq8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is irxlq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/irxltt8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/irxltt8.mf deleted file mode 100644 index 4251414333e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/irxltt8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is irxltt8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def fonteq=3 enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbbx10.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbbx10.mf deleted file mode 100644 index 772e270055b..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbbx10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbbx10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo10.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo10.mf deleted file mode 100644 index 48f9ec97b0b..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbmo10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo17.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo17.mf deleted file mode 100644 index 277a2881e6d..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbmo17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo8.mf deleted file mode 100644 index 25fcb2f7a95..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbmo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo9.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo9.mf deleted file mode 100644 index 8a8adf41898..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbmo9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr10.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr10.mf deleted file mode 100644 index a6eac164776..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbmr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr17.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr17.mf deleted file mode 100644 index c60c3fd0359..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbmr17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr8.mf deleted file mode 100644 index c157e46e754..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbmr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr9.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr9.mf deleted file mode 100644 index d935e0373bf..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbmr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbso10.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbso10.mf deleted file mode 100644 index bf32a243bc4..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbso10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbso10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbso17.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbso17.mf deleted file mode 100644 index c71763746fc..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbso17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbso17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbso8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbso8.mf deleted file mode 100644 index d975a2995a8..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbso8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbso8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbso9.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbso9.mf deleted file mode 100644 index 10cbadfe7b9..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbso9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbso9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr10.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr10.mf deleted file mode 100644 index 29ac9067b75..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbsr10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr17.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr17.mf deleted file mode 100644 index e6e019d58ff..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr17.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbsr17.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr8.mf deleted file mode 100644 index c03a2dd2221..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbsr8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr9.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr9.mf deleted file mode 100644 index f1d5e38100d..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbsr9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input ebbase; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbtl10.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbtl10.mf deleted file mode 100644 index bfd9607559b..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbtl10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbtl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input exbase; def cmbright=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbto10.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxbto10.mf deleted file mode 100644 index c4d76d304bb..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxbto10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxbto10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input exbase; def cmbright=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxcodes.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxcodes.mf deleted file mode 100644 index ae0f7648d8f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxcodes.mf +++ /dev/null @@ -1,215 +0,0 @@ -% This is rxcodes.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -CYR_.A := hex"c0"; -CYR_.a := hex"e0"; -CYR_.B := hex"c1"; -CYR_.b := hex"e1"; -CYR_.V := hex"c2"; -CYR_.v := hex"e2"; -CYR_.G := hex"c3"; -CYR_.g := hex"e3"; -CYR_.D := hex"c4"; -CYR_.d := hex"e4"; -CYR_.E := hex"c5"; -CYR_.e := hex"e5"; -CYR_.ZH := hex"c6"; -CYR_.zh := hex"e6"; -CYR_.Z := hex"c7"; -CYR_.z := hex"e7"; -CYR_.I := hex"c8"; -CYR_.i := hex"e8"; -CYR_.I_shrt := hex"c9"; -CYR_.i_shrt := hex"e9"; -CYR_.K := hex"ca"; -CYR_.k := hex"ea"; -CYR_.L := hex"cb"; -CYR_.l := hex"eb"; -CYR_.M := hex"cc"; -CYR_.m := hex"ec"; -CYR_.N := hex"cd"; -CYR_.n := hex"ed"; -CYR_.O := hex"ce"; -CYR_.o := hex"ee"; -CYR_.P := hex"cf"; -CYR_.p := hex"ef"; -CYR_.R := hex"d0"; -CYR_.r := hex"f0"; -CYR_.S := hex"d1"; -CYR_.s := hex"f1"; -CYR_.T := hex"d2"; -CYR_.t := hex"f2"; -CYR_.U := hex"d3"; -CYR_.u := hex"f3"; -CYR_.F := hex"d4"; -CYR_.f := hex"f4"; -CYR_.H := hex"d5"; -CYR_.h := hex"f5"; -CYR_.C := hex"d6"; -CYR_.c := hex"f6"; -CYR_.CH := hex"d7"; -CYR_.ch := hex"f7"; -CYR_.SH := hex"d8"; -CYR_.sh := hex"f8"; -CYR_.SHCH := hex"d9"; -CYR_.shch := hex"f9"; -CYR_.HRDSN := hex"da"; -CYR_.hrdsn := hex"fa"; -CYR_.ERY := hex"db"; -CYR_.ery := hex"fb"; -CYR_.SFTSN := hex"dc"; -CYR_.sftsn := hex"fc"; -CYR_.EREV := hex"dd"; -CYR_.erev := hex"fd"; -CYR_.YU := hex"de"; -CYR_.yu := hex"fe"; -CYR_.YA := hex"df"; -CYR_.ya := hex"ff"; -CYR_.YO := hex"9c"; -CYR_.yo := hex"bc"; -CYR_.AE := hex"41"; -CYR_.ae := hex"61"; -CYR_.DJE := hex"42"; -CYR_.dje := hex"62"; -CYR_.TSHE := hex"43"; -CYR_.tshe := hex"63"; -CYR_.ABH_CH := hex"44"; -CYR_.abh_ch := hex"64"; -CYR_.ABH_CH_dsc := hex"45"; -CYR_.abh_ch_dsc := hex"65"; -CYR_.K_vcrs := hex"46"; -CYR_.k_vcrs := hex"66"; -CYR_.K_hcrs := hex"47"; -CYR_.k_hcrs := hex"67"; -CYR_.L_dsc := hex"48"; -CYR_.l_dsc := hex"68"; -CYR_.LAT_I := hex"49"; -CYR_.lat_i := hex"69"; -CYR_.LAT_J := hex"4a"; -CYR_.lat_j := hex"6a"; -CYR_.LJE := hex"4b"; -CYR_.lje := hex"6b"; -CYR_.M_dsc := hex"4c"; -CYR_.m_dsc := hex"6c"; -CYR_.NJE := hex"4d"; -CYR_.nje := hex"6d"; -CYR_.ABH_HA := hex"4e"; -CYR_.abh_ha := hex"6e"; -CYR_.P_tl := hex"4f"; -CYR_.p_tl := hex"6f"; -CYR_.R_dsc := hex"50"; -CYR_.r_dsc := hex"70"; -CYR_.LAT_Q := hex"51"; -CYR_.lat_q := hex"71"; -CYR_.T_dsc := hex"52"; -CYR_.t_dsc := hex"72"; -CYR_.LAT_S := hex"53"; -CYR_.lat_s := hex"73"; -CYR_.TETSE := hex"54"; -CYR_.tetse := hex"74"; -CYR_.DZHE := hex"55"; -CYR_.dzhe := hex"75"; -CYR_.CH_vcrs := hex"56"; -CYR_.ch_vcrs := hex"76"; -CYR_.LAT_W := hex"57"; -CYR_.lat_w := hex"77"; -CYR_.YAT := hex"58"; -CYR_.yat := hex"78"; -CYR_.B_YUS := hex"59"; -CYR_.b_yus := hex"79"; -CYR_.IZH := hex"5a"; -CYR_.izh := hex"7a"; -CYR_.N_ltl := hex"1c"; -CYR_.n_ltl := hex"1d"; -CYR_.DELTA := hex"1e"; -CYR_.delta := hex"1f"; -CYR_.G_up := hex"80"; -CYR_.g_up := hex"a0"; -CYR_.G_hcrs := hex"81"; -CYR_.g_hcrs := hex"a1"; -CYR_.G_dsc := hex"82"; -CYR_.g_dsc := hex"a2"; -CYR_.G_tl := hex"83"; -CYR_.g_tl := hex"a3"; -CYR_.SHHA := hex"84"; -CYR_.shha := hex"a4"; -CYR_.ZH_dsc := hex"85"; -CYR_.zh_dsc := hex"a5"; -CYR_.Z_dsc := hex"86"; -CYR_.z_dsc := hex"a6"; -CYR_.ABH_DZE := hex"87"; -CYR_.abh_dze := hex"a7"; -CYR_.UKR_I := hex"88"; -CYR_.ukr_i := hex"a8"; -CYR_.K_dsc := hex"89"; -CYR_.k_dsc := hex"a9"; -CYR_.K_beak := hex"8a"; -CYR_.k_beak := hex"aa"; -CYR_.K_tl := hex"8b"; -CYR_.k_tl := hex"ab"; -CYR_.L_tl := hex"8c"; -CYR_.l_tl := hex"ac"; -CYR_.N_dsc := hex"8d"; -CYR_.n_dsc := hex"ad"; -CYR_.NG := hex"8e"; -CYR_.ng := hex"ae"; -CYR_.N_tl := hex"8f"; -CYR_.n_tl := hex"af"; -CYR_.OTLD := hex"90"; -CYR_.otld := hex"b0"; -CYR_.S_dsc := hex"91"; -CYR_.s_dsc := hex"b1"; -CYR_.U_shrt := hex"92"; -CYR_.u_shrt := hex"b2"; -CYR_.Y := hex"93"; -CYR_.y := hex"b3"; -CYR_.Y_hcrs := hex"94"; -CYR_.y_hcrs := hex"b4"; -CYR_.H_dsc := hex"95"; -CYR_.h_dsc := hex"b5"; -CYR_.H_tl := hex"96"; -CYR_.h_tl := hex"b6"; -CYR_.CH_ldsc := hex"97"; -CYR_.ch_ldsc := hex"b7"; -CYR_.CH_rdsc := hex"98"; -CYR_.ch_rdsc := hex"b8"; -CYR_.UKR_E := hex"99"; -CYR_.ukr_e := hex"b9"; -CYR_.SCHWA := hex"9a"; -CYR_.schwa := hex"ba"; -CYR_.EPS := hex"9b"; -CYR_.eps := hex"bb"; -CYR_.Agrave := hex"00"; -CYR_.Aacute := hex"01"; -CYR_.Ahat := hex"02"; -CYR_.Atilde := hex"03"; -CYR_.Aumlaut := hex"04"; -CYR_.Aacute_dbl := hex"05"; -CYR_.Aring := hex"06"; -CYR_.Ahachek := hex"07"; -CYR_.Abreve := hex"08"; -CYR_.Abar := hex"09"; -CYR_.Adot := hex"0a"; -CYR_.Acedilla := hex"0b"; -CYR_.Aogonek := hex"0c"; -CYR_.palochka := hex"0d"; -CYR_.angle_left := hex"0e"; -CYR_.angle_right := hex"0f"; -CYR_.Afrown := hex"12"; -CYR_.Agrave_dbl := hex"13"; -CYR_.Acyrbreve := hex"14"; -CYR_.dash := hex"16"; -CYR_.wordmark := hex"17"; -CYR_.pmzero := hex"18"; -CYR_.Agrave_cross := hex"19"; -CYR_.Aacute_cross := hex"1a"; -CYR_.Ahcross := hex"1b"; -CYR_.dbl_quotes := hex"22"; -CYR_.No := hex"9d"; -CYR_.currency := hex"9e"; -CYR_.section := hex"9f"; -CYR_.baseqq := hex"bd"; -CYR_.flqq := hex"be"; -CYR_.frqq := hex"bf"; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxlb8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxlb8.mf deleted file mode 100644 index 19480bdd82e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxlb8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is rxlb8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxli8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxli8.mf deleted file mode 100644 index 95edddeeca4..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxli8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is rxli8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxliker.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxliker.mf deleted file mode 100644 index 195d361ee03..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxliker.mf +++ /dev/null @@ -1,2304 +0,0 @@ -% This is rxliker.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - - -beginligtable - labelchar ( - CYR_.HRDSN - ,CYR_.SFTSN - ,CYR_.DJE - ,CYR_.LJE - ,CYR_.NJE - ,CYR_.YAT - ,CYR_.P_tl - ,CYR_.SHHA - ); - setkern [k#] ( - CYR_.ZH - ,CYR_.ZH_dsc - ,CYR_.H - ,CYR_.H_dsc - ,CYR_.H_tl - ); - labelchar ( - CYR_.A - if serifs: - ,CYR_.B_YUS - fi - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.LAT_Q - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ); - setkern [kk#] ( - CYR_.T - ,CYR_.T_dsc - ,CYR_.HRDSN - ,CYR_.DJE - ,CYR_.TSHE - ,CYR_.YAT - ,CYR_.K_beak - ,CYR_.TETSE - ,CYR_.CH - ,CYR_.CH_ldsc - ,CYR_.CH_rdsc - ,CYR_.CH_vcrs - ,CYR_.Y - ,CYR_.Y_hcrs - ,CYR_.ABH_CH - ,CYR_.ABH_CH_dsc - ); - if serifs: - setkern [kk#] ( - CYR_.U - ,CYR_.U_shrt - ); - setkern [kkk#] ( - CYR_.IZH - ,CYR_.LAT_W - ); - else: - setkern [k#] ( - CYR_.U - ,CYR_.U_shrt - ); - setkern [kk#] ( - CYR_.IZH - ,CYR_.LAT_W - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [kk#] ( - CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.dje - ,CYR_.tshe - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - setkern [kkk#] ( - CYR_.izh - ,CYR_.lat_w - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.k - ,CYR_.k_dsc - ,CYR_.k_vcrs - ,CYR_.k_tl - ,CYR_.n - ,CYR_.nje - ,CYR_.n_dsc - ,CYR_.n_tl - ,CYR_.ng - ,CYR_.p - ,CYR_.p_tl - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.yu - ,CYR_.yat - ,CYR_.ukr_i - ,CYR_.lat_i - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ); - fi - fi - endligtable; - -if concrete: - - beginligtable - labelchar ( CYR_.D ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.LAT_Q - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ); - setkern [kk#] ( - CYR_.T - ,CYR_.T_dsc - ,CYR_.HRDSN - ,CYR_.DJE - ,CYR_.TSHE - ,CYR_.YAT - ,CYR_.K_beak - ,CYR_.TETSE - ,CYR_.CH - ,CYR_.CH_ldsc - ,CYR_.CH_rdsc - ,CYR_.CH_vcrs - ,CYR_.Y - ,CYR_.Y_hcrs - ,CYR_.ABH_CH - ,CYR_.ABH_CH_dsc - ); - if serifs: - setkern [kk#] ( - CYR_.U - ,CYR_.U_shrt - ); - setkern [kkk#] ( - CYR_.IZH - ,CYR_.LAT_W - ); - else: - setkern [k#] ( - CYR_.U - ,CYR_.U_shrt - ); - setkern [kk#] ( - CYR_.IZH - ,CYR_.LAT_W - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [kk#] ( - CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.dje - ,CYR_.tshe - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - setkern [kkk#] ( - CYR_.izh - ,CYR_.lat_w - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.k - ,CYR_.k_dsc - ,CYR_.k_vcrs - ,CYR_.k_tl - ,CYR_.n - ,CYR_.nje - ,CYR_.n_dsc - ,CYR_.n_tl - ,CYR_.ng - ,CYR_.p - ,CYR_.p_tl - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.yu - ,CYR_.yat - ,CYR_.ukr_i - ,CYR_.lat_i - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ); - fi - fi - endligtable; - - - beginligtable - labelchar ( CYR_.L ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.LAT_Q - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ); - setkern [kk#] ( - CYR_.T - ,CYR_.T_dsc - ,CYR_.HRDSN - ,CYR_.DJE - ,CYR_.TSHE - ,CYR_.YAT - ,CYR_.K_beak - ,CYR_.TETSE - ,CYR_.CH - ,CYR_.CH_ldsc - ,CYR_.CH_rdsc - ,CYR_.CH_vcrs - ,CYR_.Y - ,CYR_.Y_hcrs - ,CYR_.ABH_CH - ,CYR_.ABH_CH_dsc - ); - if serifs: - setkern [kk#] ( - CYR_.U - ,CYR_.U_shrt - ); - setkern [kkk#] ( - CYR_.IZH - ,CYR_.LAT_W - ); - else: - setkern [k#] ( - CYR_.U - ,CYR_.U_shrt - ); - setkern [kk#] ( - CYR_.IZH - ,CYR_.LAT_W - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [kk#] ( - CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.dje - ,CYR_.tshe - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - setkern [kkk#] ( - CYR_.izh - ,CYR_.lat_w - ); - elseif ROMANfont: - setkern [k#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ); - else: - setkern [k#] ( - CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.k - ,CYR_.k_dsc - ,CYR_.k_vcrs - ,CYR_.k_tl - ,CYR_.n - ,CYR_.nje - ,CYR_.n_dsc - ,CYR_.n_tl - ,CYR_.ng - ,CYR_.p - ,CYR_.p_tl - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.yu - ,CYR_.yat - ,CYR_.ukr_i - ,CYR_.lat_i - ,CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ); - fi - fi - endligtable; - -fi - -beginligtable - labelchar ( CYR_.K ); - labelchar ( - CYR_.K_dsc - ,CYR_.K_vcrs - ,CYR_.K_hcrs - ,CYR_.K_beak - ,CYR_.ZH - ,CYR_.ZH_dsc - ,CYR_.H - ,CYR_.H_dsc - ,CYR_.H_tl - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.LAT_Q - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ,CYR_.ABH_CH - ,CYR_.ABH_CH_dsc - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - else: - setkern [k#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - if ROMANfont: - setkern [k#] ( - CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ); - fi - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.LAT_Q - ,CYR_.YU - ,CYR_.EREV - ,CYR_.SCHWA - ); - setkern [k#] ( - CYR_.A - ,CYR_.AE - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - ,CYR_.ZH - ,CYR_.ZH_dsc - ,CYR_.H - ,CYR_.H_dsc - ,CYR_.H_tl - ,CYR_.Y - ,CYR_.Y_hcrs - ,CYR_.U - ,CYR_.U_shrt - ,CYR_.IZH - ,CYR_.LAT_W - if serifs: - ,CYR_.YA - ,CYR_.B_YUS - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_tl - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - elseif ROMANfont: - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( CYR_.T ); - labelchar ( - CYR_.T_dsc - ,CYR_.G - ,CYR_.G_hcrs - ,CYR_.NG - ,CYR_.G_dsc - ); - setkern [kk#] ( - CYR_.A - ,CYR_.AE - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - ,CYR_.B_YUS - fi - ); - if not concrete: - if serifs: - setkern [k#] ( - CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - else: - setkern [-u#] ( - CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_tl - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.f - ,CYR_.lat_q - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - else: - setkern [kk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.G_up - ); - setkern [kk#] ( - CYR_.A - ,CYR_.AE - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - ,CYR_.B_YUS - fi - ); - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.LAT_Q - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ); - if not concrete: - if serifs: - setkern [k#] ( - CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - else: - setkern [-u#] ( - CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_tl - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.f - ,CYR_.lat_q - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.Y - ,CYR_.Y_hcrs - ); - setkern [kk#] ( - CYR_.A - ,CYR_.AE - if concrete: - ,CYR_.D - ,CYR_.L - else: - ,CYR_.D - fi - if serifs: - ,CYR_.YA - ,CYR_.B_YUS - fi - ); - if not concrete: - setkern [-u#] ( - CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_tl - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - else: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.e - ,CYR_.yo - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - if ROMANfont: - if serifs: - setkern [kkk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - else: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - fi - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.IZH - ,CYR_.LAT_W - ); - if serifs: - setkern [kkk#] ( - CYR_.A - ,CYR_.AE - if concrete: - ,CYR_.D - ,CYR_.L - fi - ,CYR_.YA - ,CYR_.B_YUS - ); - else: - setkern [kk#] ( - CYR_.A - ,CYR_.AE - ); - setkern [-u#] ( - CYR_.D - ,CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.LAT_Q - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ,CYR_.ABH_CH - ,CYR_.ABH_CH_dsc - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - fi - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - setkern [kk#] ( - if concrete: - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - else: - if serifs: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.e - ,CYR_.yo - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.e - ,CYR_.yo - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - fi - if ROMANfont: - if serifs: - setkern [kkk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - else: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - fi - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.U - ,CYR_.U_shrt - ); - if serifs: - setkern [kk#] ( - CYR_.A - ,CYR_.AE - if concrete: - ,CYR_.D - ,CYR_.L - fi - ,CYR_.YA - ,CYR_.B_YUS - ); - if not concrete: - setkern [-u#] ( - CYR_.D - ,CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - else: - setkern [k#] ( - CYR_.A - ,CYR_.AE - ); - setkern [-u#] ( - CYR_.D - ,CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - ); - fi - setkern [k#] ( - CYR_.O - ,CYR_.F - ,CYR_.OTLD - ,CYR_.ABH_HA - ,CYR_.LAT_Q - ,CYR_.S - ,CYR_.S_dsc - ,CYR_.UKR_E - ,CYR_.ABH_CH - ,CYR_.ABH_CH_dsc - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - fi - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - setkern [kk#] ( - if concrete: - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - else: - if serifs: - setkern [kk#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.e - ,CYR_.yo - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - fi - if ROMANfont: - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - else: - setkern [kkk#] ( - CYR_.i - ,CYR_.i_shrt - ,CYR_.c - ,CYR_.sh - ,CYR_.shch - ,CYR_.sftsn - ,CYR_.ery - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ); - fi - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.R - ,CYR_.R_dsc - ); - setkern [kk#] ( - CYR_.A - ,CYR_.AE - ,CYR_.D - ,CYR_.L - ,CYR_.LJE - ,CYR_.L_tl - ,CYR_.L_dsc - if serifs: - ,CYR_.YA - ,CYR_.B_YUS - fi - ); - if not TITLEfont: - if SmallCapsfont: - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if concrete: - ,CYR_.d - ,CYR_.l - else: - ,CYR_.d - fi - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - setkern [k#] ( - CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - else: - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.e - ,CYR_.yo - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ); - fi - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ,[ASCII ";"] - ,[ASCII ":"] - ); - fi - fi - endligtable; - - -beginligtable - labelchar ( - CYR_.LAT_I - ,CYR_.UKR_I - ); - setkern [-k#] ( - CYR_.LAT_I - ,CYR_.UKR_I - ); - endligtable; - -if TITLEfont: endinput \\ fi; - -if SmallCapsfont: - - u#:=lower.u#; - k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; - - - - beginligtable - labelchar ( - if kapitel: - CYR_.a - fi - ,CYR_.a - ,CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - ,CYR_.dje - fi - ,CYR_.lje - ,CYR_.nje - ,CYR_.yat - ,CYR_.p_tl - if SmallCapsfont: - ,CYR_.shha - fi - if SmallCapsfont: - fi - if serifs: - ,CYR_.b_yus - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.dje - ,CYR_.tshe - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [kk#] ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - setkern [kkk#] ( - CYR_.izh - ,CYR_.lat_w - ); - endligtable; - - if concrete: - - - beginligtable - labelchar ( CYR_.d ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.dje - ,CYR_.tshe - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [kk#] ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - setkern [kkk#] ( - CYR_.izh - ,CYR_.lat_w - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.dje - ,CYR_.tshe - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ); - setkern [kk#] ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - setkern [kkk#] ( - CYR_.izh - ,CYR_.lat_w - ); - endligtable; - - fi - - - beginligtable - labelchar ( CYR_.k ); - labelchar ( - CYR_.k_dsc - ,CYR_.k_vcrs - ,CYR_.k_hcrs - ,CYR_.k_beak - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_tl - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.b - ,CYR_.yu - ,CYR_.erev - ,CYR_.schwa - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_tl - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - endligtable; - - - beginligtable - labelchar ( CYR_.t ); - labelchar ( - CYR_.t_dsc - ,CYR_.g - ,CYR_.g_up - ,CYR_.g_hcrs - ,CYR_.ng - ,CYR_.g_dsc - ,CYR_.r - ,CYR_.r_dsc - ); - setkern [k#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - ,CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.izh - ,CYR_.lat_w - ); - setkern [kkk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ,CYR_.a - if serifs: - ,CYR_.ya - ,CYR_.b_yus - fi - ); - setkern [kk#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.lat_i - ,CYR_.ukr_i - ); - setkern [-k#] ( - CYR_.lat_i - ,CYR_.ukr_i - ); - endligtable; - -else: - - if ROMANfont: - - - beginligtable - labelchar ( - CYR_.a - ); - setkern [k#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - if serifs: - ,CYR_.izh - ,CYR_.lat_w - fi - ); - endligtable; - - if concrete: - - beginligtable - labelchar ( CYR_.d ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.l - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - - fi - - beginligtable - labelchar ( CYR_.t ); - labelchar ( - CYR_.t_dsc - ,CYR_.g - ,CYR_.g_up - ,CYR_.g_hcrs - ,CYR_.ng - ,CYR_.g_dsc - if kapitel: - ,CYR_.r - fi - ); - if serifs: - setkern [k#] ( - CYR_.a - ); - fi - setkern [k#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ,CYR_.ya - ,CYR_.b_yus - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - - beginligtable - labelchar ( CYR_.k ); - labelchar ( - CYR_.k_dsc - ,CYR_.k_vcrs - ,CYR_.k_hcrs - ,CYR_.k_beak - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_tl - ); - setkern [k#] ( - CYR_.a - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.e - ,CYR_.yo - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.lat_i - ); - setkern [-k#] ( - CYR_.ukr_i - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.ukr_i - ); - setkern [-k#] ( - CYR_.lat_i - ); - setkern [-kk#] ( - CYR_.ukr_i - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ); - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.e - ,CYR_.yo - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ,CYR_.ya - ,CYR_.b_yus - ); - setkern [kk#] ( - if kapitel: - CYR_.a - fi - ,CYR_.ae - ); - setkern [-u#] ( - CYR_.d - ,CYR_.l - ,CYR_.lje - ,CYR_.l_tl - ,CYR_.l_dsc - ); - if altcoding: - setkern [kk#] ( - [ASCII "."] - ,[ASCII ","] - ); - fi - endligtable; - - else: - - - beginligtable - labelchar ( CYR_.e ); - labelchar ( - CYR_.yo - ); - setkern [-u#] ( - CYR_.f - ,CYR_.lat_q - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.g_up - ); - setkern [kkk#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ); - setkern [kk#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ); - endligtable; - - - beginligtable - labelchar ( - CYR_.ukr_i - ); - setkern [-k#] ( - CYR_.dje - ,CYR_.tshe - ); - labelchar ( - CYR_.lat_i - ); - setkern [-k#] ( - CYR_.ukr_i - ); - endligtable; - - - beginligtable - labelchar ( CYR_.l ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.tetse - ); - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - endligtable; - - fi - - - beginligtable - labelchar ( - CYR_.hrdsn - ,CYR_.sftsn - if SmallCapsfont: - ,CYR_.dje - fi - ,CYR_.lje - ,CYR_.nje - ,CYR_.yat - ,CYR_.p_tl - if SmallCapsfont: - ,CYR_.shha - fi - if SmallCapsfont: - fi - if kapitel: - ,CYR_.a - fi - ); - if ROMANfont: - setkern [-u#] ( - CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ); - setkern [k#] ( - CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ); - if concrete: - setkern [k#] ( - CYR_.d - ,CYR_.l - ); - fi - else: - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ,CYR_.y - ,CYR_.y_hcrs - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.hrdsn - ,CYR_.k_beak - ,CYR_.tetse - ); - fi - setkern [kk#] ( - CYR_.ch - ,CYR_.ch_ldsc - ,CYR_.ch_rdsc - ,CYR_.ch_vcrs - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ); - setkern [k#] ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.f - ,CYR_.lat_q - ,CYR_.s_dsc - ,CYR_.ukr_e - ); - endligtable; - - - beginligtable - labelchar ( CYR_.s ); - labelchar ( - CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.b - ,CYR_.yu - ,CYR_.r - ,CYR_.f - ,CYR_.erev - ,CYR_.schwa - ); - if ROMANfont: - setkern [k#] ( - CYR_.d - ,CYR_.zh - ,CYR_.zh_dsc - ,CYR_.h - ,CYR_.h_dsc - ,CYR_.h_tl - ,CYR_.ya - ,CYR_.b_yus - if kapitel: - ,CYR_.a - fi - ,CYR_.ae - ); - else: - setkern [-u#] ( - CYR_.f - ,CYR_.lat_q - ,CYR_.a - ); - setkern [k#] ( - CYR_.l - ,CYR_.m - ,CYR_.lje - ,CYR_.g_up - ,CYR_.l_dsc - ,CYR_.l_tl - ,CYR_.m_dsc - ); - fi - endligtable; - - - beginligtable - labelchar ( - CYR_.b_yus - ); - setkern [k#] ( - CYR_.a - ,CYR_.o - ,CYR_.otld - ,CYR_.abh_ha - ,CYR_.s - ,CYR_.s_dsc - ,CYR_.ukr_e - ,CYR_.e - ,CYR_.yo - ,CYR_.abh_ch - ,CYR_.abh_ch_dsc - ,CYR_.t - ,CYR_.t_dsc - ,CYR_.hrdsn - ,CYR_.yat - ,CYR_.k_beak - ,CYR_.tetse - ,CYR_.izh - ,CYR_.lat_w - ,CYR_.u - ,CYR_.u_shrt - ,CYR_.y - ,CYR_.y_hcrs - ); - endligtable; - -fi diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxlo8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxlo8.mf deleted file mode 100644 index aedee7e1a54..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxlo8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is rxlo8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxlq8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxlq8.mf deleted file mode 100644 index 151a6e12723..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxlq8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is rxlq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxltt8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxltt8.mf deleted file mode 100644 index 2631b925f4d..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxltt8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is rxltt8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxocc10.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxocc10.mf deleted file mode 100644 index 291d9c808be..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxocc10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxocc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm10.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm10.mf deleted file mode 100644 index a1ca76db1cd..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxorm10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm5.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm5.mf deleted file mode 100644 index be322a01eb2..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm5.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxorm5.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm6.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm6.mf deleted file mode 100644 index cde680e3285..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm6.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxorm6.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm7.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm7.mf deleted file mode 100644 index 217aadeac53..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm7.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxorm7.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm8.mf deleted file mode 100644 index 75a03c24886..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxorm8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm9.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm9.mf deleted file mode 100644 index 9590ed2b63e..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxorm9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxorm9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl10.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl10.mf deleted file mode 100644 index 84212ea4dad..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxosl10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl5.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl5.mf deleted file mode 100644 index ce33b699e2d..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl5.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxosl5.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl6.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl6.mf deleted file mode 100644 index a210624af41..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl6.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxosl6.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl7.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl7.mf deleted file mode 100644 index 8e3ecfe2ee9..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl7.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxosl7.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl8.mf deleted file mode 100644 index fede2f6f0aa..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl8.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxosl8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl9.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl9.mf deleted file mode 100644 index e8de2186038..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxosl9.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxosl9.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxoti10.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxoti10.mf deleted file mode 100644 index ff03e8ad7b6..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxoti10.mf +++ /dev/null @@ -1,7 +0,0 @@ -% This is rxoti10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -def concrete=true enddef; -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxqi8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxqi8.mf deleted file mode 100644 index a48eb1d19ca..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxqi8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is rxqi8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxsq8.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxsq8.mf deleted file mode 100644 index 0895f6fed0a..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxsq8.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is rxsq8.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/lh-x2/rxssdc10.mf b/Master/texmf-dist/fonts/source/lh/lh-x2/rxssdc10.mf deleted file mode 100644 index 0ba39c9dd98..00000000000 --- a/Master/texmf-dist/fonts/source/lh/lh-x2/rxssdc10.mf +++ /dev/null @@ -1,6 +0,0 @@ -% This is rxssdc10.mf in text format as of 2004/6/6 -% created by LHfonts (TeX4MF) version 3.4 -% -% - -input fikparm; diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgbersta.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgbersta.mf index e2f8174d73a..e957b9754a3 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgbersta.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgbersta.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -44,7 +44,7 @@ % Lk_lcom % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Lowercase Special letter Lb_bar"; cyrchar(Lb_bar,10u#+serif_fit#,asc_height#,0); diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgberstb.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgberstb.mf index a111de37a5e..7505bd53a55 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgberstb.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgberstb.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -46,7 +46,7 @@ % Lz_lcom % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Lowercase Special letter Llpol"; cyrchar(Lpoll,5u#,asc_height#,0); l_width#:=5u#+2serif_fit#; @@ -808,7 +808,7 @@ if serifs: pos[_two](vair',-90); pos[_three](hair,-180); pos[_four](bulb_diam,-180); x[_two]=.5[x[_one],x[_three]r]; - bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=-.85d; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; z[_three]r=z[_four]r; rt x[_four]l=max(x[_zero]l-bulb_diam, floor x[_zero]-2.5u if monospace: / expansion_factor fi); diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgberstc.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgberstc.mf index 3ab8f5338e7..4085508bafe 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgberstc.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgberstc.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -52,7 +52,7 @@ % Csh_lngst % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Lowercase Special letter Lflap"; numeric r_flare#; r_flare#=.75[if serifs: stem# else: vair# fi,flare#]; @@ -515,7 +515,7 @@ if serifs: pos[_two](vair',-90); pos[_three](hair,-180); pos[_four](bulb_diam,-180); x[_two]=.5[x[_one],x[_three]r]; - bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=-.85d; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; z[_three]r=z[_four]r; rt x[_four]l=max(x[_zero]l-bulb_diam, floor x[_zero]-2.5u if monospace: / expansion_factor fi); diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgcacci.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgcacci.mf index ac33585cf81..7c564bd8489 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgcacci.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgcacci.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -28,7 +28,6 @@ % u_gr % u_com % ery_bar -% erev_uml % erev_dot % erev_bar % yu_bar @@ -50,7 +49,7 @@ % Vt - Serbian italic variant % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Italic Cyrillic letter a_bar"; cyrchar(a_bar,9u#,lc_trema_height#,0); @@ -130,11 +129,12 @@ filldraw stroke pulled_arc.e(1,2) & pulled_arc.e(2,3) y[_four]+.5bulb_diam=-d+y_move+height; pos[_four](bulb_diam,90); pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45); - z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam + z[_one]r=z[_four]r; + rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam +if monospace:.28u / expansion_factor else:.25u fi)+2eps; x[_three]=x[_four]-.5u if monospace: /expansion_factor fi; - y[_two]=1/3[y[_one],y[_three]]; - bot y[_three]r=vround(y[_four]-(height-.5bulb_diam)); + y[_two]=1/3[y[_one],y[_three]]+eps; + bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps; y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three]) intersectiontimes (z[_four]l{right}..{left}z[_four]r)); if y_<0: y_:=1; fi @@ -265,11 +265,12 @@ h:=full_h; y[_four]+.5bulb_diam=h+y_move; pos[_four](bulb_diam,90); pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45); - z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam + z[_one]r=z[_four]r; + rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam +if monospace:.28u / expansion_factor else:.25u fi)+2eps; x[_three]=x[_four]-.5u if monospace: /expansion_factor fi; - y[_two]=1/3[y[_one],y[_three]]; - bot y[_three]r=vround(y[_four]-(height-.5bulb_diam)); + y[_two]=1/3[y[_one],y[_three]]+eps; + bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps; y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three]) intersectiontimes (z[_four]l{right}..{left}z[_four]r)); if y_<0: y_:=1; fi @@ -324,30 +325,6 @@ else: filldraw stroke z[_one]e--z[_two]e; fi % bar penlabels(0,1,1',2,3,4,5,6,7,8,9,10, 11,12); endchar; -lhchar "Italic Cyrillic letter erev_uml - reverse e umlaut"; -cyrchar(erev_uml,8u#,lc_trema_height#,0); -italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi; %o -adjust_fit(0,if monospace:0 else:-.35u# fi); %o -h:=x_height; -% ital_erev; -pickup fine.nib; -pos0(flare,180); pos1(hair,-180); pos2(vair,-90); -pos3(curve,0); pos4(vair,90); pos5(hair,140); -x2+.5u=x4=.5(w-u); lft x1r=min(lft x2,hround(.25u))-eps; -rt x3r=w-hround(1.5u-.5curve); lft x5r=good.x (lft x1r-eps); x6=x5; -y1-.5flare=.1h; bot y2r=-oo; bulb(2,1,0); % bulb -top y4r=h+oo; y3=.5[y2,y4]; top y5r=vround .5[bar_height,h]; -y6=bar_height; path p; p=z4{left}....z5..z6; -filldraw stroke pulled_arc.e(2,3) - & pulled_arc.e(3,4)...{direction 1 of p}z5e; % arc -x7=x3; y7=bar_height; y8=y7; lft x8=hround min(lft x2-1-eps,rt x0l+eps); -pos7(vair,90); pos8(vair,90); -filldraw stroke z7e--z8e; -%%% -% the accent -h:=full_h; lowercase_umlaut(0,0, 9,10,11,12); -penlabels(0,1,2,3,4,5,6,7,8, 9,10,11,12); endchar; - lhchar "Italic Cyrillic letter erev_dot - reverse e dot"; cyrchar_twice(erev_dot,8u#,x_height#,0); italcorr x_height#*slant-beak_jut#-.25u#; %o @@ -801,11 +778,12 @@ filldraw stroke z7e{down}..{-u,-x_height}z8e; % right stem y[_four]+.5bulb_diam=-d+y_move+height; pos[_four](bulb_diam,90); pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45); - z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam + z[_one]r=z[_four]r; + rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam +if monospace:.28u / expansion_factor else:.25u fi)+2eps; x[_three]=x[_four]-.5u if monospace: /expansion_factor fi; - y[_two]=1/3[y[_one],y[_three]]; - bot y[_three]r=vround(y[_four]-(height-.5bulb_diam)); + y[_two]=1/3[y[_one],y[_three]]+eps; + bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps; y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three]) intersectiontimes (z[_four]l{right}..{left}z[_four]r)); if y_<0: y_:=1; fi diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgcaccl.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgcaccl.mf index c565dd8f05b..d914f4c8b7b 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgcaccl.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgcaccl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -28,7 +28,6 @@ % u_gr % u_com % ery_bar -% erev_uml % erev_dot % erev_bar % yu_bar @@ -44,7 +43,7 @@ % ch_ldot % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Lowercase Cyrillic letter a_bar"; cyrchar(a_bar,9u#,lc_trema_height#,0); @@ -159,11 +158,12 @@ penstroke pulled_arc.e(1,2) & pulled_arc.e(2,3) y[_four]+.5bulb_diam=-d+y_move+height; pos[_four](bulb_diam,90); pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45); - z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam + z[_one]r=z[_four]r; + rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam +if monospace:.28u / expansion_factor else:.25u fi)+2eps; x[_three]=x[_four]-.5u if monospace: /expansion_factor fi; - y[_two]=1/3[y[_one],y[_three]]; - bot y[_three]r=vround(y[_four]-(height-.5bulb_diam)); + y[_two]=1/3[y[_one],y[_three]]+eps; + bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps; y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three]) intersectiontimes (z[_four]l{right}..{left}z[_four]r)); if y_<0: y_:=1; fi @@ -412,11 +412,12 @@ h:=full_h; y[_four]+.5bulb_diam=h+y_move; pos[_four](bulb_diam,90); pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45); - z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam + z[_one]r=z[_four]r; + rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam +if monospace:.28u / expansion_factor else:.25u fi)+2eps; x[_three]=x[_four]-.5u if monospace: /expansion_factor fi; - y[_two]=1/3[y[_one],y[_three]]; - bot y[_three]r=vround(y[_four]-(height-.5bulb_diam)); + y[_two]=1/3[y[_one],y[_three]]+eps; + bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps; y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three]) intersectiontimes (z[_four]l{right}..{left}z[_four]r)); if y_<0: y_:=1; fi @@ -492,59 +493,6 @@ else: filldraw stroke z[_one]e--z[_two]e; fi % bar penlabels(1,2,3,4,5,6,7,8,9, 10,11); endchar; -lhchar "Lowercase Cyrillic letter erev_uml - reverse e umlaut"; -cyrchar(erev_uml,8u#,lc_trema_height#,0); % eng -italcorr x_height#*slant-.2u#; -adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi); -full_h:=h; h:=x_height; -% lower_erev; -set_bar_axis; -pickup fine.nib; pos2(vair',90); pos3(curve,0); pos4(vair',-90); -x2=x4=w-.5(w+u); top y2r=vround(h+1.5oo); bot y4r=-oo; -rt x3r=w-hround max(.6u,1.35u-.5curve); y3=.5h; % eng -if serifs: - pos1(hair,180); pos5(hair,-180); - y1=min(y2.bh+.75flare-.25vair+eps,.9[bar_height,h]-.75flare); - lft x1r=lft x5r=hround.5u; - y5=max(good.y(.5bar_height-.9),y4l+vair'); - (x,y4l)=whatever[z4r,z5l]; x4l:=max(x,x4l-.5u); - filldraw stroke z1e{x2-x1,5(y2-y1)}...pulled_super_arc.e(2,3)(.7superpull) - & pulled_super_arc.e(3,4)(.5superpull) - ..tension .9 and 1..{x5-x4,5(y5-y4)}z5e; % arc and lower terminal - pos6(.3[fine.breadth,hair],180); x6r=x1r; top y6=h+oo; - x1'-x1r=1.5curve; y1'=y1; - path upper_arc; upper_arc=z1{x2-x1,5(y2-y1)}..z2{right}; - numeric t; t=xpart(upper_arc intersectiontimes (z6l--z1')); - filldraw z1r--z6r--z6l--subpath(t,0) of upper_arc--cycle; % barb -else: - pos1(4/7[vair',flare],100); pos5(.6[vair',flare],-95); - lft x1r=good.x .6u; top y1r=vround .82[bar_height,top y2r]; - filldraw stroke term.e(2,1,left,.8,4); % upper terminal - lft x5r=good.x .5u; - y5r=good.y(y5r+1/3bar_height-y5); y5l:=good.y y5l; x5l:=good.x x5l; - forsuffixes e=l,r: path p.e; p.e=z4e{left}..tension .9 and 1..z5e; - if angle direction 1 of p.e<105: - p.e:=z4e{left}..tension atleast.9 and 1..{dir 105}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 -%%% -% lerev_bar; -if (serifs=true) and (bar#<=.5curve#): - x7r=max(rt x1l+.5hair,0.85[x3l,x1l]); x8r=x3l; - y7l=y8l=y1.bh; y7r=y8r=y2.bh; x7l=x7r; x8l=x8r; - numeric bar[]; - bar2=7/8[bar,fudged.stem-2stem_corr]; - penpos9(bar2,45); z9=.475[z7l,z8l]; - fill circ_stroke z7e{2,1}..{2,-1}z9e..{2,1}z8e; % curve /\/ -else: - bar_stroke(max(rt x1l+.5hair,0.85[x3l,x1l]),x3l); % bar -- -fi -%%%%% -% the accent -h:=full_h; lowercase_umlaut(0,0, 10,11,12,13); -penlabels(1,1',2,3,4,5,6,7,8,9, 10,11,12,13); endchar; - lhchar "Lowercase Cyrillic letter erev_dot - reverse e dot"; cyrchar_twice(erev_dot,8u#,x_height#,0); % eng italcorr x_height#*slant-.2u#; @@ -1063,11 +1011,12 @@ if serifs: y[_four]+.5bulb_diam=-d+y_move+height; pos[_four](bulb_diam,90); pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45); - z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam + z[_one]r=z[_four]r; + rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam +if monospace:.28u / expansion_factor else:.25u fi)+2eps; x[_three]=x[_four]-.5u if monospace: /expansion_factor fi; - y[_two]=1/3[y[_one],y[_three]]; - bot y[_three]r=vround(y[_four]-(height-.5bulb_diam)); + y[_two]=1/3[y[_one],y[_three]]+eps; + bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps; y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three]) intersectiontimes (z[_four]l{right}..{left}z[_four]r)); if y_<0: y_:=1; fi diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgcaccu.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgcaccu.mf index 73a226d11d5..317a8a6640a 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgcaccu.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgcaccu.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -29,7 +29,6 @@ % U_gr % U_com % ERY_bar -% EREV_uml % EREV_dot % EREV_bar % YU_bar @@ -45,7 +44,7 @@ % CH_ldot % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Uppercase Cyrillic letter A_bar"; cyrchar(A_bar,13u#,cap_height#+acc_height#,0); @@ -184,11 +183,12 @@ penstroke pulled_super_arc.e(1,2)(.5superpull) y[_four]+.5bulb_diam=-d+y_move+height; pos[_four](bulb_diam,90); pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45); - z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam + z[_one]r=z[_four]r; + rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam +if monospace:.28u / expansion_factor else:.25u fi)+2eps; x[_three]=x[_four]-.5u if monospace: /expansion_factor fi; - y[_two]=1/3[y[_one],y[_three]]; - bot y[_three]r=vround(y[_four]-(height-.5bulb_diam)); + y[_two]=1/3[y[_one],y[_three]]+eps; + bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps; y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three]) intersectiontimes (z[_four]l{right}..{left}z[_four]r)); if y_<0: y_:=1; fi @@ -469,11 +469,12 @@ h:=full_h; y[_four]+.5bulb_diam=h+y_move; pos[_four](bulb_diam,90); pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45); - z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam + z[_one]r=z[_four]r; + rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam +if monospace:.28u / expansion_factor else:.25u fi)+2eps; x[_three]=x[_four]-.5u if monospace: /expansion_factor fi; - y[_two]=1/3[y[_one],y[_three]]; - bot y[_three]r=vround(y[_four]-(height-.5bulb_diam)); + y[_two]=1/3[y[_one],y[_three]]+eps; + bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps; y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three]) intersectiontimes (z[_four]l{right}..{left}z[_four]r)); if y_<0: y_:=1; fi @@ -552,75 +553,6 @@ else: penlabels(1,2,3,4,5,6,7,8,9, 10,11); endchar; iff serifs:% -lhchar "Uppercase Cyrillic letter EREV_uml - Reverse E umlaut"; -cyrchar(EREV_uml,13u#,cap_height#+acc_height#,0); -if is_small_cap: getcharcode(erev_uml); fi -italcorr cap_height#*slant-.5u#; -adjust_fit(0,0); full_h:=h; h:=cap_height; -% upper_erev; - pickup fine.nib; pos1(cap_hair,180); pos2(cap_band,90); - pos3(cap_curve,0); pos4(cap_band,-90); pos5(hair,-180); - lft x1r=lft x5r=hround u; - rt x3r=hround(w-u); x2=x4=.55[x3,x1]; - top y2r=h+o; bot y4r=-o; y3=.5h-vair_corr; y3l:=.52h; - bot y1=min(vround.675h,bot y2l-eps); y5=max(good.y .95(h-y1),y4l+eps); - (x2l',y2l)=whatever[z2r,z1l]; x2l:=max(x2l',x2l-.5u); - (x4l',y4l)=whatever[z4r,z5l]; x4l:=max(x4l',x4l-.5u); - filldraw stroke z1e{x2-x1,10(y2-y1)}...pulled_super_arc.e(2,3)(.5superpull) - & pulled_super_arc.e(3,4)(.5superpull)...{up}z5e; % arc - pos6(.3[fine.breadth,cap_hair],180); x6r=x1r; top y6=h+o; - x1'-x1r=2cap_curve-fine; y1'=y1; - path upper_arc; upper_arc=z1{x2-x1,10(y2-y1)}..z2{right}; - numeric t; t=xpart(upper_arc intersectiontimes (z6l--z1')); - filldraw z1r--z6r--z6l--subpath(t,0) of upper_arc--cycle; % barb -%%% -%%% uerev_bar; -numeric bar[]; y8=y7=y3; -x8=x3l; x7=max(rt x1l+.5hair,0.85[x3l,x1l]); -if (bar#<=.5curve#): - penpos7(cap_bar,90); penpos8(cap_bar,90); - bar2=7/8[cap_bar,fudged.cap_stem-3stem_corr]; - penpos9(bar2,45); z9=.475[z7l,z8l]; - fill circ_stroke z7e{2,1}..{2,-1}z9e..{2,1}z8e; % curve /\/ -else: - pickup fine.nib; pos7(cap_bar,90); pos8(cap_bar,90); - filldraw stroke z7e--z8e; % bar -- -fi -%%% -% the accent -h:=full_h; uppercase_umlaut(x2-.5w,0, 10,11,12,13); -penlabels(1,1',2,3,4,5,6,7,8,9, 10,11,12,13); endchar; - -iff not serifs:% -lhchar "Uppercase Cyrillic letter EREV_uml - Reverse E umlaut"; -cyrchar(EREV_uml,11.5u#,cap_height#+acc_height#,0); -if is_small_cap: getcharcode(erev_uml); fi -italcorr cap_height#*slant-.5u#; -adjust_fit(0,0); full_h:=h; h:=cap_height; -% uppers_erev; - pickup fine.nib; pos1(1.2flare,100); pos2(slab,90); - pos3(cap_curve,0); pos4(slab,-90); pos5(flare,-95); - lft x1r=hround1.1u; x2=x4=w-(.5w+1.25u); - rt x3r=w-hround max(u,2u-.5cap_curve); - lft x5r=hround.9u; - top y1r=vround .95h+o; top y2r=h+o; y3=.5h; - bot y4r=-o; bot y5r=vround .08h-o; y5l:=good.y y5l; x5l:=good.x x5l; - filldraw stroke rterm.e(2,1,left,.9,4) & super_arc.e(2,3) - & super_arc.e(3,4) & term.e(4,5,left,.8,4); -%%% -% urevs_bar; -pickup fine.nib; numeric bar[]; -bar1=if is_small_cap: max(fine.breadth+eps,.6[thin_join,vair]) - else: cap_bar fi; -pos6(bar1,90); pos7(bar1,90); -y7=y6=y3; x7=x3l; x6=max(rt x1l+.5hair,0.85[x3l,x1l]); -filldraw stroke z6e--z7e; % bar -- -%%%%% -% the accent -h:=full_h; uppercase_umlaut(x2-.5w,0, 8,9,10,11); -penlabels(1,1',2,3,4,5,6,7, 8,9,10,11); endchar; - -iff serifs:% lhchar "Uppercase Cyrillic letter EREV_dot - Reverse E dot"; cyrchar_twice(EREV_dot,13u#,cap_height#+acc_height#,0); if is_small_cap: getcharcode(erev_dot); fi @@ -1180,11 +1112,12 @@ if serifs: dish_serif(2,1,c,1/3,1.414cap_jut,d,1/3,1.414cap_jut); % lower serif y[_four]+.5bulb_diam=-d+y_move+height; pos[_four](bulb_diam,90); pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45); - z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam + z[_one]r=z[_four]r; + rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam +if monospace:.28u / expansion_factor else:.25u fi)+2eps; x[_three]=x[_four]-.5u if monospace: /expansion_factor fi; - y[_two]=1/3[y[_one],y[_three]]; - bot y[_three]r=vround(y[_four]-(height-.5bulb_diam)); + y[_two]=1/3[y[_one],y[_three]]+eps; + bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps; y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three]) intersectiontimes (z[_four]l{right}..{left}z[_four]r)); if y_<0: y_:=1; fi diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgcmodi.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgcmodi.mf index 1161b6feab0..00d0392c2e6 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgcmodi.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgcmodi.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -27,7 +27,7 @@ % Vdzhe % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Italic Cyrillic letter Vg_hcrs - Variant ghe hcrossed"; % not italic shape cyrchar(Vg_hcrs,8u#-.5width_adj#,x_height#,0); diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgcmodl.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgcmodl.mf index dc04fb84654..dc70e66b5e8 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgcmodl.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgcmodl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -27,7 +27,7 @@ % Vdzhe % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Lowercase Cyrillic letter Vg_hcrs - Variant ghe hcrossed"; cyrchar(Vg_hcrs,8u#-.5width_adj#,x_height#,0); @@ -115,7 +115,7 @@ if serifs: w:=w+1.7u; % tail_part(2); _zero:=2; -_one:=6; _two:=7; _three:=8; _four:=9; _five:=10; +_one:=6; _two:=7; _three:=8; _five:=10; _six:=11; _seven:=12; _eight:=13; _nine:=14; % pickup tiny.nib; @@ -124,8 +124,10 @@ bulb_diam=max(currentbreadth+eps,min(.82d-1-eps,hround 7/8[hair,flare])); set_bar_axis; y[_one]r=y[_two]r=y2.bh; y[_one]l=y[_two]l=y1.bh; penpos[_three](max(currentbreadth+eps,curve if hefty:-3stem_corr fi),0); y[_three]=.5[y[_one]r,-d]; -x[_two]l=x[_two]r=w-4.75u; x[_one]l=x[_one]r=x[_zero]; -x[_three]r=hround(w-u); x[_two]l:=x[_four]l:=x[_two]r-.25curve; +x[_two]l=x[_two]r=max(x[_zero]+.25curve,w-4.75u)+eps; +x[_one]l=x[_one]r=x[_zero]-eps; +x[_three]r=hround(w-u); x[_two]l:=x[_two]r-.25curve+eps; +if x[_three]l<tiny.rt x[_zero]r: x[_three]l:=tiny.rt x[_zero]r+eps; fi {{interim superness:=more_super; fill stroke super_arc.e([_three],[_two])..z[_one]e}}; % lobe if serifs: z[_five]=z[_three]; pos[_five](curve if hefty:-3stem_corr fi,0); diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgcmodu.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgcmodu.mf index 05cdccb4399..31f55ae2c58 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgcmodu.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgcmodu.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -27,7 +27,7 @@ % VDZHE % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Uppercase Cyrillic letter VG_hcrs - Variant GHE hcrossed"; cyrchar(VG_hcrs,if monospace: 9u# else: 11u# fi-width_adj#, %G_width diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgcvaci.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgcvaci.mf index 7d24b549cae..5eb553bbd3a 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgcvaci.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgcvaci.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -48,7 +48,7 @@ % dje_ac % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Italic Cyrillic letter a_ac - a acute"; cyrchar_twice(a_ac,9u#,x_height#,0); @@ -479,10 +479,10 @@ filldraw stroke z10e--z7e; % tie filldraw stroke pulled_arc.e(4,3) & super_arc.e(3,1) & super_arc.e(1,1'); % right stem % stem&bar -y11=y12=bar_height; pos11(vair,90); pos12(vair,90); - z11=((l,y11)..(w,y11)) intersectionpoint +pos11(vair,90); pos12(vair,90); + z11=((l,bar_height)..(w,bar_height)) intersectionpoint (pulled_arc.r(4,3) & super_arc.r(3,1)); - z12=((0,y12)..(w-u,y12)) intersectionpoint (z10l..z7l); + z12=((0,bar_height)..(w,bar_height)) intersectionpoint (z10l..z7l); filldraw stroke z11e--z12e; % bar numeric stem[]; stem1=max(fine.breadth+eps,.7[thin_join,stem]); pos13(stem1,0); pos14(stem1,0); @@ -502,10 +502,12 @@ adjust_fit(if monospace: 3.5u#+else: 4.5u#+fi.5u#, pickup fine.nib; pos1(vair,-90); pos2(hair,0); pos3(hair,0); pos4(vair,-90); pos5(hair,-180); pos6(flare,-180); pos1'(stem,180); pos10(stem,0); -top y1l=h+oo; x1=.5[x3,x1']; x2=x3=3u; y3=.35h; y2=.75h; -bot y4r=-oo; x4=lft x6r+flare; y6-.5flare=.1h; lft x6r=-.25u; z5r=z6r; -y1'=.8h; x1'=x7; z10=z1'; -rt x7r=hround(w-2.5u+.5stem); +top y1l=h+oo; x1=.5[x3,x1']; x2=x3=3u-eps; y3=.35h; y2=.75h; +bot y4r=-oo; lft x6r=-.25u; +x4=min(lft x6r+flare,lft x3l-eps); y6-.5flare=.1h; z5r=z6r; +y1'=min(.8h,bot y1l)-eps; z10=z1'; +rt x7r=hround (w-2.5u+.5stem)+eps; +x1'=x7; bulb(4,5,6); % bulb % right_stem; _one:=7; _two:=8; _three:=9; @@ -514,13 +516,14 @@ if monospace: pos[_three](vair,90); pos[_one](stem,0); filldraw stroke z[_one]e{down}...{right}z[_three]e; % terminal else: x[_three]=w; hook_out([_one],[_two],[_three]); fi % opening hook filldraw stroke z10e--z7e; % tie -filldraw stroke pulled_arc.e(4,3) & super_arc.e(3,1) - & super_arc.e(1,1'); % right stem +if lft x1'r<x1: lft x1'r:=x1+eps; fi +filldraw stroke pulled_arc.e(4,3) & + super_arc.e(3,1) & super_arc.e(1,1'); % right stem % stem&bar -y11=y12=bar_height; pos11(vair,90); pos12(vair,90); - z11=((l,y11)..(w,y11)) intersectionpoint +pos11(vair,90); pos12(vair,90); +z11=((l,bar_height)..(w,bar_height)) intersectionpoint (pulled_arc.r(4,3) & super_arc.r(3,1)); - z12=((0,y12)..(w-u,y12)) intersectionpoint (z10l..z7l); +z12=((0,bar_height)..(w,bar_height)) intersectionpoint (z10l--z7l); filldraw stroke z11e--z12e; % bar numeric stem[]; stem1=max(fine.breadth+eps,.7[thin_join,stem]); pos13(stem1,0); pos14(stem1,0); @@ -645,7 +648,7 @@ adjust_fit(if hefty:0,0 else:-.6u#,-.6u#fi); numeric top_thickness,mid_thickness,bot_thickness,upper_side,lower_side,theta; top_thickness=max(fine.breadth,vround(slab-2vair_corr)); bot_thickness=max(fine.breadth,vround(slab-vair_corr)); -x0=.5w; y0=if monospace:bar_height else:.7x_height fi; %h;%%%%%%%%%%%%%% +x0=.5w; y0=if hefty:bar_height else:.7x_height fi; %h;%%%%%%%%%%%%%% pickup fine.nib; theta=90-angle(20u,h); slope:=-h/20u; upper_side=max(fine.breadth+eps,hround(.5[hair,stem]-stem_corr)); lower_side=hround(.5[hair,stem]+stem_corr); @@ -653,11 +656,11 @@ if lower_side>1.2upper_side: upper_side:=lower_side; fi pos1(top_thickness,-90); pos6(bot_thickness,-90); x1=x6=.5w; top y1l=h+o; bot y6r=-o; pos0(cap_stem,theta); lft x2l=w-rt x8l=hround 1.25u; lft x7r=w-rt x5r=hround 1.75u; - x2r-x2l=fudged.stem-fine; x5r-x5l=lower_side-fine;%%%%%%%%%%% + x2r-x2l=stem-fine; x5r-x5l=lower_side-fine;%%%%%%%%%%% ellipse_set(1l,2l,3l,0l); ellipse_set(1r,2r,3r,0r); ellipse_set(6l,5l,4l,0l); ellipse_set(6r,5r,4r,0r); numeric tau; tau=max(.8,.20710678/(superness-.5)); -y2r:=y2l+serif_drop; +y2r:=vround(y2l+max(1,serif_drop)+eps); filldraw stroke z2e{down} ..z3e---z4e..z5e{down}..tension atleast tau..z6e{left}; % S stroke pos7(lower_side,180); pos8(upper_side,180); @@ -673,10 +676,12 @@ numeric theta; theta=angle(4(x8'-x1'),y8'-y1'); pos1'(curve,theta+90); filldraw z1'l{dir theta}..tension atleast 1 and 1..{down}z8'l --z8'r{up}...{-dir theta}z1'r..cycle; % bulb % from sloped serif -pos12(slab,90); lft x12=x2l-.5jut; y12r=y2r-serif_drop; z14=z2l; -filldraw z2r--z12r--z12l{right} - ...1/3[(x14,y12l),.5[z12l,z14] ]{z14-z12l} - ...{down}z14--(x2r,y14)--cycle; % sloped serif +if serif_drop>0: + pos12(slab,90); lft x12=x2l-.5jut-eps; y12r=y2r-serif_drop; z14=z2l; + filldraw z2r--z12r--z12l{right} + ...1/3[(x14,y12l),.5[z12l,z14] ]{z14-z12l} + ...{down}z14--(x2r,y14)--cycle; % sloped serif +fi %%%%% % the accent hpos_corr=-u; put_accent(cyrcaph); repeat_once; diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgcvacl.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgcvacl.mf index 6b769826afb..33e6a697135 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgcvacl.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgcvacl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -48,7 +48,7 @@ % dje_ac % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Lowercase Cyrillic letter a_ac - a acute"; cyrchar_twice(a_ac,9u#,x_height#,0); % eng @@ -585,6 +585,7 @@ endgroup; hpos_corr=-u; put_accent; repeat_once; penlabels(1,2,3,4,5,6,7,8); endchar; +iff not concrete:% iff not specific:% lhchar "Lowercase Cyrillic letter ya_ac - ya acute (`roman')"; cyrchar_twice(ya_ac,if serifs: 9.75u# else: 10u# fi-.5width_adj#,x_height#,0); %ya (~n_width:10u) @@ -675,7 +676,7 @@ filldraw stroke z8e--z9e; % cross bar %%%%% endgroup; % the accent -hpos_corr=-u; put_accent; repeat_once; +put_accent(cyrcaph); repeat_once; % cyrcaph for asc_height penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar; lhchar "Lowercase Cyrillic letter izh_ac - izhitsa acute"; @@ -1064,22 +1065,23 @@ else: bot_thickness=vair'; upper_side=max(fine.breadth,hround(.3[vair',stem]-stem_corr)); lower_side=hround(.3[vair',stem]+stem_corr); fi - x0=.5w; y0=if serifs:.7x_height else:bar_height fi; %h;%%%%%%%%%%%%%% + x0=.5w; y0=if hefty:bar_height else:.7x_height fi; %h;%%%%%%%%%%%%%% pickup fine.nib; theta=90-angle(20u,h); slope:=-h/20u; if lower_side>1.2upper_side: upper_side:=lower_side; fi pos1(top_thickness,-90); pos6(bot_thickness,-90); -x1=x6=.5w; top y1l=h+o; bot y6r=-o; pos0(fudged.stem-2stem_corr,theta); +x1=x6=.5w; top y1l=h+o; bot y6r=-o; +pos0(max(fine.breadth,fudged.stem-2stem_corr),theta); lft x2l=w-rt x8l=hround 1.25u; lft x7r=w-rt x5r=hround 1.75u if not serifs:+.5u fi; x2r-x2l=if serifs:fudged.stem else:upper_side fi-fine; x5r-x5l=lower_side-fine; ellipse_set(1l,2l,3l,0l); ellipse_set(1r,2r,3r,0r); ellipse_set(6l,5l,4l,0l); ellipse_set(6r,5r,4r,0r); numeric tau; tau=max(.8,.20710678/(superness-.5)); -y2r:=y2l+serif_drop; +y2r:=vround(y2l+max(1,serif_drop)+eps); filldraw stroke z2e{down} ..z3e---z4e..z5e{down}..tension atleast tau..z6e{left}; % S stroke pos7(lower_side,180); pos8(upper_side,180); -y7=.5[y5l,y5r]; y8=.5[y2l,y2r]; pos9(vair,90); z9=z0; +y7=.5[y5l,y5r]; y8=.5[y2l,y2r]; pos9(vair,90); z9=(x0,min(y0,y8-eps)); filldraw stroke z8e{down} ..tension atleast tau and atleast 1..{-18u,-.618h}z9e; % upper right stroke filldraw stroke z6e{left}..tension atleast tau..z7e{up} @@ -1092,15 +1094,18 @@ if serifs: filldraw z1'l{dir theta}..tension atleast 1 and 1..{down}z8'l --z8'r{up}...{-dir theta}z1'r..cycle; % bulb % from sloped serif - pos12(slab,90); lft x12=x2l-.5jut; y12r=y2r-serif_drop; z14=z2l; - filldraw z2r--z12r--z12l{right} - ...1/3[(x14,y12l),.5[z12l,z14] ]{z14-z12l} - ...{down}z14--(x2r,y14)--cycle; % sloped serif + if serif_drop>0: + pos12(slab,90); lft x12=hround(x2l-max(1,.5jut)-.5-eps); + top y12r=vround(y2r-max(0,serif_drop)-eps); z14=(x2l,min(y2l-.5,y12)-eps); + filldraw z2r--z12r--z12l{right} + ...1/3[(x14,y12l),.5[z12l,z14] ]{z14-z12l} + ...{down}z14--(x2r,y14)--cycle; % sloped serif + fi else: pos10(flare,225); x10r=x1; y10l=h+oo; filldraw stroke z8e{up}...z10e; fi %%%%% % the accent -put_accent(cyrcaph); repeat_once; % cyrcaph for acs_height +put_accent(cyrcaph); repeat_once; % cyrcaph for asc_height penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12); endchar; lhchar "Lowercase Cyrillic letter y_ac - straight u acute"; diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgcvacu.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgcvacu.mf index e9c8a8ad99c..a598b06bc45 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgcvacu.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgcvacu.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -48,7 +48,7 @@ % DJE_ac % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Uppercase Cyrillic letter A_ac - A acute"; cyrchar_twice(A_ac,13u#,cap_height#,0); @@ -604,6 +604,7 @@ if serifs: dish_serif([_one],[_two],s,1/3,cap_jut,t,1/3,cap_jut); put_accent(cyrcaph); repeat_once; penlabels(1,2,3,4,10,11,12,13); endchar; +iff not concrete:% iff not specific:% lhchar "Uppercase Cyrillic letter YA_ac - YA acute (`roman')"; cyrchar_twice(YA_ac,if serifs:13.5u# else:12.5u#-.5width_adj# fi %N_width; upss R diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2slxi.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgt2slxi.mf index 63940e75808..bb9cfe58556 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2slxi.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgt2slxi.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -37,7 +37,7 @@ % zelo_m % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Italic Cyrillic letter vnarrow_e"; cyrcharmoving(vnarrow_e); diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2slxl.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgt2slxl.mf index 9960031cc3f..db95574ad13 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2slxl.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgt2slxl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -37,7 +37,7 @@ % zelo_m % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Lowercase Cyrillic letter variant narrow_e"; cyrchar(vnarrow_e,7u#,x_height#,0); % eng @@ -520,8 +520,8 @@ penstroke pulled_arc.e(1,2) & pulled_arc.e(2,3) & pulled_arc.e(3,4) & pulled_arc.e(4,1) & cycle; % bowl % dot pickup tiny.nib; -dot_diam:=min((lft x4l-rt x2l)-1, - max(tiny.breadth,hround(max(dot_size,cap_curve)-2stem_corr))); +dot_diam:=max(tiny.breadth,min((lft x4l-rt x2l)-1, + hround(max(dot_size,cap_curve)-2stem_corr))); pos5(dot_diam,0); pos5'(dot_diam,90); z5=z5'; x5=x1; y5=.5[y1,y3]; dot(5,5'); % dot penlabels(1,2,3,4); endchar; @@ -540,8 +540,8 @@ penstroke pulled_arc.e(1,2) & pulled_arc.e(2,3) & pulled_arc.e(3,4) & pulled_arc.e(4,1) & cycle; % bowl % dots _one:=5; _two:=6; _three:=7; _four:=8; -dot_diam:=min(.5(lft x4l-rt x2l)-1, - max(tiny.breadth,hround(max(dot_size,cap_curve)-2stem_corr))); +dot_diam:=max(tiny.breadth,min(.5(lft x4l-rt x2l)-1, + hround(max(dot_size,cap_curve)-2stem_corr))); pickup tiny.nib; pos[_one](dot_diam,0); pos[_two](dot_diam,90); x[_one]=x[_two]=.5w-1.375u; y[_one]=y[_two]=.5[y1,y3]; @@ -773,7 +773,7 @@ penlabels(0,1,1',2,3,3',4,5,6);endchar; lhchar "Lowercase Cyrillic letter mo"; cyrchar(mo,12u# if not serifs:+width_adj# fi,x_height#,0); italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut -adjust_fit(if monospace: 0,.5u# else: serif_fit#,9u# fi); %wlett_adj +adjust_fit(if monospace: 0,7.5u# else: serif_fit#,9u# fi); %wlett_adj % lower_m; numeric stem[]; % thicknesses of the four strokes stem1=hround(fudged.hair+stem_corr); @@ -792,7 +792,8 @@ if hefty: y6=if monospace: vround 1/3h else: oo fi; numeric upper_notch,lower_notch; upper_notch=h-notch_cut+eps; lower_notch=y5+notch_cut-eps; - x1'=rt x1r; z1'=whatever[z5l,z6l]; x3'=lft x3l; z3'=whatever[z7r,z8r]; + x1'=max(rt x1r,x5l)+eps; z1'=whatever[z5l,z6l]; + x3'=min(lft x3l,x8r)-eps; z3'=whatever[z7r,z8r]; z0=whatever[z5r,z6r]=whatever[z7l,z8l]; fill z5l.. if y1'<upper_notch: {right}(x1'+1,upper_notch){down}... fi @@ -831,7 +832,8 @@ y[_one]r=h+vround 1.5oo; y[_three]r=-oo; y[_two]=y[_four]=.5h-vair_corr; y[_two]l:=y[_four]l:=.52h; %shift forsuffixes $ = [_one]l,[_one],[_one]r,[_two]l,[_two],[_two]r, - [_three]l,[_three],[_three]r,[_four]l,[_four],[_four]r: x$:=x$+w; endfor; + [_three]l,[_three],[_three]r,[_four]l,[_four],[_four]r: + x$:=x$+w if monospace:-1.25u fi; endfor; penstroke pulled_arc.e([_one],[_two]) & pulled_arc.e([_two],[_three]) & pulled_arc.e([_three],[_four]) & pulled_arc.e([_four],[_one]) & cycle; % bowl %%% diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2slxu.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgt2slxu.mf index bb3f5d3544f..525703a4899 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2slxu.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgt2slxu.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -37,7 +37,7 @@ % ZELO_m % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec iff serifs:% lhchar "Uppercase Cyrillic letter variant NARROW_E - like Ukrainian E"; @@ -794,10 +794,10 @@ filldraw stroke z[_five]e--z[_six]e; % bar penlabels(0,1,2,3,3,4,5,6); endchar; lhchar "Uppercase Cyrillic letter MO"; -cyrchar(MO,16u#+width_adj#,cap_height#,0); +cyrchar(MO,16u# if monospace: -2.5u# else:+width_adj# fi,cap_height#,0); if is_small_cap: getcharcode(mo); fi italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); -adjust_fit(cap_serif_fit#,13.5u#); +adjust_fit(cap_serif_fit#,if monospace: 6.5u# else: 13.5u# fi); % upper_m; numeric stem[]; % thicknesses of the four strokes stem1=hround(fudged.hair+stem_corr); @@ -807,7 +807,7 @@ stem4=hround(fudged.cap_stem-3stem_corr); if stem4<stem1: stem4:=stem1; fi pickup tiny.nib; pos1(stem1,0); pos2(stem1,0); pos3(stem4,0); pos4(stem4,0); -x1=x2; x3=x4; x1l=w-x3r; rt x3r=hround min(w-2u,w-3u+.5stem4); +x1=x2; x3=x4; x1l=w-x3r; rt x3r=hround min(w-2u,w-3u+.5stem4)+eps; top y1=top y3=h; bot y2=bot y4=0; filldraw stroke z1e--z2e; % left stem filldraw stroke z3e--z4e; % right stem @@ -817,7 +817,8 @@ if hefty: y6=if monospace: vround 1/3h else: o fi; numeric upper_notch,lower_notch; upper_notch=h-cap_notch_cut; lower_notch=y6+cap_notch_cut; - x1'=rt x1r; z1'=whatever[z5l,z6l]; x3'=lft x3l; z3'=whatever[z7r,z8r]; + z1'=whatever[z5l,z6l]; x1'=hround max(rt x1r,x5l)-eps; + z3'=whatever[z7r,z8r]; x3'=hround min(lft x3l,x8r)+eps; z0=whatever[z5r,z6r]=whatever[z7l,z8l]; fill z5l.. if y1'<upper_notch: {right}(x1'+1,upper_notch){down}... fi @@ -840,17 +841,20 @@ if serifs: dish_serif(4,3,e,1/3,cap_jut,f,1/3,cap_jut); fi % lower right serif %%% %O_part -full_w:=13.5u; +full_w:=if monospace: 10u else: 13.5u fi; _zero:=4; _one:=9; _two:=10; _three:=11; _four:=12; _five:=13; _six:=14; penpos[_one](vair',90); penpos[_three](vround(vair+1.5vair_corr),-90); penpos[_two](cap_curve,180); penpos[_four](cap_curve,0); -x[_two]r=hround u; +if monospace: x[_two]r=hround 1.5u; + interim superness:=sqrt superness; % make |"O"|, not |"0"| +else: x[_two]r=hround u; fi x[_four]r=full_w-x[_two]r; x[_one]=x[_three]=.5full_w; y[_one]r=h+o; y[_three]r=-o; y[_two]=y[_four]=.5h-vair_corr; y[_two]l:=y[_two]l:=.52h; %shift forsuffixes $ = [_one]l,[_one],[_one]r,[_two]l,[_two],[_two]r, - [_three]l,[_three],[_three]r,[_four]l,[_four],[_four]r: x$:=x$+w; endfor; + [_three]l,[_three],[_three]r,[_four]l,[_four],[_four]r: + x$:=x$+w if monospace:-2.25u fi; endfor; penstroke pulled_super_arc.e([_one],[_two])(.5superpull) & pulled_super_arc.e([_two],[_three])(.5superpull) & pulled_super_arc.e([_three],[_four])(.5superpull) diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgunici.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgunici.mf index 21fc1ffe47d..0fdbaca8d63 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgunici.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgunici.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,6 +20,8 @@ % List of letternames and their codes in Unicode % +% e_grv "50 E with grave +% i_grv "5d I with grave % gje "53 Ghe with acute % kje "5c Ka with acute % zh_brv "c2 Zhe with breve @@ -33,6 +35,8 @@ % i_uml "e5 I with umlaut % o_uml "e7 O with umlaut % otld_uml "e9 O tilded with umlaut +% ukre_uml -- Ukrainian E with umlaut +% erev_uml "ed Erev with umlaut % u_bar "ef U with macron (bar) % u_uml "f1 U with umlaut % u_dac "f3 U with double acute @@ -40,7 +44,48 @@ % ery_uml "f9 Ery with umlaut % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec + +lhchar "Italic Cyrillic letter e_grv - e grave"; +cyrchar_twice(e_grv,8u#,x_height#,0); +italcorr max(1/3x_height#*slant,x_height#*slant+.5(.2[hair#,stem#])-u#); %e +adjust_fit(if monospace:0 else:-.35u#fi,0); +% ital_e; +pickup fine.nib; %numeric heavy_hair; heavy_hair=hround .2[hair,stem];%defined in lxpseudo +pos0(vair,-90); pos1(heavy_hair,0); pos2(vair,90); +pos3(curve,180); pos4(vair,270); pos5(hair,320); +x0=rt x3l; rt x1r=hround(w-1.5u+.5heavy_hair); x2=x4=.5(w+u); +lft x3r=hround(1.5u-.5curve); x5r=good.x(w-eps); x6=x5; +y0=y3=y6=bar_height; y1=.5[y0,y2]; top y2r=h+oo; bot y4r=-oo; +top y5l=vround .5bar_height; path p; p=z4{right}..z5..z6; +filldraw stroke z0e{right}...z1e{up}...pulled_arc.e(2,3) + & pulled_arc.e(3,4)...{direction 1 of p}z5e; % arc +% the accent +put_gravis; repeat_once; +penlabels(0,1,2,3,4,5,6); endchar; + +lhchar "Italic Cyrillic letter i_grv - i grave"; +cyrchar_twice(i_grv,10u#,x_height#,0); +italcorr 1/3x_height#*slant+.5hair#+.5u#; +adjust_fit(0,0); +% ital_i; +pickup fine.nib; interim superness:=more_super; +x2=x3+.25u; pos3(stem,-180); lft x3r=hround(2.5u-.5stem); +% left skewstem; +if monospace: pos0(vair,90); x0=good.x .5[0,x2]; top y0l=h; y2=2/3h; + pos2(stem,0); filldraw stroke z2e{u,x_height}...{left}z0e; % terminal +else: x0=0; hook_in(0,1,2)(skewed); fi % opening hook +pos2'(stem,-180); z2'=z2; +pos4(vair,-90); pos5(hair,0); x4=.5[x3,x5]; +pos6(stem,0); rt x6r=hround(w-2.5u+.5stem); +x5=x6=x7; x9=w; hook_out(7,8,9); % closing hook +y3=.7[y4,y5]; bot y4r=-oo; y5=.57h; y6+.5stem=h; +filldraw stroke z2'e{-u,-x_height} + ...super_arc.e(3,4)...{up}z5e; % left stem and arc +filldraw circ_stroke z6e--z7e; % right stem +% the accent +put_gravis; repeat_once; +penlabels(0,1,2,3,4,5,6,7,8,9); endchar; lhchar "Italic Cyrillic letter kje (k acute)"; cyrchar_twice(kje,9u#,x_height#,0); %+acc_height# @@ -361,6 +406,53 @@ fi h:=full_h; lowercase_umlaut(0,0, 8,9,10,11); penlabels(1,2,3,4,5,6,7, 8,9,10,11); endchar; +lhchar "Italic Cyrillic letter ukre_uml - Ukrainian e (c with mid-line)"; +cyrchar(ukre_uml,8u#,lc_trema_height#,0); +italcorr if math_fitting:1/3x_height#*slant else:x_height#*slant-.5u# fi; %c+.5u +adjust_fit(if monospace:0 else:-.35u#fi,0); %c + full_h:=h; h:=x_height; +% ital_ukre; +pickup fine.nib; pos0(flare,0); pos1(hair,0); pos2(vair,90); +pos3(curve,180); pos4(vair,270); pos5(hair,320); +x2=x4=.5(w+u); rt x1r=max(rt x2,hround(w-.5u))+eps; +lft x3r=hround(1.5u-.5curve); x5r=good.x(w-eps); x6=x5; +y1=.5[bar_height,h]; top y2r=h+oo; bulb(2,1,0); % bulb +bot y4r=-oo; y3=.5[y2,y4]; top y5l=vround .5bar_height; y6=bar_height; +path p; p=z4{right}..z5..z6; +filldraw stroke pulled_arc.e(2,3) + & pulled_arc.e(3,4)...{direction 1 of p}z5e; % arc +pos7(vair,90); pos8(vair,90); +y7=bar_height; rt x7=hround max(rt x2+1+eps,lft x0l-eps); x8=x3; y7=y8; +filldraw stroke z7e--z8e; +%%%%% +% the accent +h:=full_h; lowercase_umlaut(0,0, 9,10,11,12); +penlabels(1,2,3,4,5,6,7,8); endchar; + +lhchar "Italic Cyrillic letter erev_uml - reverse e umlaut"; +cyrchar(erev_uml,8u#,lc_trema_height#,0); +italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi; %o +adjust_fit(0,if monospace:0 else:-.35u# fi); %o +h:=x_height; +% ital_erev; +pickup fine.nib; +pos0(flare,180); pos1(hair,-180); pos2(vair,-90); +pos3(curve,0); pos4(vair,90); pos5(hair,140); +x2+.5u=x4=.5(w-u); lft x1r=min(lft x2,hround(.25u))-eps; +rt x3r=w-hround(1.5u-.5curve); lft x5r=good.x (lft x1r-eps); x6=x5; +y1-.5flare=.1h; bot y2r=-oo; bulb(2,1,0); % bulb +top y4r=h+oo; y3=.5[y2,y4]; top y5r=vround .5[bar_height,h]; +y6=bar_height; path p; p=z4{left}....z5..z6; +filldraw stroke pulled_arc.e(2,3) + & pulled_arc.e(3,4)...{direction 1 of p}z5e; % arc +x7=x3; y7=bar_height; y8=y7; lft x8=hround min(lft x2-1-eps,rt x0l+eps); +pos7(vair,90); pos8(vair,90); +filldraw stroke z7e--z8e; +%%% +% the accent +h:=full_h; lowercase_umlaut(0,0, 9,10,11,12); +penlabels(0,1,2,3,4,5,6,7,8, 9,10,11,12); endchar; + lhchar "Italic Cyrillic letter u_bar - u bar (macron)"; cyrchar(u_bar,if monospace:8.5u# else:9u#fi,lc_trema_height#,desc_depth#); italcorr x_height#*slant+.5stem#-u#; diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgunicl.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgunicl.mf index 608af0c5109..4c9a6a83f5a 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgunicl.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgunicl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,6 +20,8 @@ % List of letternames and their codes in Unicode % +% e_grv "50 E with grave +% i_grv "5d I with grave % gje "53 Ghe with acute % kje "5c Ka with acute % zh_brv "c2 Zhe with breve @@ -33,6 +35,8 @@ % i_uml "e5 I with umlaut % o_uml "e7 O with umlaut % otld_uml "e8 O tilded with umlaut +% ukre_uml -- Ukrainian E with umlaut +% erev_uml "ed Erev with umlaut % u_bar "ef U with macron (bar) % u_uml "f1 U with umlaut % u_dac "f3 U with double acute @@ -40,7 +44,108 @@ % ery_uml "f9 Ery with umlaut % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec + +if concrete: input lgnoncl; fi % Cyrillic concrete letters + +lhchar "Lowercase Cyrillic letter e_grv - e grave"; +cyrchar_twice(e_grv,7.25u#+max(.75u#,.5curve#),x_height#,0); +italcorr .5[bar_height#,x_height#]*slant+.5min(curve#-1.5u#,0); +adjust_fit(if monospace: .25u#,.5u# else: 0,0 fi); +% lower_e; +numeric left_curve,right_curve; +left_curve=right_curve+6stem_corr=curve if not serifs: -3stem_corr fi; +if right_curve<tiny.breadth: right_curve:=tiny.breadth; fi +if left_curve<tiny.breadth: left_curve:=tiny.breadth; fi +pickup tiny.nib; pos1(right_curve,0); +pos2(vair,90); pos3(left_curve,180); +y1=good.y bar_height; top y2r=h+vround 1.5oo; y0l=bot y1; +rt x1r=hround min(w-.5u,w-u+.5right_curve); +lft x3r=hround max(.5u,1.25u-.5left_curve); x2=.5w+.25u; +{{interim superness:=more_super; + filldraw stroke super_arc.e(1,2)}}; % right bowl +y3=.5[y2,y4]; bot y4r=-oo; x4=x2+.25u; +if serifs: + pos4(vair',270); pos5(hair,360); + y5=max(good.y(.5bar_height-.9),y4l+vair); x5r=x1r; + (x,y4l)=whatever[z4r,z5]; x4l:=min(x,x4l+.5u); + filldraw stroke pulled_arc.e(2,3) & pulled_arc.e(3,4) + ...{x5-x4,5(y5-y4)}z5e; % left bowl, arc, and terminal +else: + pos4(vair,270); + filldraw stroke super_arc.e(2,3) & super_arc.e(3,4); % left bowl and arc + pickup fine.nib; pos4'(vair,270); z4=z4'; + pos5(.5[vair,flare],275); rt x5r=hround(w-.6u); + y5r=good.y(y5r+1/3bar_height-y5); y5l:=good.y y5l; x5l:=good.x x5l; + filldraw stroke term.e(4',5,right,1,4); fi % terminal +path testpath; testpath=super_arc.r(2,3) & super_arc.r(3,4); +y1'r=y0r=y0l+.6[thin_join,vair]; y1'l=y0l; x1'l=x1'r=x1; +forsuffixes $=l,r: + x0$=xpart(((0,y0$)--(x1,y0$)) intersectionpoint testpath); endfor +fill stroke z0e--z1'e; % crossbar +%%%%% +% the accent +hpos_corr=1.5u; +put_gravis; repeat_once; +penlabels(0,1,2,3,4,5); endchar; + +lhchar "Lowercase Cyrillic letter i_grv - i grave"; +cyrchar_twice(i_grv,10u# if not serifs:+.5width_adj# fi, % n_width + x_height#,0); +italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut +adjust_fit(serif_fit#,serif_fit#); +begingroup +% lower_i; +pickup tiny.nib; pos1(fudged.stem,0); pos2(fudged.stem,0); +pos3(fudged.stem,0); pos4(fudged.stem,0); +lft x1l=lft x2l=hround(2.5u-.5fudged.stem-eps); x3=x4=w-x1; +top y1=top y3=h; bot y2=bot y4=0; +filldraw stroke z1e--z2e; % left stem +filldraw stroke z3e--z4e; % right stem +numeric stem[],alpha[]; +if hefty: numeric upper_notch,lower_notch; + stem1=fudged.hair-2stem_corr; + upper_notch=y6-cap_notch_cut-eps; lower_notch=y5+cap_notch_cut+eps; + if monospace: + x5r =rt x1r; x6l =lft x3l; y5=vround(vair'+eps); y6=vround(h-vair-eps); + alpha1=diag_ratio(1,stem1,y5-y6,x5r-x6l); + penpos5(min(2fudged.stem,alpha1*stem1),0); + penpos6(min(2fudged.stem,alpha1*stem1),0); + x5'=lft x1l; z5'=whatever[z5l,z6l]; x6'=rt x4r; z6'=whatever[z5r,z6r]; + x5l:=x5'; x6r:=x6'; y5l:=y5'; y6r:=y6'; + else: + y5l=0; y6r=h; x5=x1r; x6=x3l; penpos5(stem1,0); penpos6(stem1,0); + fi + x2'=rt x1r; z2'=whatever[z5l,z6l]; x3'=lft x4l; z3'=whatever[z5r,z6r]; + fill z5l.. + if y2'>lower_notch: {right}(x2'+1,lower_notch){up}... fi + {z6-z5}diag_in(5l,6l,1,6r)--z6r.. + if y3'<upper_notch: {left}(x3'-1,upper_notch){down}... fi + {z5-z6}diag_in(6r,5r,1,5l)--cycle; % diagonal +else: + x5=hround (rt x1r-.5)-eps; x6=hround (lft x3l+.5)+eps; + y5l=vround(y2+bracket+eps); y6r=vround(y3-bracket-eps); + stem1=max(tiny.breadth,fudged.hair-2stem_corr); + alpha1=diag_ratio(1,stem1,x6-x5,top y6r-bot y5l); + penpos5(alpha1*stem1,90); penpos6(alpha1*stem1,90); + fill stroke z5e--z6e; fi % diagonal +%%% +if serifs: + numeric inner_jut; + if rt x1r+jut+.5u+1<=lft x3l-jut: inner_jut=jut; + else: rt x1r+inner_jut+.5u+1=lft x3l-inner_jut; fi + save slab; slab:=Vround(vair-vair_corr); % lower.slab + dish_serif(1,2,a,1/3,jut,b,1/3,inner_jut); % upper left serif + dish_serif(3,4,e,1/3,inner_jut,f,1/3,jut); % upper right serif + slab:=vair; % lower.slab + dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); % lower left serif + dish_serif(4,3,g,1/3,inner_jut,h,1/3,jut); fi % lower right serif +%%%%% +endgroup; +% the accent +hpos_corr=0.75u; +put_gravis; repeat_once; +penlabels(1,2,3,4,5,6); endchar; lhchar "Lowercase Cyrillic letter gje (g acute)"; cyrchar_twice(gje,8u#-.5width_adj#,x_height#,0); @@ -65,6 +170,7 @@ endgroup; hpos_corr=-u; put_accent; repeat_once; penlabels(0,1,2,3,4,5,6,7,8,9); endchar; +iff not concrete:% iff not specific:% lhchar "Lowercase Cyrillic letter kje (k acute) (`roman')"; cyrchar_twice(kje,if serifs:10u# else:9.5u# fi % zhk_width: n_width;keng_width @@ -122,6 +228,7 @@ endgroup; hpos_corr=-u; put_accent; repeat_once; penlabels(1,2,3,4,5,6); endchar; +iff not concrete:% iff not specific:% lhchar "Lowercase Cyrillic letter zh_brv - zhe breve (`roman')"; cyrchar(zh_brv,if serifs:10u# else:9.5u# fi % zhk_width: n_width;keng_width @@ -383,6 +490,7 @@ fill stroke z0e--z1'e; % crossbar h:=full_h; lowercase_umlaut(0,0, 7,8,9,10); penlabels(0,1,2,3,4,5,5'); endchar; +iff not concrete:% iff not specific:% lhchar "Lowercase Cyrillic letter zh_uml - zhe umlaut (`roman')"; cyrchar(zh_uml,if serifs:10u# else:9.5u# fi % zhk_width: n_width;keng_width @@ -678,6 +786,111 @@ fi h:=full_h; lowercase_umlaut(0,0, 8,9,10,11); penlabels(1,2,3,4); endchar; +lhchar "Lowercase Cyrillic letter ukre_uml - Ukrainian e (C with mid-line)"; +cyrchar(ukre_uml,8u#,lc_trema_height#,0); % eng +italcorr x_height#*slant-.2u#; +adjust_fit(if monospace: .5u#,.5u# else: -.1u#,0 fi); +full_h:=h; h:=x_height; +% lower_ukre; +set_bar_axis; +pickup fine.nib; pos2(vair',90); pos3(curve,180); pos4(vair',270); +x2=x4=(.5(w+u)); top y2r=vround(h+1.5oo); bot y4r=-oo; +lft x3r=(hround max(.6u,1.35u-.5curve)); y3=.5h; +if serifs: + pos1(hair,0); pos5(hair,360); + y1=min(y2.bh+.75flare-.25vair+eps,.9[bar_height,h]-.75flare); + rt x1r=rt x5r=hround(w-.5u); + y5=max(good.y(.5bar_height-.9),y4l+vair'); + (x,y4l)=whatever[z4r,z5l]; x4l:=min(x,x4l+.5u); + filldraw stroke z1e{x2-x1,5(y2-y1)}...pulled_super_arc.e(2,3)(.7superpull) + & pulled_super_arc.e(3,4)(.5superpull) + ..tension .9 and 1..{x5-x4,5(y5-y4)}z5e; % arc and lower terminal + pos6(.3[fine.breadth,hair],0); x6r=x1r; top y6=h+oo; + x1r-x1'=1.5curve; y1'=y1; + path upper_arc; upper_arc=z1{x2-x1,5(y2-y1)}..z2{left}; + numeric t; t=xpart(upper_arc intersectiontimes (z6l--z1')); + filldraw z1r--z6r--z6l--subpath(t,0) of upper_arc--cycle; % barb +else: + pos1(4/7[vair',flare],80); pos5(.6[vair',flare],275); + rt x1r=hround(w-.6u); + top y1r=vround .82[bar_height,top y2r]; + filldraw stroke term.e(2,1,right,.8,4); % upper terminal + rt x5r=hround(w-.5u); + y5r=good.y(y5r+1/3bar_height-y5); y5l:=good.y y5l; x5l:=good.x x5l; + forsuffixes e=l,r: path p.e; p.e=z4e{right}..tension .9 and 1..z5e; + if angle direction 1 of p.e>75: + 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 +%%% +% lukre_bar; +if (serifs=true) and (bar#<=.5curve#): + x7r=x3l; x8r=min(lft x1l-.5hair,0.85[x3l,x1l]); + y7l=y8l=y1.bh; y7r=y8r=y2.bh; x7l=x7r; x8l=x8r; + numeric bar[]; + bar2=7/8[bar,fudged.stem-2stem_corr]; + penpos9(bar2,45); z9=.575[z7l,z8l]; + fill circ_stroke z8e{-2,-1}..{-2,1}z9e..{-2,-1}z7e; % curve ~ +else: + bar_stroke(x3l,min(lft x1l-.5hair,0.85[x3l,x1l])); % bar -- +fi +%%%%% +h:=full_h; lowercase_umlaut(0,0, 10,11,12,13); +penlabels(1,1',2,3,4,5,6,7,8,9); endchar; + +lhchar "Lowercase Cyrillic letter erev_uml - reverse e umlaut"; +cyrchar(erev_uml,8u#,lc_trema_height#,0); % eng +italcorr x_height#*slant-.2u#; +adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi); +full_h:=h; h:=x_height; +% lower_erev; +set_bar_axis; +pickup fine.nib; pos2(vair',90); pos3(curve,0); pos4(vair',-90); +x2=x4=w-.5(w+u); top y2r=vround(h+1.5oo); bot y4r=-oo; +rt x3r=w-hround max(.6u,1.35u-.5curve); y3=.5h; % eng +if serifs: + pos1(hair,180); pos5(hair,-180); + y1=min(y2.bh+.75flare-.25vair+eps,.9[bar_height,h]-.75flare); + lft x1r=lft x5r=hround.5u; + y5=max(good.y(.5bar_height-.9),y4l+vair'); + (x,y4l)=whatever[z4r,z5l]; x4l:=max(x,x4l-.5u); + filldraw stroke z1e{x2-x1,5(y2-y1)}...pulled_super_arc.e(2,3)(.7superpull) + & pulled_super_arc.e(3,4)(.5superpull) + ..tension .9 and 1..{x5-x4,5(y5-y4)}z5e; % arc and lower terminal + pos6(.3[fine.breadth,hair],180); x6r=x1r; top y6=h+oo; + x1'-x1r=1.5curve; y1'=y1; + path upper_arc; upper_arc=z1{x2-x1,5(y2-y1)}..z2{right}; + numeric t; t=xpart(upper_arc intersectiontimes (z6l--z1')); + filldraw z1r--z6r--z6l--subpath(t,0) of upper_arc--cycle; % barb +else: + pos1(4/7[vair',flare],100); pos5(.6[vair',flare],-95); + lft x1r=good.x .6u; top y1r=vround .82[bar_height,top y2r]; + filldraw stroke term.e(2,1,left,.8,4); % upper terminal + lft x5r=good.x .5u; + y5r=good.y(y5r+1/3bar_height-y5); y5l:=good.y y5l; x5l:=good.x x5l; + forsuffixes e=l,r: path p.e; p.e=z4e{left}..tension .9 and 1..z5e; + if angle direction 1 of p.e<105: + p.e:=z4e{left}..tension atleast.9 and 1..{dir 105}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 +%%% +% lerev_bar; +if (serifs=true) and (bar#<=.5curve#): + x7r=max(rt x1l+.5hair,0.85[x3l,x1l]); x8r=x3l; + y7l=y8l=y1.bh; y7r=y8r=y2.bh; x7l=x7r; x8l=x8r; + numeric bar[]; + bar2=7/8[bar,fudged.stem-2stem_corr]; + penpos9(bar2,45); z9=.475[z7l,z8l]; + fill circ_stroke z7e{2,1}..{2,-1}z9e..{2,1}z8e; % curve /\/ +else: + bar_stroke(max(rt x1l+.5hair,0.85[x3l,x1l]),x3l); % bar -- +fi +%%%%% +% the accent +h:=full_h; lowercase_umlaut(0,0, 10,11,12,13); +penlabels(1,1',2,3,4,5,6,7,8,9, 10,11,12,13); endchar; + lhchar "Lowercase Cyrillic letter u_bar - u bar (macron)"; cyrchar(u_bar,if serifs:9.5u# else:9u# fi, lc_trema_height#,desc_depth#); % eng diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgunicu.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgunicu.mf index b0348bb9d25..a75c5888f17 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lgunicu.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgunicu.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,6 +20,8 @@ % List of letternames and their codes in Unicode % +% E_grv "00 E with grave +% I_grv "0d I with grave % GJE "03 Ghe with acute % KJE "0c Ka with acute % ZH_brv "c1 Zhe with breve @@ -33,6 +35,8 @@ % I_uml "e4 I with umlaut % O_uml "e6 O with umlaut % OTLD_uml "e8 O tilded with umlaut +% UKRE_uml -- Ukrainian E width umlaut +% EREV_uml "ec Reverse E width umlaut % U_bar "ee U with macron (bar) % U_uml "f0 U with umlaut % U_dac "f2 U with double acute @@ -40,7 +44,92 @@ % ERY_uml "f8 Ery with umlaut % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec + +if concrete: input lgnoncu; fi % Cyrillic concrete letters + +lhchar "Uppercase Cyrillic letter E_grv - E grave"; +cyrchar_twice(E_grv,12u#-width_adj#,cap_height#,0); +if is_small_cap: getcharcode(e_grv); fi +italcorr cap_height#*slant-beak_jut#-.5u#; +adjust_fit(cap_serif_fit#,0); +% upper_e; +pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +pickup crisp.nib; pos3(slab,90); pos4(hair,0); +top y3r=h; x3=x1; rt x4r=hround(w-u); y4=good.y(y3l-beak)-eps; +arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak +pos5(cap_bar,-90); pos6(hair,0); +top y5l=vround(.52[y2,y1]+.5cap_bar); x5=x1; +pos0(cap_bar,90); pos7(hair,0); +z0=z5; x6=x7; y6-y5l=y0l-y7; +if serifs: rt x6r=hround(w-4.4u+.5hair); y6=good.y(y5l+.6beak)+eps; + rt x9r=hround(w-.5u); +else: rt x6r=hround(w-1.5u); y6=y5l+eps; rt x9r=hround(w-.75u); fi +arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif +pos8(slab if not serifs:+2stem_corr fi,-90); pos9(hair,0); +bot y8r=0; x8=x2; y9=good.y(y8l+7/6beak)+eps; +arm(8,9,h,beak_darkness,1.5beak_jut); % lower arm and beak +if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif + nodish_serif(2,1,c,1/3,cap_jut,d,1/3,.5cap_jut); fi % lower serif +%%%%% +% the accent +hpos_corr= .75u; +put_gravis(cyrcaph); repeat_once; +penlabels(0,1,2,3,4,5,6,7,8,9); endchar; + +lhchar "Uppercase Cyrillic letter I_grv - I grave"; +cyrchar_twice(I_grv,13.5u#,cap_height#,0); % N_width +if is_small_cap: getcharcode(i_grv); fi +italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); +adjust_fit(cap_serif_fit#,cap_serif_fit#); +% upper_i; +pickup tiny.nib; pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0); +pos3(fudged.cap_stem,0); pos4(fudged.cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); x3=x4=w-x1; +top y1=top y3=h; bot y2=bot y4=0; +filldraw stroke z1e--z2e; % left stem +filldraw stroke z3e--z4e; % right stem +numeric stem[],alpha[]; +if hefty: numeric upper_notch,lower_notch; + stem1=fudged.hair-stem_corr; + upper_notch=y6-cap_notch_cut-eps; lower_notch=y5+cap_notch_cut+eps; + if monospace: + x5r =rt x1r; x6l =lft x3l; y5=vround(slab+eps); y6=vround(h-slab-eps); + alpha1=diag_ratio(1,stem1,y5-y6,x5r-x6l); + penpos5(min(2fudged.cap_stem,alpha1*stem1),0); + penpos6(min(2fudged.cap_stem,alpha1*stem1),0); + x5'=lft x1l; z5'=whatever[z5l,z6l]; x6'=rt x4r; z6'=whatever[z5r,z6r]; + x5l:=x5'; x6r:=x6'; y5l:=y5'; y6r:=y6'; + else: + y5l=0; y6r=h; x5=x1r; x6=x3l; penpos5(stem1,0); penpos6(stem1,0); + fi + x2'=rt x1r; z2'=whatever[z5l,z6l]; x3'=lft x4l; z3'=whatever[z5r,z6r]; + fill z5l.. + if y2'>lower_notch: {right}(x2'+1,lower_notch){up}... fi + {z6-z5}diag_in(5l,6l,1,6r)--z6r.. + if y3'<upper_notch: {left}(x3'-1,upper_notch){down}... fi + {z5-z6}diag_in(6r,5r,1,5l)--cycle; % diagonal +else: y5l=y2+bracket+eps; y6r=y3-bracket-eps; + x5=hround (rt x1r-.5)-eps; x6=hround (lft x3l+.5)+eps; + stem1=max(tiny.breadth,fudged.hair); + alpha1=diag_ratio(1,stem1,x6-x5,top y6r-bot y5l); + penpos5(alpha1*stem1,90); penpos6(alpha1*stem1,90); + fill stroke z5e--z6e; fi % diagonal +%%% +if serifs: numeric inner_jut; + if rt x1r+cap_jut+.5u+1<=lft x3l-cap_jut: inner_jut=cap_jut; + else: rt x1r+inner_jut+.5u+1=lft x3l-inner_jut; fi + dish_serif(1,2,a,1/3,cap_jut,b,1/3,inner_jut); % upper left serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,inner_jut); % lower left serif + dish_serif(3,4,e,1/3,inner_jut,f,1/3,cap_jut); % upper right serif + dish_serif(4,3,g,1/3,inner_jut,h,1/3,cap_jut); fi % lower right serif +%%%%% +% the accent +hpos_corr= .75u; +put_gravis(cyrcaph); repeat_once; +penlabels(1,2,3,4,5,6); endchar; lhchar "Uppercase Cyrillic letter GJE (G acute)"; cyrchar_twice(GJE,if monospace: 9u# else: 11u# fi-width_adj#, %G_width @@ -62,6 +151,7 @@ if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif put_accent(cyrcaph); repeat_once; penlabels(1,2,3,4); endchar; +iff not concrete:% iff not specific:% lhchar "Uppercase Cyrillic letter KJE (K acute) (`roman')"; cyrchar_twice(KJE,13.5u#,cap_height#,0); % N_width %+acc_height# @@ -322,6 +412,7 @@ fill stroke z0e--z1'e; % crossbar h:=full_h; uppercase_umlaut(0,0, 7,8,9,10); penlabels(0,1,2,3,4,5,6, 7,8,9,10); endchar; +iff not concrete:% iff not specific:% lhchar "Uppercase Cyrillic letter ZH_uml - ZHE umlaut (`roman')"; cyrchar(ZH_uml,13.5u#,cap_height#+acc_height#,0); % N_width @@ -597,6 +688,139 @@ else: fill stroke z5e--z6e; fi h:=full_h; uppercase_umlaut(0,0, 8,9,10,11); penlabels(1,2,3,4,5,6,7, 8,9,10,11); endchar; +iff serifs:% +lhchar "Uppercase Cyrillic letter UKRE_uml - Ukrainian E (C with mid-line)"; +cyrchar(UKRE_uml,13u#,cap_height#+acc_height#,0); +if is_small_cap: getcharcode(ukre_uml); fi +italcorr cap_height#*slant-.5u#; +adjust_fit(0,0); full_h:=h; h:=cap_height; +% upper_ukre; +pickup fine.nib; pos1(cap_hair,0); pos2(cap_band,90); +pos3(cap_curve,180); pos4(cap_band,270); pos5(hair,360); +rt x1r=rt x5r=hround(w-u); lft x3r=hround u; x2=x4=.55[x3,x1]; +top y2r=h+o; bot y4r=-o; y3=.5h-vair_corr; y3l:=.52h; +bot y1=min(vround.675h,bot y2l-eps); +y5=max(good.y .95(h-y1),y4l+eps); +(x2l',y2l)=whatever[z2r,z1l]; x2l:=min(x2l',x2l+.5u); +(x4l',y4l)=whatever[z4r,z5l]; x4l:=min(x4l',x4l+.5u); +filldraw stroke z1e{x2-x1,10(y2-y1)}...pulled_super_arc.e(2,3)(.5superpull) + & pulled_super_arc.e(3,4)(.5superpull)...{up}z5e; % arc +pos6(.3[fine.breadth,cap_hair],0); x6r=x1r; top y6=h+o; +x1r-x1'=2cap_curve-fine; y1'=y1; +path upper_arc; upper_arc=z1{x2-x1,10(y2-y1)}..z2{left}; +numeric t; t=xpart(upper_arc intersectiontimes (z6l--z1')); +filldraw z1r--z6r--z6l--subpath(t,0) of upper_arc--cycle; % barb +% upukre_bar; +numeric bar[]; y7=y8=y3; +x7=x3l; x8=(min(lft x1l-.5hair,0.85[x3l,x1l])); +if (serifs=true) and (bar#<=.5curve#): + penpos7(cap_bar,90); penpos8(cap_bar,90); + bar2=7/8[cap_bar,fudged.cap_stem-3stem_corr]; + penpos9(bar2,45); z9=.575[z7l,z8l]; + fill circ_stroke z8e{-2,-1}..{-2,1}z9e..{-2,-1}z7e; % curve ~ +else: + pickup fine.nib; pos7(cap_bar,90); pos8(cap_bar,90); + filldraw stroke z7e--z8e; fi % bar -- +%%%%% +% the accent +h:=full_h; uppercase_umlaut(x2-.5w,0, 11,12,13,14); +penlabels(1,1',2,3,4,5,6); endchar; + +iff not serifs:% +lhchar "Uppercase Cyrillic letter UKRE_uml - Ukrainian E (C with mid-line)"; +cyrchar(UKRE_uml,11.5u#,cap_height#+acc_height#,0); +if is_small_cap: getcharcode(ukre_uml); fi +italcorr cap_height#*slant-.5u#; +adjust_fit(0,0); full_h:=h; h:=cap_height; +% uppers_ukre; +pickup fine.nib; pos1(1.2flare,80); pos2(slab,90); +pos3(cap_curve,180); pos4(slab,270); pos5(flare,275); +rt x1r=hround(w-1.1u); x2=x4=.5w+1.25u; +lft x3r=hround max(u,2u-.5cap_curve); rt x5r=hround(w-.9u); +top y1r=vround.95h+o; top y2r=h+o; y3=.5h; +bot y4r=-o; bot y5r=vround .08h-o; 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); +% uukres_bar; +numeric bar[]; y6=y7=y3; x6=x3l; x7=(min(lft x1l-.5hair,0.85[x3l,x1l])); +pickup fine.nib; +bar1=if is_small_cap:max(fine.breadth+eps,.6[thin_join,vair]) else: cap_bar fi; +pos6(bar1,90); pos7(bar1,90); +filldraw stroke z6e--z7e; % bar -- +%%%%% +% the accent +h:=full_h; uppercase_umlaut(x2-.5w,0, 11,12,13,14); +penlabels(1,1',2,3,4,5,6); endchar; + +iff serifs:% +lhchar "Uppercase Cyrillic letter EREV_uml - Reverse E umlaut"; +cyrchar(EREV_uml,13u#,cap_height#+acc_height#,0); +if is_small_cap: getcharcode(erev_uml); fi +italcorr cap_height#*slant-.5u#; +adjust_fit(0,0); full_h:=h; h:=cap_height; +% upper_erev; + pickup fine.nib; pos1(cap_hair,180); pos2(cap_band,90); + pos3(cap_curve,0); pos4(cap_band,-90); pos5(hair,-180); + lft x1r=lft x5r=hround u; + rt x3r=hround(w-u); x2=x4=.55[x3,x1]; + top y2r=h+o; bot y4r=-o; y3=.5h-vair_corr; y3l:=.52h; + bot y1=min(vround.675h,bot y2l-eps); y5=max(good.y .95(h-y1),y4l+eps); + (x2l',y2l)=whatever[z2r,z1l]; x2l:=max(x2l',x2l-.5u); + (x4l',y4l)=whatever[z4r,z5l]; x4l:=max(x4l',x4l-.5u); + filldraw stroke z1e{x2-x1,10(y2-y1)}...pulled_super_arc.e(2,3)(.5superpull) + & pulled_super_arc.e(3,4)(.5superpull)...{up}z5e; % arc + pos6(.3[fine.breadth,cap_hair],180); x6r=x1r; top y6=h+o; + x1'-x1r=2cap_curve-fine; y1'=y1; + path upper_arc; upper_arc=z1{x2-x1,10(y2-y1)}..z2{right}; + numeric t; t=xpart(upper_arc intersectiontimes (z6l--z1')); + filldraw z1r--z6r--z6l--subpath(t,0) of upper_arc--cycle; % barb +%%% +%%% uerev_bar; +numeric bar[]; y8=y7=y3; +x8=x3l; x7=max(rt x1l+.5hair,0.85[x3l,x1l]); +if (bar#<=.5curve#): + penpos7(cap_bar,90); penpos8(cap_bar,90); + bar2=7/8[cap_bar,fudged.cap_stem-3stem_corr]; + penpos9(bar2,45); z9=.475[z7l,z8l]; + fill circ_stroke z7e{2,1}..{2,-1}z9e..{2,1}z8e; % curve /\/ +else: + pickup fine.nib; pos7(cap_bar,90); pos8(cap_bar,90); + filldraw stroke z7e--z8e; % bar -- +fi +%%% +% the accent +h:=full_h; uppercase_umlaut(x2-.5w,0, 10,11,12,13); +penlabels(1,1',2,3,4,5,6,7,8,9, 10,11,12,13); endchar; + +iff not serifs:% +lhchar "Uppercase Cyrillic letter EREV_uml - Reverse E umlaut"; +cyrchar(EREV_uml,11.5u#,cap_height#+acc_height#,0); +if is_small_cap: getcharcode(erev_uml); fi +italcorr cap_height#*slant-.5u#; +adjust_fit(0,0); full_h:=h; h:=cap_height; +% uppers_erev; + pickup fine.nib; pos1(1.2flare,100); pos2(slab,90); + pos3(cap_curve,0); pos4(slab,-90); pos5(flare,-95); + lft x1r=hround1.1u; x2=x4=w-(.5w+1.25u); + rt x3r=w-hround max(u,2u-.5cap_curve); + lft x5r=hround.9u; + top y1r=vround .95h+o; top y2r=h+o; y3=.5h; + bot y4r=-o; bot y5r=vround .08h-o; y5l:=good.y y5l; x5l:=good.x x5l; + filldraw stroke rterm.e(2,1,left,.9,4) & super_arc.e(2,3) + & super_arc.e(3,4) & term.e(4,5,left,.8,4); +%%% +% urevs_bar; +pickup fine.nib; numeric bar[]; +bar1=if is_small_cap: max(fine.breadth+eps,.6[thin_join,vair]) + else: cap_bar fi; +pos6(bar1,90); pos7(bar1,90); +y7=y6=y3; x7=x3l; x6=max(rt x1l+.5hair,0.85[x3l,x1l]); +filldraw stroke z6e--z7e; % bar -- +%%%%% +% the accent +h:=full_h; uppercase_umlaut(x2-.5w,0, 8,9,10,11); +penlabels(1,1',2,3,4,5,6,7, 8,9,10,11); endchar; + lhchar "Uppercase Cyrillic letter U_bar - U bar (macron)"; cyrchar(U_bar,13u#,cap_height#+acc_height#,0); if is_small_cap: getcharcode(u_bar); fi diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lhberest.mf b/Master/texmf-dist/fonts/source/lh/nont2/lhberest.mf index e45502bf539..2e4cbd4b8c2 100644 --- a/Master/texmf-dist/fonts/source/lh/nont2/lhberest.mf +++ b/Master/texmf-dist/fonts/source/lh/nont2/lhberest.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -22,14 +22,12 @@ % additional macros for ec compatible mode % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec if unknown cmbase: input cmbase fi % input lcyrbeg; -LHver_check(3,4); % like |version_check| in ec - string genmode; genmode="cm"; let lhchar=\; diff --git a/Master/texmf-dist/fonts/source/lh/specific/lgcrusl.mf b/Master/texmf-dist/fonts/source/lh/specific/lgcrusl.mf index 2bb2225069f..9747f59ad82 100644 --- a/Master/texmf-dist/fonts/source/lh/specific/lgcrusl.mf +++ b/Master/texmf-dist/fonts/source/lh/specific/lgcrusl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -28,7 +28,7 @@ % f % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec lhchar "Lowercase Russian letter a - Small Caps A"; cyrchar(a,if serifs: 9.5u# else:9u# fi,x_height#,0); diff --git a/Master/texmf-dist/fonts/source/lh/specific/lgcyrcl.mf b/Master/texmf-dist/fonts/source/lh/specific/lgcyrcl.mf new file mode 100644 index 00000000000..de480378c65 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/specific/lgcyrcl.mf @@ -0,0 +1,763 @@ +% +% lgcyrcl.mf +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=1 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Lowercase Cyrillic letters common for couple of encodings +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% List of letternames and their codes in T2 & Ko +% +% X2 T2A T2B T2C T2D X2S LH WNCYR +% +% lje "6b k "a7 "a8 - - - - "09 Lje +% +% X2 T2A T2B T2C +% +% k_vcrs "66 f "ab - - Ka vertically crossed +% k_hcrs "67 g - - "ab Ka horisontally crossed +% l_dsc "68 h - "aa "aa El with descender +% +% zh_dsc "a5 "a5 "a5 - Zhe with descender +% k_dsc "a9 "a9 "a9 "a9 Ka with descender +% k_beak "aa "aa - - Ka with reversed beak +% l_tl "ac - "ac - El with tail +% + +LHver_check(3,5); % like |version_check| in ec + +begingroup + +def is_egyptian = +% |false| for most of the CM fonts, except funny fonts; +% |true| for the CC fonts + (serifs and (1.4max(fine#,crisp#, tiny#)<slab#) and (1.6slab#>stem#)) +%added + or (vair#>.5stem#) +enddef; + +lhchar "Lowercase Cyrillic letter lje (`concrete' form)"; +cyrchar(lje,10u# % if not serifs:+.5width_adj# fi % dl_width;n_width + ,x_height#,0); +italcorr .5x_height#*slant+min(.5curve#-.85u#,-.1u#); %p +adjust_fit(if serifs: .25(7/8[hair#,flare#])-.25u# if is_egyptian:+.5hair# fi + else: serif_fit# fi, + 3.25u# if serifs:-.5width_adj# fi);%lsftsn_adj(lje);lsftsnwd-.25u-.5width_adj +%lower_spec_l; +numeric bulb_diam; bulb_diam=hround 7/8[hair,flare]; +numeric left_stem,right_stem,outer_jut,alpha; +right_stem=stem-stem_corr; +left_stem=max(tiny.breadth+eps,min(hair if hefty:-3stem_corr fi,right_stem)); +outer_jut=.75jut; x4r=w+serif_fit-outer_jut- if serifs:.25 else:.5 fi u; +x1l-.5u-.065jut=w-x4r; y1=y4=0; x2-x1=x4-x3; +if serifs: x3l=x2r+((x1r-x4l)*(vair/(h-vair)))if not is_egyptian:-.25left_stem fi; + else: x3r=x2r+apex_corr; fi +y2=y3=h if not serifs:+apex_o+apex_oo fi; +alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); +penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); +penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); +if serifs: + fill stroke z3e--z4e; % right stem + pickup tiny.nib; + penpos5(left_stem,-90); pos5'(left_stem,-90); z5'=z5; + pos8(hair,-180); pos9(bulb_diam,-180); + y9-.5bulb_diam=.12desc_depth-eps; lft x9r=l+letter_fit+hround(.35u-.5); + y5r=-oo-eps; x5=max(min(.4[x9r,x1r],rt x9l+eps),lft x9r+.5bulb_diam); + z7r=(max(.5[x1,x1r],x9+if is_egyptian:1.25bulb_diam +.5slant*hair + else: 1.5bulb_diam-hair fi), + y7l-7/8left_stem); + z7l=(x7r-2/3(x1r-x1l),if is_egyptian: .35[y5l,y5] else: y5 fi); + y6l=y9+.5bulb_diam; z6r=(x7r,y1)+whatever*(z1-z2);% + y6r-y6l=y5r-y5l; x6r-x6l=2/3(x1r-x1l); + fill stroke z2e.. controls z6e and z7e ..z5e; % left stem + {{less_tense; cyrbulb(5',8,9)}}; % arc and bulb + numeric inner_jut,left_jut,fit; + pickup tiny.nib; left_jut=jut+left_stem; + prime_points_inside(4,3); + x10r=x3r; top y10=h; pos10(max(currentbreadth+eps,alpha*right_stem),0); x4:=x4r; + if rt x1r+jut+.5u+1<=lft x4'l-jut: inner_jut=jut; + else: rt x1r+inner_jut+.5u+1=lft x4'l-inner_jut; fi + save slab; slab:=Vround(vair-vair_corr); + serif(10,4,c,0,-left_jut); % upper serif + slab:=vair; + nodish_serif(4',3,d,1/2,inner_jut,e,1/3,outer_jut); %!!! right serif +else: z0=whatever[z1r,z2r]=whatever[z3l,z4l]; + if y0<h-notch_cut: y0:=h-notch_cut; + fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r) + --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{up}z0+.5left--cycle; % left and right diagonals + else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) + --diag_end(2l,1l,1,1,1r,0)--cycle; fi fi % left and right diagonals +%%%%% +% now the b part +w:=w+3.25u if serifs:-.5width_adj fi;%lsftsnwd-.25u-.5width_adj +% lsftsn_bowl(2)lje; +_zero:=4; +_one:=12; _two:=13; _three:=14; _four:=15; _five:=16; +% +set_bar_axis; +penpos[_three](curve if hefty:-3stem_corr fi,0); +penpos[_four](vair,-90); penpos[_five](vair,-90); +z[_five]r=z[_zero]; y[_four]=y[_five];%!!! +y[_three]=.5[y[_two]l,y[_four]l]; +y[_one]l=y[_two]l=y1.bh; y[_one]r=y[_two]r=y2.bh; +z[_one]l=whatever[z3,z4]; x[_one]l=x[_one]=x[_one]r;%!!! +x[_two]l=x[_two]r=x[_four]=w-3.25u; %!!! +x[_three]r=hround(w-.6u); +x[_two]l:=x[_four]l:=x[_two]r-.25curve; +fill stroke + {{if not serifs: interim superness:=more_super; fi + z[_five]e..super_arc.e([_four],[_three])}} & + super_arc.e([_three],[_two])..z[_one]e; % lobe +%%% +penlabels(1,2,3,4,5,6,7,8,9,10,11); endchar; + +lhchar "Lowercase Cyrillic letter k_vcrs (`concrete' form)"; +cyrchar(k_vcrs,11.5u# if not serifs:+.5width_adj# fi, + % n_width+if serifs:1.5u else:+2u+.5tiny fi + x_height#,0); +italcorr x_height#*slant-.2u#; +adjust_fit(serif_fit#,serif_fit#); + numeric stem[]; stem1=max(tiny.breadth,hround(fudged.stem-stem_corr)); +pickup tiny.nib; pos1(fudged.stem,0); pos2(fudged.stem,0); +lft x1l=lft x2l=hround (2.5u-.5fudged.stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +% kv_cbowl; + pos10(stem1,0); x10=hround(w-7u); y10=y1; +% k_cbowl; +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6jut else:.4tiny fi; +stem1=max(tiny.breadth,hround(fudged.hair if hefty:-\\4stem_corr fi)); +stem2=max(tiny.breadth,fudged.stem-3stem_corr); +x3r=hround(r-letter_fit-.7u-right_jut)-.5tiny+eps; +x6r=hround(r-letter_fit-.3u-right_jut)-.5tiny+eps; +y4=.7bar_height; top y3=h; bot y6=0; x4=x10;%!!! +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5$=z6'$+whatever*(z10-z6)=z3'$+whatever*(z3-z4); endfor%!!! +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y10-y6,x6r-x10));%!!! +else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z10-z6 of currentpen+whatever*(z10-z6); +z6'l=z6l+penoffset z6-z10 of currentpen+whatever*(z10-z6); +fill z5r--diag_end(4r,3'r,1,.5,3'l,4l)--z5l--cycle; %!!! upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(vair',90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal +%%% +else: fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle; fi % lower diagonal +%%% + if (2(y5l-y5r)>(.6[thin_join, vair]-eps)) or (y5l<y5r): + y9r=vround (y5l+.5(.6[thin_join, vair])-eps); + else:y9r=vround (y5r+.5(.6[thin_join, vair])-eps); fi + y9r=y8r; y9r-y9l=y8r-y8l=(.6[thin_join, vair]); x9l=x9r=x1; x8l=x8r=x5r; + fill stroke z9e--z8e; % middle cross +if serifs: + pickup tiny.nib; + save slab; slab:=Vround(vair-vair_corr); % lower.slab + dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif + slab:=vair; % lower.slab + dish_serif(2,1,c,1/3,jut,d,1/3,jut); fi % lower stem serif +%%% +if serifs: + numeric inner_jut,up_inner_jut; + if rt x2r+.5u+1<=lft x6l-jut: inner_jut=jut; + else: rt x2r+jut+.5u+1=lft x6l-inner_jut; fi + if rt x1r+jut+.5u+1<=lft x3l-1.2jut: up_inner_jut=1.2jut; + else: rt x1r+jut+.5u+1=lft x3l-up_inner_jut; fi + slab:=Vround(vair-vair_corr); % lower.slab + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); fi % upper diagonal serif +% slab:=vair; % lower.slab +% dish_serif(6,5,g,1/2,inner_jut,h,1/3,right_jut)(dark); fi % lower diagonal serif +% vcross +pickup if serifs: crisp.nib else: fine.nib fi; +numeric middle_weight; +middle_weight=max(currentbreadth+eps,.6[thin_join,vair]); +pos12(middle_weight,0); pos11(middle_weight,0); +lft x12l=lft x11l= + hround max(tiny.rt x1r+1,max(x5l-middle_weight,.5[tiny.rt x1r,x5l])); +top y11-bot y12=.5x_height; .52[y12,y11]=.5[y9l,y9r]; +filldraw stroke z12e--z11e; % cross bar +penlabels(1,2,3,4,5,6,7,8,9,10,11); endchar; + +lhchar "Lowercase Cyrillic letter k_hcrs (`concrete' form)"; +cyrchar(k_hcrs,10u#,asc_height#,0); % n_width +italcorr x_height#*slant-.2u#; +adjust_fit(serif_fit#,serif_fit#); full_h:=h; h:=x_height; +% lower_hk; +% long k_stem; +numeric stem[]; stem1=max(tiny.breadth,hround(fudged.stem-stem_corr)); +stem2=max(tiny.breadth,hround(fudged.stem-2stem_corr)); +pickup tiny.nib; pos1(stem1,0); pos2(stem2,0); +lft x1l=lft x2l=hround (2.5u-.5stem1); top y1=h; bot y2=0; +x11'=x1; top y11'=asc_height; pos11'(stem1,0); +filldraw stroke z11'e--z2e; % stem +pos0(stem1,0); pos0'(stem2,0); y0=y0'; x0=x11'; x0'=x2; +rt z0r=whatever[((w-.7u-jut-hair),x_height),(x1,.7bar_height)]; +filldraw stroke z11'e..z0e--z0'e..z2e; % stem +if serifs: + sloped_serif.l(11',0,a,1/3,jut,serif_drop); fi % upper stem serif +% k_cbowl; +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6jut else:.4tiny fi; +stem1=max(tiny.breadth,hround(fudged.hair if hefty:-\\4stem_corr fi)); +stem2=max(tiny.breadth,fudged.stem-3stem_corr); +x3r=hround(r-letter_fit-.7u-right_jut)-.5tiny+eps; +x6r=hround(r-letter_fit-.3u-right_jut)-.5tiny+eps; +y4=.7bar_height; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); +else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(vair',90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal +%%% +else: fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle; fi % lower diagonal +%%% +if serifs: save slab; slab:=Vround(vair-vair_corr); + %dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif + slab:=vair; + dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower stem serif + numeric up_inner_jut; + if rt x1r+jut+.5u+1<=lft x3l-1.2jut: up_inner_jut=1.2jut; + else: rt x1r+jut+.5u+1=lft x3l-up_inner_jut; fi + slab:=Vround(vair-vair_corr); + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif +fi +%%%%% +% hcross +h:=full_h; +_one:=8; _two:=9; +pickup crisp.nib; +pos[_one](bar,90); pos[_two](bar,90); +top y[_one]r=top y[_two]r=vround (min(.5[x_height,h]+.5bar,h-max(bracket,1.2slab))-eps); +rt x[_two]=x1r+if serifs: max(limit_dist,1.1jut) else: 1.7u fi; +lft x[_one]=hround 1/3u-serif_fit; +filldraw stroke z[_one]e--z[_two]e; % cross bar +penlabels(1,2,3,4,5,6, 7,8); endchar; + +lhchar "Lowercase Cyrillic letter l_dsc (`concrete' form)"; +cyrchar(l_dsc,10u# % if not serifs:+.5width_adj# fi % dl_width;n_width + ,x_height#,if is_ogonek: desc_depth# else: sbeak# fi); %ldesc/og_depth +italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut +adjust_fit(if serifs: .25(7/8[hair#,flare#])-.25u# if is_egyptian:+.5hair# fi + else: serif_fit# fi, + serif_fit# if serifs: if not is_ogonek:+.35jut# fi fi); +begingroup +%lower_spec_l; +numeric bulb_diam; bulb_diam=hround 7/8[hair,flare]; +numeric left_stem,right_stem,outer_jut,alpha; +right_stem=stem-stem_corr; +left_stem=max(tiny.breadth+eps,min(hair if hefty:-3stem_corr fi,right_stem)); +outer_jut=.75jut; x4r=w+serif_fit-outer_jut- if serifs:.25 else:.5 fi u; +x1l-.5u-.065jut=w-x4r; y1=y4=0; x2-x1=x4-x3; +if serifs: x3l=x2r+((x1r-x4l)*(vair/(h-vair)))if not is_egyptian:-.25left_stem fi; + else: x3r=x2r+apex_corr; fi +y2=y3=h if not serifs:+apex_o+apex_oo fi; +alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); +penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); +penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); +if serifs: + fill stroke z3e--z4e; % right stem + pickup tiny.nib; + penpos5(left_stem,-90); pos5'(left_stem,-90); z5'=z5; + pos8(hair,-180); pos9(bulb_diam,-180); + y9-.5bulb_diam=.12desc_depth-eps; lft x9r=l+letter_fit+hround(.35u-.5); + y5r=-oo-eps; x5=max(min(.45[x9r,x1r],rt x9l-eps),lft x9r+.5bulb_diam); + z7r=(max(.5[x1,x1r],x9+if is_egyptian:1.25bulb_diam +.5slant*hair + else: 1.5bulb_diam-hair fi), + y7l-7/8left_stem); + z7l=(x7r-2/3(x1r-x1l),if is_egyptian: .35[y5l,y5] else: y5 fi); + y6l=y9+.5bulb_diam; z6r=(x7r,y1)+whatever*(z1-z2);% + y6r-y6l=y5r-y5l; x6r-x6l=2/3(x1r-x1l); + fill stroke z2e.. controls z6e and z7e ..z5e; % left stem + {{less_tense; cyrbulb(5',8,9)}}; % arc and bulb + numeric inner_jut,left_jut,fit; + pickup tiny.nib; left_jut=jut+left_stem; + prime_points_inside(4,3); + x10r=x3r; top y10=h; pos10(max(currentbreadth+eps,alpha*right_stem),0); x4:=x4r; + if rt x1r+jut+.5u+1<=lft x4'l-jut: inner_jut=jut; + else: rt x1r+inner_jut+.5u+1=lft x4'l-inner_jut; fi + save slab; slab:=Vround(vair-vair_corr); + serif(10,4,c,0,-left_jut); % upper serif + slab:=vair; + if is_ogonek: + dish_serif(4',3,d,1/2,inner_jut,e,1/3,outer_jut); % right serif + fi +else: z0=whatever[z1r,z2r]=whatever[z3l,z4l]; + if y0<h-notch_cut: y0:=h-notch_cut; + fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r) + --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{up}z0+.5left--cycle; % left and right diagonals + else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) + --diag_end(2l,1l,1,1,1r,0)--cycle; fi fi % left and right diagonals +%%%%% +% lowercase descender/saam tail +slab:=vair; % lower.slab +numeric right_jut; +right_jut=if serifs: max(limit_dist,1.1jut) else: hround (r-rt x2r-.5u) fi; +if unic: + %saam tail + serif(4',3,v,1/3,-jut); + siam_serif(4',3,w,1/3,right_jut); +else: + r_serif(4',3,o,1/3,jut,p,1/3,beak_darkness,right_jut,.6beak_jut); % lower right descender +fi +endgroup; +penlabels(1,2,3,4,5,6, 7,8,9);endchar; + +lhchar "Lowercase Cyrillic letter zh_dsc (`concrete' form)"; +cyrchar(zh_dsc,if serifs:10u# else:9.5u# fi % zhk_width: n_width;keng_width + ,x_height#,if is_ogonek: desc_depth# else: sbeak# fi); %ldesc/og_depth +italcorr x_height#*slant-.2u#; +adjust_fit(w#-5u#+ %zhr_adj + if monospace: 0 else: serif_fit# fi, %wlett_adj + if monospace: 0 else: serif_fit# fi); %wlett_adj +begingroup +% lowerc_zh; +pickup tiny.nib; numeric stem[]; +stem0=max(tiny.breadth,hround(fudged.stem-stem_corr)); +if odd((r-l)-stem0): change_width; fi % symmetric & all three equal +pos1(stem0,0); pos2(stem0,0); +lft x1l=lft x2l=hround (.5[l,r]-.5fudged.stem)-eps; % middle stem point +top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +% k_cbowl; +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6jut else:.4tiny fi; +stem1=max(tiny.breadth,hround(fudged.hair if hefty:-\\4stem_corr fi)); +stem2=max(tiny.breadth,fudged.stem-3stem_corr); +x3r=hround(r-letter_fit-.7u-right_jut)-.5tiny+eps; +x6r=hround(r-letter_fit-.3u-right_jut)-.5tiny+eps; +y4=.7bar_height; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); +else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(vair',90); + else: y7=0; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi %!!! + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal +%%% +else: fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle; fi % lower diagonal +%%% +% mirror + pickup tiny.nib; +forsuffixes $ = 3l,3,3r,3'l,3'r,4l,4,4r,5l,5,5r,6l,6,6r,6'l,6'r: + x.m$=l+(r-x$); y.m$=y$; endfor; +forsuffixes $ = 7l,7r: + x.m$=l+(r-x$); y.m$=y$-o; endfor; +fill z.m4r--diag_end(.m4r,.m3'r,1,.5,.m3'l,.m4l)--z.m4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + fill z.m5l + if is_egyptian: ---z.m6'l...{z.m6r-z.m6l}(.35[x.m6l,x.m7l],y.m7l)-- + else:{z.m6'l-.5[z.m5,z.m5l]}...{z.m6r-z.m6l} fi + z.m7l..(lft x.m7l,top y.m7l)--(lft x.m7r,bot y.m7r)..z.m7r + if is_egyptian: --(.5[x.m6r,x.m7r],y.m7r){z.m6l-z.m6r}...z.m6'r--- + else: {z.m6l-z.m6r}...{.5[z.m5,z.m5l]-z.m6'l} fi + z.m5r--cycle; % lower diagonal + z8l=z.m3r; z8r=z.m3l; z9l=z.m4r; z9r=z.m4l; z8=.5[z8l,z8r]; z9=.5[z9l,z9r]; +else: fill z.m5'l--diag_end(.m5'l,.m6'l,.5,1,.m6'r,.m5'r)--z.m5'r--cycle; % lower diagonal +fi +if serifs: save slab; slab:=Vround(vair-vair_corr); + dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif + slab:=vair; + dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower stem serif + numeric up_inner_jut; + if rt x1r+jut+.5u+1<=lft x3l-1.2jut: up_inner_jut=1.2jut; + else: rt x1r+jut+.5u+1=lft x3l-up_inner_jut; fi + slab:=Vround(vair-vair_corr); + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif + dish_serif(8,9,g,1/2,right_jut,h,2/3,up_inner_jut)(dark); % upper diagonal serif +fi +%%%%% +% lowercase descender/ogonek +if is_ogonek: + endgroup; + def the_pen= + if known ogonek_pen: ogonek_pen elseif serifs: tiny else: fine fi + enddef; + % |diag_end| refers to |tiny| pen, hence |tiny| in the following equation: + ogonek_pos=(x6 if not serifs: l fi,.5the_pen) + if serifs and not is_egyptian: +(.5xvair,0) fi; + easy_ogonek(the_pen,11,12,13); % ogonek +else: + slab:=vair; % lower.slab +% + if serifs: + pickup crisp.nib; + else: + pickup pencircle scaled (3/5[fine,crisp]+eps); + fi + numeric bracket_height,light_stem; pair downward; + bracket_height=bracket; + light_stem=hround (max(tiny.breadth,fudged.hair if hefty:-4stem_corr fi)); + % for cyr_serif always |y$|<|y$$| + if (y6>y1): errmessage ("`cyr_serif' placed only on the bottom"); fi + downward=z6-z1; + y.q0=min(y6+.5bracket_height,y1)+eps; + top y.q1-slab-eps=bot y.q4+eps=tiny.bot y6; + if y.q1>y.q0: y.q0:=y.q1+eps; fi + bot y.q2=bot y.q3=vround(-d); + y.q5=y.q1; y.q6=y.q0; + z.q5=whatever[z6,z1]; z.q6=whatever[z6,z1]; + z.q0-penoffset downward of currentpen = + z6r-penoffset downward of pen_[tiny.nib]-whatever*downward; + rt x.q1=hround (tiny.rt x6r+right_jut)+eps; + if x.q6>x.q0-eps: x.q6:=x.q0-eps; fi + rt x.q2=lft x.q3+light_stem+eps=hround (rt x.q1+.6beak_jut)+eps; + x.q4=x6-.5(fudged.stem-3stem_corr-tiny)-eps; + pair corner,beak_corner; + ypart corner=y.q1; corner=z.q0+whatever*downward; + ypart beak_corner=y.q4; beak_corner=z.q3+whatever*(z.q1-z.q2); + filldraw z.q6--z.q5 + ...(beak_darkness+eps)[beak_corner,.5[z.q3,z.q4]] + ...{z.q2-z.q1}z.q3--z.q2--z.q1{-right_jut,0} + ...(1/3+eps)[corner,.5[z.q1,z.q0]]{z.q0-z.q1} + ...{z1-z6}z.q0--cycle; % descender + labels (.q0,.q1,.q2,.q3,.q4,.q5,.q6); +% + endgroup; +fi +penlabels(1,2,3,4,5,6,7,8,9,10, 11,12,13); endchar; + +lhchar "Lowercase Cyrillic letter k_dsc (`concrete' form)"; +cyrchar(k_dsc,if serifs:10u# else:9.5u# fi % zhk_width: n_width;keng_width + ,x_height#,if is_ogonek: desc_depth# else: sbeak# fi); %ldesc/og_depth +italcorr x_height#*slant-.2u#; +adjust_fit(serif_fit#,serif_fit#); +begingroup +% lowerr_k; +pickup tiny.nib; numeric stem[]; +stem0=max(tiny.breadth,hround(fudged.stem-stem_corr)); +pos1(stem0,0); pos2(stem0,0); +lft x1l=lft x2l=hround (2.5u-.5fudged.stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +% k_cbowl; +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6jut else:.4tiny fi; +stem1=max(tiny.breadth,hround(fudged.hair if hefty:-\\4stem_corr fi)); +stem2=max(tiny.breadth,fudged.stem-3stem_corr); +x3r=hround(r-letter_fit-.7u-right_jut)-.5tiny+eps; +x6r=hround(r-letter_fit-.3u-right_jut)-.5tiny+eps; +y4=.7bar_height; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); +else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(vair',90); + else: y7=0; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi %!!! + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal +%%% +else: fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle; fi % lower diagonal +%%% +if serifs: save slab; slab:=Vround(vair-vair_corr); + dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif + slab:=vair; + dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower stem serif + numeric up_inner_jut; + if rt x1r+jut+.5u+1<=lft x3l-1.2jut: up_inner_jut=1.2jut; + else: rt x1r+jut+.5u+1=lft x3l-up_inner_jut; fi + slab:=Vround(vair-vair_corr); + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif +fi +%%%%% +% lowercase descender/ogonek +if is_ogonek: + endgroup; + def the_pen= + if known ogonek_pen: ogonek_pen elseif serifs: tiny else: fine fi + enddef; + % |diag_end| refers to |tiny| pen, hence |tiny| in the following equation: + ogonek_pos=(x6 if not serifs: l fi,.5the_pen) + if serifs and not is_egyptian: +(.5xvair,0) fi; + easy_ogonek(the_pen,7,8,9); % ogonek +else: + slab:=vair; % lower.slab +% + if serifs: + pickup crisp.nib; + else: + pickup pencircle scaled (3/5[fine,crisp]+eps); + fi + numeric bracket_height,light_stem; pair downward; + bracket_height=bracket; + light_stem=hround (max(tiny.breadth,fudged.hair if hefty:-4stem_corr fi)); + % for cyr_serif always |y$|<|y$$| + if (y6>y1): errmessage ("`cyr_serif' placed only on the bottom"); fi + downward=z6-z1; + y.q0=min(y6+.5bracket_height,y1)+eps; + top y.q1-slab-eps=bot y.q4+eps=tiny.bot y6; + if y.q1>y.q0: y.q0:=y.q1+eps; fi + bot y.q2=bot y.q3=vround(-d); + y.q5=y.q1; y.q6=y.q0; + z.q5=whatever[z6,z1]; z.q6=whatever[z6,z1]; + z.q0-penoffset downward of currentpen = + z6r-penoffset downward of pen_[tiny.nib]-whatever*downward; + rt x.q1=hround (tiny.rt x6r+right_jut)+eps; + if x.q6>x.q0-eps: x.q6:=x.q0-eps; fi + rt x.q2=lft x.q3+light_stem+eps=hround (rt x.q1+.6beak_jut)+eps; + x.q4=x6-.5(fudged.stem-3stem_corr-tiny)-eps; + pair corner,beak_corner; + ypart corner=y.q1; corner=z.q0+whatever*downward; + ypart beak_corner=y.q4; beak_corner=z.q3+whatever*(z.q1-z.q2); + filldraw z.q6--z.q5 + ...(beak_darkness+eps)[beak_corner,.5[z.q3,z.q4]] + ...{z.q2-z.q1}z.q3--z.q2--z.q1{-right_jut,0} + ...(1/3+eps)[corner,.5[z.q1,z.q0]]{z.q0-z.q1} + ...{z1-z6}z.q0--cycle; % descender + labels (.q0,.q1,.q2,.q3,.q4,.q5,.q6); +% + endgroup; +fi +penlabels(1,2,3,4,5,6); endchar; + +lhchar "Lowercase Cyrillic letter k_beak (`concrete' form)"; +cyrchar(k_beak,if serifs:10u# else:9.5u# fi % zhk_width: n_width;keng_width + ,x_height#,0); +italcorr x_height#*slant-.2u#; +adjust_fit(2u#-.5width_adj#, % beak_adj + serif_fit#); +% lowerc_k; +pickup tiny.nib; numeric stem[]; +stem0=max(tiny.breadth,hround(fudged.stem-stem_corr)); +pos1(stem0,0); pos2(stem0,0); +lft x1l=lft x2l=hround (2.5u-.5fudged.stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +% k_cbowl; +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6jut else:.4tiny fi; +stem1=max(tiny.breadth,hround(fudged.hair if hefty:-\\4stem_corr fi)); +stem2=max(tiny.breadth,fudged.stem-3stem_corr); +x3r=hround(r-letter_fit-.7u-right_jut)-.5tiny+eps; +x6r=hround(r-letter_fit-.3u-right_jut)-.5tiny+eps; +y4=.7bar_height; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); +else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(vair',90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal +%%% +else: fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle; fi % lower diagonal +%%% +if serifs: save slab; slab:=Vround(vair-vair_corr); + nodish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif + slab:=vair; + dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower stem serif + numeric up_inner_jut; + if rt x1r+jut+.5u+1<=lft x3l-1.2jut: up_inner_jut=1.2jut; + else: rt x1r+jut+.5u+1=lft x3l-up_inner_jut; fi + slab:=Vround(vair-vair_corr); + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif +fi +%%%%% +% lower left beak +_one:=9; _two:=10; +pickup crisp.nib; pos[_one](vair,90); pos[_two](hair,180); +top y[_one]r=h; x[_one]=x1; lft x[_two]r=l+letter_fit+hround.45u; y[_two]=good.y(y[_one]l-beak/1.4)-eps; +arm([_one],[_two],q,beak_darkness,-.4beak_jut); +penlabels(1,2,3,4,5,6, 7,8); endchar; + +lhchar "Lowercase Cyrillic letter l_tl (`concrete' form)"; +cyrchar(l_tl,10u# % if not serifs:+.5width_adj# fi % dl_width;n_width + ,x_height#,desc_depth#); +italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut +adjust_fit(if serifs: .25(7/8[hair#,flare#])-.25u# if is_egyptian:+.5hair# fi + else: serif_fit# fi, + -.75cap_jut#+if serifs:.25 else .5 fi u#); %lcon_tl +%lower_spec_l!!!; +numeric bulb_diam; bulb_diam=hround 7/8[hair,flare]; +numeric left_stem,right_stem,outer_jut,alpha; +right_stem=stem-stem_corr; +left_stem=min(hair if hefty:-3stem_corr fi,right_stem); +outer_jut=.75jut; x4r=w+serif_fit-outer_jut- if serifs:.25 else:.5 fi u; +x1l-.5u-.065jut=w-x4r; y1=y4=0; x2-x1=x4-x3; +if serifs: x3l=x2r+((x1r-x4l)*(vair/(h-vair)))if not is_egyptian:-.25left_stem fi; + else: x3r=x2r+apex_corr; fi +y2=y3=h if not serifs:+apex_o+apex_oo fi; +alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); +penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); +penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); +numeric t; t=slab+bracket; +forsuffixes e=l,r: z54e=(((0,t)--(w,t)) intersectionpoint (z4e--z3e)); endfor; +if serifs: + fill stroke z3e--z54e; %!!! right stem + pickup tiny.nib; + penpos5(left_stem,-90); pos5'(left_stem,-90); z5'=z5; + pos8(hair,-180); pos9(bulb_diam,-180); + y9-.5bulb_diam=.12desc_depth-eps; lft x9r=l+letter_fit+hround(.35u-.5); + y5r=-oo-eps; x5=max(min(.45[x9r,x1r],rt x9l-eps),lft x9r+.5bulb_diam); + z7r=(max(.5[x1,x1r],x9+if is_egyptian:1.25bulb_diam +.5slant*hair + else: 1.5bulb_diam-hair fi), + y7l-7/8left_stem); + z7l=(x7r-2/3(x1r-x1l),if is_egyptian: .35[y5l,y5] else: y5 fi); + y6l=y9+.5bulb_diam; z6r=(x7r,y1)+whatever*(z1-z2);% + y6r-y6l=y5r-y5l; x6r-x6l=2/3(x1r-x1l); + fill stroke z2e.. controls z6e and z7e ..z5e; % left stem + {{less_tense; cyrbulb(5',8,9)}}; % arc and bulb + numeric inner_jut,left_jut,fit; + pickup tiny.nib; left_jut=jut+left_stem; + prime_points_inside(4,3); + x10r=x3r; top y10=h; pos10(alpha*right_stem,0); x4:=x4r; + if rt x1r+jut+.5u+1<=lft x4'l-jut: inner_jut=jut; + else: rt x1r+inner_jut+.5u+1=lft x4'l-inner_jut; fi + save slab; slab:=Vround(vair-vair_corr); + serif(10,4,c,0,-left_jut); % upper serif + slab:=vair; + %dish_serif(4',3,d,1/2,inner_jut,e,1/3,outer_jut); % right serif +else: z0=whatever[z1r,z2r]=whatever[z3l,z4l]; + if y0<h-notch_cut: y0:=h-notch_cut; + fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r) + --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{up}z0+.5left--cycle; % left and right diagonals + else: fill z0--z54l--z54r--diag_end(2l,1l,1,1,1r,0)--cycle; fi fi %!!! left and right diagonals +%%%%% +% l_tail(4);x_tail +_zero:=4; +_one:=14; _two:=15; _three:=16; _four:=17; +% +% x_ +pickup fine.nib; +stem3=hround (max(fine.breadth,.5[fudged.stem-4stem_corr,x[_zero]r-x[_zero]l])); +x[_one]'r=x4r; +penpos[_one]'(stem3,0); pos[_one](stem3,0); z[_one]=z[_one]'; +bot y[_one]=max(-1/3d,-d+vair')-eps; +(x[_one]'l,y54')=whatever[z4l,z4l+dir angle(z4l-z3l)]; +z54'=(x[_one]'l,y54'); +fill z54l{z4r-z1r} + ..controls (z54').. + {down}z[_one]'l--z[_one]'r{up} + ..controls (z4r).. + {z1r-z4r}z54r--cycle; %link +% _x +if serifs: + numeric bulb_diam; + bulb_diam=max(currentbreadth+eps,min(.82d-1-eps,hround 7/8[hair,flare])); + pos[_two](vair',-90); pos[_three](hair,-180); + pos[_four](bulb_diam,-180); + x[_two]=.5[x[_one],x[_three]r]; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; + z[_three]r=z[_four]r; + rt x[_four]l=max(x[_one]l-bulb_diam,%!!! + floor x[_one]-2.5u if monospace: / expansion_factor fi);%!!! + (x,y[_two]r)=whatever[z[_two]l,z[_one]l]; + x[_two]r:=max(x,.5[x[_three]r,x[_two]]); + filldraw stroke pulled_arc.e([_one],[_two]);%!!! + bulb([_two],[_three],[_four]); % bulb +else: + pos[_two](vair',-90); pos[_three](.6[vair',flare],-105); + rt x[_three]r=x[_one]-3u; bot y[_three]r=-d;%!!! + bot y[_two]r=-d-oo; x[_two]=.4[x[_three]r,x[_one]r];%!!! + filldraw stroke super_arc.e([_one],[_two])%!!! + & term.e([_two],[_three],left,.8,4); fi +%%% +penlabels(1,2,3,4,5,6, 7,8,9,10,11);endchar; + +endgroup; + +endinput; +%end of file diff --git a/Master/texmf-dist/fonts/source/lh/specific/lgcyrcu.mf b/Master/texmf-dist/fonts/source/lh/specific/lgcyrcu.mf new file mode 100644 index 00000000000..38047b59c77 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/specific/lgcyrcu.mf @@ -0,0 +1,723 @@ +% +% lgcyrcu.mf +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=1 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Lowercase Cyrillic letters common for couple of encodings +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% List of letternames and their codes in T2 & Ko +% +% X2 T2A T2B T2C T2D X2S LH WNCYR +% +% LJE "4b K !"87 "88 - - - - "01 Lje +% +% X2 T2A T2B T2C +% +% K_vcrs "46 F "8b - - Ka vertically crossed +% K_hcrs "47 G - - "8b Ka horisontally crossed +% L_dsc "48 H - "8a "8a El with descender +% +% ZH_dsc "85 "85 "85 - Zhe with descender +% K_dsc "89 "89 "89 "89 Ka with descender +% K_beak "8a "8a - - Ka with reversed beak +% L_tl "8c - "8c - El with tail +% + +LHver_check(3,5); % like |version_check| in ec + +begingroup + +def is_egyptian = +% |false| for most of the CM fonts, except funny fonts; +% |true| for the CC fonts + (serifs and (1.4max(fine#,crisp#, tiny#)<slab#) and (1.6slab#>stem#)) +%added + or (vair#>.5stem#) +enddef; + +lhchar "Uppercase Russian letter LJE (`concrete' form)"; +cyrchar(LJE,13.5u#,cap_height#,0); %N_width# +if is_small_cap: getcharcode(lje); fi +adjust_fit(if serifs: .8(flare#+(cap_stem#-stem#))-.5u# + else: cap_serif_fit# fi, + 4u#-.5width_adj#);% usftsn_adj;usftsnwd-.25u-.5width_adj +% upper_spec_l; +numeric bulb_diam; bulb_diam=flare+(cap_stem-stem); +numeric left_stem,right_stem,outer_jut,alpha; +right_stem=cap_stem-stem_corr; +left_stem=max(tiny.breadth+eps,min(cap_hair if hefty:-3stem_corr fi,right_stem)); +outer_jut=.8cap_jut; x1l=w-x4r=outer_jut+if serifs:.5 fi u; y1=y4=0; x2-x1=x4-x3; +if serifs: x3l=x2r+((x1r-x4l)*(slab/(h-slab))) %+2apex_corr; + if not is_egyptian:-.25left_stem fi; +else: x3r= x2r+apex_corr; fi +y2=y3=h if not serifs:+apex_o+apex_oo fi; +alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); +penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); +penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); +if serifs: + fill stroke z3e--z4e; % right stem + pickup tiny.nib; + penpos5(left_stem,-90); pos5'(left_stem,-90); z5'=z5; + pos8(cap_hair,-180); pos9(bulb_diam,-180); + y9=if is_egyptian: 0.12h else: 1/6h-max(0,flare-stem-2vair_corr-.5) fi; + lft x9r=l+letter_fit+hround(.5u-.5); + y5r=-o; x5=max(lft x9r+.5bulb_diam,.5[x9r,x1r]); + y6l=y9+bulb_diam-hair; + numeric t; t=1-slant; + z7r=(max(.75[x1,x1r],x9+if is_egyptian: (if is_small_cap: 2.25 else: 2.667 fi + +max(-2slant,.5slant))*hair + else: if is_bold:.75 fi bulb_diam+1.35hair fi), + y7l-t*7/8left_stem); + z7l=(x7r-2/3(x1r-x1l),if is_egyptian: .35[y5l,y5] else: y5 fi);%y5l); + z6r=(x7r,y1)+whatever*((x1r,y1)-z2r); y6r-y6l=t*(y5r-y5l); + x6r-x6l=1/2(x1r-x1l); + fill stroke z2e{z1e-z6e}.. controls z6e and z7e ..z5e; + {{less_tense; cyrbulb(5',8,9)}}; % arc and bulb + numeric inner_jut,left_jut,fit; pickup tiny.nib; + x10r=x3r; top y10=h; pos10(max(currentbreadth+eps,alpha*right_stem),0); x4:=x4r; + left_jut=cap_jut+left_stem; + serif(10,4,c,0,-left_jut); % upper serif + pickup tiny.nib; + prime_points_inside(1,2); prime_points_inside(4,3); + if rt x1'r+cap_jut+.5u+1<=lft x4'l-cap_jut: inner_jut=cap_jut; + else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi + dish_serif(4',3,d,1/2,inner_jut,e,1/3,outer_jut); % right serif +else: z0=whatever[z1r,z2r]=whatever[z3l,z4l]; + if y0<h-cap_notch_cut: y0:=h-cap_notch_cut; + fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r) + --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{up}z0+.5left--cycle; % left and right diagonals + else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) + --diag_end(2l,1l,1,1,1r,0)--cycle; fi fi % left and right diagonals +%%%%% +% now the b part +w:=w+4u-.5width_adj;%usftsnwd-.5u-.5width_adj +% usftsn_bowl(4)LJE; +_zero:=4; +_one:=11; _two:=12; _three:=13; _four:=14; _five:=15; +% +pickup tiny.nib; +penpos[_one](cap_bar,90); +penpos[_three](cap_curve if hefty:-3stem_corr fi,0); +penpos[_four](cap_band,-90); penpos[_five](cap_band,-90); +z[_five]r=z[_zero]; y[_four]=y[_five];%!!! +z[_one]l=whatever[z3,z4]; %x[_one]l=x[_one]=x[_one]r;%!!! +y[_three]=.5[y[_four],y[_two]]; +x[_three]r=hround(w-u); +if (serifs=false) or (cap_bar#>.5cap_curve#) or (cap_bar<3): + penpos[_two](cap_bar,90); + x[_four]=.5[.5[x2,x4],w-if serifs:1.5u else:2.5u fi]+.5u; + y[_one]=y[_two]=.52h; x[_two]=x[_four]; +else: penpos[_two](1/18[cap_bar,cap_curve],90); + x[_four]=.5[.5[x2,x4],w-1.5u]+.5u; + y[_one]l=y[_two]l-.35cap_bar=.52h-.5cap_bar; + x[_two]=x[_four]-.35u; fi +x[_two]l:=x[_two]l-.5u; x[_four]l:=x[_four]l-.5u; +fill stroke z[_five]e..super_arc.e([_four],[_three]) + & super_arc.e([_three],[_two])..z[_one]e; % lobe +%%%%% +penlabels(0,2,6,3,4,5,7,8,9,10); endchar; + +lhchar "Uppercase Russian letter K_vcrs (`concrete' form)"; +cyrchar(K_vcrs,15u# if not serifs:+.5width_adj# fi, % N_width+1.5u + cap_height#,0); +if is_small_cap: getcharcode(k_vcrs); fi +italcorr cap_height#*slant-.5u#; +adjust_fit(cap_serif_fit#,cap_serif_fit#); +% upperc_k; +pickup tiny.nib; pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5fudged.cap_stem); +top y1=h; bot y2=0; +pickup tiny.nib; filldraw stroke z1e--z2e; % stem +if serifs: dish_serif(1,2,a,1/3,cap_jut,b,1/3,cap_jut); % upper stem serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut); fi % lower stem serif +% Kv_cbowl; + pos10(stem1,0); y10=y1; x10=hround max(w-11.5u,w-10.5u-.5fudged.cap_stem); +% K_cbowl +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6cap_jut else:.4tiny fi; +stem1=max(tiny.breadth,fudged.hair if hefty:-3stem_corr fi); +stem2=max(tiny.breadth,fudged.cap_stem-3stem_corr); +rt x3r=hround(r-letter_fit-u-right_jut); +rt x6r=hround(r-letter_fit-.75u-right_jut); +y4=1/3h; top y3=h; bot y6=0; x4=x10;%!!! +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y10-y6,x6r-x10);%!!! +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y10-y6,x6r-x10));%!!! + else: y6'l=y6'r=0; fi +forsuffixes $=l,r: y3'$=h; z4$=z3'$+whatever*(z3-z4); + z5$=z6'$+whatever*(z10-z6)=z3'$+whatever*(z3-z4); endfor +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z10-z6 of currentpen+whatever*(z10-z6);%!!! +z6'l=z6l+penoffset z6-z10 of currentpen+whatever*(z10-z6);%!!! +fill z5r--diag_end(5r,3'r,1,.5,3'l,5l)--z5l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(slab,90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal + numeric up_inner_jut; + if rt x1r+cap_jut+.5u+1<=lft x3l-1.2cap_jut: up_inner_jut=1.2cap_jut; + else: rt x1r+cap_jut+.5u+1=lft x3l-up_inner_jut; fi + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif +else: fill z5'l--diag_end(5'l,6'l,.5,1,6'r,5'r)--z5'r--cycle; fi% lower diagonal +%%% +_one:=12; _two:=13; _three:=14; _four:=15; + pickup fine.nib; pos[_one](vair,90); pos[_two](vair,90); + y[_one]=y[_two]=y5l; x[_one]=x1; rt x[_two]=x5r; + filldraw stroke z[_one]e--z[_two]e; % middle cross +%%% +% vcross +pickup crisp.nib; pos[_three](bar,0); pos[_four](bar,0); +lft x[_three]l=lft x[_four]l=hround max(rt x1r+1,max(x5l-bar+eps,.5[rt x1r,x5l])); +top y[_four]-bot y[_three]=.5cap_height; .52[y[_three],y[_four]]=y[_one]; +filldraw stroke z[_three]e--z[_four]e; % cross bar +%%%%% +penlabels(1,2,3,4,5,6,7,10); endchar; + +lhchar "Uppercase Russian letter K_hcrs (`concrete' form)"; +cyrchar(K_hcrs,13.5u#,cap_height#,0); %EN_width# +if is_small_cap: getcharcode(k_hcrs); fi +italcorr cap_height#*slant-.5u#; +adjust_fit(cap_serif_fit#,cap_serif_fit#); +% upperc_k; +pickup tiny.nib; pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5fudged.cap_stem); +top y1=h; bot y2=0; +pickup tiny.nib; filldraw stroke z1e--z2e; % stem +if serifs: dish_serif(1,2,a,1/3,cap_jut,b,1/3,cap_jut); % upper stem serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut); fi % lower stem serif +% K_cbowl +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6cap_jut else:.4tiny fi; +stem1=max(tiny.breadth,fudged.hair if hefty:-3stem_corr fi); +stem2=max(tiny.breadth,fudged.cap_stem-3stem_corr); +rt x3r=hround(r-letter_fit-u-right_jut); +rt x6r=hround(r-letter_fit-.75u-right_jut); +y4=1/3h; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); + else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(slab,90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal + numeric up_inner_jut; + if rt x1r+cap_jut+.5u+1<=lft x3l-1.2cap_jut: up_inner_jut=1.2cap_jut; + else: rt x1r+cap_jut+.5u+1=lft x3l-up_inner_jut; fi + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif +else: fill z5'l--diag_end(5'l,6'l,.5,1,6'r,5'r)--z5'r--cycle; fi% lower diagonal +%%% +% hcross +_one:=12; _two:=13; +pickup crisp.nib; numeric outer_jut; +outer_jut=if serifs: max(limit_dist,if not is_egyptian: 1.1 fi cap_jut) else: 1.8u fi; +pos[_one](bar,90); pos[_two](bar,90); +top y[_one]r=top y[_two]r=vround (min(.35[x_height,h]+.5bar,h-max(bracket,1.2slab))-eps); +if serifs and is_egyptian: + rt x[_one]=tiny.rt x1r+cap_jut; lft x[_two]=tiny.lft x1l-cap_jut; +else: + x[_one]=x1r+1.15outer_jut; x[_two]=hround 1/3u-cap_serif_fit; +fi +filldraw stroke z[_one]e--z[_two]e; % cross bar +%%%%% +penlabels(1,2,3,4,5,6,7); endchar; + +lhchar "Uppercase Russian letter L_dsc (`concrete' form)"; +cyrchar(L_dsc,13.5u#,cap_height#, %N_width# + if is_ogonek: desc_depth# else: cap_sbeak# fi); %udesc/og_depth +if is_small_cap: getcharcode(l_dsc); fi +adjust_fit(if serifs: .8(flare#+(cap_stem#-stem#))-.5u# + else: cap_serif_fit# fi, + cap_serif_fit# if (serifs=false) or (is_ogonek=false):+.5(cap_stem#-u#) fi); %ZhDL_adj +% upper_spec_l; +numeric bulb_diam; bulb_diam=flare+(cap_stem-stem); +numeric left_stem,right_stem,outer_jut,alpha; +right_stem=cap_stem-stem_corr; +left_stem=max(tiny.breadth+eps,min(cap_hair if hefty:-3stem_corr fi,right_stem)); +outer_jut=.8cap_jut; x1l=w-x4r=outer_jut+if serifs:.5 fi u; y1=y4=0; x2-x1=x4-x3; +if serifs: x3l=x2r+((x1r-x4l)*(slab/(h-slab))) %+2apex_corr; + if not is_egyptian:-.25left_stem fi; +else: x3r= x2r+apex_corr; fi +y2=y3=h if not serifs:+apex_o+apex_oo fi; +alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); +penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); +penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); +if serifs: + fill stroke z3e--z4e; % right stem + pickup tiny.nib; + penpos5(left_stem,-90); pos5'(left_stem,-90); z5'=z5; + pos8(cap_hair,-180); pos9(bulb_diam,-180); + y9=if is_egyptian: 0.12h else: 1/6h-max(0,flare-stem-2vair_corr-.5) fi; + lft x9r=l+letter_fit+hround(.5u-.5); + y5r=-o; x5=max(lft x9r+.5bulb_diam,.5[x9r,x1r]); + y6l=y9+bulb_diam-hair; + numeric t; t=1-slant; + z7r=(max(.75[x1,x1r],x9+if is_egyptian: (if is_small_cap: 2.25 else: 2.667 fi + +max(-2slant,.5slant))*hair + else: if is_bold:.75 fi bulb_diam+1.35hair fi), + y7l-t*7/8left_stem); + z7l=(x7r-2/3(x1r-x1l),if is_egyptian: .35[y5l,y5] else: y5 fi);%y5l); + z6r=(x7r,y1)+whatever*((x1r,y1)-z2r); y6r-y6l=t*(y5r-y5l); + x6r-x6l=1/2(x1r-x1l); + fill stroke z2e{z1e-z6e}.. controls z6e and z7e ..z5e; + {{less_tense; cyrbulb(5',8,9)}}; % arc and bulb + numeric inner_jut,left_jut,fit; pickup tiny.nib; + x10r=x3r; top y10=h; pos10(max(currentbreadth+eps,alpha*right_stem),0); x4:=x4r; + left_jut=cap_jut+left_stem; + serif(10,4,c,0,-left_jut); % upper serif + pickup tiny.nib; + prime_points_inside(1,2); prime_points_inside(4,3); + if rt x1'r+cap_jut+.5u+1<=lft x4'l-cap_jut: inner_jut=cap_jut; + else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi + if is_ogonek: + dish_serif(4',3,d,1/2,inner_jut,e,1/3,outer_jut); % right serif + fi +else: z0=whatever[z1r,z2r]=whatever[z3l,z4l]; + if y0<h-cap_notch_cut: y0:=h-cap_notch_cut; + fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r) + --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{up}z0+.5left--cycle; % left and right diagonals + else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) + --diag_end(2l,1l,1,1,1r,0)--cycle; fi fi % left and right diagonals +% uppercase descender/saam tail +numeric right_jut; +right_jut= + if serifs: max(limit_dist,1.1cap_jut) else: hround (r-rt x2r-.65u) fi; +if unic: + %saam tail + serif(4',3,v,1/3,-cap_jut); + siam_serif(4',3,w,1/3,right_jut); +else: + r_serif(4',3,x,1/3,cap_jut,y,1/3,beak_darkness,right_jut,beak_jut); % lower right descender +fi +%%%%% +penlabels(0,2,6,3,4,5,7,8,9,10); endchar; + +lhchar "Uppercase Russian letter ZH_dsc (`concrete' form)"; +cyrchar(ZH_dsc,13.5u#,cap_height#, %N_width# + if is_ogonek: desc_depth# else: cap_sbeak# fi); %udesc/og_depth +if is_small_cap: getcharcode(zh_dsc); fi +italcorr cap_height#*slant+.25u#; +adjust_fit(w#-2max(2u#+.5cap_stem#,3u#)+cap_serif_fit#, + cap_serif_fit# if (serifs=false) or (is_ogonek=false):+.5(cap_stem#-u#) fi); %ZhDL_adj +% upperc_zh; +if odd((r-l)-fudged.cap_stem): change_width; fi % symmetric & all three equal +pickup tiny.nib; pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0); +lft x1l=lft x2l=hround (.5[l,r]-.5fudged.cap_stem)-eps; % middle stem point +top y1=h; bot y2=0; +pickup tiny.nib; filldraw stroke z1e--z2e; % stem +if serifs: dish_serif(1,2,a,1/3,cap_jut,b,1/3,cap_jut); % upper stem serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut); fi % lower stem serif +% K_cbowl +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6cap_jut else:.4tiny fi; +stem1=max(tiny.breadth,fudged.hair if hefty:-3stem_corr fi); +stem2=max(tiny.breadth,fudged.cap_stem-3stem_corr); +rt x3r=hround(r-letter_fit-u-right_jut); +rt x6r=hround(r-letter_fit-.75u-right_jut); +y4=1/3h; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); + else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(slab,90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal + numeric up_inner_jut; + if rt x1r+cap_jut+.5u+1<=lft x3l-1.2cap_jut: up_inner_jut=1.2cap_jut; + else: rt x1r+cap_jut+.5u+1=lft x3l-up_inner_jut; fi + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif +else: fill z5'l--diag_end(5'l,6'l,.5,1,6'r,5'r)--z5'r--cycle; fi% lower diagonal +%%% +% mirror +pickup tiny.nib; +forsuffixes $ = 3l,3,3r,3'l,3'r,4l,4,4r,5l,5,5r,6l,6,6r,6'l,6'r,7l,7r: + x.m$=l+(r-x$); y.m$=y$; endfor; +fill z.m4r--diag_end(.m4r,.m3'r,1,.5,.m3'l,.m4l)--z.m4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + fill z.m5l + if is_egyptian: ---z.m6'l...{z.m6r-z.m6l}(.35[x.m6l,x.m7l],y.m7l)-- + else:{z.m6'l-.5[z.m5,z.m5l]}...{z.m6r-z.m6l} fi + z.m7l..(lft x.m7l,top y.m7l)--(lft x.m7r,bot y.m7r)..z.m7r + if is_egyptian: --(.5[x.m6r,x.m7r],y.m7r){z.m6l-z.m6r}...z.m6'r--- + else: {z.m6l-z.m6r}...{.5[z.m5,z.m5l]-z.m6'l} fi + z.m5r--cycle; % lower diagonal + z8l=z.m3r; z8r=z.m3l; z9l=z.m4r; z9r=z.m4l; z8=.5[z8l,z8r]; z9=.5[z9l,z9r]; + dish_serif(8,9,g,1/2,right_jut,h,2/3,up_inner_jut)(dark); % upper diagonal serif +else: fill z.m5'l--diag_end(.m5'l,.m6'l,.5,1,.m6'r,.m5'r)--z.m5'r--cycle; % lower diagonal +fi +%%%%% +% uppercase descender/ogonek +if is_ogonek: + def the_pen=if known ogonek_pen: ogonek_pen + elseif serifs: tiny elseif is_bold: fisp else: fine fi + enddef; + % |diag_end| refers to |tiny| pen, hence |tiny| in the following equation: + ogonek_pos=(x6 if not serifs: l if is_bold: +.75tiny fi\\ fi,.5the_pen) + if serifs and not is_egyptian: +(.5xvair,0) fi; + easy_ogonek(the_pen,11,12,13); % ogonek +else: + if not serifs: + right_jut:=max(right_jut,hround (r-rt x6r-.65u)); fi + if serifs: + pickup crisp.nib; + else: + pickup pencircle scaled (3/5[fine,crisp]+eps); + fi + numeric bracket_height,light_stem; pair downward; + bracket_height=bracket; + light_stem=hround (max(tiny.breadth,fudged.hair if hefty:-4stem_corr fi)); + % for cyr_serif always |y$|<|y$$| + if (y6>y1): errmessage ("`cyr_serif' placed only on the bottom"); fi + downward=z6-z1; + y.q0=min(y6+.5bracket_height,y1)+eps; + top y.q1-slab-eps=bot y.q4+eps=tiny.bot y6; + if y.q1>y.q0: y.q0:=y.q1+eps; fi + bot y.q2=bot y.q3=vround(-d); + y.q5=y.q1; y.q6=y.q0; + z.q5=whatever[z6,z1]; z.q6=whatever[z6,z1]; + z.q0-penoffset downward of currentpen = + z6r-penoffset downward of pen_[tiny.nib]-whatever*downward; + rt x.q1=hround (tiny.rt x6r+right_jut)+eps; + if x.q6>x.q0-eps: x.q6:=x.q0-eps; fi + rt x.q2=lft x.q3+light_stem+eps=hround (rt x.q1+beak_jut)+eps; + x.q4=x6-.5(fudged.stem-3stem_corr-tiny)-eps; + pair corner,beak_corner; + ypart corner=y.q1; corner=z.q0+whatever*downward; + ypart beak_corner=y.q4; beak_corner=z.q3+whatever*(z.q1-z.q2); + filldraw z.q6--z.q5 + ...(beak_darkness+eps)[beak_corner,.5[z.q3,z.q4]] + ...{z.q2-z.q1}z.q3--z.q2--z.q1{-right_jut,0} + ...(1/3+eps)[corner,.5[z.q1,z.q0]]{z.q0-z.q1} + ...{z1-z6}z.q0--cycle; % descender + labels (.q0,.q1,.q2,.q3,.q4,.q5,.q6); +% +fi +penlabels(1,2,3,4,5,6,7); endchar; + +lhchar "Uppercase Russian letter K_dsc (`concrete' form)"; +cyrchar(K_dsc,13.5u#,cap_height#, %EN_width# + if is_ogonek: desc_depth# else: cap_sbeak# fi); %udesc/og_depth +if is_small_cap: getcharcode(k_dsc); fi +italcorr cap_height#*slant-.5u#; +adjust_fit(cap_serif_fit#, + cap_serif_fit# if (serifs=false) or (is_ogonek=false):+.5(cap_stem#-u#) fi); %ZhDL_adj +% upperc_k; +pickup tiny.nib; pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5fudged.cap_stem); +top y1=h; bot y2=0; +pickup tiny.nib; filldraw stroke z1e--z2e; % stem +if serifs: dish_serif(1,2,a,1/3,cap_jut,b,1/3,cap_jut); % upper stem serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut); fi % lower stem serif +% K_cbowl +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6cap_jut else:.4tiny fi; +stem1=max(tiny.breadth,fudged.hair if hefty:-3stem_corr fi); +stem2=max(tiny.breadth,fudged.cap_stem-3stem_corr); +rt x3r=hround(r-letter_fit-u-right_jut); +rt x6r=hround(r-letter_fit-.75u-right_jut); +y4=1/3h; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); + else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(slab,90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal + numeric up_inner_jut; + if rt x1r+cap_jut+.5u+1<=lft x3l-1.2cap_jut: up_inner_jut=1.2cap_jut; + else: rt x1r+cap_jut+.5u+1=lft x3l-up_inner_jut; fi + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif +else: fill z5'l--diag_end(5'l,6'l,.5,1,6'r,5'r)--z5'r--cycle; fi% lower diagonal +%%% +% uppercase descender/ogonek +if is_ogonek: + def the_pen=if known ogonek_pen: ogonek_pen + elseif serifs: tiny elseif is_bold: fisp else: fine fi + enddef; + % |diag_end| refers to |tiny| pen, hence |tiny| in the following equation: + ogonek_pos=(x6 if not serifs: l if is_bold: +.75tiny fi\\ fi,.5the_pen) + if serifs and not is_egyptian: +(.5xvair,0) fi; + easy_ogonek(the_pen,11,12,13); % ogonek +else: + if not serifs: + right_jut:=max(right_jut,hround (r-rt x6r-.65u)); fi + if serifs: + pickup crisp.nib; + else: + pickup pencircle scaled (3/5[fine,crisp]+eps); + fi + numeric bracket_height,light_stem; pair downward; + bracket_height=bracket; + light_stem=hround (max(tiny.breadth,fudged.hair if hefty:-4stem_corr fi)); + % for cyr_serif always |y$|<|y$$| + if (y6>y1): errmessage ("`cyr_serif' placed only on the bottom"); fi + downward=z6-z1; + y.q0=min(y6+.5bracket_height,y1)+eps; + top y.q1-slab-eps=bot y.q4+eps=tiny.bot y6; + if y.q1>y.q0: y.q0:=y.q1+eps; fi + bot y.q2=bot y.q3=vround(-d); + y.q5=y.q1; y.q6=y.q0; + z.q5=whatever[z6,z1]; z.q6=whatever[z6,z1]; + z.q0-penoffset downward of currentpen = + z6r-penoffset downward of pen_[tiny.nib]-whatever*downward; + rt x.q1=hround (tiny.rt x6r+right_jut)+eps; + if x.q6>x.q0-eps: x.q6:=x.q0-eps; fi + rt x.q2=lft x.q3+light_stem+eps=hround (rt x.q1+beak_jut)+eps; + x.q4=x6-.5(fudged.stem-3stem_corr-tiny)-eps; + pair corner,beak_corner; + ypart corner=y.q1; corner=z.q0+whatever*downward; + ypart beak_corner=y.q4; beak_corner=z.q3+whatever*(z.q1-z.q2); + filldraw z.q6--z.q5 + ...(beak_darkness+eps)[beak_corner,.5[z.q3,z.q4]] + ...{z.q2-z.q1}z.q3--z.q2--z.q1{-right_jut,0} + ...(1/3+eps)[corner,.5[z.q1,z.q0]]{z.q0-z.q1} + ...{z1-z6}z.q0--cycle; % descender + labels (.q0,.q1,.q2,.q3,.q4,.q5,.q6); +% +fi +%%%%% +penlabels(1,2,3,4,5,6,7); endchar; + +lhchar "Uppercase Russian letter K_beak (`concrete' form)"; +cyrchar(K_beak,13.5u#,cap_height#,0); %EN_width# +if is_small_cap: getcharcode(k_beak); fi +italcorr cap_height#*slant-.5u#; +adjust_fit(min(4.5u#-.5cap_stem#,3.5u#)-.5width_adj#, % Beak_adj + cap_serif_fit#); +% upperc_k;beak +pickup tiny.nib; pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5fudged.cap_stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +if serifs: + nodish_serif(1,2,a,1/3,cap_jut,b,1/3,cap_jut); %!!! upper stem serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut); fi % lower stem serif +% K_cbowl +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6cap_jut else:.4tiny fi; +stem1=max(tiny.breadth,fudged.hair if hefty:-3stem_corr fi); +stem2=max(tiny.breadth,fudged.cap_stem-3stem_corr); +rt x3r=hround(r-letter_fit-u-right_jut); +rt x6r=hround(r-letter_fit-.75u-right_jut); +y4=1/3h; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); + else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(slab,90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal + numeric up_inner_jut; + if rt x1r+cap_jut+.5u+1<=lft x3l-1.2cap_jut: up_inner_jut=1.2cap_jut; + else: rt x1r+cap_jut+.5u+1=lft x3l-up_inner_jut; fi + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif +else: fill z5'l--diag_end(5'l,6'l,.5,1,6'r,5'r)--z5'r--cycle; fi% lower diagonal +%%% +% upper left beak +_one:=10; _two:=11; +pickup crisp.nib; +top y[_one]r=h; x[_one]=x1; pos[_one](slab,90); pos[_two](hair,180); +lft x[_two]r=l+letter_fit+hround.65u; y[_two]=good.y(y[_one]l-beak)-eps; +arm([_one],[_two],q,beak_darkness,-.7beak_jut); +%%%%% +penlabels(1,2,3,4,5,6,7); endchar; + +lhchar "Uppercase Russian letter L_tl (`concrete' form)"; +cyrchar(L_tl,13.5u#,cap_height#,desc_depth#); %N_width# +if is_small_cap: getcharcode(l_tl); fi +adjust_fit(if serifs: .8(flare#+(cap_stem#-stem#))-.5u# + else: cap_serif_fit# fi, + -.8cap_jut#+if serifs:.5 fi u#); %Lcon_tl +% upper_spec_l; +numeric bulb_diam; bulb_diam=flare+(cap_stem-stem); +numeric left_stem,right_stem,outer_jut,alpha; +right_stem=cap_stem-stem_corr; +left_stem=min(cap_hair if hefty:-3stem_corr fi,right_stem); +outer_jut=.8cap_jut; x1l=w-x4r=outer_jut+if serifs:.5 fi u; y1=y4=0; x2-x1=x4-x3; +if serifs: x3l=x2r+((x1r-x4l)*(slab/(h-slab))) %+2apex_corr; + if not is_egyptian:-.25left_stem fi; +else: x3r= x2r+apex_corr; fi +y2=y3=h if not serifs:+apex_o+apex_oo fi; +alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); +penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); +penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); +numeric t; t=slab+bracket; +forsuffixes e=l,r: z54e=(((0,t)--(w,t)) intersectionpoint (z4e--z3e)); endfor; +if serifs: + fill stroke z3e--z54e; %!!! right stem + pickup tiny.nib; + penpos5(left_stem,-90); pos5'(left_stem,-90); z5'=z5; + pos8(cap_hair,-180); pos9(bulb_diam,-180); + y9=if is_egyptian: 0.12h else: 1/6h-max(0,flare-stem-2vair_corr-.5) fi; + lft x9r=l+letter_fit+hround(.5u-.5); + y5r=-o; x5=max(lft x9r+.5bulb_diam,.5[x9r,x1r]); + y6l=y9+bulb_diam-hair; + numeric t; t=1-slant; + z7r=(max(.75[x1,x1r],x9+if is_egyptian: (if is_small_cap: 2.25 else: 2.667 fi + +max(-2slant,.5slant))*hair + else: if is_bold:.75 fi bulb_diam+1.35hair fi), + y7l-t*7/8left_stem); + z7l=(x7r-2/3(x1r-x1l),if is_egyptian: .35[y5l,y5] else: y5 fi);%y5l); + z6r=(x7r,y1)+whatever*((x1r,y1)-z2r); y6r-y6l=t*(y5r-y5l); + x6r-x6l=1/2(x1r-x1l); + fill stroke z2e{z1e-z6e}.. controls z6e and z7e ..z5e; + {{less_tense; cyrbulb(5',8,9)}}; % arc and bulb + numeric inner_jut,left_jut,fit; pickup tiny.nib; + x10r=x3r; top y10=h; pos10(alpha*right_stem,0); x4:=x4r; + left_jut=cap_jut+left_stem; + serif(10,4,c,0,-left_jut); % upper serif + pickup tiny.nib; + prime_points_inside(1,2); prime_points_inside(4,3); + if rt x1'r+cap_jut+.5u+1<=lft x4'l-cap_jut: inner_jut=cap_jut; + else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi + %dish_serif(4',3,d,1/2,inner_jut,e,1/3,outer_jut); %!!! right serif +else: z0=whatever[z1r,z2r]=whatever[z3l,z4l]; + if y0<h-notch_cut: y0:=h-notch_cut; + fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r) + --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{up}z0+.5left--cycle; % left and right diagonals + else: fill z0--z54l--z54r--diag_end(2l,1l,1,1,1r,0)--cycle; fi fi %!!! left and right diagonals +%%%%% +% L_tail(4);X_tail +_zero:=4; +_one:=11; _two:=12; _three:=13; _four:=14; +% +% X_ +pickup fine.nib; +stem3=hround (max(fine.breadth,.5[stem1,x[_zero]r-x[_zero]l])); +x[_one]'r=x[_zero]r; +penpos[_one]'(stem3,0); pos[_one](stem3,0); z[_one]=z[_one]'; +bot y[_one]=max(-1/3d-eps,-d+if serifs: vair'else: slab fi); +(x[_one]'l,y54')=whatever[z4l,z4l+dir angle(z4l-if serifs:z1l else:z34'fi)]; +z54'=(x[_one]'l,y54'); +fill z54l{z4r-z1r} + ..controls (z54').. + {down}z[_one]'l--z[_one]'r{up} + ..controls (z4r).. + {z1r-z4r}z54r--cycle; %link +% _X +if serifs: + numeric bulb_diam; + bulb_diam=max(currentbreadth+eps,min(.82d-1-eps,flare+(cap_stem-stem))); + pos[_two](vair',-90); pos[_three](hair,-180); + pos[_four](bulb_diam,-180); + x[_two]=.5[x[_one],x[_three]r]; + bot y[_two]r=-d-oo; y[_three]-.5bulb_diam=vround max(-.85d,y[_two]r+eps)+eps; + z[_three]r=z[_four]r; + rt x[_four]l=floor x[_one]-2.5u if monospace: / expansion_factor fi;%!!! + filldraw stroke pulled_arc.e([_one],[_two]);%!!! + bulb([_two],[_three],[_four]); % bulb +else: + pos[_two](slab,-90); pos[_three](flare,-105); + rt x[_three]r=x[_one]-4u; bot y[_three]r=-d;%!!! + bot y[_two]r=-d-o; x[_two]=.4[x[_three]r,x[_one]r];%!!! + filldraw stroke super_arc.e([_one],[_two])%!!! + & term.e([_two],[_three],left,.8,4); fi +%%% +penlabels(0,2,6,3,4,5,7,8,9,10); endchar; + +endgroup; + +endinput; +%end of file diff --git a/Master/texmf-dist/fonts/source/lh/specific/lgnoncl.mf b/Master/texmf-dist/fonts/source/lh/specific/lgnoncl.mf new file mode 100644 index 00000000000..1f569679971 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/specific/lgnoncl.mf @@ -0,0 +1,465 @@ +% +% lgnoncl.mf +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Lowercase Cyrillic letters common for couple of encodings +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% kje "5c Ka with acute +% zh_brv "c2 Zhe with breve +% zh_uml "dd Zhe with umlaut +% ya_ac +% ya_bar +% l_ldot + +LHver_check(3,5); % like |version_check| in ec + +begingroup + +def is_egyptian = +% |false| for most of the CM fonts, except funny fonts; +% |true| for the CC fonts + (serifs and (1.4max(fine#,crisp#, tiny#)<slab#) and (1.6slab#>stem#)) +%added + or (vair#>.5stem#) +enddef; + +lhchar "Lowercase Cyrillic letter kje (`concrete' form)"; +cyrchar_twice(kje,10u#,x_height#,0); %en_width# +italcorr x_height#*slant-.5u#; +adjust_fit(serif_fit#,serif_fit#); +begingroup +% lowerc_k; +pickup tiny.nib; numeric stem[]; +stem0=max(tiny.breadth,hround(fudged.stem-stem_corr)); +pos1(stem0,0); pos2(stem0,0); +lft x1l=lft x2l=hround (2.5u-.5fudged.stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +% k_cbowl; +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6jut else:.4tiny fi; +stem1=max(tiny.breadth,hround(fudged.hair if hefty:-\\4stem_corr fi)); +stem2=max(tiny.breadth,fudged.stem-3stem_corr); +x3r=hround(r-letter_fit-.7u-right_jut)-.5tiny+eps; +x6r=hround(r-letter_fit-.3u-right_jut)-.5tiny+eps; +y4=.7bar_height; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); +else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(vair',90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal +%%% +else: fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle; fi % lower diagonal +%%% +if serifs: save slab; slab:=Vround(vair-vair_corr); + dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif + slab:=vair; + dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower stem serif + numeric up_inner_jut; + if rt x1r+jut+.5u+1<=lft x3l-1.2jut: up_inner_jut=1.2jut; + else: rt x1r+jut+.5u+1=lft x3l-up_inner_jut; fi + slab:=Vround(vair-vair_corr); + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif +fi +%%%%% +endgroup; +% the accent +hpos_corr=-u; put_accent; repeat_once; +penlabels(1,2,3,4,5,6); endchar; + +lhchar "Lowercase Cyrillic letter zh breve (`concrete' form)"; +cyrchar(zh_brv,10u#,x_height#+acc_height#, 0); %en_width# +italcorr x_height#*slant+.25u#; +adjust_fit(w#-5u#+serif_fit#,serif_fit#); +full_h:=h; h:=x_height; +% lowerc_zh; +pickup tiny.nib; numeric stem[]; +stem0=max(tiny.breadth,hround(fudged.stem-stem_corr)); +if odd((r-l)-stem0): change_width; fi % symmetric & all three equal +pos1(stem0,0); pos2(stem0,0); +lft x1l=lft x2l=hround (.5[l,r]-.5fudged.stem)-eps; % middle stem point +top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +% k_cbowl; +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6jut else:.4tiny fi; +stem1=max(tiny.breadth,hround(fudged.hair if hefty:-\\4stem_corr fi)); +stem2=max(tiny.breadth,fudged.stem-3stem_corr); +x3r=hround(r-letter_fit-.7u-right_jut)-.5tiny+eps; +x6r=hround(r-letter_fit-.3u-right_jut)-.5tiny+eps; +y4=.7bar_height; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); +else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(vair',90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal +%%% +else: fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle; fi % lower diagonal +%%% +% mirror + pickup tiny.nib; +forsuffixes $ = 3l,3,3r,3'l,3'r,4l,4,4r,5l,5,5r,6l,6,6r,6'l,6'r,7l,7r: + x.m$=l+(r-x$); y.m$=y$; endfor; +fill z.m4r--diag_end(.m4r,.m3'r,1,.5,.m3'l,.m4l)--z.m4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + fill z.m5l + if is_egyptian: ---z.m6'l...{z.m6r-z.m6l}(.35[x.m6l,x.m7l],y.m7l)-- + else:{z.m6'l-.5[z.m5,z.m5l]}...{z.m6r-z.m6l} fi + z.m7l..(lft x.m7l,top y.m7l)--(lft x.m7r,bot y.m7r)..z.m7r + if is_egyptian: --(.5[x.m6r,x.m7r],y.m7r){z.m6l-z.m6r}...z.m6'r--- + else: {z.m6l-z.m6r}...{.5[z.m5,z.m5l]-z.m6'l} fi + z.m5r--cycle; % lower diagonal + z8l=z.m3r; z8r=z.m3l; z9l=z.m4r; z9r=z.m4l; z8=.5[z8l,z8r]; z9=.5[z9l,z9r]; +else: fill z.m5'l--diag_end(.m5'l,.m6'l,.5,1,.m6'r,.m5'r)--z.m5'r--cycle; % lower diagonal +fi +if serifs: save slab; slab:=Vround(vair-vair_corr); + dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif + slab:=vair; + dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower stem serif + numeric up_inner_jut; + if rt x1r+jut+.5u+1<=lft x3l-1.2jut: up_inner_jut=1.2jut; + else: rt x1r+jut+.5u+1=lft x3l-up_inner_jut; fi + slab:=Vround(vair-vair_corr); + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif + dish_serif(8,9,g,1/2,right_jut,h,2/3,up_inner_jut)(dark); % upper diagonal serif +fi +%%%%% +% the accent +h:=full_h; lowercase_breve(x1,0, 17,18,19); +endchar; + +lhchar "Lowercase Cyrillic letter zh umlaut (`concrete' form)"; +cyrchar(zh_uml,10u#,lc_trema_height#, 0); %en_width# +italcorr x_height#*slant+.25u#; +adjust_fit(w#-5u#+serif_fit#,serif_fit#); +full_h:=h; h:=x_height; +% lowerc_zh; +pickup tiny.nib; numeric stem[]; +stem0=max(tiny.breadth,hround(fudged.stem-stem_corr)); +if odd((r-l)-stem0): change_width; fi % symmetric & all three equal +pos1(stem0,0); pos2(stem0,0); +lft x1l=lft x2l=hround (.5[l,r]-.5fudged.stem)-eps; % middle stem point +top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +% k_cbowl; +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6jut else:.4tiny fi; +stem1=max(tiny.breadth,hround(fudged.hair if hefty:-\\4stem_corr fi)); +stem2=max(tiny.breadth,fudged.stem-3stem_corr); +x3r=hround(r-letter_fit-.7u-right_jut)-.5tiny+eps; +x6r=hround(r-letter_fit-.3u-right_jut)-.5tiny+eps; +y4=.7bar_height; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); +else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(vair',90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal +%%% +else: fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle; fi % lower diagonal +%%% +% mirror + pickup tiny.nib; +forsuffixes $ = 3l,3,3r,3'l,3'r,4l,4,4r,5l,5,5r,6l,6,6r,6'l,6'r,7l,7r: + x.m$=l+(r-x$); y.m$=y$; endfor; +fill z.m4r--diag_end(.m4r,.m3'r,1,.5,.m3'l,.m4l)--z.m4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + fill z.m5l + if is_egyptian: ---z.m6'l...{z.m6r-z.m6l}(.35[x.m6l,x.m7l],y.m7l)-- + else:{z.m6'l-.5[z.m5,z.m5l]}...{z.m6r-z.m6l} fi + z.m7l..(lft x.m7l,top y.m7l)--(lft x.m7r,bot y.m7r)..z.m7r + if is_egyptian: --(.5[x.m6r,x.m7r],y.m7r){z.m6l-z.m6r}...z.m6'r--- + else: {z.m6l-z.m6r}...{.5[z.m5,z.m5l]-z.m6'l} fi + z.m5r--cycle; % lower diagonal + z8l=z.m3r; z8r=z.m3l; z9l=z.m4r; z9r=z.m4l; z8=.5[z8l,z8r]; z9=.5[z9l,z9r]; +else: fill z.m5'l--diag_end(.m5'l,.m6'l,.5,1,.m6'r,.m5'r)--z.m5'r--cycle; % lower diagonal +fi +if serifs: save slab; slab:=Vround(vair-vair_corr); + dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif + slab:=vair; + dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower stem serif + numeric up_inner_jut; + if rt x1r+jut+.5u+1<=lft x3l-1.2jut: up_inner_jut=1.2jut; + else: rt x1r+jut+.5u+1=lft x3l-up_inner_jut; fi + slab:=Vround(vair-vair_corr); + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif + dish_serif(8,9,g,1/2,right_jut,h,2/3,up_inner_jut)(dark); % upper diagonal serif +fi +%%%%% +% the accent +h:=full_h; lowercase_umlaut((x1-.5w),0, 17,18,19,20); +endchar; + +lhchar "Lowercase Cyrillic letter ya acute (`concrete' form) (looks like backward R)"; +cyrchar_twice(ya_ac,if serifs: 9.75u# else: 10u# fi-.5width_adj#,x_height#,0); %ya (~n_width:10u) +italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut +adjust_fit(if serifs:serif_fit# else:0 fi,serif_fit#); +begingroup +% lowerc_ya; +pickup tiny.nib; pos1(stem',0); pos2(stem',0); +rt x1r=rt x2r=hround(w-2.5u+.5stem'); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +penpos3(vair,90); penpos4(vair,90); penpos5(curve if hefty:-3stem_corr fi,180); +y6r=y7r=hround (if serifs:.52h else:.5h fi-.6[thin_join,vair]/2); +y6l=y7l=y6r+.6[thin_join,vair]; y6=y7=.5[y6l,y6r];% +z3r=top z1; y4=y3; y5=.52[y6r,y4r]+eps; +x7l=x7r=x2; x4+.25u=x6l=x6r; x4=.5w if serifs:+.25u else:-.25u fi; +x5r=hround min(1.25u,2u-.5curve)+eps; +x4l:=x4+.125curve; x6l:=x6l+.125curve; +fill stroke +{{interim superness:=more_super; z7e..pulled_arc.e(6,5) & + pulled_arc.e(5,4)..z3e}}; % lobe +numeric stem[],alpha,right_jut; +right_jut=if serifs:.7jut else:.4tiny fi; +stem1=max(tiny.breadth,hround(fudged.stem-3stem_corr)); +lft x9l=hround(l+letter_fit+.3u+right_jut)-eps; bot y9=0; +alpha=diag_ratio(1,.5(stem1-tiny),y1-y9,x9l-x1); +penpos9(alpha*(stem1-tiny),0); +x8=x6l-if serifs:.75u else:.25u fi; y8=y6; +if serifs: numeric theta; theta=angle(y1-y9,x9l-x1); + y9'r=max(hair,.5stem); z9'l=z9'r+whatever*dir theta; +else: y9'l=y9'r=0; fi +z9'r=z9r+penoffset z1-z9 of currentpen+whatever*(z1-z9); +z9'l=z9l+penoffset z9-z1 of currentpen+whatever*(z1-z9); +z8=z9'+whatever*(z1-z9); +penpos8(if serifs: alpha*stem1 else: stem fi-2stem_corr,0); +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + lft x10=tiny.lft x9l-right_jut; + if is_egyptian: y10r=0; penpos10(vair',-90); else: y10=-o; + penpos10(max(fine.breadth+eps,hair-fine),-90); fi + fill z8l + if is_egyptian: ---z9'l...{z9l-z9r}(.35[x9l,x10l],y10l)-- + else: {.5[z9l,z9]-z8l}...{z8l-z8r} fi + z10l..(lft x10l,bot y10l)--(lft x10r,top y10r)..z10r + if is_egyptian: --(.35[x9r,x10r],y10r){z9r-z9l}...z9'r--- + else: {z8r-z8l}...{z8l-.5[z9l,z9]} fi + z8r--cycle; % lower diagonal + numeric inner_jut; + if lft x2l-jut-.5u+1>=rt x9r+jut: inner_jut=jut; + else: lft x2l-jut-.5u+1=rt x9r+inner_jut; fi + save slab; slab:=Vround(vair-vair_corr); + nodish_serif(1,2,a,1/3,.5jut,b,1/3,jut); % upper serif + slab:=vair; + dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower serif +else: fill z8l--diag_end(8l,9'l,1,.5,9'r,8r)--z8r--cycle; fi % diagonal +%%%%% +endgroup; +% the accent +hpos_corr=-u; put_accent; repeat_once; +penlabels(0,1,2,3,4,5,6,7,8,9,9',10); endchar; + +lhchar "Lowercase Cyrillic letter ya bar (`concrete' form) (looks like backward R)"; +cyrchar(ya_bar,if serifs: 9.75u# else: 10u# fi-.5width_adj#,lc_trema_height#,0); %ya (~n_width:10u) +italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut +adjust_fit(if serifs:serif_fit# else:0 fi,serif_fit#); +full_h:=h; h:=x_height; +% lowerc_ya; +pickup tiny.nib; pos1(stem',0); pos2(stem',0); +rt x1r=rt x2r=hround(w-2.5u+.5stem'); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +penpos3(vair,90); penpos4(vair,90); penpos5(curve if hefty:-3stem_corr fi,180); +y6r=y7r=hround (if serifs:.52h else:.5h fi-.6[thin_join,vair]/2); +y6l=y7l=y6r+.6[thin_join,vair]; y6=y7=.5[y6l,y6r];% +z3r=top z1; y4=y3; y5=.52[y6r,y4r]+eps; +x7l=x7r=x2; x4+.25u=x6l=x6r; x4=.5w if serifs:+.25u else:-.25u fi; +x5r=hround min(1.25u,2u-.5curve)+eps; +x4l:=x4+.125curve; x6l:=x6l+.125curve; +fill stroke +{{interim superness:=more_super; z7e..pulled_arc.e(6,5) & + pulled_arc.e(5,4)..z3e}}; % lobe +numeric stem[],alpha,right_jut; +right_jut=if serifs:.7jut else:.4tiny fi; +stem1=max(tiny.breadth,hround(fudged.stem-3stem_corr)); +lft x9l=hround(l+letter_fit+.3u+right_jut)-eps; bot y9=0; +alpha=diag_ratio(1,.5(stem1-tiny),y1-y9,x9l-x1); +penpos9(alpha*(stem1-tiny),0); +x8=x6l-if serifs:.75u else:.25u fi; y8=y6; +if serifs: numeric theta; theta=angle(y1-y9,x9l-x1); + y9'r=max(hair,.5stem); z9'l=z9'r+whatever*dir theta; +else: y9'l=y9'r=0; fi +z9'r=z9r+penoffset z1-z9 of currentpen+whatever*(z1-z9); +z9'l=z9l+penoffset z9-z1 of currentpen+whatever*(z1-z9); +z8=z9'+whatever*(z1-z9); +penpos8(if serifs: alpha*stem1 else: stem fi-2stem_corr,0); +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + lft x10=tiny.lft x9l-right_jut; + if is_egyptian: y10r=0; penpos10(vair',-90); else: y10=-o; + penpos10(max(fine.breadth+eps,hair-fine),-90); fi + fill z8l + if is_egyptian: ---z9'l...{z9l-z9r}(.35[x9l,x10l],y10l)-- + else: {.5[z9l,z9]-z8l}...{z8l-z8r} fi + z10l..(lft x10l,bot y10l)--(lft x10r,top y10r)..z10r + if is_egyptian: --(.35[x9r,x10r],y10r){z9r-z9l}...z9'r--- + else: {z8r-z8l}...{z8l-.5[z9l,z9]} fi + z8r--cycle; % lower diagonal + numeric inner_jut; + if lft x2l-jut-.5u+1>=rt x9r+jut: inner_jut=jut; + else: lft x2l-jut-.5u+1=rt x9r+inner_jut; fi + save slab; slab:=Vround(vair-vair_corr); + nodish_serif(1,2,a,1/3,.5jut,b,1/3,jut); % upper serif + slab:=vair; + dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower serif +else: fill z8l--diag_end(8l,9'l,1,.5,9'r,8r)--z8r--cycle; fi % diagonal +%%%%% +the accent +h:=full_h; +% low_bar(.5[x1,x6r-.5curve],0, 10,11); +x_move:=.5[x1,x6r-.5curve]; y_move:=0; _one:=20; _two:=21; +pickup if serifs: crisp.nib else: fine.nib fi; +numeric macron_breadth; macron_breadth:=Vround .2[vair,stem]; +pos[_one](macron_breadth,90); pos[_two](macron_breadth,90); +x[_one]=x_move+hround(2.5u if monospace:/expansion_factor fi+.5vair); +top y[_one]r=top y[_two]r=lc_trema_height+o; +x[_two]=x_move-hround(2.5u if monospace:/expansion_factor fi+.5vair); +filldraw stroke z[_one]e--z[_two]e; % bar +penlabels(0,1,2,3,4,5,6,7,8,9,9',10); endchar; + +lhchar "Lowercase Cyrillic letter l lower dot (`concrete' form)"; +cyrchar(l_ldot,10u#-.5width_adj#,x_height#,desc_depth#); %en_width# +adjust_fit(if serifs: +% max(.25u#,.25(7/8[hair#,flare#])+.5hair#) %l +% if not is_egyptian: -.5hair# fi + %if is_egyptian: max(.25u#,.25(7/8[hair#,flare#])+.5hair#) %l + %else: + .25(7/8[hair#,flare#])-.25u# if is_egyptian:+.5hair# fi +%fi + else: serif_fit# fi,serif_fit#); +%lower_spec_l; +numeric bulb_diam; bulb_diam=hround 7/8[hair,flare]; +numeric left_stem,right_stem,outer_jut,alpha; +right_stem=stem-stem_corr; +left_stem=min(hair if hefty:-3stem_corr fi,right_stem); +outer_jut=.75jut; x4r=r-letter_fit-outer_jut- if serifs:.25 else:.5 fi u; +x1l-.5u-.065jut=w-x4r; y1=y4=0; x2-x1=x4-x3; +if serifs: x3l=x2r+((x1r-x4l)*(vair/(h-vair)))if not is_egyptian:-.25left_stem fi; + else: x3r=x2r+apex_corr; fi +y2=y3=h if not serifs:+apex_o+apex_oo fi; +alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); +penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); +penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); +if serifs: + fill stroke z3e--z4e; % right stem + pickup tiny.nib; + penpos5(left_stem,-90); pos5'(left_stem,-90); z5'=z5; + pos8(hair,-180); pos9(bulb_diam,-180); + y9-.5bulb_diam=.12desc_depth-eps; lft x9r=l+letter_fit+hround(.35u-.5); + y5r=-oo-eps; x5=max(min(.45[x9r,x1r],rt x9l-eps),lft x9r+.5bulb_diam); + z7r=(max(.5[x1,x1r],x9+if is_egyptian:1.25bulb_diam +.5slant*hair + else: 1.5bulb_diam-hair fi), + y7l-7/8left_stem); + z7l=(x7r-2/3(x1r-x1l),if is_egyptian: .35[y5l,y5] else: y5 fi); + y6l=y9+.5bulb_diam; z6r=(x7r,y1)+whatever*(z1-z2);% + y6r-y6l=y5r-y5l; x6r-x6l=2/3(x1r-x1l); + fill stroke z2e.. controls z6e and z7e ..z5e; % left stem + {{less_tense; cyrbulb(5',8,9)}}; % arc and bulb + numeric inner_jut,left_jut,fit; + pickup tiny.nib; left_jut=jut+left_stem; + prime_points_inside(4,3); + x10r=x3r; top y10=h; pos10(alpha*right_stem,0); x4:=x4r; + if rt x1r+jut+.5u+1<=lft x4'l-jut: inner_jut=jut; + else: rt x1r+inner_jut+.5u+1=lft x4'l-inner_jut; fi + save slab; slab:=Vround(vair-vair_corr); + serif(10,4,c,0,-left_jut); % upper serif + slab:=vair; + dish_serif(4',3,d,1/2,inner_jut,e,1/3,outer_jut); % right serif +else: z0=whatever[z1r,z2r]=whatever[z3l,z4l]; + if y0<h-notch_cut: y0:=h-notch_cut; + fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r) + --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{up}z0+.5left--cycle; % left and right diagonals + else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) + --diag_end(2l,1l,1,1,1r,0)--cycle; fi fi % left and right diagonals +%%%%% +% the accent +% lower_dot; +_one:=17; _two:=18; _center:=.5w; +% +numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#); +define_whole_blacker_pixels(dot_diam); +pos[_one](dot_diam,0); pos[_two](dot_diam,90); +x[_one]=hround(_center); bot y[_two]l=vround(-d-1); +if 0-oo-top y[_two]r<slab: y[_one]r:=vround(max(y[_two]l+eps,-fine-slab)); fi +x[_one]=x[_two]; y[_one]=vround(.5[y[_two]l,y[_two]r]); +dot([_one],[_two]); % dot +%%%%% +penlabels(0,1,2,6,3,4,5,7,8,9,10); endchar; + +endgroup; + +endinput; +%end of file diff --git a/Master/texmf-dist/fonts/source/lh/specific/lgnoncu.mf b/Master/texmf-dist/fonts/source/lh/specific/lgnoncu.mf new file mode 100644 index 00000000000..1c9a688c6e2 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/specific/lgnoncu.mf @@ -0,0 +1,437 @@ +% +% lgnoncu.mf +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Lowercase Cyrillic letters common for couple of encodings +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% KJE "0c Ka with acute +% ZH_brv "c1 Zhe with breve +% ZH_uml "dc Zhe with umlaut +% YA_ac +% YA_bar +% L_ldot + +LHver_check(3,5); % like |version_check| in ec + +begingroup + +def is_egyptian = +% |false| for most of the CM fonts, except funny fonts; +% |true| for the CC fonts + (serifs and (1.4max(fine#,crisp#, tiny#)<slab#) and (1.6slab#>stem#)) +%added + or (vair#>.5stem#) +enddef; + +lhchar "Uppercase Cyrillic letter KJE (`concrete' form)"; +cyrchar_twice(KJE,13.5u#,cap_height#,0); %EN_width# +if is_small_cap: getcharcode(kje); fi +italcorr cap_height#*slant-.5u#; +adjust_fit(cap_serif_fit#,cap_serif_fit#); +% upperc_k; +pickup tiny.nib; pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5fudged.cap_stem); +top y1=h; bot y2=0; +pickup tiny.nib; filldraw stroke z1e--z2e; % stem +if serifs: dish_serif(1,2,a,1/3,cap_jut,b,1/3,cap_jut); % upper stem serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut); fi % lower stem serif +% K_cbowl +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6cap_jut else:.4tiny fi; +stem1=max(tiny.breadth,fudged.hair if hefty:-3stem_corr fi); +stem2=max(tiny.breadth,fudged.cap_stem-3stem_corr); +rt x3r=hround(r-letter_fit-u-right_jut); +rt x6r=hround(r-letter_fit-.75u-right_jut); +y4=1/3h; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); + else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(slab,90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal + numeric up_inner_jut; + if rt x1r+cap_jut+.5u+1<=lft x3l-1.2cap_jut: up_inner_jut=1.2cap_jut; + else: rt x1r+cap_jut+.5u+1=lft x3l-up_inner_jut; fi + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif +else: fill z5'l--diag_end(5'l,6'l,.5,1,6'r,5'r)--z5'r--cycle; fi% lower diagonal +%%% +%%%%% +% the accent +put_accent(cyrcaph); repeat_once; +penlabels(1,2,3,4,5,6,7); endchar; + +lhchar "Uppercase Cyrillic letter ZH breve (`concrete' form)"; +cyrchar(ZH_brv,13.5u#,cap_height#+acc_height#, 0); %N_width# +if is_small_cap: getcharcode(zh_brv); fi +italcorr cap_height#*slant+.25u#; +adjust_fit(w#-2max(2u#+.5cap_stem#,3u#)+cap_serif_fit#,cap_serif_fit#); +full_h:=h; h:=cap_height; +% upperc_zh; +if odd((r-l)-fudged.cap_stem): change_width; fi % symmetric & all three equal +pickup tiny.nib; pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0); +lft x1l=lft x2l=hround (.5[l,r]-.5fudged.cap_stem)-eps; % middle stem point +top y1=h; bot y2=0; +pickup tiny.nib; filldraw stroke z1e--z2e; % stem +if serifs: dish_serif(1,2,a,1/3,cap_jut,b,1/3,cap_jut); % upper stem serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut); fi % lower stem serif +% K_cbowl +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6cap_jut else:.4tiny fi; +stem1=max(tiny.breadth,fudged.hair if hefty:-3stem_corr fi); +stem2=max(tiny.breadth,fudged.cap_stem-3stem_corr); +rt x3r=hround(r-letter_fit-u-right_jut); +rt x6r=hround(r-letter_fit-.75u-right_jut); +y4=1/3h; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); + else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(slab,90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal + numeric up_inner_jut; + if rt x1r+cap_jut+.5u+1<=lft x3l-1.2cap_jut: up_inner_jut=1.2cap_jut; + else: rt x1r+cap_jut+.5u+1=lft x3l-up_inner_jut; fi + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif +else: fill z5'l--diag_end(5'l,6'l,.5,1,6'r,5'r)--z5'r--cycle; fi% lower diagonal +%%% +% mirror +pickup tiny.nib; +forsuffixes $ = 3l,3,3r,3'l,3'r,4l,4,4r,5l,5,5r,6l,6,6r,6'l,6'r,7l,7r: + x.m$=l+(r-x$); y.m$=y$; endfor; +fill z.m4r--diag_end(.m4r,.m3'r,1,.5,.m3'l,.m4l)--z.m4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + fill z.m5l + if is_egyptian: ---z.m6'l...{z.m6r-z.m6l}(.35[x.m6l,x.m7l],y.m7l)-- + else:{z.m6'l-.5[z.m5,z.m5l]}...{z.m6r-z.m6l} fi + z.m7l..(lft x.m7l,top y.m7l)--(lft x.m7r,bot y.m7r)..z.m7r + if is_egyptian: --(.5[x.m6r,x.m7r],y.m7r){z.m6l-z.m6r}...z.m6'r--- + else: {z.m6l-z.m6r}...{.5[z.m5,z.m5l]-z.m6'l} fi + z.m5r--cycle; % lower diagonal + z8l=z.m3r; z8r=z.m3l; z9l=z.m4r; z9r=z.m4l; z8=.5[z8l,z8r]; z9=.5[z9l,z9r]; + dish_serif(8,9,g,1/2,right_jut,h,2/3,up_inner_jut)(dark); % upper diagonal serif +else: fill z.m5'l--diag_end(.m5'l,.m6'l,.5,1,.m6'r,.m5'r)--z.m5'r--cycle; % lower diagonal +fi +%%%%% +% the accent +h:=full_h; uppercase_breve(x1,0, 17,18,19); +penlabels(1,2,3,4,5,6,7); endchar; + +lhchar "Uppercase Russian letter ZH umlaut (`concrete' form)"; +cyrchar(ZH_uml,13.5u#,cap_height#+acc_height#, 0); %N_width# +if is_small_cap: getcharcode(zh_uml); fi +italcorr cap_height#*slant+.25u#; +adjust_fit(w#-2max(2u#+.5cap_stem#,3u#)+cap_serif_fit#,cap_serif_fit#); +full_h:=h; h:=cap_height; +% upperc_zh; +if odd((r-l)-fudged.cap_stem): change_width; fi % symmetric & all three equal +pickup tiny.nib; pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0); +lft x1l=lft x2l=hround (.5[l,r]-.5fudged.cap_stem)-eps; % middle stem point +top y1=h; bot y2=0; +pickup tiny.nib; filldraw stroke z1e--z2e; % stem +if serifs: dish_serif(1,2,a,1/3,cap_jut,b,1/3,cap_jut); % upper stem serif + dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut); fi % lower stem serif +% K_cbowl +numeric right_jut,stem[],alpha[]; pickup tiny.nib; +right_jut=if serifs:.6cap_jut else:.4tiny fi; +stem1=max(tiny.breadth,fudged.hair if hefty:-3stem_corr fi); +stem2=max(tiny.breadth,fudged.cap_stem-3stem_corr); +rt x3r=hround(r-letter_fit-u-right_jut); +rt x6r=hround(r-letter_fit-.75u-right_jut); +y4=1/3h; top y3=h; bot y6=0; x4=x1; +penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); +alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); +penpos6(alpha2*(stem2-tiny),0); +alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); +forsuffixes $=l,r: y3'$=h; z4.$=z3'$+whatever*(z3-z4); + z5.$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor +if serifs: y6'l=max(cap_hair,.5stem); + z6'r=z6'l+whatever*dir(angle(y1-y6,x6r-x1)); + else: y6'l=y6'r=0; fi +z5=.5[z5l,z5r]; +z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); +% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] +z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); +z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); +fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + rt x7=rt x6r+right_jut; + if is_egyptian: y7l=0; penpos7(slab,90); + else: y7=-o; penpos7(max(fine.breadth+eps,cap_hair-fine),90); fi + fill z5l + if is_egyptian: ---z6'l...{z6r-z6l}(.35[x6l,x7l],y7l)-- + else:{z6'l-.5[z5,z5l]}...{z6r-z6l} fi + z7l..(rt x7l,top y7l)--(rt x7r,bot y7r)..z7r + if is_egyptian: --(.5[x6r,x7r],y7r){z6l-z6r}...z6'r--- + else: {z6l-z6r}...{.5[z5,z5l]-z6'l} fi + z5r--cycle; % lower diagonal + numeric up_inner_jut; + if rt x1r+cap_jut+.5u+1<=lft x3l-1.2cap_jut: up_inner_jut=1.2cap_jut; + else: rt x1r+cap_jut+.5u+1=lft x3l-up_inner_jut; fi + dish_serif(3,4,e,2/3,up_inner_jut,f,1/2,right_jut)(dark); % upper diagonal serif +else: fill z5'l--diag_end(5'l,6'l,.5,1,6'r,5'r)--z5'r--cycle; fi% lower diagonal +%%% +% mirror +pickup tiny.nib; +forsuffixes $ = 3l,3,3r,3'l,3'r,4l,4,4r,5l,5,5r,6l,6,6r,6'l,6'r,7l,7r: + x.m$=l+(r-x$); y.m$=y$; endfor; +fill z.m4r--diag_end(.m4r,.m3'r,1,.5,.m3'l,.m4l)--z.m4l--cycle; % upper diagonal +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + fill z.m5l + if is_egyptian: ---z.m6'l...{z.m6r-z.m6l}(.35[x.m6l,x.m7l],y.m7l)-- + else:{z.m6'l-.5[z.m5,z.m5l]}...{z.m6r-z.m6l} fi + z.m7l..(lft x.m7l,top y.m7l)--(lft x.m7r,bot y.m7r)..z.m7r + if is_egyptian: --(.5[x.m6r,x.m7r],y.m7r){z.m6l-z.m6r}...z.m6'r--- + else: {z.m6l-z.m6r}...{.5[z.m5,z.m5l]-z.m6'l} fi + z.m5r--cycle; % lower diagonal + z8l=z.m3r; z8r=z.m3l; z9l=z.m4r; z9r=z.m4l; z8=.5[z8l,z8r]; z9=.5[z9l,z9r]; + dish_serif(8,9,g,1/2,right_jut,h,2/3,up_inner_jut)(dark); % upper diagonal serif +else: fill z.m5'l--diag_end(.m5'l,.m6'l,.5,1,.m6'r,.m5'r)--z.m5'r--cycle; % lower diagonal +fi +%%%%% +% the accent +h:=full_h; uppercase_umlaut((x1-.5w),0, 17,18,19,20); +penlabels(1,2,3,4,5,6,7); endchar; + +lhchar "Uppercase Russian letter YA acute (`concrete' form)"; +cyrchar_twice(YA_ac,if serifs:13.5u# else:12.5u#-.5width_adj# fi %N_width; upss R + ,cap_height#,0); +if is_small_cap: getcharcode(ya_ac); fi +italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); +adjust_fit(if serifs: cap_serif_fit# else:0 fi,cap_serif_fit#); +% upperc_ya; +pickup tiny.nib; pos1(cap_stem',0); pos2(cap_stem',0); +rt x1r=rt x2r=w-hround max(2u,3u-.5cap_stem'); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +penpos3(cap_band,90); penpos4(cap_band,90); +penpos5(cap_curve if hefty:-3stem_corr fi,180); +numeric middle_weight; middle_weight=.5[vair,cap_band]; +penpos6(middle_weight,-90); penpos7(middle_weight,-90); +z3r=top z1; y4=y3; y5=.52[y6l,y4l]; y6=y7; +x7=x2; y7l=vround(.5h+.5vair); x4=x6; +if serifs: x4=.5w+.5u; x5r=hround (2u); + else: x4=.5w-.5u; x5r=hround u; fi +x4l:=x6l:=x4+.125cap_curve; +fill stroke z7e..pulled_arc.e(6,5) & pulled_arc.e(5,4)..z3e; % lobe +pickup tiny.nib; numeric stem[],alpha,right_jut; +right_jut=if serifs:.8cap_jut else:.4tiny fi; +if serifs: bot y9=bot y2; else: y9=0; fi +lft x9l=hround(if serifs:l+letter_fit+.75u+right_jut else:.5u fi); y8=y6; +stem1=max(tiny.breadth,fudged.cap_stem-3stem_corr); +alpha=diag_ratio(1,.5(stem1-tiny),y1-y9,x9l-x1); +penpos9(alpha*(stem1-tiny),0); +if serifs: numeric theta; theta=angle(y1-y9,x9l-x1); + y9'r=max(hair,.5stem); z9'l=z9'r+whatever*dir theta; + else: y9'l=y9'r=0; fi +z9'r=z9r+penoffset z1-z9 of currentpen+whatever*(z1-z9); +z9'l=z9l+penoffset z9-z1 of currentpen+whatever*(z1-z9); +if serifs: z8r=z9'r+whatever*(z1r-z9); else: x8=x6+.5u; fi +penpos8(if serifs: alpha*stem1 else: cap_stem fi-2stem_corr,0); +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + lft x10=tiny.lft x9l-right_jut; + if is_egyptian: y10r=0; penpos10(slab,-90); else: y10=-o; + penpos10(max(fine.breadth+eps,hair-fine),-90); fi + fill z8l + if is_egyptian: ---z9'l...{z9l-z9r}(.35[x9l,x10l],y10l)-- + else: {.5[z9l,z9]-z8l}...{z8l-z8r} fi + z10l..(lft x10l,bot y10l)--(lft x10r,top y10r)..z10r + if is_egyptian: --(.35[x9r,x10r],y10r){z9r-z9l}...z9'r--- + else: {z8r-z8l}...{z8l-.5[z9l,z9]} fi + z8r--cycle; % lower diagonal +else: fill z8l--diag_end(8l,9'l,1,.5,9'r,8r)--z8r--cycle; fi % diagonal +if serifs: +nodish_serif(1,2,a,1/3,.5cap_jut,b,1/3,cap_jut); % upper serif +dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut); fi % lower serif +%%%%% +% the accent +put_accent(cyrcaph); repeat_once; +penlabels(0,1,2,3,4,5,6,7,8,9,9',10); endchar; + +lhchar "Uppercase Russian letter YA bar (`concrete' form)"; +cyrchar(YA_bar,if serifs:13.5u# else:12.5u#-.5width_adj# fi %N_width; upss R + ,cap_height#+acc_height#,0); +if is_small_cap: getcharcode(ya_bar); fi +italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); +adjust_fit(if serifs: cap_serif_fit# else:0 fi,cap_serif_fit#); +full_h:=h; h:=cap_height; +% upperc_ya; +pickup tiny.nib; pos1(cap_stem',0); pos2(cap_stem',0); +rt x1r=rt x2r=w-hround max(2u,3u-.5cap_stem'); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +penpos3(cap_band,90); penpos4(cap_band,90); +penpos5(cap_curve if hefty:-3stem_corr fi,180); +numeric middle_weight; middle_weight=.5[vair,cap_band]; +penpos6(middle_weight,-90); penpos7(middle_weight,-90); +z3r=top z1; y4=y3; y5=.52[y6l,y4l]; y6=y7; +x7=x2; y7l=vround(.5h+.5vair); x4=x6; +if serifs: x4=.5w+.5u; x5r=hround (2u); + else: x4=.5w-.5u; x5r=hround u; fi +x4l:=x6l:=x4+.125cap_curve; +fill stroke z7e..pulled_arc.e(6,5) & pulled_arc.e(5,4)..z3e; % lobe +pickup tiny.nib; numeric stem[],alpha,right_jut; +right_jut=if serifs:.8cap_jut else:.4tiny fi; +if serifs: bot y9=bot y2; else: y9=0; fi +lft x9l=hround(if serifs:l+letter_fit+.75u+right_jut else:.5u fi); y8=y6; +stem1=max(tiny.breadth,fudged.cap_stem-3stem_corr); +alpha=diag_ratio(1,.5(stem1-tiny),y1-y9,x9l-x1); +penpos9(alpha*(stem1-tiny),0); +if serifs: numeric theta; theta=angle(y1-y9,x9l-x1); + y9'r=max(hair,.5stem); z9'l=z9'r+whatever*dir theta; + else: y9'l=y9'r=0; fi +z9'r=z9r+penoffset z1-z9 of currentpen+whatever*(z1-z9); +z9'l=z9l+penoffset z9-z1 of currentpen+whatever*(z1-z9); +if serifs: z8r=z9'r+whatever*(z1r-z9); else: x8=x6+.5u; fi +penpos8(if serifs: alpha*stem1 else: cap_stem fi-2stem_corr,0); +if serifs: pickup if is_egyptian: crisp else: fine fi nib; + lft x10=tiny.lft x9l-right_jut; + if is_egyptian: y10r=0; penpos10(slab,-90); else: y10=-o; + penpos10(max(fine.breadth+eps,hair-fine),-90); fi + fill z8l + if is_egyptian: ---z9'l...{z9l-z9r}(.35[x9l,x10l],y10l)-- + else: {.5[z9l,z9]-z8l}...{z8l-z8r} fi + z10l..(lft x10l,bot y10l)--(lft x10r,top y10r)..z10r + if is_egyptian: --(.35[x9r,x10r],y10r){z9r-z9l}...z9'r--- + else: {z8r-z8l}...{z8l-.5[z9l,z9]} fi + z8r--cycle; % lower diagonal +else: fill z8l--diag_end(8l,9'l,1,.5,9'r,8r)--z8r--cycle; fi % diagonal +if serifs: +nodish_serif(1,2,a,1/3,.5cap_jut,b,1/3,cap_jut); % upper serif +dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut); fi % lower serif +%%%%% +% the accent +h:=full_h; +% up_bar(.5[x1,x6-.5cap_curve],0, 11,12); +x_move:=.5[x1,x6-.5cap_curve]; y_move:=0; _one:=11; _two:=12; +numeric macron_breadth; macron_breadth:=Vround .2[vair,stem]; +pickup if serifs: crisp.nib else: fine.nib fi; +pos[_one](macron_breadth,90); pos[_two](macron_breadth,90); +x[_one]=x_move+hround(2.75u if monospace:/expansion_factor fi+.5vair); +top y[_one]r=top y[_two]r=vround(cap_height+dot_height#*hppp); +x[_two]=x_move-hround(2.75u if monospace:/expansion_factor fi+.5vair); +filldraw stroke z[_one]e--z[_two]e; % bar +penlabels(0,1,2,3,4,5,6,7,8,9,9',10); endchar; + +lhchar "Uppercase Russian letter L lower dot(`concrete' form)"; +cyrchar(L_ldot,13.5u#,cap_height#,desc_depth#); %N_width# +if is_small_cap: getcharcode(l_ldot); fi +adjust_fit(if serifs: .8(flare#+(cap_stem#-stem#))-.5u# + else: cap_serif_fit# fi, + cap_serif_fit#); % +% upper_spec_l; +numeric bulb_diam; bulb_diam=flare+(cap_stem-stem); +numeric left_stem,right_stem,outer_jut,alpha; +right_stem=cap_stem-stem_corr; +left_stem=min(cap_hair if hefty:-3stem_corr fi,right_stem); +outer_jut=.8cap_jut; x1l=w-x4r=outer_jut+if serifs:.5 fi u; y1=y4=0; x2-x1=x4-x3; +if serifs: x3l=x2r+((x1r-x4l)*(slab/(h-slab))) %+2apex_corr; + if not is_egyptian:-.25left_stem fi; +else: x3r= x2r+apex_corr; fi +y2=y3=h if not serifs:+apex_o+apex_oo fi; +alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); +penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); +penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); +if serifs: + fill stroke z3e--z4e; % right stem + pickup tiny.nib; + penpos5(left_stem,-90); pos5'(left_stem,-90); z5'=z5; + pos8(cap_hair,-180); pos9(bulb_diam,-180); + y9=if is_egyptian: 0.12h else: 1/6h-max(0,flare-stem-2vair_corr-.5) fi; + lft x9r=l+letter_fit+hround(.5u-.5); + y5r=-o; x5=max(lft x9r+.5bulb_diam,.5[x9r,x1r]); + y6l=y9+bulb_diam-hair; + numeric t; t=1-slant; + z7r=(max(.75[x1,x1r],x9+if is_egyptian: (if is_small_cap: 2.25 else: 2.667 fi + +max(-2slant,.5slant))*hair + else: if is_bold:.75 fi bulb_diam+1.35hair fi), + y7l-t*7/8left_stem); + z7l=(x7r-2/3(x1r-x1l),if is_egyptian: .35[y5l,y5] else: y5 fi);%y5l); + z6r=(x7r,y1)+whatever*((x1r,y1)-z2r); y6r-y6l=t*(y5r-y5l); + x6r-x6l=1/2(x1r-x1l); + fill stroke z2e{z1e-z6e}.. controls z6e and z7e ..z5e; + {{less_tense; cyrbulb(5',8,9)}}; % arc and bulb + numeric inner_jut,left_jut,fit; pickup tiny.nib; + x10r=x3r; top y10=h; pos10(alpha*right_stem,0); x4:=x4r; + left_jut=cap_jut+left_stem; + serif(10,4,c,0,-left_jut); % upper serif + pickup tiny.nib; + prime_points_inside(1,2); prime_points_inside(4,3); + if rt x1'r+cap_jut+.5u+1<=lft x4'l-cap_jut: inner_jut=cap_jut; + else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi + dish_serif(4',3,d,1/2,inner_jut,e,1/3,outer_jut); % right serif +else: z0=whatever[z1r,z2r]=whatever[z3l,z4l]; + if y0<h-cap_notch_cut: y0:=h-cap_notch_cut; + fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r) + --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{up}z0+.5left--cycle; % left and right diagonals + else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) + --diag_end(2l,1l,1,1,1r,0)--cycle; fi fi % left and right diagonals +%%%%% +% upper_dot; +_one:=17; _two:=18; _center:=.5w; +% +numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#); +define_whole_blacker_pixels(dot_diam); +pos[_one](dot_diam,0); pos[_two](dot_diam,90); +x[_one]=hround(_center); bot y[_two]l=vround(-d-1); +if 0-o-top y[_two]r<slab: y[_two]r:=vround(max(y[_two]l+eps,-fine-slab)); fi +x[_one]=x[_two]; y[_one]=vround(.5[y[_two]l,y[_two]r]); +dot([_one],[_two]); % dot +penlabels(0,2,6,3,4,5,7,8,9,10); endchar; + +endgroup; + +endinput; +%end of file diff --git a/Master/texmf-dist/fonts/source/lh/specific/lgrucl.mf b/Master/texmf-dist/fonts/source/lh/specific/lgrucl.mf index 6c9599f3c37..a3b93d7b778 100644 --- a/Master/texmf-dist/fonts/source/lh/specific/lgrucl.mf +++ b/Master/texmf-dist/fonts/source/lh/specific/lgrucl.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -27,7 +27,7 @@ % ya % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec begingroup @@ -58,7 +58,7 @@ penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); if serifs: numeric left_jut; left_jut=jut+left_stem; pickup tiny.nib; x5r=x3r; top y5=h; - pos5(alpha*right_stem,0); + pos5(max(currentbreadth+eps,alpha*right_stem),0); fill stroke if is_egyptian: z1e--z2e else: z1e{(x2+2(stem-hair),y2)-z1}...{z2-(x1+.5(stem-hair),y1)}z2e fi; fill stroke z3e--z4e; x4:=x4r; @@ -233,10 +233,11 @@ adjust_fit(if serifs: .25(7/8[hair#,flare#])-.25u# if is_egyptian:+.5hair# fi %fi else: serif_fit# fi,serif_fit#); +%lower_spec_l; numeric bulb_diam; bulb_diam=hround 7/8[hair,flare]; numeric left_stem,right_stem,outer_jut,alpha; right_stem=stem-stem_corr; -left_stem=min(hair if hefty:-3stem_corr fi,right_stem); +left_stem=max(tiny.breadth+eps,min(hair if hefty:-3stem_corr fi,right_stem)); outer_jut=.75jut; x4r=r-letter_fit-outer_jut- if serifs:.25 else:.5 fi u; x1l-.5u-.065jut=w-x4r; y1=y4=0; x2-x1=x4-x3; if serifs: x3l=x2r+((x1r-x4l)*(vair/(h-vair)))if not is_egyptian:-.25left_stem fi; @@ -263,7 +264,7 @@ if serifs: numeric inner_jut,left_jut,fit; pickup tiny.nib; left_jut=jut+left_stem; prime_points_inside(4,3); - x10r=x3r; top y10=h; pos10(alpha*right_stem,0); x4:=x4r; + x10r=x3r; top y10=h; pos10(max(currentbreadth+eps,alpha*right_stem),0); x4:=x4r; if rt x1r+jut+.5u+1<=lft x4'l-jut: inner_jut=jut; else: rt x1r+inner_jut+.5u+1=lft x4'l-inner_jut; fi save slab; slab:=Vround(vair-vair_corr); @@ -277,6 +278,7 @@ else: z0=whatever[z1r,z2r]=whatever[z3l,z4l]; ...{up}z0+.5left--cycle; % left and right diagonals else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) --diag_end(2l,1l,1,1,1r,0)--cycle; fi fi % left and right diagonals +%%%%% penlabels(0,1,2,6,3,4,5,7,8,9,10); endchar; lhchar "Lowercase Russian letter ya (`concrete' form) (looks like backward R)"; diff --git a/Master/texmf-dist/fonts/source/lh/specific/lgrucu.mf b/Master/texmf-dist/fonts/source/lh/specific/lgrucu.mf index f287285a838..f5abb52b964 100644 --- a/Master/texmf-dist/fonts/source/lh/specific/lgrucu.mf +++ b/Master/texmf-dist/fonts/source/lh/specific/lgrucu.mf @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -27,7 +27,7 @@ % YA % -LHver_check(3,4); % like |version_check| in ec +LHver_check(3,5); % like |version_check| in ec begingroup @@ -61,7 +61,7 @@ z0=whatever[z1r,z2r]=whatever[z3l,z4l]; if serifs: numeric left_jut; left_jut=cap_jut+left_stem; pickup tiny.nib; x35r=x3r; top y35=h; - pos35(alpha*right_stem,0); + pos35(max(currentbreadth+eps,alpha*right_stem),0); fill stroke if is_egyptian: z1e--z2e else: z1e{(x2+2stem,y2)-z1}...{z2-(x1+.5stem,y1)}z2e fi; fill stroke z3e--z4e; x4:=x4r; @@ -222,10 +222,11 @@ if is_small_cap: getcharcode(l); fi adjust_fit(if serifs: .8(flare#+(cap_stem#-stem#))-.5u# else: cap_serif_fit# fi, cap_serif_fit#); % +% upper_spec_l; numeric bulb_diam; bulb_diam=flare+(cap_stem-stem); numeric left_stem,right_stem,outer_jut,alpha; right_stem=cap_stem-stem_corr; -left_stem=min(cap_hair if hefty:-3stem_corr fi,right_stem); +left_stem=max(tiny.breadth+eps,min(cap_hair if hefty:-3stem_corr fi,right_stem)); outer_jut=.8cap_jut; x1l=w-x4r=outer_jut+if serifs:.5 fi u; y1=y4=0; x2-x1=x4-x3; if serifs: x3l=x2r+((x1r-x4l)*(slab/(h-slab))) %+2apex_corr; if not is_egyptian:-.25left_stem fi; @@ -254,7 +255,7 @@ if serifs: fill stroke z2e{z1e-z6e}.. controls z6e and z7e ..z5e; {{less_tense; cyrbulb(5',8,9)}}; % arc and bulb numeric inner_jut,left_jut,fit; pickup tiny.nib; - x10r=x3r; top y10=h; pos10(alpha*right_stem,0); x4:=x4r; + x10r=x3r; top y10=h; pos10(max(currentbreadth+eps,alpha*right_stem),0); x4:=x4r; left_jut=cap_jut+left_stem; serif(10,4,c,0,-left_jut); % upper serif pickup tiny.nib; @@ -269,6 +270,7 @@ else: z0=whatever[z1r,z2r]=whatever[z3l,z4l]; ...{up}z0+.5left--cycle; % left and right diagonals else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) --diag_end(2l,1l,1,1,1r,0)--cycle; fi fi % left and right diagonals +%%%%% penlabels(0,2,6,3,4,5,7,8,9,10); endchar; lhchar "Uppercase Russian letter YA (`concrete' form)"; diff --git a/Master/texmf-dist/doc/fonts/lh/dvidrv.mfj b/Master/texmf-dist/source/fonts/dvidrv.mfj index c0c055c56d2..c3588e51f62 100644 --- a/Master/texmf-dist/doc/fonts/lh/dvidrv.mfj +++ b/Master/texmf-dist/source/fonts/dvidrv.mfj @@ -1,5 +1,5 @@ % -% dvidrv.mfj +% dvidrv.mfj (modified) % % Declarations for automatic generation of fonts for dvidrv % diff --git a/Master/texmf-dist/source/fonts/dvidrvlh.mfj b/Master/texmf-dist/source/fonts/dvidrvlh.mfj new file mode 100644 index 00000000000..21ae3a07dd3 --- /dev/null +++ b/Master/texmf-dist/source/fonts/dvidrvlh.mfj @@ -0,0 +1,49 @@ +% +% dvidrvlh.mfj -- head part of dvidrv.mfj +% +% Declarations for automatic LHfonts generation for dvidrv +% +% !!! PLACE FORWARD TO THE EmTeX ORIGINAL FILE DVIDRV.MFJ !!! +% + +rule = lh* ll* wn* wc* mc* kc* ic* % LH Cyrillic fonts -- CM based fonts + { + name = [@f@s]; + name_size = [@f17] 17.28; + commands = [input fikparm;]; + base = cm; + } + +rule = rx* la* lb* lc* ld* % LH Cyrillic fonts -- EC based fonts + { + name = [@f@T2.2s@F.2s]; + commands = [input fikparm;]; + } + +rule = eu* % EULER fonts + { + name = [@f@s]; + commands = [input @f@s;]; + base = plain; + } + +rule = ms* % AmSTeX fonts + { + name = [@f@s]; + commands = [input @f@s;]; + base = cm; + } + +rule = emsy* % EmTeX symbol fonts + { + name = [@f@s]; + commands = [input @f@s;]; + base = cm; + } + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% Then must go EmTeX's original dvidrv.mfj % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + diff --git a/Master/texmf-dist/doc/fonts/lh/tex/01cm-lh.tex b/Master/texmf-dist/source/fonts/lh/tex/01cm-lh.tex index 9725f42e878..516d3f01f1e 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/01cm-lh.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/01cm-lh.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\def\wrkdir{wrk/lh-lcy/} +\lhvercheck(3,5) % Two first font/enc letters: lh (LCY) (default) % Encoding data file: enc-t2.tex (default) @@ -30,35 +31,9 @@ \usesetter \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi +%common code for all cm-based fonts +\input fntaddcm \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/03cm-wn.tex b/Master/texmf-dist/source/fonts/lh/tex/03cm-wn.tex index 8064f44f418..a9f84d8f1ea 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/03cm-wn.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/03cm-wn.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\def\wrkdir{wrk/lh-ot2/} +\lhvercheck(3,5) % Two first font/enc letters: \def\fonttwoletters{wn} @@ -34,35 +35,9 @@ \usesetter \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi +%common code for all cm-based fonts +\input fntaddcm \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/04cm-vf.tex b/Master/texmf-dist/source/fonts/lh/tex/04cm-vf.tex index a1cfce8b52b..694a3a3c8c8 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/04cm-vf.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/04cm-vf.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +%Please create dir before uncommenting +%\def\wrkdir{wrk/lh-cmcyr/} +\lhvercheck(3,5) % Two first font/enc letters: \def\fonttwoletters{lv}\def\encodingletters{vf} @@ -31,36 +33,10 @@ % Lettercode output: ^^hex (default) \usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi +%common code for all cm-based fonts +\input fntaddcm \end diff --git a/Master/texmf-dist/source/fonts/lh/tex/11ex-rs.tex b/Master/texmf-dist/source/fonts/lh/tex/11ex-rs.tex new file mode 100644 index 00000000000..7ceba986717 --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/11ex-rs.tex @@ -0,0 +1,44 @@ +% +% 11ex-rs.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=1 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% TeX file for creation Cyrillic European Computer Modern font +% in XSlav encoding +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% set defaults +\input cfhead +\def\wrkdir{wrk/lh-XSlav/} +\lhvercheck(3,5) + +% Two first font/enc letters: +\def\fonttwoletters{rs}\def\encodingletters{xs} +% Encoding data file: enc-t2.tex (default) +% Font headers data file: +\def\fontfile{\fntallec} +% Text for ??begin: absent (default) +\def\defamily{roman_ec:=false; more_letters:=true; old_cyr:=true; % + genmode:="ex"; enc_name:="XSlav";} +% Lettercode output: \char"HEX +\codehatsfalse + +\usesetter +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files +\input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec +\end diff --git a/Master/texmf-dist/source/fonts/lh/tex/11ex-rx.tex b/Master/texmf-dist/source/fonts/lh/tex/11ex-rx.tex new file mode 100644 index 00000000000..e6ce1cb8e80 --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/11ex-rx.tex @@ -0,0 +1,42 @@ +% +% 11ex-rx.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=1 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% TeX file for creation Cyrillic European Computer Modern font +% in X2 encoding +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% set defaults +\input cfhead +\def\wrkdir{wrk/lh-x2/} +\lhvercheck(3,5) + +% Two first font/enc letters: +\def\fonttwoletters{rx}\def\encodingletters{x2} +% Encoding data file: enc-t2.tex (default) +% Font headers data file: +\def\fontfile{\fntallec} +% Text for ??begin: absent (default) +% Lettercode output: \char"HEX +\codehatsfalse + +\usesetter +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files +\input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec +\end diff --git a/Master/texmf-dist/source/fonts/lh/tex/12ex-la.tex b/Master/texmf-dist/source/fonts/lh/tex/12ex-la.tex new file mode 100644 index 00000000000..2da3f254fd6 --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/12ex-la.tex @@ -0,0 +1,41 @@ +% +% 12ex-la.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=1 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% TeX file for creation Latin-Cyrillic European Computer Modern font +% in T2A encoding +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% set defaults +\input cfhead +\def\wrkdir{wrk/lh-t2a/} +\lhvercheck(3,5) + +% Two first font/enc letters: +\def\fonttwoletters{la}\def\encodingletters{ta} +% Encoding data file: enc-t2.tex (default) +% Font headers data file: +\def\fontfile{\fntallec} +% Text for ??begin: absent (default) +% Lettercode output: ^^hex (default) + +\usesetter +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files +\input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec +\end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/13ex-lb.tex b/Master/texmf-dist/source/fonts/lh/tex/13ex-lb.tex index 165d09b6556..9c054986368 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/13ex-lb.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/13ex-lb.tex @@ -4,23 +4,24 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % -% TeX file for creation Latin-Cyrillic Europian Computer Modern font +% TeX file for creation Latin-Cyrillic European Computer Modern font % in T2B encoding % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\def\wrkdir{wrk/lh-t2b/} +\lhvercheck(3,5) % Two first font/enc letters: \def\fonttwoletters{lb}\def\encodingletters{tb} @@ -32,35 +33,9 @@ \usesetter \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvec} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconec} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntbriec} -\input cfstdedt -\endgroup -\fi +%common code for all ex-based fonts +\input fntaddec \end diff --git a/Master/texmf-dist/source/fonts/lh/tex/14ex-lc.tex b/Master/texmf-dist/source/fonts/lh/tex/14ex-lc.tex new file mode 100644 index 00000000000..330d377ba2b --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/14ex-lc.tex @@ -0,0 +1,41 @@ +% +% 14ex-lc.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=1 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% TeX file for creation Latin-Cyrillic European Computer Modern font +% in T2C encoding +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% set defaults +\input cfhead +\def\wrkdir{wrk/lh-t2c/} +\lhvercheck(3,5) + +% Two first font/enc letters: +\def\fonttwoletters{lc}\def\encodingletters{tc} +% Encoding data file: enc-t2.tex (default) +% Font headers data file: +\def\fontfile{\fntallec} +% Text for ??begin: absent (default) +% Lettercode output: ^^hex (default) + +\usesetter +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files +\input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec +\end diff --git a/Master/texmf-dist/source/fonts/lh/tex/15ex-ld.tex b/Master/texmf-dist/source/fonts/lh/tex/15ex-ld.tex new file mode 100644 index 00000000000..8f7789d95b4 --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/15ex-ld.tex @@ -0,0 +1,41 @@ +% +% 15ex-ld.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=1 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% TeX file for creation Latin-Cyrillic European Computer Modern font +% in T2C encoding +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% set defaults +\input cfhead +\def\wrkdir{wrk/lh-t2d/} +\lhvercheck(3,5) + +% Two first font/enc letters: +\def\fonttwoletters{ld}\def\encodingletters{td} +% Encoding data file: enc-t2.tex (default) +% Font headers data file: +\def\fontfile{\fntallec}% list of SliTeX font headers for EC-like fonts +% Text for ??begin: absent (default) +% Lettercode output: ^^hex (default) + +\usesetter +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files +\input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec +\end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/20cm-ct.tex b/Master/texmf-dist/source/fonts/lh/tex/20cm-ct.tex index 62499faa245..6799dbb98f8 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/20cm-ct.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/20cm-ct.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: \def\fonttwoletters{ct} @@ -36,32 +36,4 @@ \input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/21cm-ic.tex b/Master/texmf-dist/source/fonts/lh/tex/21cm-ic.tex index 8ecca499230..a3922e88c8a 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/21cm-ic.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/21cm-ic.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: \def\fonttwoletters{ic} @@ -31,36 +31,8 @@ % Lettercode output: ^^hex (default) \usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/22cm-wc.tex b/Master/texmf-dist/source/fonts/lh/tex/22cm-wc.tex index 759cfeecfdc..3900355350d 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/22cm-wc.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/22cm-wc.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: lh (LCY) (default) \def\fonttwoletters{wc} @@ -28,40 +28,12 @@ % Font headers data file: fntallcm.tex (default) % Text for ??begin: absent (default) \def\defamily{more_letters:=true; other_cyr:=true; % - enc_name:="Win-1251";} + enc_name:="Win-1251";} % Lettercode output: ^^hex (default) \usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/23cm-mc.tex b/Master/texmf-dist/source/fonts/lh/tex/23cm-mc.tex index 3179a4ba652..8ae4ac71689 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/23cm-mc.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/23cm-mc.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: lh (LCY) (default) \def\fonttwoletters{mc} @@ -32,35 +32,7 @@ \usesetter \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/24cm-kc.tex b/Master/texmf-dist/source/fonts/lh/tex/24cm-kc.tex index a0285ab09d4..34590467db3 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/24cm-kc.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/24cm-kc.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: lh (LCY) (default) \def\fonttwoletters{kc}\def\encodingletters{8h} @@ -32,36 +32,8 @@ % Lettercode output: ^^hex (default) \usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/25cm-uc.tex b/Master/texmf-dist/source/fonts/lh/tex/25cm-uc.tex index 853eae22db5..1833d98846e 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/25cm-uc.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/25cm-uc.tex @@ -1,16 +1,16 @@ % -% 24cm-kc.tex +% 25cm-uc.tex % %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: lh (LCY) (default) \def\fonttwoletters{uc} @@ -28,41 +28,14 @@ % Font headers data file: fntallcm.tex (default) \def\fontfile{\fntallcm} % Text for ??begin: absent (default) -\def\defamily{vfcoding:=true; more_letters:=true; other_cyr:=true; old_cyr:=true; unic:=true; - enc_name:="Unicode";} +\def\defamily{vfcoding:=true; more_letters:=true; other_cyr:=true; % + old_cyr:=true; unic:=true; enc_name:="Unicode";} % Lettercode output: ^^hex (default) \usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files - -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse \MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files +\input cfstdedt % creates font headers; batch and mfjob files -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/30cm-lx.tex b/Master/texmf-dist/source/fonts/lh/tex/30cm-lx.tex index 36eacebca01..c0f9a34f52c 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/30cm-lx.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/30cm-lx.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: lh (LCY) (default) \def\fonttwoletters{lx} @@ -33,35 +33,7 @@ \usesetter \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/31cm-ix.tex b/Master/texmf-dist/source/fonts/lh/tex/31cm-ix.tex index 0a9c65fe06c..e97732cd665 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/31cm-ix.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/31cm-ix.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: \def\fonttwoletters{ix} @@ -32,36 +32,8 @@ % Lettercode output: ^^hex (default) \usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/32cm-wx.tex b/Master/texmf-dist/source/fonts/lh/tex/32cm-wx.tex index eef86814a42..cf6cc084177 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/32cm-wx.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/32cm-wx.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: lh (LCY) (default) \def\fonttwoletters{wx} @@ -28,40 +28,12 @@ % Font headers data file: fntallcm.tex (default) % Text for ??begin: absent (default) \def\defamily{more_letters:=true; other_cyr:=true; % - enc_name:="Win-1251x";} + enc_name:="Win-1251x";} % Lettercode output: ^^hex (default) \usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/33cm-mx.tex b/Master/texmf-dist/source/fonts/lh/tex/33cm-mx.tex index a0365a45f55..27844cead71 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/33cm-mx.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/33cm-mx.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: lh (LCY) (default) \def\fonttwoletters{mx} @@ -33,35 +33,7 @@ \usesetter \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/34cm-kx.tex b/Master/texmf-dist/source/fonts/lh/tex/34cm-kx.tex index 0aced472010..8bf95ab2476 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/34cm-kx.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/34cm-kx.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: lh (LCY) (default) \def\fonttwoletters{kx}\def\encodingletters{8x} @@ -33,36 +33,8 @@ % Lettercode output: ^^hex (default) \usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/46cm-ly.tex b/Master/texmf-dist/source/fonts/lh/tex/46cm-ly.tex index a52ecac6248..f316b58b6b5 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/46cm-ly.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/46cm-ly.tex @@ -4,23 +4,23 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % -% TeX file for creation Latin-Cyrillic Europian Computer Modern font +% TeX file for creation Latin-Cyrillic European Computer Modern font % in OT2 encoding (TeX/Upper part of T2) % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: \def\fonttwoletters{ly}\def\encodingletters{ty} @@ -31,36 +31,8 @@ % Lettercode output: ^^hex (default) \usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/46cm-lz.tex b/Master/texmf-dist/source/fonts/lh/tex/46cm-lz.tex index 76fa8b161dc..8c27293471a 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/46cm-lz.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/46cm-lz.tex @@ -4,23 +4,23 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % -% TeX file for creation Latin-Cyrillic Europian Computer Modern font +% TeX file for creation Latin-Cyrillic European Computer Modern font % in OT2 encoding (TeX/Lower(+part of Upper) part of T2) % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: \def\fonttwoletters{lz}\def\encodingletters{tz} @@ -31,36 +31,8 @@ % Lettercode output: ^^hex (default) \usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/source/fonts/lh/tex/47ex-tx.tex b/Master/texmf-dist/source/fonts/lh/tex/47ex-tx.tex new file mode 100644 index 00000000000..a3a219d0063 --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/47ex-tx.tex @@ -0,0 +1,41 @@ +% +% 47ex-tx.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=1 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% TeX file for creation Cyrillic European Computer Modern font +% in X2 encoding +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% set defaults +\input cfhead +\lhvercheck(3,5) + +% Two first font/enc letters: +\def\fonttwoletters{tx} +% Encoding data file: enc-t2.tex (default) +% Font headers data file: +\def\fontfile{\fntallec} +% Text for ??begin: absent (default) +\def\defamily{roman_ec:=false; more_letters:=true; other_cyr:=true; genmode:="ex"; % + enc_name:="Trash";} +% Lettercode output: \char"HEX +\codehatsfalse + +\usesetter +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files +\input cfstdedt % creates font headers; batch and mfjob files + +\end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/91berest.tex b/Master/texmf-dist/source/fonts/lh/tex/91berest.tex index a9ca1f72598..a1798ff7adb 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/91berest.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/91berest.tex @@ -1,16 +1,16 @@ % -% 99allenc.tex +% 91berest.tex % %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) \MakeFileHeadsfalse % Create font file headers ? \SliTeXfalse % Create SliTeX font file headers ? @@ -44,7 +44,7 @@ \begingroup \MakeFontEncfalse \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -55,8 +55,8 @@ \begingroup \def\fonttwoletters{la}\def\encodingletters{ta}\def\berestachar{a} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -65,7 +65,7 @@ \def\fonttwoletters{lb}\def\encodingletters{tb}\def\berestachar{b} \def\fontfile{\fntallec} \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -73,8 +73,8 @@ \begingroup \def\fonttwoletters{lc}\def\encodingletters{tc}\def\berestachar{c} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -82,8 +82,8 @@ \begingroup \def\fonttwoletters{ld}\def\encodingletters{td}\def\berestachar{d} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -92,8 +92,8 @@ \begingroup \def\fonttwoletters{rx}\def\encodingletters{x2}\def\berestachar{x} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -104,11 +104,11 @@ \def\fontfile{\fntallec} % Text for ??begin: absent (default) \def\defamily{roman_ec:=false; more_letters:=true; other_cyr:=true; genmode:="ex"; % - enc_name:="Trash";} + enc_name:="Trash";} % Lettercode output: \char"HEX \codehatstrue -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -118,13 +118,13 @@ % Two first font/enc letters: lh (LCY) (default) \def\fonttwoletters{rw}\def\encodingletters{ta}\def\berestachar{w} % Font headers data macro: -\long\def\FontsToBeGenerated{\tablevalues ( 10[1000] ) - \makefont \fonttwoletters rm ( 10[1000] )() - \makefont \fonttwoletters ti ( 10[1000] )()} +\long\def\FontsToBeGenerated{\tablevalues ( 10[1000] ) + \makefont \fonttwoletters rm ( 10[1000] )() + \makefont \fonttwoletters ti ( 10[1000] )()} % Text for ??begin: absent (default) \def\defamily{genmode:="ex"; is_ogonek:=true;} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup \fi @@ -134,7 +134,7 @@ \def\nolettercode{x} \def\fonttwoletters{yy}\def\encodingletters{vf}\def\berestachar{x} \codehatsfalse -\input cod-edt % creates encoding file +\input cod-edt % creates encoding file \endgroup \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/92check.tex b/Master/texmf-dist/source/fonts/lh/tex/92check.tex index 967583c16f5..372d1e522f8 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/92check.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/92check.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) \newcount\Test \def\itest{\Test=0 @@ -45,15 +45,6 @@ % Two first font/enc letters: \def\encodingletters{vf}%any encoding % Encoding data file: enc-t2.tex (default) -% Font headers data file: -\long\def\FontsToBeGenerated{ - \tablevalues ( 10 ) - - \makefont \fonttwoletters r ( 10 )() - \makefont \fonttwoletters ti ( 10 )() - \makefont \fonttwoletters csc ( 10 )() - \makefont \fonttwoletters tt ( 10 )() -} % Text for ??begin: \def\defamily{% %boolean TFMonly; TFMonly=true;^^J% @@ -92,16 +83,37 @@ other_cyr:=true;^^J% unic:=true;^^J% more_letters:=true;^^J% old_cyr:=true;^^J% -%genmode:="ec";^^J^^J% +genmode:="ec";^^J^^J% } +% Font headers data file: +\def\fontfile{\fntallec} +\iffalse +\long\def\FontsToBeGenerated{ + \tablevalues ( 10 ) + + \makefont \fonttwoletters r ( 10 )() + \makefont \fonttwoletters ti ( 10 )() + \makefont \fonttwoletters csc ( 10 )() + \makefont \fonttwoletters tt ( 10 )() +} +\fi \chartesttrue \MakeFontEncfalse % Create TeX encoding files ? \itest +\doBatchtrue % Create Batch file + % [true option is only for experts; that was heavily + % borrowed from EC's ecstdedt.tex and had not any testing] +\def\BatchOutput#1{ +% \BatchLine{$ MF "\string\mode=localfont; input #1"} + + \BatchLine{MF "\string\mode=epstyplo; input #1"} +} +\MakeFileHeadstrue \doMFJobtrue % Create MFJob file ? \TFMonlytrue % Create tfm-files only ? -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/92cm-xx.tex b/Master/texmf-dist/source/fonts/lh/tex/92cm-xx.tex index df29e0565d0..917aecddf5e 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/92cm-xx.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/92cm-xx.tex @@ -1,26 +1,26 @@ % -% 24cm-kc.tex +% 92cm-xx.tex % %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % % TeX file for creation All main letter shapes in Cyrillic Container -% (excluding accended and samle-modified letters) +% (excluding accented and sample-modified letters) % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) % Two first font/enc letters: lh (LCY) (default) \def\fonttwoletters{xx} @@ -33,36 +33,8 @@ % Lettercode output: ^^hex (default) \usesetter -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\ifSliTeX -%SliTeX fonts -\begingroup -\MFJobheadfalse % don't create MFJob head from this point -\MakeFileHeadstrue % Create font file headers ? -\def\fontfile{fntinvcm} -\def\jifont{i} -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup -\fi - -\ifConcrete % concrete fonts -\begingroup -\MFJobheadfalse -\MakeFileHeadstrue -\def\fontfile{fntconcm} -\input cfstdedt -\endgroup -\fi - -\ifCMBright % CM Bright fonts -\begingroup -\MFJobheadfalse -%\MakeFileHeadstrue -\def\fontfile{fntbricm} -\input cfstdedt -\endgroup -\fi \end diff --git a/Master/texmf-dist/source/fonts/lh/tex/99-CMstd.tex b/Master/texmf-dist/source/fonts/lh/tex/99-CMstd.tex new file mode 100644 index 00000000000..c6349715279 --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/99-CMstd.tex @@ -0,0 +1,53 @@ +% +% 99-CMstd.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=1 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% TeX file for creation all Standard Latin-Cyrillic font +% in all more or less standard LH encodings +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% set defaults +\input cfhead +\lhvercheck(3,5) + +\usesetter +\def\NMFJobFileName {all-enc.mfj} + +%lh MS DOS Alternative Cyrillic +\begingroup +\def\wrkdir{wrk/lh-lcy/} +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files +\input cfstdedt % creates font headers; batch and mfjob files + +%common code for all cm-based fonts +\input fntaddcm +\endgroup + +\MFJobheadfalse % don't create MFJob head from this point + +%wn WNCYR +\begingroup +\def\wrkdir{wrk/lh-ot2/} +\def\fonttwoletters{wn}\wncodingtrue +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files +\input cfstdedt % creates font headers; batch and mfjob files + +%common code for all cm-based fonts +\input fntaddcm +\endgroup + +\end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/99-t2enc.tex b/Master/texmf-dist/source/fonts/lh/tex/99-T2enc.tex index 281dcf80e3e..cf4576e4169 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/99-t2enc.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/99-T2enc.tex @@ -1,16 +1,16 @@ % -% 99allenc.tex +% 99-T2enc.tex % %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) \usesetter \def\NMFJobFileName {T2enc.mfj} @@ -28,63 +28,91 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %la T2A \begingroup +\def\wrkdir{wrk/lh-t2a/} \def\fonttwoletters{la}\def\encodingletters{ta} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec \endgroup +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %lb T2B \begingroup +\def\wrkdir{wrk/lh-t2b/} \def\fonttwoletters{lb}\def\encodingletters{tb} \def\fontfile{\fntallec} \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec \endgroup +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %lc T2C \begingroup +\def\wrkdir{wrk/lh-t2c/} \def\fonttwoletters{lc}\def\encodingletters{tc} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec \endgroup +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %ld T2D \begingroup +\def\wrkdir{wrk/lh-t2d/} \def\fonttwoletters{ld}\def\encodingletters{td} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec \endgroup %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\iffalse %COMMENT %rx X2 \begingroup +\def\wrkdir{wrk/lh-x2/} \def\fonttwoletters{rx}\def\encodingletters{x2} \def\fontfile{\fntallec} \codehatsfalse -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec \endgroup +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %rx XSlav +\iffalse %COMMENT \begingroup +\def\wrkdir{wrk/lh-XSlav/} \def\fonttwoletters{rs}\def\encodingletters{xs} \def\fontfile{\fntallec} \def\defamily{roman_ec:=false; more_letters:=true; old_cyr:=true; genmode:="ex"; % - enc_name:="XSlav";} + enc_name:="XSlav";} \codehatsfalse -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec \endgroup -\fi %END COMMENT +\fi %END COMMENT \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/99allenc.tex b/Master/texmf-dist/source/fonts/lh/tex/99allenc.tex index e1477131acd..cb759024718 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/99allenc.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/99allenc.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,123 +20,128 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) \usesetter \def\NMFJobFileName {all-enc.mfj} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %lh MS DOS Alternative Cyrillic \begingroup +\def\wrkdir{wrk/lh-lcy/} \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all cm-based fonts +\input fntaddcm \endgroup \MFJobheadfalse % don't create MFJob head from this point +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %wn WNCYR \begingroup +\def\wrkdir{wrk/lh-ot2/} \def\fonttwoletters{wn}\wncodingtrue \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all cm-based fonts +\input fntaddcm \endgroup %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %la T2A \begingroup +\def\wrkdir{wrk/lh-t2a/} \def\fonttwoletters{la}\def\encodingletters{ta} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec \endgroup +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %lb T2B \begingroup +\def\wrkdir{wrk/lh-t2b/} \def\fonttwoletters{lb}\def\encodingletters{tb} \def\fontfile{\fntallec} \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec \endgroup +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %lc T2C \begingroup +\def\wrkdir{wrk/lh-t2c/} \def\fonttwoletters{lc}\def\encodingletters{tc} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec \endgroup +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %ld T2D \begingroup +\def\wrkdir{wrk/lh-t2d/} \def\fonttwoletters{ld}\def\encodingletters{td} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec \endgroup %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %rx X2 \begingroup +\def\wrkdir{wrk/lh-x2/} \def\fonttwoletters{rx}\def\encodingletters{x2} \def\fontfile{\fntallec} \codehatsfalse -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files + +%common code for all ex-based fonts +\input fntaddec \endgroup +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %rx XSlav +\iffalse %COMMENT \begingroup +\def\wrkdir{wrk/lh-xSlav/} \def\fonttwoletters{rs}\def\encodingletters{xs} \def\fontfile{\fntallec} -\def\defamily{roman_ec:=false; more_letters:=true; old_cyr:=true; genmode:="ex"; % - enc_name:="XSlav";} +\def\defamily{roman_ec:=false; more_letters:=true; old_cyr:=true; % + genmode:="ex"; enc_name:="XSlav";} \codehatsfalse -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%ic ISO Cyrillic -\begingroup -\def\fonttwoletters{ic} -\def\defamily{more_letters:=true; other_cyr:=true; enc_name:="ISO8859-5";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup - -%wc Windows Cyrillic -\begingroup -\def\fonttwoletters{wc} -\def\defamily{more_letters:=true; other_cyr:=true; enc_name:="Win-1251";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files -\endgroup - -%mc Mac Cyrillic -\begingroup -\def\fonttwoletters{mc} -\def\defamily{more_letters:=true; other_cyr:=true; enc_name:="Mac Ukr";} \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files -\endgroup -%kc KOI Cyrillic -\begingroup -\def\fonttwoletters{kc}\def\encodingletters{8h} -\def\defamily{enc_name:="KOI8-R";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files -\input cfstdedt % creates font headers; batch and mfjob files +%common code for all ex-based fonts +\input fntaddec \endgroup +\fi %END COMMENT \end diff --git a/Master/texmf-dist/doc/fonts/lh/tex/99tstenc.tex b/Master/texmf-dist/source/fonts/lh/tex/99tstenc.tex index 5909e97e812..af43da1acb3 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/99tstenc.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/99tstenc.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -20,15 +20,16 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set defaults \input cfhead -\lhvercheck(3,4) +\lhvercheck(3,5) \usesetter \def\NMFJobFileName {test-enc.mfj} %lh MS DOS Alternative Cyrillic \begingroup +\def\wrkdir{wrk/lh-lcy/} \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -36,9 +37,10 @@ %wn WNCYR \begingroup +\def\wrkdir{wrk/lh-ot2/} \def\fonttwoletters{wn}\wncodingtrue \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -47,67 +49,73 @@ \def\fonttwoletters{ct} \def\defamily{more_letters:=true; enc_name:="cp866(Tatar)";} \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %la T2A \begingroup +\def\wrkdir{wrk/lh-t2a/} \def\fonttwoletters{la}\def\encodingletters{ta} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup %lb T2B \begingroup +\def\wrkdir{wrk/lh-t2b/} \def\fonttwoletters{lb}\def\encodingletters{tb} \def\fontfile{\fntallec} \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup %lc T2C \begingroup +\def\wrkdir{wrk/lh-t2c/} \def\fonttwoletters{lc}\def\encodingletters{tc} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup %ld T2D \begingroup +\def\wrkdir{wrk/lh-t2d/} \def\fonttwoletters{ld}\def\encodingletters{td} \def\fontfile{\fntallec} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %rx X2 \begingroup +\def\wrkdir{wrk/lh-x2/} \def\fonttwoletters{rx}\def\encodingletters{x2} \def\fontfile{\fntallec} \codehatsfalse -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup %rx XSlav \begingroup +\def\wrkdir{wrk/lh-xSlav/} \def\fonttwoletters{rs}\def\encodingletters{xs} \def\fontfile{\fntallec} \def\defamily{roman_ec:=false; more_letters:=true; old_cyr:=true; genmode:="ex"; % - enc_name:="XSlav";} + enc_name:="XSlav";} \codehatsfalse -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -116,8 +124,8 @@ \begingroup \def\fonttwoletters{ic} \def\defamily{more_letters:=true; other_cyr:=true; enc_name:="ISO8859-5";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -125,8 +133,8 @@ \begingroup \def\fonttwoletters{wc} \def\defamily{more_letters:=true; other_cyr:=true; enc_name:="Win-1251";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -135,7 +143,7 @@ \def\fonttwoletters{mc} \def\defamily{more_letters:=true; other_cyr:=true; enc_name:="Mac Ukr";} \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -143,8 +151,8 @@ \begingroup \def\fonttwoletters{kc}\def\encodingletters{8h} \def\defamily{enc_name:="KOI8-R";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -154,7 +162,7 @@ \def\fonttwoletters{lx} \def\defamily{more_letters:=true; other_cyr:=true; enc_name:="LCYx";} \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -162,8 +170,8 @@ \begingroup \def\fonttwoletters{ix} \def\defamily{more_letters:=true; other_cyr:=true; enc_name:="ISO8859-5";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -171,8 +179,8 @@ \begingroup \def\fonttwoletters{wx} \def\defamily{more_letters:=true; other_cyr:=true; enc_name:="Win-1251";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -181,7 +189,7 @@ \def\fonttwoletters{mx} \def\defamily{more_letters:=true; other_cyr:=true; enc_name:="Mac Ukr";} \input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -189,8 +197,8 @@ \begingroup \def\fonttwoletters{kx}\def\encodingletters{8x} \def\defamily{more_letters:=true; other_cyr:=true; enc_name:="KOI8-R";} -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -199,10 +207,10 @@ \begingroup \def\fonttwoletters{uc} \def\defamily{vfcoding:=true; more_letters:=true; other_cyr:=true; old_cyr:=true; unic:=true; - enc_name:="Unicode";} + enc_name:="Unicode";} \codehatsfalse -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup @@ -211,11 +219,11 @@ \begingroup \def\fonttwoletters{tx} \def\defamily{roman_ec:=false; more_letters:=true; other_cyr:=true; genmode:="ex"; % - enc_name:="Trash";} + enc_name:="Trash";} \def\fontfile{\fntallec} \codehatsfalse -\input cod-edt % creates encoding file -\input rliker % creates kern&ligature files +\input cod-edt % creates encoding file +\input rliker % creates kern&ligature files \input cfstdedt % creates font headers; batch and mfjob files \endgroup diff --git a/Master/texmf-dist/doc/fonts/lh/tex/cfhead.tex b/Master/texmf-dist/source/fonts/lh/tex/cfhead.tex index e06f69e80a8..d8352091918 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/cfhead.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/cfhead.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=1 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -22,7 +22,7 @@ % \newcount\lhmajver\newcount\lhminver \newcount\tempe\newcount\tempf -\lhmajver3 \lhminver4 %3,4 +\lhmajver3 \lhminver5 %3,5 \def\lhvercheck(#1,#2){\tempe#1\tempf#2 \ifnum\tempe>\lhmajver\message{LH (TEX4MF) font warning: Obsolete head file} \else @@ -60,7 +60,7 @@ % User temporary TeX output directory; % default: subdirectory wrk -\def\wrkdir{wrk/} +\def\wrkdir{wrk/lh_temp/} %\new... @@ -90,7 +90,8 @@ % (should be changed in ##-xx.tex files for created font family) % \def\fonttwoletters{lh} % Two first font letters (and font encoding); - % Russian CP866nav (new alternative with Ukr and Byel letters) + % Russian CP866nav (new alternative with Ukrainian + % and Byelorussian letters) \def\virtualtwoletters{} % Two first letters of virtual font (if exist); % default: absent @@ -107,8 +108,8 @@ \def\onefont #1#2{% \def\FontsToBeGenerated{ - \tablevalues ( #2 ) - \makefont \fonttwoletters #1 ( #2 )()} + \tablevalues ( #2 ) + \makefont \fonttwoletters #1 ( #2 )()} } \def\defamily{} % Text for ??begin; @@ -179,7 +180,7 @@ % \newif\ifdoBatch % Create batch file? \doBatchfalse % default: No -\def\modedef{} % e.g. \def\modedef{\string\mode:=hplaser;} +\def\modedef{} % e.g. \def\modedef{\string\mode:=ljfour;} % % The Batch file entries ( #1 contains the fontname ) @@ -189,25 +190,24 @@ % \BatchLine{...}} % preset value, change \BatchOutput if you like .... % -\ifdoBatch - \def\BatchOutput#1{ - \BatchLine{$ MF "\string\mode=localfont; input #1"} - } -\fi +\def\BatchOutput#1{ +% \BatchLine{$ MF "\string\mode=localfont; input #1"} + \BatchLine{MF "\string\mode=localfont; input #1"} +} % % FILE NAMING CONVENTIONS: % -\def\encfontname {\wrkdir\Nencfontname} -\def\Nencfontname {\fonttwoletters codes.mf} +\def\encfontname {\wrkdir\Nencfontname} +\def\Nencfontname {\fonttwoletters codes.mf} \def\codefilename {\wrkdir\Ncodefilename} \def\Ncodefilename {\ifBabel l\fonttwoletters def.enc\else \ifBeresta\fonttwoletters codes.tex\else \fonttwoletters rusdef.tex \fi\fi} -\def\testfontname {\wrkdir\Ntestfontname} -\def\Ntestfontname {\fonttwoletters ftest.mf} +\def\testfontname {\wrkdir\Ntestfontname} +\def\Ntestfontname {\fonttwoletters ftest.mf} \def\rusdefname {\wrkdir\jobname.ulc} \def\chardefname {\wrkdir\jobname.chr} @@ -226,11 +226,12 @@ \def\Nligfile {\fonttwoletters liker.mf} \def\BatchFileName {\wrkdir\NBatchFileName} -\def\NBatchFileName {\fonttwoletters batch.bat} +\def\NBatchFileName {\ifx\jifont\undefined\else\jifont\fi + \fonttwoletters batch.bat} \def\MFJobFileName {\wrkdir\NMFJobFileName} \def\NMFJobFileName {\ifx\jifont\undefined\else\jifont\fi - \fonttwoletters job.mfj} + \fonttwoletters job.mfj} % \new... \newwrite \encfontoutput % coding file for METAFONT @@ -253,9 +254,9 @@ \def\usesetter{% \openin\resetter=setter \ifeof\resetter - \message{^^J*** You may reset defaults for font genegation % + \message{^^J*** You may reset defaults for font generation % for your TeX system!^^J% - \| PLease write them to file setter.tex^^J% + \| Please write them to file setter.tex^^J% % ^^JPress *Enter* to continue } % \read-1 to\trick %trick! diff --git a/Master/texmf-dist/doc/fonts/lh/tex/cfstdedt.tex b/Master/texmf-dist/source/fonts/lh/tex/cfstdedt.tex index c5a158cb570..d7c36c6937d 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/cfstdedt.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/cfstdedt.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) \ifMakeFileHeads\let\next\relax\else \ifdoMFJob\let\next\relax\else diff --git a/Master/texmf-dist/doc/fonts/lh/tex/cod-edt.tex b/Master/texmf-dist/source/fonts/lh/tex/cod-edt.tex index 116b21f5c50..71acf874d8b 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/cod-edt.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/cod-edt.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -19,7 +19,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \catcode`\_=11 @@ -52,17 +52,17 @@ \else \ifx\lettercode\minus\Del\lettercode\let\next\relax \else - \advance\tablecount1 - \ifnum\tablecount=\currtable\let\next\docode + \advance\tablecount1 + \ifnum\tablecount=\currtable\let\next\docode \else - \ifnum\tablecount<\currtable\let\next\singlecode - \else - \ifnum\currtable=0 - \message{Wrong currtable: currtable=\the\currtable}% - \Del\lettercode\let\next\singlecode - \fi - \Del\lettercode\let\next\singlecode - \fi\fi + \ifnum\tablecount<\currtable\let\next\singlecode + \else + \ifnum\currtable=0 + \message{Wrong currtable: currtable=\the\currtable}% + \Del\lettercode\let\next\singlecode + \fi + \Del\lettercode\let\next\singlecode + \fi\fi \fi\fi\fi \next} @@ -73,9 +73,9 @@ \ifx\minus\lettercode\Del\lettercode\let\next\relax \else \ifx\encodingletters\lettercode\currtable\codecount - \let\next\singletablevalue + \let\next\singletablevalue \else\advance\codecount1\let\next\singletablevalue - \fi + \fi \fi\fi \next} @@ -105,12 +105,12 @@ } \def\makeuclcletter#1#2#3#4{% - \ifx#1\undefined %relax - \else + \ifx#1\undefined %relax + \else \def\upperletter{#1}\def\uppercode{#2}% \ifx#3\undefined % \message{\string#1: Uppercase letter has not pair} - \else + \else \def\lowerletter{#3}\def\lowercode{#4}\Doucfile \fi \fi @@ -133,20 +133,20 @@ \def\LetA{A}\def\LetB{B}\def\LetC{C}\def\LetD{D}\def\LetE{E}\def\LetF{F} \def\Leta{a}\def\Letb{b}\def\Letc{c}\def\Letd{d}\def\Lete{e}\def\Letf{f} \def\codesUP#1#2\endcodesUP{\gdef\firstlet{#1}\gdef\secondlet{#2}% - \ifx\firstlet\Leta\let\firstlet\LetA\else - \ifx\firstlet\Letb\let\firstlet\LetB\else - \ifx\firstlet\Letc\let\firstlet\LetC\else - \ifx\firstlet\Letd\let\firstlet\LetD\else - \ifx\firstlet\Lete\let\firstlet\LetE\else - \ifx\firstlet\Letf\let\firstlet\LetF\else - \fi\fi\fi\fi\fi\fi - \ifx\secondlet\Leta\let\secondlet\LetA\else - \ifx\secondlet\Letb\let\secondlet\LetB\else - \ifx\secondlet\Letc\let\secondlet\LetC\else - \ifx\secondlet\Letd\let\secondlet\LetD\else - \ifx\secondlet\Lete\let\secondlet\LetE\else - \ifx\secondlet\Letf\let\secondlet\LetF\else - \fi\fi\fi\fi\fi\fi\Del\firstlet\Del\secondlet + \ifx\firstlet\Leta\let\firstlet\LetA\else + \ifx\firstlet\Letb\let\firstlet\LetB\else + \ifx\firstlet\Letc\let\firstlet\LetC\else + \ifx\firstlet\Letd\let\firstlet\LetD\else + \ifx\firstlet\Lete\let\firstlet\LetE\else + \ifx\firstlet\Letf\let\firstlet\LetF\else + \fi\fi\fi\fi\fi\fi + \ifx\secondlet\Leta\let\secondlet\LetA\else + \ifx\secondlet\Letb\let\secondlet\LetB\else + \ifx\secondlet\Letc\let\secondlet\LetC\else + \ifx\secondlet\Letd\let\secondlet\LetD\else + \ifx\secondlet\Lete\let\secondlet\LetE\else + \ifx\secondlet\Letf\let\secondlet\LetF\else + \fi\fi\fi\fi\fi\fi\Del\firstlet\Del\secondlet } {\catcode`\%=11 \catcode`\|=14 diff --git a/Master/texmf-dist/doc/fonts/lh/tex/enc-t2.tex b/Master/texmf-dist/source/fonts/lh/tex/enc-t2.tex index 6f8414bf7ff..aab624740a0 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/enc-t2.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/enc-t2.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) % Now these file support: % @@ -39,7 +39,7 @@ % % X2 font x2 T2 encodings (in progress) % -% T2 fonts ta T2A: Europian and Asia Cyrillic (States) +% T2 fonts ta T2A: European and Asia Cyrillic (States) % tb T2B: Russia Federation Cyrillic % tc T2C: Much exotic Cyrillic % td T2D: Old Slav Cyrillic @@ -55,7 +55,7 @@ % ty OT2u (experimental) % tz OT2l (experimental) % xx All main lettershapes in this package -% (excluded accended and sample modified letters) +% (excluded accented and sample modified letters) % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \tablevalues ( lh wn x2 xs ta tb tc td wx lx ix 8x mx wc ic 8h mc er vf ct tx ty tz uc xx ) @@ -125,8 +125,8 @@ \makeCOD YA CYRYA ( 9f 17[YA] df * df df df df df 9f cf f1 9f df cf f1 9f f1 3f 9f * df df 2f df ) \makecod ya cyrya ( ef 1f[ya] ff * ff ff ff ff ff ef ef d1 df ff ef d1 df d1 5f ef * ff ff 4f ff ) %%% -\makeCOD YO CYRYO ( f0 13[E0] 9c * 9c 9c 9c 9c a8 f0 a1 b3 dd a8 a1 b3 dd b3 60 f0 * 9c 9c 01 a8 ) -\makecod yo cyryo ( f1 1b[e0] bc * bc bc bc bc b8 f1 f1 a3 de b8 f1 a3 de a3 61 f1 * bc bc 51 b8 ) +\makeCOD YO CYRYO ( f0 13[E0] 9c * 9c 9c 9c 9c a8 f0 a1 b3 dd a8 a1 b3 dd b3 60 f0 * 9c 9c 01 * ) +\makecod yo cyryo ( f1 1b[e0] bc * bc bc bc bc b8 f1 f1 a3 de b8 f1 a3 de a3 61 f1 * bc bc 51 * ) %%% % lgt2lo(u/l/ti) -- X2 Lower part \makeCOD AE CYRAE ( * * 41 * 8c * * * * * * * * * * * * * * * * * 80 d4 * ) @@ -143,16 +143,16 @@ \makecod k_vcrs cyrkvcrs ( * * 66 * ab * * * * * * * * * * * * * * * * b4 aa 9d 93 ) \makeCOD K_hcrs CYRKHCRS ( * * 47 * * * 8b * * * * * * * * * * * * * * * 88 9e 84 ) \makecod k_hcrs cyrkhcrs ( * * 67 * * * ab * * * * * * * * * * * * * * * a8 9f 94 ) -\makeCOD L_dsc CYRLDSC ( * * 48 * * 8a 8a * * * * * * * * * * * * * * * 8e * * ) -\makecod l_dsc cyrldsc ( * * 68 * * aa aa * * * * * * * * * * * * * * * ae * * ) +\makeCOD L_dsc CYRLDSC ( * * 48 * * 8a 8a * * * * * * * * * * * * * * * 8e c5 * ) +\makecod l_dsc cyrldsc ( * * 68 * * aa aa * * * * * * * * * * * * * * * ae c6 * ) \makeCOD LAT_I CYRII ( f6 04[I1] 49 41 * * * * b2 f6 a6 b6 a7 b2 a6 * a7 b6 * * 50 * * 06 * ) \makecod lat_i cyrii ( f7 0c[i1] 69 61 * * * * b3 f7 f6 a6 b4 b3 f6 * b4 a6 * * 70 * * 56 * ) \makeCOD LAT_J CYRJE ( * 4a[J] 4a 42 * * * * a3 b5 a8 b8 b7 a3 a8 * b7 * * * 51 * * 08 * ) \makecod lat_j cyrje ( * 6a[j] 6a 62 * * * * bc d5 f8 a8 c0 bc f8 * c0 * * * 71 * * 58 * ) \makeCOD LJE CYRLJE ( * 01[LJ] 4b * 87 88 * * 8a b1 a9 b9 bc 8a a9 * bc * * * * * 91 09 * )%!!! \makecod lje cyrlje ( * 09[lj] 6b * a7 a8 * * 9a d1 f9 a9 bd 9a f9 * bd * * * * * b1 59 * )%!!! -\makeCOD M_dsc CYRMDSC ( * * 4c * * * 88 * * * * * * * * * * * * * * * 90 * * ) -\makecod m_dsc cyrmdsc ( * * 6c * * * a8 * * * * * * * * * * * * * * * b0 * * ) +\makeCOD M_dsc CYRMDSC ( * * 4c * * * 88 * * * * * * * * * * * * * * * 90 cd * ) +\makecod m_dsc cyrmdsc ( * * 6c * * * a8 * * * * * * * * * * * * * * * b0 ce * ) \makeCOD NJE CYRNJE ( * 00[NJ] 4d * 9b 99 * * 8c b2 aa ba be 8c 0a * be * * * * * 92 0a * )%!!! \makecod nje cyrnje ( * 08[nj] 6d * bb b9 * * 9c d2 fa aa bf 9c fa * bf * * * * * b2 5a * )%!!! \makeCOD ABH_HA CYRABHHA ( * * 4e * * * 97 * * * * * * * * * * * * * * * 93 a8 85 ) @@ -176,25 +176,25 @@ \makecod ch_vcrs cyrchvcrs ( * * 76 * b7 * * * * * * * * * * * * * * * * * b7 b9 9a ) \makeCOD LAT_W CYRW ( * * 57 * * * * * * * * * * * * * * * * * 53 * * * * ) \makecod lat_w cyrw ( * * 77 * * * * * * * * * * * * * * * * * 73 * * * * ) -\makeCOD YAT CYRYAT ( * 23 58 44 * * * 93 * * * * * * * * * * * * * * 9c 62 8b ) -\makecod yat cyryat ( * 2b 78 64 * * * b3 * * * * * * * * * * * * * * bc 63 9b ) +\makeCOD YAT CYRYAT ( * 23 58 44 * * * 93 * * * * * * * * * * * * * * * 62 8b ) +\makecod yat cyryat ( * 2b 78 64 * * * b3 * * * * * * * * * * * * * * * 63 9b ) \makeCOD B_YUS CYRBYUS ( * * 59 45 * * * 97 * * * * * * * * * * * * * * * 6a 8c ) \makecod b_yus cyrbyus ( * * 79 65 * * * b7 * * * * * * * * * * * * * * * 6b 9c ) \makeCOD IZH CYRIZH ( * 14 5a 46 * * * 8a * * * * * * * * * * * * * * * 74 8d ) \makecod izh cyrizh ( * 1c 7a 66 * * * aa * * * * * * * * * * * * * * * 75 9d ) -\makeCOD SEMISN CYRSEMISFTSN ( * * * * * * 93 * * * * * * * * * * * * * * * 9c * 8e ) -\makecod semisn cyrsemisftsn ( * * * * * * b3 * * * * * * * * * * * * * * * bc * 9e ) -\makeCOD I_shdsc CYRISHRTDSC ( * * * * * * 94 * * * * * * * * * * * * * * * 9c * * ) -\makecod i_shdsc cyrishrtdsc ( * * * * * * b4 * * * * * * * * * * * * * * * bc * * ) +\makeCOD SEMISN CYRSEMISFTSN ( * * * * * * 93 * * * * * * * * * * * * * * * * 8c 8e ) +\makecod semisn cyrsemisftsn ( * * * * * * b3 * * * * * * * * * * * * * * * * 8d 9e ) +\makeCOD I_shdsc CYRISHRTDSC ( * * * * * * 94 * * * * * * * * * * * * * * * * 8a * ) +\makecod i_shdsc cyrishrtdsc ( * * * * * * b4 * * * * * * * * * * * * * * * * 8b * ) \makeCOD R_tl CYRRHOOK ( * * * * * * 9b * * * * * * * * * * * * * * * * * 8f ) \makecod r_tl cyrrhook ( * * * * * * bb * * * * * * * * * * * * * * * * * 9f ) % -\makeCOD N_ltl CYRNLHK ( * * 1c * * * 99 * * * * * * * * * * * * * * * * * a0 ) -\makecod n_ltl cyrnlhk ( * * 1d * * * b9 * * * * * * * * * * * * * * * * * b0 ) -\makeCOD DELTA CYRDELTA ( * * 1e * * 86 * * * * * * * * * * * * * * * * * * a1 ) -\makecod delta cyrdelta ( * * 1f * * a6 * * * * * * * * * * * * * * * * * * b1 ) -\makeCOD R_gcrs CYRRTICK ( * * * * * * 86 * * * * * * * * * * * * * * * * * * ) -\makecod r_gcrs cyrrtick ( * * * * * * a6 * * * * * * * * * * * * * * * * * * ) +\makeCOD N_ltl CYRNLHK ( * * 1e * * * 99 * * * * * * * * * * * * * * * * * a0 ) +\makecod n_ltl cyrnlhk ( * * 1f * * * b9 * * * * * * * * * * * * * * * * * b0 ) +\makeCOD DELTA CYRDELTA ( * * 1c * * 86 * * * * * * * * * * * * * * * * * * a1 ) +\makecod delta cyrdelta ( * * 1d * * a6 * * * * * * * * * * * * * * * * * * b1 ) +\makeCOD R_gcrs CYRRTICK ( * * * * * * 86 * * * * * * * * * * * * * * * * 8e * ) +\makecod r_gcrs cyrrtick ( * * * * * * a6 * * * * * * * * * * * * * * * * 8f * ) \makeCOD S_acrs CYRSTICK ( * * * * * 91 * * * * * * * * * * * * * * * * * * * ) \makecod s_acrs cyrstick ( * * * * * b1 * * * * * * * * * * * * * * * * * * * ) \makeCOD G_crsdsc CYRGHCRDSC ( * * * * * 80 * * * * * * * * * * * * * * * * * * * ) @@ -233,6 +233,8 @@ \makecod l_tl cyrlhk ( * * ac * * ac ac * * * * * * * * * * * * * * ac ac * b8 ) \makeCOD N_dsc CYRNDSC ( * * 8d * 8d 8d 8d * a0 bb 84 94 c2 * * * * * * fa * 8d 8d a2 * ) \makecod n_dsc cyrndsc ( * * ad * ad ad ad * b0 db 8c 84 c3 * * * * * * fb * ad ad a3 * ) +\makeCOD N_stl CYRNTAIL ( * * * * * * * * * * * * * * * * * * * * * * * c9 * ) +\makecod n_stl cyrntail ( * * * * * * * * * * * * * * * * * * * * * * * ca * ) \makeCOD NG CYRNG ( * * 8e 48 8e 8e * * * * * * * * * * * * * * * 8e * a4 * ) \makecod ng cyrng ( * * ae 68 ae ae * * * * * * * * * * * * * * * ae * a5 * ) \makeCOD N_tl CYRNHK ( * * 8f * * 8f 8f * * * * * * * * * * * * * * 8f 8f c7 a9 ) @@ -252,8 +254,8 @@ \makecod h_dsc cyrhdsc ( * * b5 * b5 b5 b5 * * * * * * * * * * * * * * b5 b5 b3 * ) \makeCOD H_tl CYRHHK ( * * 96 * * 96 * * * * * * * * * * * * * * * 96 * * ab ) \makecod h_tl cyrhhk ( * * b6 * * b6 * * * * * * * * * * * * * * * b6 * * bb ) -\makeCOD CH_ldsc CYRCHLDSC ( * * 97 * * 97 * * * * * * * * * * * * * * * 97 97 cb * ) -\makecod ch_ldsc cyrchldsc ( * * b7 * * b7 * * * * * * * * * * * * * * * b7 b7 cc * ) +\makeCOD CH_ldsc CYRCHLDSC ( * * 97 * * 97 * * * * * * * * * * * * * * * 97 * cb * ) +\makecod ch_ldsc cyrchldsc ( * * b7 * * b7 * * * * * * * * * * * * * * * b7 * cc * ) \makeCOD CH_rdsc CYRCHRDSC ( * * 98 * 98 98 98 * * * * * * * * * * * * * * 98 * b6 * ) \makecod ch_rdsc cyrchrdsc ( * * b8 * b8 b8 b8 * * * * * * * * * * * * * * b8 * b7 * ) \makeCOD UKR_E CYRIE ( f4 05[E2] 99 49 99 * * 99 aa f4 a4 b4 b8 aa a4 * b8 b4 * * * 99 * 04 ac ) @@ -289,7 +291,7 @@ \makeacc Agrave_dbl C ( * * 13 13 13 13 13 13 * * * * * * * * * * * * * * * * * ) \makeacc Acyrbreve U ( * 24 14 14 14 14 14 14 * * * * * * * * * * * * * * * * * ) %X2/T2: "15 endash -\makechr dash cyrdash ( c4 * 16 16 16 16 16 16 98 ce 9e 97 d6 * * * * * * * 16 16 16 * * )%lgcyrsym ec: "18 +\makechr dash cyrdash ( c4 * 16 16 16 16 16 16 98 ce 9e 97 d6 * * * * * * * * 16 16 * * )%lgcyrsym ec: "18 \makechr wordmark compwordmark ( * * 17 * 17 17 17 * * * * * * * * * * * * * * * * * * )%lgcyrsym ec: "18 \makechr pmzero perthousand ( * * 18 * 18 18 18 18 89 ca 97 8f d5 * * * * * * * * 9f 9f * * )%lgcyrsym ec: "17 \makechr Agrave_cross CYRaccrs ( * * 19 * * * * * * * * * * * * * * * * * 19 * * * * ) @@ -304,10 +306,12 @@ % \makechr No CYRNo ( fc 7d 9d * 9d 9d 9d 9d b9 fc f0 98 dc b9 f0 86 dc be 05 * * 9d 9d * 1b )%lgcyrsym \makechr currency currency ( c5 * 9e * 9e 9e 9e * a4 c8 ad 9f ff * * * * * * * * 9e 9e * * )%lgcyrsym -\makechr section textsection ( * * 9f * 9f 9f 9f 9f * * * * * * * * * * * * * * * * * )%lgcyrsym +\makechr section textsection ( * * 9f * 9f 9f 9f 9f * * * * * * fd * * * * * * * * * * )%lgcyrsym \makechr baseqq quotedblbase ( ff * bd * bd bd bd bd 84 ff 9a 96 d7 * * * * * * * * bd bd * * )%lgcyrsym ec: "12 -\makechr flqq guillemotleft ( fd 3c be * be be be be ab fd 9d 9d c7 ab ae 84 c7 84 00 * * be be * * )%lgcyrsym ec: "13 -\makechr frqq guillemotright ( fe 3e bf * bf bf bf bf bb fe 9b 9b c8 bb af 85 c8 85 01 * * bf bf * * )%lgcyrsym ec: "14 +\makechr flqq guillemotleft ( fd 3c be * be be be be ab fd 9d 9d c7 ab 9e 84 c7 84 00 * * be be * * )%lgcyrsym ec: "13 +\makechr frqq guillemotright ( fe 3e bf * bf bf bf bf bb fe 9b 9b c8 bb 9f 85 c8 85 01 * * bf bf * * )%lgcyrsym ec: "14 +%could be "c6" in lh/lcy encoding? +\makechr grqq textquotedblleft ( * * * * * * * * * * * * * * * * * * * * * * * * * )%lgcyrsym % %%% % lgocyrac: Old Slav Accents @@ -322,17 +326,17 @@ \makechr pneuac CYRpneuac ( * * * 1e * * * 1e * * * * * * * * * * * * * * * * * ) \makechr pneugr CYRpneugrav ( * * * 1f * * * 1f * * * * * * * * * * * * * * * * * ) % -\makechr tlo_c CYRrtloc ( * * * 06 * * * * * * * * * * * * * * * * 00 * * 84 * ) -\makechr tlo_d CYRrtlod ( * * * 07 * * * * * * * * * * * * * * * * 01 * * 84 * ) -\makechr tlo_o CYRrtloo ( * * * 08 * * * * * * * * * * * * * * * * 02 * * 84 * ) -\makechr tlo_g CYRrtlog ( * * * 09 * * * * * * * * * * * * * * * * 03 * * 84 * ) -\makechr tlo_r CYRrtlor ( * * * 0a * * * * * * * * * * * * * * * * 04 * * 84 * ) +\makechr tlo_c CYRrtloc ( * * * 06 * * * * * * * * * * * * * * * * 00 * * * * ) +\makechr tlo_d CYRrtlod ( * * * 07 * * * * * * * * * * * * * * * * 01 * * * * ) +\makechr tlo_o CYRrtloo ( * * * 08 * * * * * * * * * * * * * * * * 02 * * * * ) +\makechr tlo_g CYRrtlog ( * * * 09 * * * * * * * * * * * * * * * * 03 * * * * ) +\makechr tlo_r CYRrtlor ( * * * 0a * * * * * * * * * * * * * * * * 04 * * * * ) % \makechr thousands CYRthousands ( * * * 9e * * * 9e * * * * * * * * * * * * 05 * * 82 * ) \makechr accte CYRaccte ( * * * 0e * * * * * * * * * * * * * * * * 06 * * * * ) \makechr tma CYRtma ( * * * 00 * * * * * * * * * * * * * * * * 07 * * * * ) -\makechr legion CYRlegion ( * * * 01 * * * * * * * * * * * * * * * * 08 * * * * ) -\makechr leodr CYRleodr ( * * * 02 * * * * * * * * * * * * * * * * 09 * * * * ) +\makechr legion CYRlegion ( * * * 01 * * * * * * * * * * * * * * * * 08 * * 88 * ) +\makechr leodr CYRleodr ( * * * 02 * * * * * * * * * * * * * * * * 09 * * 89 * ) \makechr vran CYRvran ( * * * 03 * * * * * * * * * * * * * * * * 0a * * * * ) \makechr koloda CYRkoloda ( * * * 04 * * * * * * * * * * * * * * * * 0b * * * * ) \makechr tmatem CYRtmatem ( * * * 05 * * * * * * * * * * * * * * * * 0c * * * * ) @@ -357,8 +361,8 @@ \makechr NJE_title CYRNJETIT ( * * * * * * * * * * * * * * * * * * * * 21 * * * 7f )%lgcyrsp % % lgslav(u/l/ti) -- Unicode Old Slav -\makeCOD AZ CYRAZ ( * * * 4a * * * 80 * * * * * * * * * * * * * * * 70 41 ) -\makecod az cyraz ( * * * 6a * * * a0 * * * * * * * * * * * * * * * 71 61 ) +\makeCOD AZ CYRAZ ( * * * 4a * * * 80 * * * * * * * * * * * * * * * * 41 ) +\makecod az cyraz ( * * * 6a * * * a0 * * * * * * * * * * * * * * * * 61 ) \makeCOD I_AZ CYRIAZ ( * * * 4b * * * 81 * * * * * * * * * * * * * * * * 42 ) \makecod i_az cyriaz ( * * * 6b * * * a1 * * * * * * * * * * * * * * * * 62 ) \makeCOD L_YUS CYRLYUS ( * * * 4c * * * 82 * * * * * * * * * * * * * * * 66 43 ) @@ -414,8 +418,8 @@ \makecod vnarrow_e cyrvnarre ( * * * bc * * * * * * * * * * * * * * * * 60 * * * * ) \makeCOD ZELO CYRZELO ( * * * 86 * * * * * * * * * * * * * * * * 41 * * * 58 ) \makecod zelo cyrzelo ( * * * a6 * * * * * * * * * * * * * * * * 61 * * * 78 ) -\makeCOD VUK CYRVARUK ( * * * 87 * * * * * * * * * * * * * * * * 42 * * 78 59 ) -\makecod vuk cyrvaruk ( * * * a7 * * * * * * * * * * * * * * * * 62 * * 79 79 ) +\makeCOD VUK CYRVARUK ( * * * 87 * * * * * * * * * * * * * * * * 42 * * * 59 ) +\makecod vuk cyrvaruk ( * * * a7 * * * * * * * * * * * * * * * * 62 * * * 79 ) \makeCOD VI_A CYRVIA ( * * * 88 * * * * * * * * * * * * * * * * 43 * * * 5a ) \makecod vi_a cyrvia ( * * * a8 * * * * * * * * * * * * * * * * 63 * * * 7a ) \makeCOD VL_YUS CYRVLYUS ( * * * 89 * * * * * * * * * * * * * * * * 44 * * * * ) @@ -451,8 +455,12 @@ % %%% % lgunic(u/l/ti) -- Unicode; non-X2/T2 -\makeCOD GJE CYRGJE ( * * * * * * * * * * * * * 81 a3 * ae * * * 54 * * 03 5d ) -\makecod gje cyrgje ( * * * * * * * * * * * * * 83 f3 * af * * * 74 * * 53 7d ) +\makeCOD E_grv CYREGRV ( * * * * * * * * * * * * * * * * * * * * da * * 00 * ) +\makecod e_grv cyregrv ( * * * * * * * * * * * * * * * * * * * * fa * * 50 * ) +\makeCOD I_grv CYRIGRV ( * * * * * * * * * * * * * * * * * * * * db * * 0d * ) +\makecod i_grv cyrigrv ( * * * * * * * * * * * * * * * * * * * * fb * * 5d * ) +\makeCOD GJE CYRGJE ( * * * * * * * * * * * * * 81 a3 * ae * * * 54 * * 03 * ) +\makecod gje cyrgje ( * * * * * * * * * * * * * 83 f3 * af * * * 74 * * 53 * ) \makeCOD KJE CYRKJE ( * * * * * * * * * * * * * 8d ac * cd * * * 55 * * 0c * ) \makecod kje cyrkje ( * * * * * * * * * * * * * 9d fc * ce * * * 75 * * 5c * ) \makeCOD ZH_brv CYRZHBRV ( * * * * * * * * * * * * * * * * * * * * 56 * * c1 * ) @@ -478,6 +486,10 @@ \makecod o_uml cyrouml ( * * * * * * * * * * * * * * * * * * * * 7f * * e7 * ) \makeCOD OTLD_uml CYROTLDUML ( * * * * * * * * * * * * * * * * * * * * 80 * * ea * ) \makecod otld_uml cyrotlduml ( * * * * * * * * * * * * * * * * * * * * a0 * * eb * ) +\makeCOD EREV_uml CYREREVUML ( * * * * * * * * * * * * * * * * * * * * 91 * * ec * ) +\makecod erev_uml cyrerevuml ( * * * * * * * * * * * * * * * * * * * * b1 * * ed * ) +\makeCOD UKRE_uml CYRUKREUML ( * * * * * * * * * * * * * * * * * * * * d9 * * * * ) +\makecod ukre_uml cyrukreuml ( * * * * * * * * * * * * * * * * * * * * f9 * * * * ) \makeCOD U_bar CYRUBAR ( * * * * * * * * * * * * * * * * * * * * 81 * * ee * ) \makecod u_bar cyrubar ( * * * * * * * * * * * * * * * * * * * * a1 * * ef * ) % @@ -495,15 +507,15 @@ \makecod lat_i_dsc cyrukridsc ( * * * * * * * * * * * * * * * * * * * * a6 * * * * ) \makeCOD VG_hcrs CYRVGHCRS ( * * * * * * * * * * * * * * * * * * * * 87 * * * * ) \makecod Vg_hcrs cyrvghcrs ( * * * * * * * * * * * * * * * * * * * * a7 * * * * ) -\makeCOD VDZHE CYRVDZHE ( * * * * * * * * * * * * * * * * * * * * 88 * * * 40 ) -\makecod Vdzhe cyrvdzhe ( * * * * * * * * * * * * * * * * * * * * a8 * * * 60 ) -% -\makechr Vy CYRVy ( * * * * * * * * * * * * * * * * * * * * 28 * * * 40 ) -\makechr Vy_bar cyrvbar ( * * * * * * * * * * * * * * * * * * * * 29 * * * 60 ) -\makechr Vy_hcrs cyrvhcrs ( * * * * * * * * * * * * * * * * * * * * 2a * * * 60 ) -\makechr Vg cyrvg ( * * * * * * * * * * * * * * * * * * * * 2b * * * 60 ) -\makechr Vp cyrvp ( * * * * * * * * * * * * * * * * * * * * 2c * * * 60 ) -\makechr Vt cyrvt ( * * * * * * * * * * * * * * * * * * * * 2d * * * 60 ) +\makeCOD VDZHE CYRVDZHE ( * * * * * * * * * * * * * * * * * * * * 88 * * * 5d ) +\makecod Vdzhe cyrvdzhe ( * * * * * * * * * * * * * * * * * * * * a8 * * * 7d ) +% +\makechr Vy CYRVy ( * * * * * * * * * * * * * * * * * * * * 28 * * * 5e ) +\makechr Vy_bar cyrvbar ( * * * * * * * * * * * * * * * * * * * * 29 * * * 7e ) +\makechr Vy_hcrs cyrvhcrs ( * * * * * * * * * * * * * * * * * * * * 2a * * * 1c ) +\makechr Vg cyrvg ( * * * * * * * * * * * * * * * * * * * * 2b * * * 1d ) +\makechr Vp cyrvp ( * * * * * * * * * * * * * * * * * * * * 2c * * * 1e ) +\makechr Vt cyrvt ( * * * * * * * * * * * * * * * * * * * * 2d * * * 1f ) %%% % lgcacc(u/l/ti) \makeCOD A_bar CYRABAR ( * * * * * * * * * * * * * * * * * * * * 89 * * * * ) @@ -523,8 +535,6 @@ \makecod u_com cyrucom ( * * * * * * * * * * * * * * * * * * * * af * * * * ) \makeCOD ERY_bar CYRERYBAR ( * * * * * * * * * * * * * * * * * * * * 90 * * * * ) \makecod ery_bar cyrerybar ( * * * * * * * * * * * * * * * * * * * * b0 * * * * ) -\makeCOD EREV_uml CYREREVUML ( * * * * * * * * * * * * * * * * * * * * 91 * * * * ) -\makecod erev_uml cyrerevuml ( * * * * * * * * * * * * * * * * * * * * b1 * * * * ) \makeCOD EREV_bar CYREREVBAR ( * * * * * * * * * * * * * * * * * * * * 92 * * * * ) \makecod erev_bar cyrerevbar ( * * * * * * * * * * * * * * * * * * * * b2 * * * * ) \makeCOD EREV_dot CYREREVDOT ( * * * * * * * * * * * * * * * * * * * * 93 * * * * ) diff --git a/Master/texmf-dist/source/fonts/lh/tex/fntaddcm.tex b/Master/texmf-dist/source/fonts/lh/tex/fntaddcm.tex new file mode 100644 index 00000000000..5705d0b3556 --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/fntaddcm.tex @@ -0,0 +1,31 @@ +\ifSliTeX +%SliTeX fonts +\begingroup +\MFJobheadfalse % don't create MFJob head from this point +\MakeFileHeadstrue % Create font file headers ? +\def\fontfile{fntinvcm}% list of SliTeX font headers for CM-like fonts +\def\jifont{i} +\input cfstdedt % creates font headers; batch and mfjob files +\endgroup +\fi + +\ifConcrete % concrete fonts +\begingroup +\MFJobheadfalse +\MakeFileHeadstrue +\def\fontfile{fntconcm}% list of concrete font headers for CM-like fonts +\def\jifont{c} +\input cfstdedt +\endgroup +\fi + +\ifCMBright % CM Bright fonts +\begingroup +\MFJobheadfalse +\MakeFileHeadstrue +\def\fontfile{fntbricm}% list of CM Bright font headers for CM-like fonts +\def\jifont{b} +\input cfstdedt +\endgroup +\fi +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/source/fonts/lh/tex/fntaddec.tex b/Master/texmf-dist/source/fonts/lh/tex/fntaddec.tex new file mode 100644 index 00000000000..b9c5d3a521f --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/fntaddec.tex @@ -0,0 +1,31 @@ +\ifSliTeX +%SliTeX fonts +\begingroup +\MFJobheadfalse % don't create MFJob head from this point +\MakeFileHeadstrue % Create font file headers ? +\def\fontfile{fntinvec}% list of SliTeX font headers for EC-like fonts +\def\jifont{i} +\input cfstdedt % creates font headers; batch and mfjob files +\endgroup +\fi + +\ifConcrete % concrete fonts +\begingroup +\MFJobheadfalse +\MakeFileHeadstrue +\def\fontfile{fntconec}% list of concrete font headers for EC-like fonts +\def\jifont{c} +\input cfstdedt +\endgroup +\fi + +\ifCMBright % CM Bright fonts +\begingroup +\MFJobheadfalse +\MakeFileHeadstrue +\def\fontfile{fntbriec}% list of CM Bright font headers for EC-like fonts +\def\jifont{b} +\input cfstdedt +\endgroup +\fi +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntallcm.tex b/Master/texmf-dist/source/fonts/lh/tex/fntallcm.tex index 5e7d0f31e6e..717f90cb056 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntallcm.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/fntallcm.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,11 +18,11 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) % file names depend to necessary encoding % - \tablevalues ( 5 6 7 8 9 10 12 17.28[17] ) + \tablevalues ( 5 6 7 8 9 10 12 17.28[17] ) \makefont \fonttwoletters r ( 5 6 7 8 9 10 12 17.28[17] )() \makefont \fonttwoletters sl ( 8 9 10 12 )() @@ -48,3 +48,4 @@ \makefont \fonttwoletters bxti ( 10 )() \makefont \fonttwoletters csc ( 8 9 10 )() \makefont \fonttwoletters tcsc ( 10 )() + \makefont \fonttwoletters tex ( 8 9 10 )() diff --git a/Master/texmf-dist/source/fonts/lh/tex/fntallec.tex b/Master/texmf-dist/source/fonts/lh/tex/fntallec.tex new file mode 100644 index 00000000000..2bbcdd3a300 --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/fntallec.tex @@ -0,0 +1,170 @@ +% +% fntallec.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Data TeX file of head files for ec-like fonts: full assortment +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\lhvercheck(3,5) + +% file names depend to necessary encoding +% + \tablevalues ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] + 29.86[2986] 35.83[3583]) + + \makefont\fonttwoletters rm %cmr + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters sl %cmsl + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters bx %cmbx + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters bl %cmbxsl + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters rb %cmb + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters ti %cmti + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters ui %cmu + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters bi %cmbxti + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters cc %csc + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters xc %bx/csc + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters sc %sl/csc + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters oc %/bx/sl/csc + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters ci % + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters tt %cmtt + (% 5[0500] 6[0600] 7[0700] + 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters it %cmitt + (% 5[0500] 6[0600] 7[0700] + 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters vt %cmvtt + (% 5[0500] 6[0600] 7[0700] + 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters vi %vtt\it + (% 5[0500] 6[0600] 7[0700] + 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters tc %cmtcsc + (% 5[0500] 6[0600] 7[0700] + 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters st % + (% 5[0500] 6[0600] 7[0700] + 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters ss %cmss + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters si %cmssi + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters sx %cmssbx + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() + \makefont\fonttwoletters so % + ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] + 10[1000] 10.95[1095] 12[1200] 14.4[1440] + 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] + 35.83[3583])() +% \makefont\fonttwoletters ff %cmff +% ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] +% 10[1000] 10.95[1095] 12[1200] 14.4[1440] +% 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] +% 35.83[3583])() +% \makefont\fonttwoletters fi %cmfi +% ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] +% 10[1000] 10.95[1095] 12[1200] 14.4[1440] +% 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] +% 35.83[3583])() +% \makefont\fonttwoletters fb %cmfib +% ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] +% 10[1000] 10.95[1095] 12[1200] 14.4[1440] +% 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] +% 35.83[3583])() +% \makefont\fonttwoletters dh %cmdh +% ( 5[0500] 6[0600] 7[0700] 8[0800] 9[0900] +% 10[1000] 10.95[1095] 12[1200] 14.4[1440] +% 17.28[1728] 20.74[2074] 24.88[2488] 29.86[2986] +% 35.83[3583])() diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntbasec.tex b/Master/texmf-dist/source/fonts/lh/tex/fntbasec.tex index efeb6684647..39472e10570 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntbasec.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/fntbasec.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) % file names depend to necessary encoding % diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntbercm.tex b/Master/texmf-dist/source/fonts/lh/tex/fntbercm.tex index 6569faed9db..0b571bbc44e 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntbercm.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/fntbercm.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,11 +18,11 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) % file names depend to necessary encoding - \tablevalues ( 7 10 12 ) + \tablevalues ( 7 10 12 ) \makefont \fonttwoletters r ( 7 10 12 )() \makefont \fonttwoletters sl ( 10 12 )() diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntberec.tex b/Master/texmf-dist/source/fonts/lh/tex/fntberec.tex index bf2cf7812f1..5a9d58fe578 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntberec.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/fntberec.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,23 +18,23 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) - \tablevalues ( 7[0700] 10[1000] 12[1200] 14[1440]) + \tablevalues ( 7[0700] 10[1000] 12[1200] 14[1440]) \makefont\fonttwoletters rm %cmr - ( 7[0700] 10[1000] 12[1200] 14[1440])() + ( 7[0700] 10[1000] 12[1200] 14[1440])() \makefont\fonttwoletters sl %cmsl - ( 10[1000] 14[1440])() + ( 10[1000] 14[1440])() \makefont\fonttwoletters bx %cmbx - ( 10[1000] 14[1440])() + ( 10[1000] 14[1440])() \makefont\fonttwoletters ti %cmti - ( 10[1000] 14[1440])() + ( 10[1000] 14[1440])() \makefont\fonttwoletters cc %csc - ( 10[1000] 14[1440])() + ( 10[1000] 14[1440])() \makefont\fonttwoletters tt %cmtt - ( 10[1000] 14[1440])() + ( 10[1000] 14[1440])() \makefont\fonttwoletters ss %cmss - ( 10[1000] 14[1440])() + ( 10[1000] 14[1440])() \makefont\fonttwoletters sx %cmssbx - ( 10[1000] 14[1440])() + ( 10[1000] 14[1440])() diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntbricm.tex b/Master/texmf-dist/source/fonts/lh/tex/fntbricm.tex index 7f9f14962a3..9eec9cad99a 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntbricm.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/fntbricm.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko +% Version 3.5 // Patchlevel=0 +% (c) V.Volovich % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,12 +18,12 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) % file names depend to necessary encoding % \MakeFileHeadstrue % always do font heads - \tablevalues ( 8 9 10 17 ) + \tablevalues ( 8 9 10 17 ) \makefont \fonttwoletters br ( 8 9 10 17 )() \makefont \fonttwoletters brsl ( 8 9 10 17 )() \makefont \fonttwoletters brbx ( 10 )() diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntbriec.tex b/Master/texmf-dist/source/fonts/lh/tex/fntbriec.tex index 5c1b5c35684..0333a3f86c6 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntbriec.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/fntbriec.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 -% (c) O.Lapko +% Version 3.5 // Patchlevel=0 +% (c) V.Volovich % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,25 +18,25 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) % file names depend to necessary encoding % \MakeFileHeadstrue % always do font heads - \tablevalues ( 8 9 10 17 ) + \tablevalues ( 8 9 10 17 ) \makefont \fonttwoletters bmr ( 8 9 10 17 )(% - input ebbase;) + ebbase:=1;) \makefont \fonttwoletters bmo ( 8 9 10 17 )(% - input ebbase;) + ebbase:=1;) \makefont \fonttwoletters bsr ( 8 9 10 17 )(% - input ebbase;) + ebbase:=1;) \makefont \fonttwoletters bso ( 8 9 10 17 )(% - input ebbase;) + ebbase:=1;) \makefont \fonttwoletters bbx ( 10 )(% - input ebbase;) + ebbase:=1;) \makefont \fonttwoletters btl ( 10 )(% - input exbase; def cmbright=true enddef;) + ebbase:=0; def cmbright=true enddef;) \makefont \fonttwoletters bto ( 10 )(% - input exbase; def cmbright=true enddef;) + ebbase:=0; def cmbright=true enddef;) \endinput diff --git a/Master/texmf-dist/source/fonts/lh/tex/fntconcm.tex b/Master/texmf-dist/source/fonts/lh/tex/fntconcm.tex new file mode 100644 index 00000000000..f8ac69a25a0 --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/fntconcm.tex @@ -0,0 +1,48 @@ +% +% fntconcm.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) V.Volovich +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Data TeX file of head files for cm-like fonts: concrete fonts +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\lhvercheck(3,5) + +% file names depend to necessary encoding +% +\MakeFileHeadstrue % always do font heads + \tablevalues ( 5 6 7 8 9 10 ) + + \makefont \fonttwoletters cr ( 5 6 7 8 9 10 )(% + def concrete=true enddef;) + \makefont \fonttwoletters csl ( 9 10 )(% + def concrete=true enddef;) + \makefont \fonttwoletters cslc ( 9 )(% + def concrete=true enddef;) + \makefont \fonttwoletters cti ( 10 )(% + def concrete=true enddef;) + \makefont \fonttwoletters ccsc ( 10 )(% + def concrete=true enddef;) +% +% font headers for bold fonts with concrete letter shapes + \makefont \fonttwoletters cb ( 10 )(% + def concrete=true enddef;) + \makefont \fonttwoletters cbx ( 5 6 7 8 9 10 )(% + def concrete=true enddef;) + \makefont \fonttwoletters cbxsl ( 10 )(% + def concrete=true enddef;) + \makefont \fonttwoletters cbxti ( 10 )(% + def concrete=true enddef;) +\endinput diff --git a/Master/texmf-dist/source/fonts/lh/tex/fntconec.tex b/Master/texmf-dist/source/fonts/lh/tex/fntconec.tex new file mode 100644 index 00000000000..4752fb5606c --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/fntconec.tex @@ -0,0 +1,48 @@ +% +% fntconec.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) V.Volovich +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Data TeX file of head files for ec-like fonts: concrete fonts +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\lhvercheck(3,5) + +% file names depend to necessary encoding +% +\MakeFileHeadstrue % always do font heads + \tablevalues ( 5 6 7 8 9 10 ) + + \makefont \fonttwoletters orm ( 5 6 7 8 9 10 )(% + def concrete=true enddef;) + \makefont \fonttwoletters osl ( 5 6 7 8 9 10 )(% + def concrete=true enddef;) + \makefont \fonttwoletters oslc ( 9 )(% + def concrete=true enddef;) + \makefont \fonttwoletters oti ( 10 )(% + def concrete=true enddef;) + \makefont \fonttwoletters occ ( 10 )(% + def concrete=true enddef;) +% +% font headers for bold fonts with concrete letter shapes + \makefont \fonttwoletters ob ( 10 )(% + def concrete=true enddef;) + \makefont \fonttwoletters obx ( 5 6 7 8 9 10 )(% + def concrete=true enddef;) + \makefont \fonttwoletters obxsl ( 10 )(% + def concrete=true enddef;) + \makefont \fonttwoletters obxti ( 10 )(% + def concrete=true enddef;) +\endinput diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntinvcm.tex b/Master/texmf-dist/source/fonts/lh/tex/fntinvcm.tex index a3ce5eae2ef..5814a50fb5c 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntinvcm.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/fntinvcm.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,34 +18,34 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) % file names depend to necessary encoding % \MakeFileHeadstrue % always do font heads - \tablevalues ( 8 10 ) + \tablevalues ( 8 10 ) \def\ifont{l} \makefont \ifont\fonttwoletters ss ( 8 )(% - def fonteq=3 enddef;) + def fonteq=3 enddef;) \makefont \ifont\fonttwoletters ssb ( 8 )(% - def fonteq=3 enddef;) + def fonteq=3 enddef;) \makefont \ifont\fonttwoletters ssi ( 8 )(% - def fonteq=3 enddef;) + def fonteq=3 enddef;) \def\ifont{i} % there could be an error in old versions of icmcsc10.mf: % in corrected file the line: extra_endchar := extra_endchar & "clearit"; % must stay BEFORE line: generate csc % switch to the driver file \makefont \ifont\fonttwoletters csc ( 10 )(% - def fonteq=3 enddef;) + def fonteq=3 enddef;) \makefont \ifont\fonttwoletters tt ( 8 )(% - def fonteq=3 enddef;) + def fonteq=3 enddef;) \def\ifont{il} \makefont \ifont\fonttwoletters ss ( 8 )(% - def fonteq=4 enddef;) + def fonteq=4 enddef;) \makefont \ifont\fonttwoletters ssb ( 8 )(% - def fonteq=4 enddef;) + def fonteq=4 enddef;) \makefont \ifont\fonttwoletters ssi ( 8 )(% - def fonteq=4 enddef;) + def fonteq=4 enddef;) \endinput diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntinvec.tex b/Master/texmf-dist/source/fonts/lh/tex/fntinvec.tex index 71249aac445..ab16a64f338 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntinvec.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/fntinvec.tex @@ -18,12 +18,12 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) % file names depend to necessary encoding % \MakeFileHeadstrue % always do font heads - \tablevalues ( 8 10 ) + \tablevalues ( 8 10 ) \def\ifont{} \makefont \ifont\fonttwoletters lq ( 8 )() @@ -44,14 +44,14 @@ \def\ifont{i} \makefont \ifont\fonttwoletters lq ( 8 )(% - def fonteq=3 enddef;) + def fonteq=3 enddef;) \makefont \ifont\fonttwoletters li ( 8 )(% - def fonteq=3 enddef;) + def fonteq=3 enddef;) \makefont \ifont\fonttwoletters lb ( 8 )(% - def fonteq=3 enddef;) + def fonteq=3 enddef;) \makefont \ifont\fonttwoletters lo ( 8 )(% - def fonteq=3 enddef;) + def fonteq=3 enddef;) \makefont \ifont\fonttwoletters ltt ( 8 )(% - def fonteq=3 enddef;) + def fonteq=3 enddef;) \endinput diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntmincm.tex b/Master/texmf-dist/source/fonts/lh/tex/fntmincm.tex index bec96c650f8..fea687c38a6 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntmincm.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/fntmincm.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,11 +18,11 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) % file names depend to necessary encoding % - \tablevalues ( 8 10 ) + \tablevalues ( 8 10 ) \makefont \fonttwoletters r ( 10 )() \makefont \fonttwoletters sl ( 10 )() diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fntminec.tex b/Master/texmf-dist/source/fonts/lh/tex/fntminec.tex index 9be59e72ba3..27e782fd36b 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/fntminec.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/fntminec.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) % file names depend to necessary encoding @@ -28,56 +28,56 @@ 29.86[2986] 35.83[3583]) \makefont\fonttwoletters rm %cmr - ( 10[1000] 14.4[1440] )() + ( 10[1000] 14.4[1440] )() \makefont\fonttwoletters sl %cmsl - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters bx %cmbx - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters bl %cmbxsl - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters rb %cmb - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters ti %cmti - ( 10[1000] 14.4[1440] )() + ( 10[1000] 14.4[1440] )() \makefont\fonttwoletters ui %cmu - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters bi %cmbxti - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters cc %csc - ( 10[1000] 14.4[1440] )() + ( 10[1000] 14.4[1440] )() \makefont\fonttwoletters xc %bx/csc - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters sc %sl/csc - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters oc %/bx/sl/csc - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters ci % - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters tt %cmtt - ( 10[1000] 14.4[1440] )() + ( 10[1000] 14.4[1440] )() \makefont\fonttwoletters it %cmitt - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters vt %cmvtt - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters vi %vtt\it - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters tc %cmtcsc - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters st % - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters ss %cmss - ( 10[1000] 14.4[1440] )() + ( 10[1000] 14.4[1440] )() \makefont\fonttwoletters si %cmssi - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters sx %cmssbx - ( 10[1000] )() + ( 10[1000] )() \makefont\fonttwoletters so % - ( 10[1000] )() + ( 10[1000] )() % \makefont\fonttwoletters ff %cmff -% ( 10[1000] )() +% ( 10[1000] )() % \makefont\fonttwoletters fi %cmfi -% ( 10[1000] )() +% ( 10[1000] )() % \makefont\fonttwoletters fb %cmfib -% ( 10[1000] )() +% ( 10[1000] )() \makefont\fonttwoletters dh %cmdh - ( 10[1000] )() + ( 10[1000] )() diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fnttstcm.tex b/Master/texmf-dist/source/fonts/lh/tex/fnttstcm.tex index f93e29c6a41..3da8954f8b3 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/fnttstcm.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/fnttstcm.tex @@ -1,16 +1,16 @@ % -% fntmincm.tex +% fnttstcm.tex % %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,11 +18,11 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) % file names depend to necessary encoding % - \tablevalues ( 8 10 ) + \tablevalues ( 8 10 ) \makefont \fonttwoletters r ( 10 )() \makefont \fonttwoletters sl ( 10 )() diff --git a/Master/texmf-dist/doc/fonts/lh/tex/fnttstec.tex b/Master/texmf-dist/source/fonts/lh/tex/fnttstec.tex index 5a503fd4983..dfa7cb276cb 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/fnttstec.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/fnttstec.tex @@ -1,16 +1,16 @@ % -% beresec.tex +% fnttstec.tex % %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,21 +18,21 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) - \tablevalues ( 10[1000]) + \tablevalues ( 10[1000]) \makefont\fonttwoletters rm %cmr - ( 10[1000])() + ( 10[1000])() \makefont\fonttwoletters sl %cmsl - ( 10[1000])() + ( 10[1000])() \makefont\fonttwoletters bx %cmbx - ( 10[1000])() + ( 10[1000])() \makefont\fonttwoletters ti %cmti - ( 10[1000])() + ( 10[1000])() \makefont\fonttwoletters cc %csc - ( 10[1000])() + ( 10[1000])() \makefont\fonttwoletters tt %cmtt - ( 10[1000])() + ( 10[1000])() \makefont\fonttwoletters ss %cmss - ( 10[1000])() + ( 10[1000])() diff --git a/Master/texmf-dist/doc/fonts/lh/tex/likerdat.tex b/Master/texmf-dist/source/fonts/lh/tex/likerdat.tex index b21b8c8e477..b6b648b9f75 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/likerdat.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/likerdat.tex @@ -4,21 +4,21 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % -% Data TeX file for liker files except lower part of csc ligs & kerns +% Data TeX file for *liker files except lower part of csc ligs & kerns % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) % ligatures and kerning for Cyrillic fonts % @@ -26,7 +26,7 @@ \begingroup \obeyspaces\catcode`\^^M=\active\newlinechar=`\^^M \wl{% -% ligatures for cyrillic quotes +% ligatures for Cyrillic quotes beginligtable labelchar ([ASCII"["]); setlig ([ASCII"["],CYR_.flqq); % "<<" @@ -242,33 +242,33 @@ endligtable; \beginligtable %A - \labelchar {\<bup_>} - \setcern [k#] {\<K> } - \labelchar {\<A_> - \WL{if serifs:} + \labelchar {\<bup_>} + \setcern [k#] {\<K> } + \labelchar {\<A_> + \WL{if serifs:} \<R_> \WL{fi} - } + } % % - \setcern [k#] {\<O> \<_C>} - \setcern [kk#] {\<_T> \<_P> \<Y> \<eh>} + \setcern [k#] {\<O> \<_C>} + \setcern [kk#] {\<_T> \<_P> \<Y> \<eh>} \WL{if serifs:} - \setcern [kk#] {\<YV>} - \setcern [kkk#] {\<V>} + \setcern [kk#] {\<YV>} + \setcern [kkk#] {\<V>} \WL{else:} - \setcern [k#] {\<YV>} - \setcern [kk#] {\<V>} + \setcern [k#] {\<YV>} + \setcern [kk#] {\<V>} \WL{fi} \WL{if not TITLEfont:} \WL{\|if SmallCapsfont:} \setcern [k#] {\<o> \<Osc> \(s)\<_c> \<_Plo>} \setcern [kk#] {\<_Tlo> \<_Tsc> \<y> \<ehl>} - \setcern [kkk#] {\<v>} + \setcern [kkk#] {\<v>} \WL{\|elseif ROMANfont:} - \setcern [k#] {\<_Tlo>} - \setcern [kk#] {\<_Plo>} + \setcern [k#] {\<_Tlo>} + \setcern [kk#] {\<_Plo>} \WL{\|else:} - \setcern [k#] {\<Tit> \<vit> \<nit> \(ukr_i) \<iit> \<uit> \<yit>} + \setcern [k#] {\<Tit> \<vit> \<nit> \(ukr_i) \<iit> \<uit> \<yit>} \WL{\|fi} \WL{fi} \endligtable @@ -283,23 +283,23 @@ endligtable; setlig([ASCII "J"],CYR_.DJE); setlig([ASCII "j"],CYR_.DJE);} % \setcern [k#] {\<O> \<_C>} - \setcern [kk#] {\<_T> \<_P> \<Y> \<eh>} + \setcern [kk#] {\<_T> \<_P> \<Y> \<eh>} \WL{\|if serifs:} - \setcern [kk#] {\<YV>} - \setcern [kkk#] {\<V>} + \setcern [kk#] {\<YV>} + \setcern [kkk#] {\<V>} \WL{\|else:} - \setcern [k#] {\<YV>} - \setcern [kk#] {\<V>} + \setcern [k#] {\<YV>} + \setcern [kk#] {\<V>} \WL{\|fi} \WL{\|if not TITLEfont:} \WL{\|\|if SmallCapsfont:} \setcern [k#] {\<o> \<Osc> \(s)\<_c> \<_Plo>} \setcern [kk#] {\<_Tlo> \<_Tsc> \<y> \<ehl>} - \setcern [kkk#] {\<v>} + \setcern [kkk#] {\<v>} \WL{\|\|elseif ROMANfont:} - \setcern [k#] {\<_Plo> \<_Tlo>} + \setcern [k#] {\<_Plo> \<_Tlo>} \WL{\|\|else:} - \setcern [k#] {\<Tit> \<vit> \<nit> \(ukr_i) \<iit> \<uit> \<yit>} + \setcern [k#] {\<Tit> \<vit> \<nit> \(ukr_i) \<iit> \<uit> \<yit>} \WL{\|\|fi} \WL{\|fi} \endligtable @@ -309,24 +309,24 @@ endligtable; setlig([ASCII "1"],CYR_.LJE); setlig([ASCII "J"],CYR_.LJE);^^J\.\|\|\|% setlig([ASCII "j"],CYR_.LJE);} % - \setcern [k#] {\<O> \<_C>} - \setcern [kk#] {\<_T> \<_P> \<Y> \<eh>} + \setcern [k#] {\<O> \<_C>} + \setcern [kk#] {\<_T> \<_P> \<Y> \<eh>} \WL{if serifs:} - \setcern [kk#] {\<YV>} - \setcern [kkk#] {\<V>} + \setcern [kk#] {\<YV>} + \setcern [kkk#] {\<V>} \WL{else:} - \setcern [k#] {\<YV>} - \setcern [kk#] {\<V>} + \setcern [k#] {\<YV>} + \setcern [kk#] {\<V>} \WL{fi} \WL{if not TITLEfont:} \WL{\|if SmallCapsfont:} \setcern [k#] {\<o> \<Osc> \(s)\<_c> \<_Plo>} \setcern [kk#] {\<_Tlo> \<_Tsc> \<y> \<ehl>} - \setcern [kkk#] {\<v>} + \setcern [kkk#] {\<v>} \WL{\|elseif ROMANfont:} - \setcern [k#] {\<_Plo> \<_Tlo>} + \setcern [k#] {\<_Plo> \<_Tlo>} \WL{\|else:} - \setcern [k#] {\<Tit> \<vit> \<nit> \(ukr_i) \<iit> \<uit> \<yit>} + \setcern [k#] {\<Tit> \<vit> \<nit> \(ukr_i) \<iit> \<uit> \<yit>} \WL{\|fi} \WL{fi} \endligtable @@ -338,18 +338,18 @@ endligtable; %2u \beginligtable %K \labeligchar{K}{%"K" - setlig([ASCII "H"],CYR_.H); setlig([ASCII "h"],CYR_.H);} + setlig([ASCII "H"],CYR_.H); setlig([ASCII "h"],CYR_.H);} % \labelchar {\<K_>} % % - \setcern [k#] {\<O> \<_C> \<eh>} + \setcern [k#] {\<O> \<_C> \<eh>} \WL{if not TITLEfont:} \WL{\|if SmallCapsfont:} \setcern [k#] {\<o> \<Osc> \(s)\<_c> \<ehl>} \WL{\|else:} - \setcern [k#] {\<_Plo>} + \setcern [k#] {\<_Plo>} \WL{\|\|if ROMANfont:} - \setcern [k#] {\<_Tlo>} + \setcern [k#] {\<_Tlo>} \WL{\|\|fi} \WL{\|fi} \WL{fi} @@ -357,34 +357,34 @@ endligtable; %3u \beginligtable %O - \labelchar {\<O> \<O_> \<C_>} + \labelchar {\<O> \<O_> \<C_>} % % - \setcern [k#] {\<_A> - \WL{if concrete:} + \setcern [k#] {\<_A> + \WL{if concrete:} \(D)\(L) - \WL{else:} + \WL{else:} \(D) - \WL{fi} + \WL{fi} \<K> \<Y> \<YV> \<V> - \WL{if serifs:} + \WL{if serifs:} \<_R> \WL{fi} - } + } \WL{if not TITLEfont:} \WL{\|if SmallCapsfont:} - \setcern [k#] {\<_Alo> \<_Asc> - \WL{if concrete:} + \setcern [k#] {\<_Alo> \<_Asc> + \WL{if concrete:} \(d) \(l) - \WL{else:} + \WL{else:} \<_Jlo> - \WL{fi} + \WL{fi} \<k> \<y> \<v> - \WL{if serifs:} + \WL{if serifs:} \<_Rlo> \WL{fi} - } + } \WL{\|elseif ROMANfont:} - \setcern [k#] {\<_Alo>} + \setcern [k#] {\<_Alo>} \WL{\|fi} \WL{fi} \endligtable @@ -392,45 +392,45 @@ endligtable; %4u \beginligtable %T \labeligchar{T}{%"T" - setlig([ASCII "S"],CYR_.C); setlig([ASCII "s"],CYR_.C);} + setlig([ASCII "S"],CYR_.C); setlig([ASCII "s"],CYR_.C);} % - \labelchar {\<T_>} + \labelchar {\<T_>} % % - \setcern [kk#] {\<_A> \WL{if concrete:} + \setcern [kk#] {\<_A> \WL{if concrete:} \(D) \(L) - \WL{else:} + \WL{else:} \(D) - \WL{fi} - \WL{if serifs:} + \WL{fi} + \WL{if serifs:} \<_R> \WL{fi} - } + } \WL{if not concrete:} \WL{\|if serifs:} - \setcern [k#] {\<_J>} + \setcern [k#] {\<_J>} \WL{\|else:} - \setcern [-u#] {\<_J>} + \setcern [-u#] {\<_J>} \WL{\|fi} \WL{fi} \WL{if not TITLEfont:} \WL{\|if SmallCapsfont:} - \setcern [kk#] {\<_Alo> \<_Asc> - \WL{if concrete:} + \setcern [kk#] {\<_Alo> \<_Asc> + \WL{if concrete:} \(d) \(l) - \WL{else:} + \WL{else:} \<_Jlo> - \WL{fi} + \WL{fi} \<k> \<y> \<v> - \WL{if serifs:} + \WL{if serifs:} \<_Rlo> \WL{fi} - } + } \WL{\|else:} \setcern [kk#] {\<a> \<o> \(e)\<e> \(s)\<_c> \<_q> \<ehl>} \WL{\|\|if ROMANfont:} \setcern [kk#] {\<_Jlo> \<_Rlo> \<_Alo>} \WL{\|\|else:} - \setcern [kk#]{\<uit> \<yit> \<vit> \<Tit> \<Jit>} + \setcern [kk#]{\<uit> \<yit> \<vit> \<Tit> \<Jit>} \WL{\|\|fi} \WL{\|fi} \WL{\|if altcoding:}%restored @@ -442,45 +442,45 @@ endligtable; \endligtable \beginligtable %G_up%!!! - \labelchar {\(G_up)} + \labelchar {\(G_up)} % % \setcern [kk#] {\<_A> - \WL{if concrete:} + \WL{if concrete:} \(D) \(L) - \WL{else:} + \WL{else:} \(D) - \WL{fi} - \WL{if serifs:} + \WL{fi} + \WL{if serifs:} \<_R> \WL{fi} - } - \setcern [k#] {\<O> \<_C>}%!!! + } + \setcern [k#] {\<O> \<_C>}%!!! \WL{if not concrete:} \WL{\|if serifs:} - \setcern [k#] {\<_J>} + \setcern [k#] {\<_J>} \WL{\|else:} - \setcern [-u#] {\<_J>} + \setcern [-u#] {\<_J>} \WL{\|fi} \WL{fi} \WL{if not TITLEfont:} \WL{\|if SmallCapsfont:} - \setcern [kk#] {\<_Alo> \<_Asc> - \WL{if concrete:} + \setcern [kk#] {\<_Alo> \<_Asc> + \WL{if concrete:} \(d) \(l) - \WL{else:} + \WL{else:} \<_Jlo> - \WL{fi} + \WL{fi} \<k> \<y> \<v> - \WL{if serifs:} + \WL{if serifs:} \<_Rlo> \WL{fi} - } + } \WL{\|else:} \setcern [kk#] {\<a> \<o> \(e)\<e> \(s)\<_c> \<_q> \<ehl>} \WL{\|\|if ROMANfont:} - \setcern [kk#] {\<_Jlo> \<_Rlo> \<_Alo>} + \setcern [kk#] {\<_Jlo> \<_Rlo> \<_Alo>} \WL{\|\|else:} - \setcern [kkk#] {\<uit> \<yit> \<vit> \<Tit> \<Jit>} + \setcern [kkk#] {\<uit> \<yit> \<vit> \<Tit> \<Jit>} \WL{\|\|fi} \WL{\|fi} \WL{\|if altcoding:}%restored @@ -492,44 +492,44 @@ endligtable; \endligtable \beginligtable %Y - \labelchar {\<Y>} + \labelchar {\<Y>} % % - \setcern [kk#] {\<_A> - \WL{if concrete:} + \setcern [kk#] {\<_A> + \WL{if concrete:} \(D) \(L) - \WL{else:} + \WL{else:} \(D) - \WL{fi} - \WL{if serifs:} + \WL{fi} + \WL{if serifs:} \<_R> \WL{fi} - } + } \WL{if not concrete:} - \setcern [-u#] {\<_J>} + \setcern [-u#] {\<_J>} \WL{fi} \WL{if not TITLEfont:} \WL{\|if SmallCapsfont:} - \setcern [kk#] {\<_Alo> \<_Asc> - \WL{if concrete:} + \setcern [kk#] {\<_Alo> \<_Asc> + \WL{if concrete:} \(d) \(l) - \WL{else:} + \WL{else:} \<_Jlo> - \WL{fi} + \WL{fi} \<k> \<y> \<v> - \WL{if serifs:} + \WL{if serifs:} \<_Rlo> \WL{fi} - } + } \WL{\|else:} - \setcern [kk#] {\<a> \<o> \(e)\<e> \<ehl>} + \setcern [kk#] {\<a> \<o> \(e)\<e> \<ehl>} \WL{\|\|if ROMANfont:} \WL{\|\|\|if serifs:} - \setcern [kkk#] {\<_Jlo> \<_Rlo> \<_Alo>} + \setcern [kkk#] {\<_Jlo> \<_Rlo> \<_Alo>} \WL{\|\|\|else:} - \setcern [kk#] {\<_Jlo> \<_Rlo> \<_Alo>} + \setcern [kk#] {\<_Jlo> \<_Rlo> \<_Alo>} \WL{\|\|\|fi} \WL{\|\|else:} - \setcern [kkk#] {\<uit> \<yit> \<vit> \<Tit> \<Jit>} + \setcern [kkk#] {\<uit> \<yit> \<vit> \<Tit> \<Jit>} \WL{\|\|fi} \WL{\|fi} \WL{\|if altcoding:}%restored @@ -541,49 +541,49 @@ endligtable; \endligtable \beginligtable %V - \labelchar {\<V>} + \labelchar {\<V>} % % \WL{if serifs:} - \setcern [kkk#] {\<_A> - \WL{if concrete:} + \setcern [kkk#] {\<_A> + \WL{if concrete:} \(D) \(L) \WL{fi} \<_R> - } + } \WL{else:} - \setcern [kk#] {\<_A>} - \setcern [-u#] {\(D) \<_J>} + \setcern [kk#] {\<_A>} + \setcern [-u#] {\(D) \<_J>} \WL{fi} - \setcern [k#] {\<O> \<_C> \<eh>} + \setcern [k#] {\<O> \<_C> \<eh>} \WL{if not TITLEfont:} \WL{\|if SmallCapsfont:} - \setcern [kkk#] {\<_Alo> \<_Asc> - \WL{if concrete:} + \setcern [kkk#] {\<_Alo> \<_Asc> + \WL{if concrete:} \(d) \(l) \WL{fi} - \WL{if serifs:} + \WL{if serifs:} \<_Rlo> \WL{fi} - } - \setcern [kk#] {\WL{if concrete:} + } + \setcern [kk#] {\WL{if concrete:} \<_Jlo> \WL{fi} } \setcern [k#] {\<o> \<Osc> \(s)\<_c> \<ehl>} \WL{\|else:} \WL{\|\|if serifs:} - \setcern [kk#]{\<a> \<o> \(e)\<e> \<ehl>} + \setcern [kk#]{\<a> \<o> \(e)\<e> \<ehl>} \WL{\|\|else:} - \setcern [k#] {\<a> \<o> \(e)\<e> \<ehl>} + \setcern [k#] {\<a> \<o> \(e)\<e> \<ehl>} \WL{\|\|fi} \WL{\|\|if ROMANfont:} \WL{\|\|\|if serifs:} - \setcern [kkk#]{\<_Jlo> \<_Rlo> \<_Alo>} + \setcern [kkk#]{\<_Jlo> \<_Rlo> \<_Alo>} \WL{\|\|\|else:} - \setcern [kk#]{\<_Jlo> \<_Rlo> \<_Alo>} + \setcern [kk#]{\<_Jlo> \<_Rlo> \<_Alo>} \WL{\|\|\|fi} \WL{\|\|else:} - \setcern [kkk#]{\<uit> \<yit> \<vit> \<Tit> \<Jit>} + \setcern [kkk#]{\<uit> \<yit> \<vit> \<Tit> \<Jit>} \WL{\|\|fi} \WL{\|fi} \WL{\|if altcoding:}%restored @@ -595,34 +595,34 @@ endligtable; \endligtable \beginligtable %YV - \labelchar {\<YV>} + \labelchar {\<YV>} % % \WL{if serifs:} - \setcern [kk#] {\<_A> - \WL{if concrete:} + \setcern [kk#] {\<_A> + \WL{if concrete:} \(D) \(L) \WL{fi} \<_R> - } + } \WL{if not concrete:} - \setcern [-u#] {\(D) \<_J>} + \setcern [-u#] {\(D) \<_J>} \WL{fi} \WL{else:} - \setcern [k#] {\<_A>} - \setcern [-u#] {\(D) \<_J>} + \setcern [k#] {\<_A>} + \setcern [-u#] {\(D) \<_J>} \WL{fi} - \setcern [k#] {\<O> \<_C> \<eh>} + \setcern [k#] {\<O> \<_C> \<eh>} \WL{if not TITLEfont:} \WL{\|if SmallCapsfont:} - \setcern [kkk#] {\<_Alo> \<_Asc> - \WL{if concrete:} + \setcern [kkk#] {\<_Alo> \<_Asc> + \WL{if concrete:} \(d) \(l) \WL{fi} - \WL{if serifs:} + \WL{if serifs:} \<_Rlo> \WL{fi} - } - \setcern [kk#] {\WL{if concrete:} + } + \setcern [kk#] {\WL{if concrete:} \<_Jlo> \WL{fi} } @@ -648,35 +648,35 @@ endligtable; \endligtable \beginligtable %P - \labelchar {\<P_>} + \labelchar {\<P_>} % % - \setcern [kk#] {\<_A> + \setcern [kk#] {\<_A> \(D) \<_J> - \WL{if serifs:} + \WL{if serifs:} \<_R> \WL{fi} - } + } \WL{if not TITLEfont:} \WL{\|if SmallCapsfont:} - \setcern [kk#] {\<_Alo> \<_Asc> - \WL{if concrete:} + \setcern [kk#] {\<_Alo> \<_Asc> + \WL{if concrete:} \(d) \(l) - \WL{else:} + \WL{else:} \(d) - \WL{fi} - \WL{if serifs:} + \WL{fi} + \WL{if serifs:} \<_Rlo> \WL{fi} - } - \setcern [k#] {\<ehl>} + } + \setcern [k#] {\<ehl>} \WL{\|else:} \setcern [k#] {\<a> \<o> \(e)\<e> \<ehl>} \setcern [kk#] {\<_Jlo>} \WL{\|fi} \WL{\|if altcoding:}% - \setkern [kk#] {\([ASCII "."]) \([ASCII ","]) + \setkern [kk#] {\([ASCII "."]) \([ASCII ","]) \([ASCII ";"]) \([ASCII ":"]) - }% + }% \WL{\|fi} \WL{fi} \endligtable @@ -684,7 +684,7 @@ endligtable; \beginligtable %I \labelchar {\<I>} - \setcern [-k#] {\<I>} + \setcern [-k#] {\<I>} \endligtable %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -702,14 +702,14 @@ if SmallCapsfont:^^J^^J % true (Small Caps Fonts) \beginligtable %Alo (Small Caps) \labelchar {\<Alo_> \<Asc_> \<blo_> - \WL{if serifs:} - \<Rlo_> + \WL{if serifs:} + \<Rlo_> \WL{fi} - } + } % % \setcern [k#] {\<o> \<Osc> \(s)\<_c> \<_Tlo> \<_Tsc> \<_Plo>} - \setcern [kk#] {\<y>} - \setcern [kkk#] {\<v>} + \setcern [kk#] {\<y>} + \setcern [kkk#] {\<v>} \endligtable @@ -721,17 +721,17 @@ if SmallCapsfont:^^J^^J % true (Small Caps Fonts) setlig([ASCII "3"],CYR_.lat_s); setlig([ASCII "j"],CYR_.dje);} % \setcern [k#] {\<o> \<Osc> \(s)\<_c> \<_Tlo> \<_Tsc> \<_Plo> } - \setcern [kk#] {\<y>} - \setcern [kkk#] {\<v>} + \setcern [kk#] {\<y>} + \setcern [kkk#] {\<v>} \endligtable \beginligtable %l(A) (Small Caps) \labeligchar{l}{%"l" - setlig([ASCII "1"],CYR_.lje); setlig([ASCII "j"],CYR_.lje);} + setlig([ASCII "1"],CYR_.lje); setlig([ASCII "j"],CYR_.lje);} % \setcern [k#] {\<o> \<Osc> \(s)\<_c> \<_Tlo> \<_Tsc> \<_Plo>} - \setcern [kk#] {\<y>} - \setcern [kkk#] {\<v>} + \setcern [kk#] {\<y>} + \setcern [kkk#] {\<v>} \endligtable \wl{fi^^J}\let\.\| @@ -739,7 +739,7 @@ if SmallCapsfont:^^J^^J % true (Small Caps Fonts) \beginligtable %k (Small Caps) \labeligchar{k}{%"k" - setlig([ASCII "h"],CYR_.h);} + setlig([ASCII "h"],CYR_.h);} % \labelchar {\<k_>} % % @@ -750,36 +750,36 @@ if SmallCapsfont:^^J^^J % true (Small Caps Fonts) \beginligtable %o (Small Caps) \labelchar {\<o> \<Osc> \<o_> \<c_> \<ehl>} % % - \setcern [k#] {\<_Alo> \<_Asc> \<_Jlo> \<k> \<y> \<v> - \WL{if serifs:} + \setcern [k#] {\<_Alo> \<_Asc> \<_Jlo> \<k> \<y> \<v> + \WL{if serifs:} \<_Rlo> \WL{fi} - } + } \endligtable \beginligtable %T (Small Caps) \labeligchar{t}{%"t" - setlig([ASCII "s"],CYR_.C);} + setlig([ASCII "s"],CYR_.C);} % \labelchar {\<Tlo_> \<Plo_>} % % - \setcern [k#] {\<_Alo> \<_Asc> \<_Jlo> - \WL{if serifs:} + \setcern [k#] {\<_Alo> \<_Asc> \<_Jlo> + \WL{if serifs:} \<_Rlo> \WL{fi} - } + } \endligtable \beginligtable %Y (Small Caps) \labelchar {\<y>} % % - \setcern [kk#] {\<_Alo> \<_Asc> \<_Jlo> - \WL{if serifs:} + \setcern [kk#] {\<_Alo> \<_Asc> \<_Jlo> + \WL{if serifs:} \<_Rlo> \WL{fi} - } + } \setcern [k#] {\<o> \<Osc> \(s)\<_c> \<ehl>} \endligtable @@ -787,18 +787,18 @@ if SmallCapsfont:^^J^^J % true (Small Caps Fonts) \beginligtable %V (Small Caps) \labelchar {\<v>} % % - \setcern [kkk#] {\<_Alo> \<_Asc> - \WL{if serifs:} + \setcern [kkk#] {\<_Alo> \<_Asc> + \WL{if serifs:} \<_Rlo> \WL{fi} - } - \setcern [kk#] {\<_Jlo>} + } + \setcern [kk#] {\<_Jlo>} \setcern [k#] {\<o> \<Osc> \(s)\<_c> \<ehl>} \endligtable \beginligtable %i \labelchar {\<i> \(ukr_i)} - \setcern [-k#] {\<i> \(ukr_i)} + \setcern [-k#] {\<i> \(ukr_i)} \endligtable \let\.\empty @@ -811,10 +811,10 @@ if SmallCapsfont:^^J^^J % true (Small Caps Fonts) \labelchar {\<a>} % \setcern [k#] {\<_Plo> \<y> - \WL{if serifs:} + \WL{if serifs:} \<v> \WL{fi} - } + } \endligtable @@ -830,7 +830,7 @@ if SmallCapsfont:^^J^^J % true (Small Caps Fonts) \beginligtable %l (ROMANfont) \labeligchar{l}{%"l" - setlig([ASCII "1"],CYR_.lje); setlig([ASCII "j"],CYR_.lje);} + setlig([ASCII "1"],CYR_.lje); setlig([ASCII "j"],CYR_.lje);} \setcern [k#] {\<o> \(s)\<_c> \<_Tlo> \<_Plo> \<y> \<v> \(l)} \setcern [kk#] {\<_Plo> \<ehl>} \endligtable @@ -840,50 +840,50 @@ if SmallCapsfont:^^J^^J % true (Small Caps Fonts) \beginligtable %Tlo (ROMANfont) \labeligchar{t}{%"t" - setlig([ASCII "s"],CYR_.c);} + setlig([ASCII "s"],CYR_.c);} \labelchar {\<Tlo_> \WL{if kapitel:} - \(r) + \(r) \WL{fi} } \WL{if serifs:} - \setcern [k#] {\<a>} + \setcern [k#] {\<a>} \WL{fi} - \setcern [k#] {\<_Jlo> \<_Alo> \<_Rlo> \<ehl>} + \setcern [k#] {\<_Jlo> \<_Alo> \<_Rlo> \<ehl>} % \WL{if altcoding:} - \setkern [kk#] {\([ASCII "."]) \([ASCII ","])} + \setkern [kk#] {\([ASCII "."]) \([ASCII ","])} \WL{fi} \endligtable \beginligtable %x (ROMANfont) \labeligchar{k}{%"k" - setlig([ASCII "h"],CYR_.h);} + setlig([ASCII "h"],CYR_.h);} \labelchar {\<k_>} - \setcern [k#] {\<a>} - \setcern [k#] {\<o> \(s)\<_c> \(e)\<e> \<ehl>} + \setcern [k#] {\<a>} + \setcern [k#] {\<o> \(s)\<_c> \(e)\<e> \<ehl>} \endligtable \beginligtable %i (ROMANfont) \labelchar {\<i>} - \setcern [-k#] {\(ukr_i)} + \setcern [-k#] {\(ukr_i)} \endligtable \beginligtable %i (ROMANfont) \labelchar {\(ukr_i)} - \setcern [-k#] {\<i>} - \setcern [-kk#] {\(ukr_i)} + \setcern [-k#] {\<i>} + \setcern [-kk#] {\(ukr_i)} \endligtable \beginligtable %y (ROMANfont) - \labelchar {\<y> \<v>} + \labelchar {\<y> \<v>} % % - \setcern [k#] {\<a> \<o> \(s)\<_c> \(e)\<e> \<ehl> \<_Rlo>} - \setcern [kk#] {\<_Alo>} - \setcern [-u#] {\<_Jlo>} + \setcern [k#] {\<a> \<o> \(s)\<_c> \(e)\<e> \<ehl> \<_Rlo>} + \setcern [kk#] {\<_Alo>} + \setcern [-u#] {\<_Jlo>} % \WL{if altcoding:} - \setkern [kk#] {\([ASCII "."]) \([ASCII ","])} + \setkern [kk#] {\([ASCII "."]) \([ASCII ","])} \WL{fi} \endligtable @@ -893,35 +893,35 @@ if SmallCapsfont:^^J^^J % true (Small Caps Fonts) \beginligtable %e (not ROMANfont) \labeligchar{e}{%"e" - setlig([ASCII "0"],CYR_.yo); setlig([ASCII "1"],CYR_.erev);^^J% - setlig([ASCII "2"],CYR_.ukr_e);} - \labelchar {\<e>} + setlig([ASCII "0"],CYR_.yo); setlig([ASCII "1"],CYR_.erev);^^J% + setlig([ASCII "2"],CYR_.ukr_e);} + \labelchar {\<e>} \setcern [-u#] {\<_q>\<a>} % \<o> \(e)\<e> % \(s)\<_c> - \setcern [k#] {\<Jit>} + \setcern [k#] {\<Jit>} \endligtable \beginligtable %Jit (not ROMANfont) \labelchar {\(g_up)} - \setcern [kkk#] {\<Jit>} + \setcern [kkk#] {\<Jit>} \endligtable \beginligtable %v (not ROMANfont) \labelchar {\<vit>} - \setcern [kk#] {\<Jit>} + \setcern [kk#] {\<Jit>} \endligtable \beginligtable %i (not ROMANfont) \labelchar {\(ukr_i)} - \setcern [-k#] {\(dje) \(tshe)} + \setcern [-k#] {\(dje) \(tshe)} \labelchar {\<iit>} - \setcern [-k#] {\(ukr_i)} + \setcern [-k#] {\(ukr_i)} \endligtable \beginligtable %l (not ROMANfont) \labeligchar{l}{%"l" setlig([ASCII "1"],CYR_.lje); setlig([ASCII "j"],CYR_.lje);} \setcern [k#] {\<Jit> \<vit> \<Tit>} - \setcern [kk#] {\<_Plo> \<ehl>} + \setcern [kk#] {\<_Plo> \<ehl>} \endligtable \let\.\| @@ -932,31 +932,31 @@ if SmallCapsfont:^^J^^J % true (Small Caps Fonts) \labelchar {\<blo_> \<Alo_>} % % \WL{if ROMANfont:} - \setcern [-u#] {\<y> \<v>} - \setcern [k#] {\<_Tlo>} + \setcern [-u#] {\<y> \<v>} + \setcern [k#] {\<_Tlo>} \WL{\|if concrete:} - \setcern [k#] {\(d)\(l)} + \setcern [k#] {\(d)\(l)} \WL{\|fi} \WL{else:} - \setcern [k#] {\<Jit> \<vit> \<Tit>} + \setcern [k#] {\<Jit> \<vit> \<Tit>} \WL{fi} - \setcern [kk#] {\<_Plo> \<ehl>} - \setcern [k#] {\<o> \<_q> \<_c>} + \setcern [kk#] {\<_Plo> \<ehl>} + \setcern [k#] {\<o> \<_q> \<_c>} \endligtable \beginligtable %o (Lowercase) \labeligchar{s}{%"s" - setlig([ASCII "h"],CYR_.sh);} + setlig([ASCII "h"],CYR_.sh);} \labelchar {\<o> \<o_> \<p_> \<c_>}%\<_c> % % \WL{if ROMANfont:} %\setcern [-k#] {\<_q> \<o> \(e)\<e> \(s)\<_c>} \setcern [k#] {\(d) \<k> \<_Rlo> \<_Alo>}%\<_Jlo> \WL{else:} - \setcern [-u#] {\<_q> \<a>}%\<o> \(e)\<e> %\(s)\<_c> - \setcern [k#] {\<Jit>} + \setcern [-u#] {\<_q> \<a>}%\<o> \(e)\<e> %\(s)\<_c> + \setcern [k#] {\<Jit>} \WL{fi} \endligtable @@ -964,8 +964,8 @@ if SmallCapsfont:^^J^^J % true (Small Caps Fonts) \beginligtable %x (Lowercase) \labelchar {\<Rlo_>} % % - \setcern [k#] {\<a> \<o> \(s)\<_c> \(e)\<e> \<ehl> - \<_Tlo> \<v> \<y>} + \setcern [k#] {\<a> \<o> \(s)\<_c> \(e)\<e> \<ehl> + \<_Tlo> \<v> \<y>} \endligtable diff --git a/Master/texmf-dist/source/fonts/lh/tex/likergrp.tex b/Master/texmf-dist/source/fonts/lh/tex/likergrp.tex new file mode 100644 index 00000000000..beca407b989 --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/likergrp.tex @@ -0,0 +1,409 @@ +% +% likergrp.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% Data TeX file ligs & kerns +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\lhvercheck(3,5) + +\lkgroup{A_}{% + \(A) + \(L_YUS) \(IL_YUS) \(VL_YUS) + \(A_brv) \(A_uml) \(A_bar) \(A_ac) + \(L_YUS_ac) \(IL_YUS_ac) + } +\lkgroup{Alo_}{% + \WL{if kapitel:} + \(a) + \WL{fi} + \(l_yus) \(il_yus) \(Vl_yus) + \(l_yus_ac)\(il_yus_ac) + } +% +\lkgroup{Asc_}{% + \(a) + \(a_brv) \(a_uml) \(a_bar) \(a_ac) + } +% +\lkgroup{_A}{% + \(A) + \(AE) + \(L_YUS) \(VL_YUS) + \(A_brv) \(A_uml) \(A_bar) \(A_ac) + \(L_YUS_ac) + } +\lkgroup{_Alo}{% + \WL{if kapitel:} + \(a) + \WL{fi} + \(ae) + \(l_yus) \(Vl_yus) + \(l_yus_ac) + } +\lkgroup{_Asc}{% + \(a) + \(a_brv) \(a_uml) \(a_bar) \(a_ac) + } +%%%%% +\lkgroup{_J}{% + \(L) + \(LJE) \(L_tl) \(L_dsc) + \(L_ldot) + \(OLG) + } +\lkgroup{_Jlo}{% + \(d) + \(l) + \(lje) \(l_tl) \(l_dsc) + \(l_ldot) + \(olg) + } +%%%%% +\lkgroup{bup_}{% + \(HRDSN) \(SFTSN) + \(DJE) \(LJE) \(NJE) + \(YAT) \(SEMISN) + \(P_tl) + \(SHHA) + \(OHRDSN) + \(YAT_ac) \(HRDSN_ac) \(DJE_ac) + } +\lkgroup{blo_}{% + \(hrdsn) \(sftsn) + \WL{if SmallCapsfont:} + \(dje) + \WL{fi} + \(lje) \(nje) + \(yat) \(semisn) + \(p_tl) + \WL{if SmallCapsfont:} + \(shha) + \WL{fi} + \(ohrdsn) + \(hrdsn_ac) \(yat_ac) + \WL{if SmallCapsfont:} + \(dje_ac) + \WL{fi} + } +%%%%% +\lkgroup{R_}{% + \(B_YUS) \(IB_YUS) + \(B_YUS_ac) \(IB_YUS_ac) + } +%% +\lkgroup{Rlo_}{% + \(b_yus) \(ib_yus) + \(b_yus_ac) \(ib_yus_ac) + } +%%% +\lkgroup{_R}{% + \(YA) \(B_YUS) + \(YA_bar) + \(YA_ac) \(B_YUS_ac) + } +%% +\lkgroup{_Rlo}{% + \(ya) \(b_yus) + \(ya_bar) + \(ya_ac) \(b_yus_ac) + } +%%%%% +\lkgroup{K_}{% + %\labeligchar{K}{if wn: setlig\("H",H) setlig\("h",H) fi} + \(KJE) \(K_dsc) \(K_vcrs) \(K_hcrs) \(K_beak) + \(ZH) \(ZH_dsc) \(ZH_brv) \(ZH_uml) + \(H) \(H_dsc) \(H_hcrs) \(H_tl) + } +%% +\lkgroup{k_}{% + %\labeligchar{k}{if wn: setlig\("h",h) fi} + \(kje) \(k_dsc) \(k_vcrs) \(k_hcrs) \(k_beak) + \(zh) \(zh_dsc) \(zh_brv) \(zh_uml) + \(h) \(h_dsc) \(h_hcrs) \(h_tl) + } +%%% +\lkgroup{K}{% + \(ZH) \(ZH_dsc) \(ZH_brv) \(ZH_uml) + \(H) \(H_dsc) \(H_hcrs) \(H_tl) + } +%% +\lkgroup{k}{% + \(zh) \(zh_dsc) \(zh_brv) \(zh_uml) + \(h) \(h_dsc) \(h_hcrs) \(h_tl) + } +%%%%% +\lkgroup{O_}{% + \(YU) + \(YU_bar) \(YU_ac) + } +\lkgroup{O}{% + \(O) \(O_uml) \(O_bar) \(O_ac) %\(O_lcom) + \(F) + \(OTLD) \(OTLD_uml) \(OTLD_bar) \(OTLD_ac) + \(ABH_HA) + \(LAT_Q) + \(OMGA) \(OMGA_tlo) \(OT) + \(PSI) + \(FITA) + \(OMGA_rnd) \(OO_cdot) \(OO_cddot) + } +\lkgroup{o_}{% + \(b) \(yu) + \(yu_bar) \(yu_ac) + } +\lkgroup{o}{% + \(o) \(o_uml) \(o_bar) \(o_ac) %\(o_lcom) + \(otld) \(otld_uml) \(otld_bar) \(otld_ac) + \(abh_ha) + \(omga) \(omga_tlo) \(ot) + \(fita) + \(omga_rnd) \(oo_cdot) \(oo_cddot) + } +\lkgroup{Osc}{% + \(f) + \(lat_q) + \(psi) + } +%%%%% +\lkgroup{_C}{% not used in ligtable + %\labeligchar{S}{if wn: setlig\("H",SH) setlig\("h",SH) fi} + \(S)%<- + \(S_dsc) + \(UKR_E) \(UKR_E_ac) + \(KOPPA) \(AZ) + } +%%% +\lkgroup{_c}{% + %\labeligchar{s}{if wn: setlig\("h",sh) fi} + \(s_dsc) + \(ukr_e) \(ukr_e_ac) + \(koppa) \(az) + } +%%%%% +\lkgroup{C_}{% + \(EREV) + \(SCHWA) \(SCHWA_uml) + \(EREV_uml) \(EREV_bar) \(EREV_dot) + \(EREV_ac) \(SCHWA_ac) + } +%% +\lkgroup{c_}{% + \(erev) + \(schwa) \(schwa_uml) + \(erev_uml) \(erev_bar) \(erev_dot) + \(erev_ac) \(schwa_ac) + } +%%%%% +\lkgroup{T_}{% + %\labeligchar{T}{if wn: setlig\("S",C) setlig\("s",C) fi} + \(T_dsc) + \(G) \(GJE) \(G_hcrs) %\(G_up) + \(NG) + \(VG_hcrs) \(G_dsc) \(G_crsdsc) + \(OLG) + \(T_lcom) + } +%% +\lkgroup{Tlo_}{% + %\labeligchar{t}{if wn: setlig\("s",c) setlig\("s",c) fi} + \(t_dsc) \(t_lcom) + \(g) \(gje) \(g_up) \(g_hcrs) + \(ng) + \(Vg_hcrs) \(g_dsc) \(g_crsdsc) + \(olg) + } +%%% +\lkgroup{_T}{% + \(T) \(T_dsc) \(T_lcom) + \(HRDSN) + \(DJE) \(TSHE) + \(YAT) \(SEMISN) + \(K_beak) \(TETSE) + \(OHRDSN) \(OERY) + \(YAT_ac) \(DJE_ac) + } +\lkgroup{_Tlo}{% + \(t) \(t_dsc) \(t_lcom) + \(hrdsn) + \(yat) \(semisn) + \(k_beak) \(tetse) + \(ohrdsn) \(oery) + \(yat_ac) + } +\lkgroup{_Tsc}{% + \(dje) \(tshe) + \(dje_ac) + } +%%%%% +\lkgroup{Y}{% + \(Y) \(Y_hcrs) + \(Y_bar) \(Y_ac) + } +\lkgroup{YV}{% + \(U) \(U_shrt) + \(U_uml) \(U_dac) \(U_hat) \(U_tld) %\(U_com) + \(U_bar) \(U_gr) \(U_ac) + } +\lkgroup{y}{% + \(u) \(u_shrt) + \(u_bar) \(u_gr) \(u_ac) + \(u_uml) \(u_dac) \(u_hat) \(u_tld) %\(u_com) + \(y) \(y_hcrs) + \(y_bar) \(y_ac) + } +% +\lkgroup{V}{% + \(IZH) \(IZH_dgr) \(IZH_uml) \(IZH_ac) + \(LAT_W) + } +\lkgroup{v}{% + \(izh) \(izh_dgr) \(izh_uml) \(izh_ac) + \(lat_w) + } +% +\lkgroup{P_}{% + \(R) + \(R_dsc) \(R_brv) \(R_gcrs) + \(CHERV) + } +\lkgroup{Plo_}{% + \(r) + \(r_dsc) \(r_brv) \(r_gcrs) \(r_tl) + \(cherv) +} +% +\lkgroup{_P}{% + \(CH) \(CH_ldsc) \(CH_rdsc) \(CH_vcrs) \(CH_uml) + \(CHERV) + } +\lkgroup{_Plo}{% + \(ch) \(ch_ldsc) \(ch_rdsc) \(ch_vcrs) \(ch_uml) + \(cherv) + } +% +\lkgroup{I}{% + \(LAT_I) + \(UKR_I) + \(VIZHE) + \(LAT_I_dsc) \(LAT_I_dot) + \(LAT_I_ac) \(UKR_I_ac) + } +% +\lkgroup{i}{% + \(lat_i) +% \(ukr_i) + \(izhe) + \(lat_i_dsc) + \(lat_i_ac) %\(ukr_i_ac) + } +% +\lkgroup{eh}{% + \(ABH_CH) \(ABH_CH_dsc) + } +\lkgroup{ehl}{% + \(abh_ch) \(abh_ch_dsc) + } +% +%new! +\lkgroup{DSC_}{% + \(C) \(SHCH) + \(ZH_dsc)\(K_dsc) + \(L_dsc) \(M_dsc) \(N_dsc) \(CH_rdsc) + \(LAT_I_dsc) \(I_shdsc) +} +% +\lkgroup{dsc_}{% + \(c) \(shch) + \(zh_dsc)\(k_dsc) \(l_dsc) \(m_dsc) \(n_dsc) \(ch_rdsc) + \(lat_i_dsc) (i_shdsc) +} + + +%%%%%%%%%%%% +% Lowercases only +\lkgroup{a}{% + \(a) + \(a_brv) \(a_uml) \(a_bar) \(a_ac) + } +\lkgroup{e}{% + %\labeligchar{e}{% + %if wn: setlig\("0",yo) setlig\("1",erev) setlig\("2",ukr_e) fi} + \(yo) + \(e_brv) + \(e_ac) \(yo_ac) + } +\lkgroup{p_}{% + \(r) \(f) + \(psi) + } +\lkgroup{_q}{% + \(f) + \(lat_q) + \(psi) + } + +%%%%%%%% +% Italic +\lkgroup{Tit}{% + \(hrdsn) + \(k_beak) \(tetse) + \(hrdsn_ac) + } +\lkgroup{nit}{% + \(k) \(kje) \(k_dsc) \(k_vcrs) \(k_tl) + \(n) \(nje) \(n_dsc) \(n_tl) \(ng) + \(p) \(p_tl) + \(t) \(t_dsc) + \(yu) + \(yat) + \(yu_ac) \(yat_ac) + } +\lkgroup{uit}{% + \(i) \(i_shrt) \(i_bar) \(i_uml) + \(c) \(sh) \(shch) + \(sftsn) + \(ery) \(ery_uml) + \(i_ac) \(ery_ac) + } +\lkgroup{yit}{% + \(u) \(u_shrt) + \(u_uml) \(u_bar) \(u_dac) + \(u_tld) \(u_hat) \(u_gr) \(u_ac) %\(u_com) + } +\lkgroup{vit}{% + \(y) \(y_hcrs) + \(izh) \(izh_dgr) \(izh_uml) + \(lat_w) + \(y_bar) + \(izh_ac) + } +\lkgroup{iit}{% + \(lat_i) + %\(ukr_i) + \(lat_i_dsc) %\(lat_i_dot) + \(ukr_i_ac) \(lat_i_ac) + } +\lkgroup{Jit}{% + \(l) \(m) + \(lje) + \(g_up) + \(l_dsc) \(l_tl) + \(m_dsc) \(m_tl) + \(l_ldot) + } +% +% end of likergrp.tex diff --git a/Master/texmf-dist/doc/fonts/lh/tex/likermac.tex b/Master/texmf-dist/source/fonts/lh/tex/likermac.tex index 99cea30439e..288ac6a3184 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/likermac.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/likermac.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) \catcode`\@=11 \catcode`\#=12 \catcode`\$=6 %\catcode`\_=11 @@ -32,11 +32,11 @@ \def\lkgroup$1$2{\expandafter\def\csname LiK@r $1\endcsname{$2}} \def\<$1>{\csname LiK@r $1\endcsname - \@ifundefined{LiK@r$1}{}{\errmessage{group $1 undefined}} - } + \@ifundefined{LiK@r$1}{}{\errmessage{group $1 undefined}} + } \def\@letteri $1{\@ifundefined{MF$1}{\ifchartest\ifx\phanfont\undefined - \errmessage{letter $1 undefined}\fi\else\relax\fi}{\@lettertrue}% + \errmessage{letter $1 undefined}\fi\else\relax\fi}{\@lettertrue}% } \def\@letterii $1{\@ifundefined{MF$1}{\relax}{\@colonfalse}% } @@ -47,7 +47,7 @@ } \def\@kerni $1{\@ifundefined{MF$1}{\ifchartest\ifx\phanfont\undefined - \errmessage{letter $1 undefined}\fi\else\relax\fi}{\if@letter\@ligtrue\fi}% + \errmessage{letter $1 undefined}\fi\else\relax\fi}{\if@letter\@ligtrue\fi}% } \def\@kerniii $1{\@ifundefined{MF$1}{\relax}% @@ -65,11 +65,11 @@ % FIRST RUN : % full check of existance of letters and ligs&kerns \def\labeligchar$$1$$2{\@ifundefined{MF$$1}{\relax}% - {\@lettertrue\@ligtrue}}% + {\@lettertrue\@ligtrue}}% \def\labelchar$$1{\def\($$$$1){\@letteri{$$$$1}}% - $$1} + $$1} \def\setcern[$$1]$$2{\def\($$$$1){\@kerni{$$$$1}}% - $$2} + $$2} \def\setkern[$$1]$$2{}% nothing to check \def\WL$$1{}% $1 % run text for ligtable first time @@ -82,35 +82,35 @@ {\@wrilig{\.\|labelchar ( CYR_.$$1 );\ifwncoding ^^J\.\|\|\|$$2 \fi}}} % writing %% \def\labelchar$$1{\begingroup\@colontrue - \def\($$$$1){\@letterii{$$$$1}}% repeat check of letters in lettergroup - \def\WL$$$$1{} - $$1 - \if@colon\relax - \else\@colontrue % THIRD : writing - \def\($$$$1){\@letteriii{$$$$1}} - \def\WL$$$$1{\@wrilig{\.\|\|$$$$1}} + \def\($$$$1){\@letterii{$$$$1}}% repeat check of letters in lettergroup + \def\WL$$$$1{} + $$1 + \if@colon\relax + \else\@colontrue % THIRD : writing + \def\($$$$1){\@letteriii{$$$$1}} + \def\WL$$$$1{\@wrilig{\.\|\|$$$$1}} % - \@wrilig{\.\|labelchar (} $$1 \@wrilig{\.\| );} - \fi\endgroup} + \@wrilig{\.\|labelchar (} $$1 \@wrilig{\.\| );} + \fi\endgroup} %% \def\setcern[$$1]$$2{\begingroup\@colontrue - \def\($$$$1){\@letterii{$$$$1}}% repeat check of letters in lettergroup - \def\WL$$$$1{} - $$2 - \if@colon\relax - \else\@colontrue % THIRD : writing - \def\($$$$1){\@kerniii{$$$$1}} - \def\WL$$$$1{\@wrilig{\.\|\|\|\|\|$$$$1}} + \def\($$$$1){\@letterii{$$$$1}}% repeat check of letters in lettergroup + \def\WL$$$$1{} + $$2 + \if@colon\relax + \else\@colontrue % THIRD : writing + \def\($$$$1){\@kerniii{$$$$1}} + \def\WL$$$$1{\@wrilig{\.\|\|\|\|\|$$$$1}} % - \@wrilig{\.\|\|\|\|setkern [$$1] (} $$2 \@wrilig{\.\|\|\|\| );} - \fi\endgroup} + \@wrilig{\.\|\|\|\|setkern [$$1] (} $$2 \@wrilig{\.\|\|\|\| );} + \fi\endgroup} %% \def\setkern[$$1]$$2{\begingroup\@colontrue - \def\($$$$1){\@kerniv{$$$$1}} - \def\WL$$$$1{\@wrilig{\.\|\|\|\|\|$$$$1}} + \def\($$$$1){\@kerniv{$$$$1}} + \def\WL$$$$1{\@wrilig{\.\|\|\|\|\|$$$$1}} % - \@wrilig{\.\|\|\|\|setkern [$$1] (} $$2 \@wrilig{\.\|\|\|\| );} - \endgroup} + \@wrilig{\.\|\|\|\|setkern [$$1] (} $$2 \@wrilig{\.\|\|\|\| );} + \endgroup} %%% \def\WL$$1{\@wrilig{\.\|$$1}} \@wrilig{^^J\.beginligtable}% diff --git a/Master/texmf-dist/source/fonts/lh/tex/readme.txt b/Master/texmf-dist/source/fonts/lh/tex/readme.txt new file mode 100644 index 00000000000..60cf12434e4 --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/readme.txt @@ -0,0 +1,22 @@ +Run plain tex with files started with numerals: +01cm-lh.tex - to create fonts for LCY encoding (DOS based encoding) +02cm-wn.tex - to create fonts for OT2 encoding (AmS bases Cyrillic encoding) +03cm-vf.tex - to create 7-bit fonts (encoding of N.Glonti fonts) + like a part for virtual 8-bit Latin-Cyrillic font + +11ex-rs.tex - to create fonts with Old Slav letters (in modern shapes) +11ex-rx.tex - to create fonts for X2 encoding +12ex-la.tex +13ex-lb.tex +14ex-lc.tex +15ex-ld.tex - to create fonts for T2(A,B,C,D) encodings + +99CMstd.tex - to create cm-based fonts in more or less standard encodings + (01cm-lh.tex+02cm-wn.tex+03cm-vf.tex) +99T2enc.tex - to create ex-based fonts for LaTeX T2*/X2 encodings + (11ex-rs.tex---15ex-ld.tex) +99allenc.tex - to create cm-based and ex-based fonts + (99CMstd.tex+99T2enc.tex) + +After texing just copy subdirs with created mf-files as a whole from `wrk' +directory to `texmf/fonts/source/lh' directory diff --git a/Master/texmf-dist/doc/fonts/lh/tex/rliker.tex b/Master/texmf-dist/source/fonts/lh/tex/rliker.tex index 73fa5502c49..b71d57fa3fb 100644 --- a/Master/texmf-dist/doc/fonts/lh/tex/rliker.tex +++ b/Master/texmf-dist/source/fonts/lh/tex/rliker.tex @@ -4,13 +4,13 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.4 // Patchlevel=0 +% Version 3.5 // Patchlevel=0 % (c) O.Lapko % -% This package belongs to the public domain under conditions similar to +% This package is freeware product under conditions similar to % those of D. E. Knuth specified for the Computer Modern family of fonts. % In particular, only the authors are entitled to modify this file -% and to save it under the same name. +% (and all this package as well) and to save it under the same name. % % Content: % @@ -18,7 +18,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\lhvercheck(3,4) +\lhvercheck(3,5) \input likermac \input likergrp @@ -26,7 +26,7 @@ \message{\ligfile} \immediate\openout\ligoutput\ligfile \MakeHeadFileDefinition\ligoutput{\fonttwoletters liker.mf} -\input likerdat % ligatures and kerning data for Cyrillic fonts +\input likerdat % ligatures and kerning data for Cyrillic fonts \immediate\closeout\ligoutput %\catcode`\_=8 diff --git a/Master/texmf-dist/source/fonts/lh/tex/setter.tex b/Master/texmf-dist/source/fonts/lh/tex/setter.tex new file mode 100644 index 00000000000..c0c154a0f25 --- /dev/null +++ b/Master/texmf-dist/source/fonts/lh/tex/setter.tex @@ -0,0 +1,61 @@ +%% setter.tex +% +%% Cyrillic font container with T2 encoding beta-support +% +% This file is future part of lxfonts package +% Version 3.5 // Patchlevel=0 +% (c) O.Lapko +% +% This package is freeware product under conditions similar to +% those of D. E. Knuth specified for the Computer Modern family of fonts. +% In particular, only the authors are entitled to modify this file +% (and all this package as well) and to save it under the same name. +% +% Content: +% +% The example file of resetting some defaults +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% + +\def\fntallcm{fntallcm} % Font assortment for CM-like fonts +\def\fntallec{fntallec} % Font assortment for EC-like fonts + +\MakeFileHeadsfalse % Create font file headers ? +\SliTeXtrue % Create SliTeX font file headers ? +\Concretetrue % Create concrete font file headers ? +\CMBrighttrue % Create CM Bright font file headers ? + +\MakeDvifalse % Create DVI file ? + +%for experts +%\MakeFontEnctrue % Create encoding files ? +\MakeFontEncfalse % Create encoding files ? +%\Babeltrue % Create encoding files like LaTeX2e XXXdef.enc ? +\Babelfalse % Create encoding files like LaTeX2e XXXdef.enc ? + +\TFMonlyfalse % Create tfm-files only ? +%\TFMonlytrue % Create tfm-files only ? + +\doBatchfalse % Create Batch file + % [true option is only for experts; that was heavily + % borrowed from EC's ecstdedt.tex and had not any testing] +\def\BatchOutput#1{ +% \BatchLine{MF "\string\mode=localfont; input #1"}%600 +% \BatchLine{MF "\string\mode=epstyplo; input #1"}%180 +% \BatchLine{MF "\string\mode=ljlo; input #1"}%150 +% \BatchLine{MF "\string\mode=epstypmd; input #1"}%720x360 +% \BatchLine{MF "\string\mode=esphi; input #1"}%720 +% \BatchLine{MF "\string\mode=epstylus; input #1"}%360 +% \BatchLine{MF "\string\mode=canonlbp; input #1"}%240 + \BatchLine{MF "\string\mode=jetiiisi; input #1"}%300 +} + +%\doMFJobtrue % Create MFJob file ? +\doMFJobfalse % Create MFJob file ? +\def\jobmodedef{m} % (works if \doMFJobtrue) +\def\fmtbase{plain} % (works if \doMFJobtrue) +\def\mfjobscaling{s0} % (works if \doMFJobtrue) +\def\mfcommand{} % (works if \doMFJobtrue) + +\endinput diff --git a/Master/texmf-dist/source/latex/lh/lcyfonts.fdd b/Master/texmf-dist/source/latex/lh/lcyfonts.fdd new file mode 100644 index 00000000000..28b7a53b427 --- /dev/null +++ b/Master/texmf-dist/source/latex/lh/lcyfonts.fdd @@ -0,0 +1,681 @@ +% \iffalse meta-comment +% lcyfonts.fdd +% extraction and modification of cmfonts.fdd +% (+concmath.dtx,slifonts.fdd,cmbr.fdd) +% Part of LH fonts package v3.5(d) +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \fi +% \CheckSum{126} +% +%\iffalse This is a META comment +% +% File `lcyfonts.fdd'. +% +%<LCYccr, >\ProvidesFile{lcyccr.fd} +%<LCYcmdh, >\ProvidesFile{lcycmdh.fd} +%<LCYcmfib, >\ProvidesFile{lcycmfib.fd} +%<LCYcmfr, >\ProvidesFile{lcycmfr.fd} +%<LCYcmr&!LCYcmss>\ProvidesFile{lcycmr.fd} +%<LCYcmss&!LCYcmr>\ProvidesFile{lcycmss.fd} +%<LCYcmr&LCYcmss>\ProvidesPackage{lh-lcy} +%<LCYcmtt, >\ProvidesFile{lcycmtt.fd} +%<LCYcmvtt, >\ProvidesFile{lcycmvtt.fd} +%<lcmss, >\ProvidesFile{lcylcmss.fd} +%<lcmtt, >\ProvidesFile{lcylcmtt.fd} +%<slimain, >\ProvidesFile{lcysfonts.def} +%<lcycmbr, >\ProvidesFile{lcycmbr.fd} +%<lcycmtl, >\ProvidesFile{lcycmtl.fd} +%<*driver, > + \ProvidesFile{lcyfonts.drv} +%</driver, > + [2006/06/08 v0.0a LCY Cyrillic font definitions] +% +%<*driver> +\documentclass{ltxdoc} +\GetFileInfo{lcyfonts.drv} +\providecommand\dst{\expandafter{\normalfont\scshape docstrip}} +\title{The file \texttt{lcyfonts.fdd} for use with + \LaTeXe.\thanks{This file has version + number \fileversion, dated \filedate.}} +\date{\filedate}\author{Olga Lapko} +\begin{document} +\maketitle + \DocInput{lcyfonts.fdd} +\end{document} +%</driver> +% +%\fi +% +% +% +% +% \section{Introduction} +% +% This file contains the external font information needed to load +% the LH fonts in old Cyrillic encoding (|LCY|). +% +% \StopEventually{} +% +% \section{The \texttt{docstrip} modules} +% +% The following modules are used to direct \texttt{docstrip} in +% generating external files: +% \begin{center} +% \begin{tabular}{ll} +% driver & produce a documentation driver file \\ +% nowarn & produce |.fd| files that do not warn about substitutions\\ +% ori & make conservative |.fd| files\\ +% fd & produce a font definition file (actually no longer used)\\[2pt] +% LCYccr & make Concrete Roman (old encoding) \\ +% LCYcmdh & make Computer Modern Dunhill (old encoding)\\ +% LCYcmfib & make Computer Modern Fibonacci (old encoding)\\ +% LCYcmfr & make Computer Modern Funny (old encoding)\\ +% LCYcmr & make Computer Modern Roman (old encoding)\\ +% LCYcmss & make Computer Modern Sans (old encoding)\\ +% LCYcmtt & make Computer Modern Typewriter (old encoding)\\ +% LCYcmvtt & make Computer Modern Variable Typewriter (old encoding)\\[2pt] +% slimain & generate \texttt{ot2sfonts.def} for slides\\ +% lccr & Concrete Roman slide sizes \\ +% lcmss & Computer Modern Sans slide sizes \\ +% lcmtt & Computer Modern Typewriter slide sizes \\[2pt] +% lcycmbr & font definition file \texttt{lcycmbr.fd}\\ +% lcycmtl & font definition file \texttt{lcycmtl.fd}\\ +% \end{tabular} +% \end{center} +% A typical \texttt{docstrip} command file would then have entries like: +% \begin{verbatim} +%\generateFile{LCYcmr.fd}{t}{\from{cmfonts.fdd}{fd,LCYcmr}} +%\end{verbatim} +% +% +% \section{The font definition files with local cyrillic encoding (\texttt{LCY})} +% +% \subsection{Computer Modern Roman (\texttt{LCY})} +% +% The package \texttt{lh-lcy} can be loaded without \texttt{fontenc}. +% Here is declared font encoding and default font for this encoding. +% \begin{macrocode} +%<*LCYcmr&LCYcmss> +\DeclareFontEncoding{LCY}{}{} +\DeclareFontSubstitution{LCY}{cmr}{m}{n} +%</LCYcmr&LCYcmss> +% \end{macrocode} +% \begin{macrocode} +%<*LCYcmr> +\DeclareFontFamily{LCY}{cmr}{\hyphenchar\font45 } +\DeclareFontShape{LCY}{cmr}{m}{n}% + {<5><6><7><8><9><10><12>gen*lhr% + <10.95>lhr10% + <14.4>lhr12% + <17.28><20.74><24.88>lhr17}{} +\DeclareFontShape{LCY}{cmr}{m}{sl}% + {% +%<+ori> <5-8>sub*cmr/m/n% +%<-ori> <5><6><7>lhsl8% + <8><9>gen*lhsl% + <10><10.95>lhsl10% + <12><14.4><17.28><20.74><24.88>lhsl12% + }{} +\DeclareFontShape{LCY}{cmr}{m}{it}% + {% +%<+ori> <5-7>sub*cmr/m/n% +%<+ori> <7>lhti7% +%<-ori> <5><6><7>lhti7% + <8>lhti8% + <9>lhti9% + <10><10.95>lhti10% + <12><14.4><17.28><20.74><24.88>lhti12% + }{} +\DeclareFontShape{LCY}{cmr}{m}{sc}% + {% +%<+ori> <5-8>sub*cmr/m/n% +%<+ori> <8><9><10><10.95><12>% +%<+ori> <14.4><17.28><20.74><24.88>lhcsc10% +%<-ori> <5><6><7><8><9><10><10.95><12>% +%<-ori> <14.4><17.28><20.74><24.88>lhcsc10% + }{} +% \end{macrocode} +% Here we try to cure the famous \$ $\to$ \pounds{} bug: +% \begin{macrocode} +%<+LCYcmr>% Warning: please note that the upright shape below is +%<+LCYcmr>% used for the \pounds symbol of LaTeX. So this +%<+LCYcmr>% font definition shouldn't be removed. +%<+LCYcmr>% +%<+ori>% If cmu below 10pt is not available we substitute +%<+ori>% cmti as far as possible (sizes 7, 8, 9). This is +%<+ori>% done because cmu is used mainly for producing the +%<+ori>% the \pound symbol and it is better to get a slanted +%<+ori>% (or bigger) pound then to get a $ sign in such +%<+ori>% situations. +\DeclareFontShape{LCY}{cmr}{m}{ui} + { +%<+ori> <7>subf*cmti7% +%<+ori> <8>subf*cmti8% +%<+ori> <9>subf*cmti9% +%<+ori> <10><10.95><12><14.4><17.28><20.74><24.88>lhu10% +%<-ori> <5><6><7><8><9><10><10.95><12>% +%<-ori> <14.4><17.28><20.74><24.88>lhu10% + }{} +%%%%%%% bold series +\DeclareFontShape{LCY}{cmr}{b}{n} + {% +%<+ori> <-10>sub*cmr/bx/n% +%<+ori> <10><10.95><12><14.4><17.28><20.74><24.88>lhb10% +%<-ori> <5><6><7><8><9><10><10.95><12>% +%<-ori> <14.4><17.28><20.74><24.88>lhb10% + }{} +%%%%%%%% bold extended series +\DeclareFontShape{LCY}{cmr}{bx}{n} + {% + <5><6><7><8><9>gen*lhbx% + <10><10.95>lhbx10% + <12><14.4><17.28><20.74><24.88>lhbx12% + }{} +\DeclareFontShape{LCY}{cmr}{bx}{sl} + {% +%<+ori> <-10>sub*cmr/bx/n% +%<+ori> <10><10.95><12><14.4><17.28><20.74><24.88>lhbxsl10% +%<-ori> <5><6><7><8><9>% +%<-ori> <10><10.95><12><14.4><17.28><20.74><24.88>lhbxsl10% + }{} +\DeclareFontShape{LCY}{cmr}{bx}{it} + {% +%<+ori> <-10>sub*cmr/bx/n% +%<+ori> <10><10.95><12><14.4><17.28><20.74><24.88>lhbxti10% +%<-ori> <5><6><7><8><9>% +%<-ori> <10><10.95><12><14.4><17.28><20.74><24.88>lhbxti10% + }{} +% \end{macrocode} +% \begin{macrocode} +%<+LCYcmr>% Again this is necessary for a correct \pounds symbol in +%<+LCYcmr>% the cmr fonts Hopefully the dc/ec font layout will take +%<+LCYcmr>% over soon. +%<+LCYcmr>% +%<+LCYcmr>\DeclareFontShape{LCY}{cmr}{bx}{ui} +%<-nowarn> {<->sub*cmr/m/ui}{} +%<+nowarn> {<->ssub*cmr/m/ui}{} +%</LCYcmr> +% \end{macrocode} +% +% \subsection{Computer Modern Sans (\texttt{LCY})} +% +% Same game for the Sans family. +% \begin{macrocode} +%<*LCYcmss> +\DeclareFontFamily{LCY}{cmss}{\hyphenchar\font45 } +\DeclareFontShape{LCY}{cmss}{m}{n} + {% +%<+ori> <-8>sub*cmr/m/n% +%<+ori> <8>lhss8% +%<-ori> <5><6><7><8>lhss8% + <9>lhss9% + <10><10.95>lhss10% + <12><14.4>lhss12% + <17.28><20.74><24.88>lhss17% + }{} +%<+LCYcmss>% Font undefined, therefore substituted +\DeclareFontShape{LCY}{cmss}{m}{it} +%<-nowarn> {<->sub*cmss/m/sl}{} +%<+nowarn> {<->ssub*cmss/m/sl}{} +\DeclareFontShape{LCY}{cmss}{m}{sl} + {% +%<+ori> <-8>sub*cmss/m/n% +%<+ori> <8><9>gen*lhssi% +%<-ori> <5><6><7><8>lhssi8<9>lhssi9% + <10><10.95>lhssi10% + <12><14.4>lhssi12% + <17.28><20.74><24.88>lhssi17% + }{} +%%%%%%% Font/shape undefined, therefore substituted +\DeclareFontShape{LCY}{cmss}{m}{sc} + {<->sub*cmr/m/sc}{} +%%%%%%% Font/shape undefined, therefore substituted +\DeclareFontShape{LCY}{cmss}{m}{ui} + {<->sub*cmr/m/ui}{} +%%%%%%%% semibold condensed series +\DeclareFontShape{LCY}{cmss}{sbc}{n} + {% +%<+ori> <-10>sub*cmss/m/n% +%<-ori> <5><6><7><8><9>lhssdc10% + <10><10.95><12><14.4><17.28><20.74><24.88>lhssdc10% + }{} + +%%%%%%%%% bold extended series +\DeclareFontShape{LCY}{cmss}{bx}{n} + {% +%<+ori> <-10>sub*cmss/m/n% +%<-ori> <5><6><7><8><9>lhssbx10% + <10><10.95><12><14.4><17.28><20.74><24.88>lhssbx10% + }{} +%%%%%%% Font/shape undefined, therefore substituted +\DeclareFontShape{LCY}{cmss}{bx}{ui} + {<->sub*cmr/bx/ui}{} +%</LCYcmss> +% \end{macrocode} +% +% \subsection{Computer Modern Typewriter (\texttt{LCY})} +% +% Notice that this encoding is in fact quite different and we +% shouldn't therefore substitute some other font group if the +% correct size or shape isn't available. Otherwise, we may end with +% a |\verb| suddenly producing a lot of funny chars instead of the +% desired ones. +% \begin{macrocode} +%<*LCYcmtt> +\DeclareFontFamily{LCY}{cmtt}{\hyphenchar \font\m@ne} +\DeclareFontShape{LCY}{cmtt}{m}{n} + {% +% \end{macrocode} +% This substitution for |ori| is wrong and only in here because +% that was the way stuff has be set up in the old |lfonts.tex| file. +% \begin{macrocode} +%<+ori> <-8>sub*cmr/m/n% +%<+ori> <8><9>gen*lhtt% +%<-ori> <5><6><7><8>lhtt8<9>lhtt9% + <10><10.95>lhtt10% + <12><14.4><17.28><20.74><24.88>lhtt12% + }{} +%%%%%% make sure subst shapes are available +\DeclareFontShape{LCY}{cmtt}{m}{it} + {% +% \end{macrocode} +% The following substitution however is okay since both fonts have +% the same encoding. +% \begin{macrocode} +%<+ori> <-10>sub*cmtt/m/n% +%<-ori> <5><6><7><8><9>% + <10><10.95><12><14.4><17.28><20.74><24.88>lhitt10% + }{} +\DeclareFontShape{LCY}{cmtt}{m}{sl} + {% +%<+ori> <-10>sub*cmtt/m/n% +%<-ori> <5><6><7><8><9>% + <10><10.95><12><14.4><17.28><20.74><24.88>lhsltt10% + }{} +\DeclareFontShape{LCY}{cmtt}{m}{sc} + {% +%<+ori> <-10>sub*cmtt/m/n% +%<-ori> <5><6><7><8><9>% + <10><10.95><12><14.4><17.28><20.74><24.88>lhtcsc10% + }{} +\DeclareFontShape{LCY}{cmtt}{m}{ui} +%<-nowarn> {<->sub*cmtt/m/it}{} +%<+nowarn> {<->ssub*cmtt/m/it}{} +\DeclareFontShape{LCY}{cmtt}{bx}{n} +%<-nowarn> {<->sub*cmtt/m/n}{} +%<+nowarn> {<->ssub*cmtt/m/n}{} +\DeclareFontShape{LCY}{cmtt}{bx}{it} +%<-nowarn> {<->sub*cmtt/m/it}{} +%<+nowarn> {<->ssub*cmtt/m/it}{} +\DeclareFontShape{LCY}{cmtt}{bx}{ui} +%<-nowarn> {<->sub*cmtt/m/it}{} +%<+nowarn> {<->ssub*cmtt/m/it}{} +%</LCYcmtt> +% \end{macrocode} +% +% +% \subsection{Computer Modern Variable Typewriter (\texttt{LCY})} +% +% The Computer Modern Variable Typewriter family is the +% proportional spaced version of the Computer Modern Typewriter +% family. It is implemented as a separate family to allow easy use +% in normal text, including changes of shape/series etc if available. +% This family also allows normal hyphenation. +% \begin{macrocode} +%<*LCYcmvtt> +\DeclareFontFamily{LCY}{cmvtt}{\hyphenchar\font45 } +\DeclareFontShape{LCY}{cmvtt}{m}{n}% + {% + <5><6><7><8><9><10><10.95>% + <12><14.4><17.28><20.74><24.88>lhvtt10% + }{} +% \end{macrocode} +% This font is probably not available to everybody as it is not +% part of the standard distribution. One might find it in +% \texttt{.../systems/knuth/local} on CTAN. +% \begin{macrocode} +\DeclareFontShape{LCY}{cmvtt}{m}{it}% + {% + <5><6><7><8><9><10><10.95>% + <12><14.4><17.28><20.74><24.88>lhvtti10% + }{} +%</LCYcmvtt> +% \end{macrocode} +% +% +% \subsection{Computer Modern Funny (\texttt{LCY})} +% +% \begin{macrocode} +%<*LCYcmfr> +\DeclareFontFamily{LCY}{cmfr}{\hyphenchar\font45 } +\DeclareFontShape{LCY}{cmfr}{m}{n}{% + <10>lhff10% + }{} +\DeclareFontShape{LCY}{cmfr}{m}{it}{% + <10>lhfi10% + }{} +%</LCYcmfr> +% \end{macrocode} +% +% \subsection{Computer Modern Dunhill (\texttt{LCY})} +% +% \begin{macrocode} +%<*LCYcmdh> +\DeclareFontFamily{LCY}{cmdh}{\hyphenchar\font45 } +\DeclareFontShape{LCY}{cmdh}{m}{n}{% + <10>lhdunh10% + }{} +%</LCYcmdh> +% \end{macrocode} +% +% \subsection{Computer Modern Fibonacci (\texttt{LCY})} +% +% \begin{macrocode} +%<*LCYcmfib> +\DeclareFontFamily{LCY}{cmfib}{\hyphenchar\font45 } +\DeclareFontShape{LCY}{cmfib}{m}{n}{% + <8>lhfib8% + }{} +%</LCYcmfib> +% \end{macrocode} +% +% \subsection{Concrete Roman} +% +% Text of explanation borrowed from original \texttt{concmath.dtx}. +% +% Here are the standard font definitions for Concrete Roman, +% including the \textit{italics}, \textsl{slanted}, and +% \textsc{small-caps} variants, which are usually only available +% in~10\,pt size. While it would be a trivial exercise to create a +% full set of slanted fonts by taking the \texttt{ccr} parameter +% files and setting the slant parameter to~$1/6$ in the +% \texttt{ccsl} parameter files, we shall only use the sizes +% provided in Knuth's official distribution. As for the italics +% and small-caps versions, there is no way to generate appropriate +% smaller sizes without extensive tuning and testing to derive new +% parameter sets. +% +% \begin{macrocode} +%<*LCYccr> +\DeclareFontFamily{LCY}{ccr}{\hyphenchar\font45 } +\DeclareFontShape{LCY}{ccr}{m}{n}{% + <5><6><7><8><9>gen*lhcr% + <10><10.95><12><14.4><17.28><20.74><24.88>lhcr10}{} +\DeclareFontShape{LCY}{ccr}{m}{sl}{% + <5><6><7><8><9>lhcsl9% + <10><10.95><12><14.4><17.28><20.74><24.88>lhcsl10}{} +\DeclareFontShape{LCY}{ccr}{m}{it}{% + <5><6><7><8><9>% + <10><10.95><12><14.4><17.28><20.74><24.88>lhcti10}{} +\DeclareFontShape{LCY}{ccr}{m}{sc}{% + <5><6><7><8><9>% + <10><10.95><12><14.4><17.28><20.74><24.88>lhccsc10}{} +% \end{macrocode} +% +% Next, here are the font substitutions for the bold series. Since +% there is no bold series in Concrete, we will use the +% corresponding Computer Modern fonts. +% {\em Added substitution for |\fontseries b| font.} +% +% \begin{macrocode} +%<+ori>\DeclareFontShape{LCY}{ccr}{b}{n}{<->ssub*cmr/b/n}{} +%<+ori>\DeclareFontShape{LCY}{ccr}{bx}{n}{<->ssub*cmr/bx/n}{} +%<+ori>\DeclareFontShape{LCY}{ccr}{bx}{sl}{<->ssub*cmr/bx/sl}{} +%<+ori>\DeclareFontShape{LCY}{ccr}{bx}{it}{<->ssub*cmr/bx/it}{} +%<-ori>\DeclareFontShape{LCY}{ccr}{b}{n}{% +%<-ori> <5><6><7><8><9>% +%<-ori> <10><10.95><12><14.4><17.28><20.74><24.88>lhcb10}{} +%<-ori>\DeclareFontShape{LCY}{ccr}{bx}{n}{% +%<-ori> <5><6><7><8><9>gen*lhcbx% +%<-ori> <10><10.95><12><14.4><17.28><20.74><24.88>lhcbx10}{} +%<-ori>\DeclareFontShape{LCY}{ccr}{bx}{sl}{% +%<-ori> <5><6><7><8><9>% +%<-ori> <10><10.95><12><14.4><17.28><20.74><24.88>lhcbxsl10}{} +%<-ori>\DeclareFontShape{LCY}{ccr}{bx}{it}{% +%<-ori> <5><6><7><8><9>% +%<-ori> <10><10.95><12><14.4><17.28><20.74><24.88>lhcbxti10}{} +% \end{macrocode} +% +% Next, here are the font substitutions for the semibold series. +% As we shall see below, the \texttt{concmath} package provides a +% `\textsf{boldsans}' option which redefines |\bfdefault| and thus +% turns all bold material into semibold condensed (which will then +% be substituted by semibold condensed sans serif). Since some +% people prefer to use semibold condensed Computer Modern Sans +% Serif in combination with Concrete Roman, this unusual +% substitution allows to switch between both choices by selecting +% or omitting a package option. +% +% \begin{macrocode} +\DeclareFontShape{LCY}{ccr}{sbc}{n} {<->ssub*cmss/sbc/n}{} +\DeclareFontShape{LCY}{ccr}{sbc}{sl}{<->ssub*cmss/sbc/n}{} +\DeclareFontShape{LCY}{ccr}{sbc}{it}{<->ssub*cmss/sbc/n}{} +% \end{macrocode} +% +% Finally, here is the font shape declaration for the special +% purpose condensed slanted font that was used in \textit{Concrete +% Mathematics} for so-called `graffiti'. The \texttt{concmath} +% package does not bother to provide macros for such kinds of +% marginal notes, thus users who want to use this feature will have +% to develop their own. +% +% \begin{macrocode} +\DeclareFontShape{LCY}{ccr}{c}{sl}{<9>lhcslc9}{} +%</LCYccr> +% \end{macrocode} +% +% \section{The font definition files for slides} +% +% \subsection{Concrete Roman} +% +% \begin{macrocode} +%<*lccr> +\DeclareFontFamily{LCY}{lccr}{\hyphenchar\font45 } +\DeclareFontShape{LCY}{lccr}{m}{sc}{% + <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>lhccsc10% + }{} +\DeclareFontShape{LCY}{lccr}{m}{sl}{% + <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>lhcslc9% + }{} +\DeclareFontShape{LCY}{lccr}{m}{n}{% + <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>lhcr8% + }{} +\DeclareFontShape{LCY}{lccr}{m}{In}{% + <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>ilhcr8% + }{} +%</lccr> +% \end{macrocode} +% +% \subsection{Computer Modern Sans} +% +% \begin{macrocode} +%<*lcmss> + \DeclareFontFamily{LCY}{lcmss}{\hyphenchar\font45 } +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{LCY}{lcmss}{m}{n}{% + <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + llhss8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{LCY}{lcmss}{m}{In}{% + <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + illhss8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{LCY}{lcmss}{m}{sl}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + llhssi8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{LCY}{lcmss}{m}{Isl}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + illhssi8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{LCY}{lcmss}{m}{it}{% + <->sub*lcmss/m/sl}{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{LCY}{lcmss}{m}{Iit}{% + <->sub*lcmss/m/Isl}{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{LCY}{lcmss}{bx}{n}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + llhssb8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{LCY}{lcmss}{bx}{In}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + illhssb8% + }{} +% \end{macrocode} +% +% There are extra substitutions for the shape |ui| which are needed +% for |\pounds| to not come out as a \$ sign (mostly). +% \begin{macrocode} +\DeclareFontShape{LCY}{lcmss}{m}{ui}{% + <->sub*cmr/m/ui}{} +\DeclareFontShape{LCY}{lcmss}{bx}{ui}{% + <->sub*cmr/m/ui}{} +%</lcmss> +% \end{macrocode} +% +% \subsection{Computer Modern Typewriter} +% +% \begin{macrocode} +%<*lcmtt> + \DeclareFontFamily{LCY}{lcmtt}{\hyphenchar\font\m@ne} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{LCY}{lcmtt}{m}{n}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + lhtt8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{LCY}{lcmtt}{m}{In}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + ilhtt8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{LCY}{lcmtt}{m}{it}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + lhitt10% + }{} +% \end{macrocode} +% There are extra substitutions for the shape |ui| which are needed +% for |\pounds| to not come out as a \$ sign (mostly). +% \begin{macrocode} +\DeclareFontShape{LCY}{lcmtt}{m}{ui}{% + <->sub*cmtt/m/it}{} +\DeclareFontShape{LCY}{lcmtt}{bx}{ui}{% + <->sub*cmtt/m/it}{} +%</lcmtt> +% \end{macrocode} +% +% \section{Setting defaults} +% +% The following statements go into the file \texttt{sfonts.def} +% which plays a r\^ole similar to \texttt{fontdef.ltx}. Thus, you may +% want to produce your own local variant of it if you intend to use +% different fonts in your slides. +% \begin{macrocode} +%<*slimain> +\DeclareErrorFont{LCY}{lcmss}{m}{n}{19.907} +\DeclareFontSubstitution{LCY}{lcmss}{m}{n} +\input lcylcmss.fd +%</slimain> +% \end{macrocode} +% +% \section{CM Bright fonts} +% +% Borrowed code and with adaptations from file \texttt{cmbr.fdd} +% +% \subsection{CM Bright, LCY encoding} +% +% \begin{macrocode} +%<*lcycmbr> +\DeclareFontFamily{LCY}{cmbr}{\hyphenchar\font45} +\DeclareFontShape{LCY}{cmbr}{m}{n}{% +<5><6><7><8>lhbr8% +<9>lhbr9% +<10><10.95><12><14.4>lhbr10% +<17.28><20.74><24.88><29.86><35.83>lhbr17% +}{} +\DeclareFontShape{LCY}{cmbr}{m}{sl}{% +<5><6><7><8>lhbrsl8% +<9>lhbrsl9% +<10><10.95><12><14.4>lhbrsl10% +<17.28><20.74><24.88><29.86><35.83>lhbrsl17% +}{} +\DeclareFontShape{LCY}{cmbr}{m}{it}{% +<->ssub*cmbr/m/sl% +}{} +\DeclareFontShape{LCY}{cmbr}{b}{n}{% +<->ssub*cmbr/bx/n% +}{} +\DeclareFontShape{LCY}{cmbr}{bx}{n}{% +<-9>sub*cmbr/m/n% +<9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>lhbrbx10% +}{} +%</lcycmbr> +% \end{macrocode} +% +% \subsection{CM Typewriter Light, LCY encoding} +% +% \begin{macrocode} +%<*lcycmtl> +\DeclareFontFamily{LCY}{cmtl}{\hyphenchar\font\m@ne} +\DeclareFontShape{LCY}{cmtl}{m}{n}{% +<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>lhtl10% +}{} +\DeclareFontShape{LCY}{cmtl}{m}{sl}{% +<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>lhsltl10% +}{} +\DeclareFontShape{LCY}{cmtl}{m}{it}{<->ssub*cmtl/m/sl}{} +%</lcycmtl> +% \end{macrocode} +% +% The next line goes into all files and in addition prevents \dst{} +% from adding any further code from the main source file (such as a +% character table. +% \begin{macrocode} +\endinput +% \end{macrocode} +% +% \Finale +% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} diff --git a/Master/texmf-dist/source/latex/lh/lcyfonts.ins b/Master/texmf-dist/source/latex/lh/lcyfonts.ins new file mode 100644 index 00000000000..e0f29be06e4 --- /dev/null +++ b/Master/texmf-dist/source/latex/lh/lcyfonts.ins @@ -0,0 +1,57 @@ +% lcyfonts.ins +% extracted and modified cmfonts.ins +% (+slides.ins,cmbr.ins) +% Part of LH fonts package v3.5(d) +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% + +\input docstrip +\usedir{tex/latex/lhfonts} + +\preamble + +This is a generated file. + +This file is part of lhfonts package +Version 3.5 // Patchlevel=2 + +\endpreamble + +\keepsilent + +\generate{\file{lcycmss.fd}{\from{lcyfonts.fdd}{LCYcmss}} + \file{lcycmr.fd}{\from{lcyfonts.fdd}{LCYcmr}} + \file{lh-lcy.sty}{\from{lcyfonts.fdd}{LCYcmr,LCYcmss}} + \file{lcycmtt.fd}{\from{lcyfonts.fdd}{LCYcmtt,nowarn}} + \file{lcycmvtt.fd}{\from{lcyfonts.fdd}{LCYcmvtt}} + \file{lcycmfib.fd}{\from{lcyfonts.fdd}{LCYcmfib}} + \file{lcycmfr.fd}{\from{lcyfonts.fdd}{LCYcmfr}} + \file{lcycmdh.fd}{\from{lcyfonts.fdd}{LCYcmdh}}} + +\generate{\file{lcyccr.fd}{\from{lcyfonts.fdd}{LCYccr,ori}} + \file{lh-lcyccr.sty}{\from{lcyfonts.fdd}{LCYccr,ori}} + \file{lh-lcyxccr.sty}{\from{lcyfonts.fdd}{LCYccr}}} + +\generate{\file{lcylcmss.fd}{\from{lcyfonts.fdd}{lcmss,fd}} + \file{lcylcmtt.fd}{\from{lcyfonts.fdd}{lcmtt,fd}}} + +\generate{\file{lcycmbr.fd}{\from{lcyfonts.fdd}{lcycmbr}} + \file{lcycmtl.fd}{\from{lcyfonts.fdd}{lcycmtl}}} + +\ifToplevel{ +\Msg{***********************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* files into a directory searched by TeX:} +\Msg{*} +\Msg{* \space\space All *.fd} +\Msg{*} +\Msg{* To produce the documentation run the files ending with} +\Msg{* `.fdd' through LaTeX.} +\Msg{*} +\Msg{* Happy TeXing} +\Msg{***********************************************************} +} + +\endbatchfile + diff --git a/Master/texmf-dist/source/latex/lh/ot2fonts.fdd b/Master/texmf-dist/source/latex/lh/ot2fonts.fdd new file mode 100644 index 00000000000..6d1bcf3f86e --- /dev/null +++ b/Master/texmf-dist/source/latex/lh/ot2fonts.fdd @@ -0,0 +1,682 @@ +% \iffalse meta-comment +% ot2fonts.fdd +% extraction and modification of cmfonts.fdd +% (+concmath.dtx,slifonts.fdd,cmbr.fdd) +% Part of LH fonts package v3.5(d) +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \fi +% \CheckSum{131} +% +%\iffalse This is a META comment +% +% File `ot2fonts.fdd'. +% +%<OT2ccr, >\ProvidesFile{ot2ccr.fd} +%<OT2cmdh, >\ProvidesFile{ot2cmdh.fd} +%<OT2cmfib, >\ProvidesFile{ot2cmfib.fd} +%<OT2cmfr, >\ProvidesFile{ot2cmfr.fd} +%<OT2cmr&!OT2cmss>\ProvidesFile{ot2cmr.fd} +%<OT2cmss&!OT2cmr>\ProvidesFile{ot2cmss.fd} +%<OT2cmr&OT2cmss>\ProvidesPackage{lh-ot2} +%<OT2cmtt, >\ProvidesFile{ot2cmtt.fd} +%<OT2cmvtt, >\ProvidesFile{ot2cmvtt.fd} +%<lcmss, >\ProvidesFile{ot2lcmss.fd} +%<lcmtt, >\ProvidesFile{ot2lcmtt.fd} +%<slimain, >\ProvidesFile{ot2sfonts.def} +%<ot2cmbr, >\ProvidesFile{ot2cmbr.fd} +%<ot2cmtl, >\ProvidesFile{ot2cmtl.fd} +%<*driver, > + \ProvidesFile{ot2fonts.drv} +%</driver, > + [2006/06/08 v0.0a OT2 Cyrillic font definitions] +% +%<*driver> +\documentclass{ltxdoc} +\GetFileInfo{ot2fonts.drv} +\providecommand\dst{\expandafter{\normalfont\scshape docstrip}} +\title{The file \texttt{ot2fonts.fdd} for use with + \LaTeXe.\thanks{This file has version + number \fileversion, dated \filedate.}} +\date{\filedate}\author{Olga Lapko} +\begin{document} +\maketitle + \DocInput{ot2fonts.fdd} +\end{document} +%</driver> +% +%\fi +% +% \section{Introduction} +% +% This file contains the external font information needed to load +% the LH fonts in old Cyrillic encoding (|OT2|). +% +% \StopEventually{} +% +% \section{The \texttt{docstrip} modules} +% +% The following modules are used to direct \texttt{docstrip} in +% generating external files: +% \begin{center} +% \begin{tabular}{ll} +% driver & produce a documentation driver file \\ +% nowarn & produce |.fd| files that do not warn about substitutions\\ +% ori & make conservative |.fd| files\\ +% fd & produce a font definition file (actually no longer used)\\[2pt] +% OT2ccr & make Concrete Roman (old encoding) \\ +% OT2cmdh & make Computer Modern Dunhill (old encoding)\\ +% OT2cmfib & make Computer Modern Fibonacci (old encoding)\\ +% OT2cmfr & make Computer Modern Funny (old encoding)\\ +% OT2cmr & make Computer Modern Roman (old encoding)\\ +% OT2cmss & make Computer Modern Sans (old encoding)\\ +% OT2cmtt & make Computer Modern Typewriter (old encoding)\\ +% OT2cmvtt & make Computer Modern Variable Typewriter (old encoding)\\[2pt] +% slimain & generate \texttt{ot2sfonts.def} for slides\\ +% lccr & Concrete Roman slide sizes \\ +% lcmss & Computer Modern Sans slide sizes \\ +% lcmtt & Computer Modern Typewriter slide sizes \\[2pt] +% ot2cmbr & CM bright font definition file \texttt{ot2cmbr.fd}\\ +% ot2cmtl & CM bright font definition file \texttt{ot2cmtl.fd}\\ +% \end{tabular} +% \end{center} +% A typical \texttt{docstrip} command file would then have entries like: +% \begin{verbatim} +%\generateFile{OT2cmr.fd}{t}{\from{cmfonts.fdd}{fd,OT2cmr}} +%\end{verbatim} +% +% +% \section{The font definition files for old Cyrillic encoding (\texttt{OT2})} +% +% \subsection{Computer Modern Roman (\texttt{OT2})} +% +% The package \texttt{lh-ot2} can be loaded without \texttt{fontenc}. +% Here is declared font encoding and default font for this encoding. +% To avoid mixing of WNCYR and LH fonts the default font redefined +% to \texttt{wnr10}. +% \begin{macrocode} +%<*OT2cmr&OT2cmss> +\DeclareFontEncoding{OT2}{}{} +\DeclareFontSubstitution{OT2}{cmr}{m}{n} +\@ifundefined{OT2/cmr/m/n/10}{}{% + \expandafter\font\csname OT2/cmr/m/n/10\endcsname=wnr10} +%</OT2cmr&OT2cmss> +% \end{macrocode} +% \begin{macrocode} +%<*OT2cmr> +\DeclareFontFamily{OT2}{cmr}{\hyphenchar\font45 } +\DeclareFontShape{OT2}{cmr}{m}{n}% + {<5><6><7><8><9><10><12>gen*wnr% + <10.95>wnr10% + <14.4>wnr12% + <17.28><20.74><24.88>wnr17}{} +\DeclareFontShape{OT2}{cmr}{m}{sl}% + {% +%<+ori> <5-8>sub*cmr/m/n% +%<-ori> <5><6><7>wnsl8% + <8><9>gen*wnsl% + <10><10.95>wnsl10% + <12><14.4><17.28><20.74><24.88>wnsl12% + }{} +\DeclareFontShape{OT2}{cmr}{m}{it}% + {% +%<+ori> <5-7>sub*cmr/m/n% +%<+ori> <7>wnti7% +%<-ori> <5><6><7>wnti7% + <8>wnti8% + <9>wnti9% + <10><10.95>wnti10% + <12><14.4><17.28><20.74><24.88>wnti12% + }{} +\DeclareFontShape{OT2}{cmr}{m}{sc}% + {% +%<+ori> <5-8>sub*cmr/m/n% +%<+ori> <8><9><10><10.95><12>% +%<+ori> <14.4><17.28><20.74><24.88>wncsc10% +%<-ori> <5><6><7><8><9><10><10.95><12>% +%<-ori> <14.4><17.28><20.74><24.88>wncsc10% + }{} +% \end{macrocode} +% Here we try to cure the famous \$ $\to$ \pounds{} bug: +% \begin{macrocode} +%<+OT2cmr>% Warning: please note that the upright shape below is +%<+OT2cmr>% used for the \pounds symbol of LaTeX. So this +%<+OT2cmr>% font definition shouldn't be removed. +%<+OT2cmr>% +%<+ori>% If cmu below 10pt is not available we substitute +%<+ori>% cmti as far as possible (sizes 7, 8, 9). This is +%<+ori>% done because cmu is used mainly for producing the +%<+ori>% the \pound symbol and it is better to get a slanted +%<+ori>% (or bigger) pound then to get a $ sign in such +%<+ori>% situations. +\DeclareFontShape{OT2}{cmr}{m}{ui} + { +%<+ori> <7>subf*cmti7% +%<+ori> <8>subf*cmti8% +%<+ori> <9>subf*cmti9% +%<+ori> <10><10.95><12><14.4><17.28><20.74><24.88>wnu10% +%<-ori> <5><6><7><8><9><10><10.95><12>% +%<-ori> <14.4><17.28><20.74><24.88>wnu10% + }{} +%%%%%%% bold series +\DeclareFontShape{OT2}{cmr}{b}{n} + {% +%<+ori> <-10>sub*cmr/bx/n% +%<+ori> <10><10.95><12><14.4><17.28><20.74><24.88>wnb10% +%<-ori> <5><6><7><8><9><10><10.95><12>% +%<-ori> <14.4><17.28><20.74><24.88>wnb10% + }{} +%%%%%%%% bold extended series +\DeclareFontShape{OT2}{cmr}{bx}{n} + {% + <5><6><7><8><9>gen*wnbx% + <10><10.95>wnbx10% + <12><14.4><17.28><20.74><24.88>wnbx12% + }{} +\DeclareFontShape{OT2}{cmr}{bx}{sl} + {% +%<+ori> <-10>sub*cmr/bx/n% +%<+ori> <10><10.95><12><14.4><17.28><20.74><24.88>wnbxsl10% +%<-ori> <5><6><7><8><9>% +%<-ori> <10><10.95><12><14.4><17.28><20.74><24.88>wnbxsl10% + }{} +\DeclareFontShape{OT2}{cmr}{bx}{it} + {% +%<+ori> <-10>sub*cmr/bx/n% +%<+ori> <10><10.95><12><14.4><17.28><20.74><24.88>wnbxti10% +%<-ori> <5><6><7><8><9>% +%<-ori> <10><10.95><12><14.4><17.28><20.74><24.88>wnbxti10% + }{} +% \end{macrocode} +% \begin{macrocode} +%<+OT2cmr>% Again this is necessary for a correct \pounds symbol in +%<+OT2cmr>% the cmr fonts Hopefully the dc/ec font layout will take +%<+OT2cmr>% over soon. +%<+OT2cmr>% +%<+OT2cmr>\DeclareFontShape{OT2}{cmr}{bx}{ui} +%<-nowarn> {<->sub*cmr/m/ui}{} +%<+nowarn> {<->ssub*cmr/m/ui}{} +%</OT2cmr> +% \end{macrocode} +% +% \subsection{Computer Modern Sans (\texttt{OT2})} +% +% Same game for the Sans family. +% \begin{macrocode} +%<*OT2cmss> +\DeclareFontFamily{OT2}{cmss}{\hyphenchar\font45 } +\DeclareFontShape{OT2}{cmss}{m}{n} + {% +%<+ori> <-8>sub*cmr/m/n% +%<+ori> <8>wnss8% +%<-ori> <5><6><7><8>wnss8% + <9>wnss9% + <10><10.95>wnss10% + <12><14.4>wnss12% + <17.28><20.74><24.88>wnss17% + }{} +%<+OT2cmss>% Font undefined, therefore substituted +\DeclareFontShape{OT2}{cmss}{m}{it} +%<-nowarn> {<->sub*cmss/m/sl}{} +%<+nowarn> {<->ssub*cmss/m/sl}{} +\DeclareFontShape{OT2}{cmss}{m}{sl} + {% +%<+ori> <-8>sub*cmss/m/n% +%<+ori> <8><9>gen*wnssi% +%<-ori> <5><6><7><8>wnssi8<9>wnssi9% + <10><10.95>wnssi10% + <12><14.4>wnssi12% + <17.28><20.74><24.88>wnssi17% + }{} +%%%%%%% Font/shape undefined, therefore substituted +\DeclareFontShape{OT2}{cmss}{m}{sc} + {<->sub*cmr/m/sc}{} +%%%%%%% Font/shape undefined, therefore substituted +\DeclareFontShape{OT2}{cmss}{m}{ui} + {<->sub*cmr/m/ui}{} +%%%%%%%% semibold condensed series +\DeclareFontShape{OT2}{cmss}{sbc}{n} + {% +%<+ori> <-10>sub*cmss/m/n% +%<-ori> <5><6><7><8><9>wnssdc10% + <10><10.95><12><14.4><17.28><20.74><24.88>wnssdc10% + }{} + +%%%%%%%%% bold extended series +\DeclareFontShape{OT2}{cmss}{bx}{n} + {% +%<+ori> <-10>sub*cmss/m/n% +%<-ori> <5><6><7><8><9>wnssbx10% + <10><10.95><12><14.4><17.28><20.74><24.88>wnssbx10% + }{} +%%%%%%% Font/shape undefined, therefore substituted +\DeclareFontShape{OT2}{cmss}{bx}{ui} + {<->sub*cmr/bx/ui}{} +%</OT2cmss> +% \end{macrocode} +% +% \subsection{Computer Modern Typewriter (\texttt{OT2})} +% +% Notice that this encoding is in fact quite different and we +% shouldn't therefore substitute some other font group if the +% correct size or shape isn't available. Otherwise, we may end with +% a |\verb| suddenly producing a lot of funny chars instead of the +% desired ones. +% \begin{macrocode} +%<*OT2cmtt> +\DeclareFontFamily{OT2}{cmtt}{\hyphenchar \font\m@ne} +\DeclareFontShape{OT2}{cmtt}{m}{n} + {% +% \end{macrocode} +% This substitution for |ori| is wrong and only in here because +% that was the way stuff has be set up in the old |lfonts.tex| file. +% \begin{macrocode} +%<+ori> <-8>sub*cmr/m/n% +%<+ori> <8><9>gen*wntt% +%<-ori> <5><6><7><8>wntt8<9>wntt9% + <10><10.95>wntt10% + <12><14.4><17.28><20.74><24.88>wntt12% + }{} +%%%%%% make sure subst shapes are available +\DeclareFontShape{OT2}{cmtt}{m}{it} + {% +% \end{macrocode} +% The following substitution however is okay since both fonts have +% the same encoding. +% \begin{macrocode} +%<+ori> <-10>sub*cmtt/m/n% +%<-ori> <5><6><7><8><9>% + <10><10.95><12><14.4><17.28><20.74><24.88>wnitt10% + }{} +\DeclareFontShape{OT2}{cmtt}{m}{sl} + {% +%<+ori> <-10>sub*cmtt/m/n% +%<-ori> <5><6><7><8><9>% + <10><10.95><12><14.4><17.28><20.74><24.88>wnsltt10% + }{} +\DeclareFontShape{OT2}{cmtt}{m}{sc} + {% +%<+ori> <-10>sub*cmtt/m/n% +%<-ori> <5><6><7><8><9>% + <10><10.95><12><14.4><17.28><20.74><24.88>wntcsc10% + }{} +\DeclareFontShape{OT2}{cmtt}{m}{ui} +%<-nowarn> {<->sub*cmtt/m/it}{} +%<+nowarn> {<->ssub*cmtt/m/it}{} +\DeclareFontShape{OT2}{cmtt}{bx}{n} +%<-nowarn> {<->sub*cmtt/m/n}{} +%<+nowarn> {<->ssub*cmtt/m/n}{} +\DeclareFontShape{OT2}{cmtt}{bx}{it} +%<-nowarn> {<->sub*cmtt/m/it}{} +%<+nowarn> {<->ssub*cmtt/m/it}{} +\DeclareFontShape{OT2}{cmtt}{bx}{ui} +%<-nowarn> {<->sub*cmtt/m/it}{} +%<+nowarn> {<->ssub*cmtt/m/it}{} +%</OT2cmtt> +% \end{macrocode} +% +% +% \subsection{Computer Modern Variable Typewriter (\texttt{OT2})} +% +% The Computer Modern Variable Typewriter family is the +% proportional spaced version of the Computer Modern Typewriter +% family. It is implemented as a separate family to allow easy use +% in normal text, including changes of shape/series etc if available. +% This family also allows normal hyphenation. +% \begin{macrocode} +%<*OT2cmvtt> +\DeclareFontFamily{OT2}{cmvtt}{\hyphenchar\font45 } +\DeclareFontShape{OT2}{cmvtt}{m}{n}% + {% + <5><6><7><8><9><10><10.95>% + <12><14.4><17.28><20.74><24.88>wnvtt10% + }{} +% \end{macrocode} +% This font is probably not available to everybody as it is not +% part of the standard distribution. One might find it in +% \texttt{.../systems/knuth/local} on CTAN. +% \begin{macrocode} +\DeclareFontShape{OT2}{cmvtt}{m}{it}% + {% + <5><6><7><8><9><10><10.95>% + <12><14.4><17.28><20.74><24.88>wnvtti10% + }{} +%</OT2cmvtt> +% \end{macrocode} +% +% +% \subsection{Computer Modern Funny (\texttt{OT2})} +% +% \begin{macrocode} +%<*OT2cmfr> +\DeclareFontFamily{OT2}{cmfr}{\hyphenchar\font45 } +\DeclareFontShape{OT2}{cmfr}{m}{n}{% + <10>wnff10% + }{} +\DeclareFontShape{OT2}{cmfr}{m}{it}{% + <10>wnfi10% + }{} +%</OT2cmfr> +% \end{macrocode} +% +% \subsection{Computer Modern Dunhill (\texttt{OT2})} +% +% \begin{macrocode} +%<*OT2cmdh> +\DeclareFontFamily{OT2}{cmdh}{\hyphenchar\font45 } +\DeclareFontShape{OT2}{cmdh}{m}{n}{% + <10>wndunh10% + }{} +%</OT2cmdh> +% \end{macrocode} +% +% \subsection{Computer Modern Fibonacci (\texttt{OT2})} +% +% \begin{macrocode} +%<*OT2cmfib> +\DeclareFontFamily{OT2}{cmfib}{\hyphenchar\font45 } +\DeclareFontShape{OT2}{cmfib}{m}{n}{% + <8>wnfib8% + }{} +%</OT2cmfib> +% \end{macrocode} +% +% \subsection{Concrete Roman} +% +% Text of explanation borrowed from original \texttt{concmath.dtx}. +% +% Here are the standard font definitions for Concrete Roman, +% including the \textit{italics}, \textsl{slanted}, and +% \textsc{small-caps} variants, which are usually only available +% in~10\,pt size. While it would be a trivial exercise to create a +% full set of slanted fonts by taking the \texttt{ccr} parameter +% files and setting the slant parameter to~$1/6$ in the +% \texttt{ccsl} parameter files, we shall only use the sizes +% provided in Knuth's official distribution. As for the italics +% and small-caps versions, there is no way to generate appropriate +% smaller sizes without extensive tuning and testing to derive new +% parameter sets. +% +% \begin{macrocode} +%<*OT2ccr> +\DeclareFontFamily{OT2}{ccr}{\hyphenchar\font45 } +\DeclareFontShape{OT2}{ccr}{m}{n}{% + <5><6><7><8><9>gen*wncr% + <10><10.95><12><14.4><17.28><20.74><24.88>wncr10}{} +\DeclareFontShape{OT2}{ccr}{m}{sl}{% + <5><6><7><8><9>wncsl9% + <10><10.95><12><14.4><17.28><20.74><24.88>wncsl10}{} +\DeclareFontShape{OT2}{ccr}{m}{it}{% + <5><6><7><8><9>% + <10><10.95><12><14.4><17.28><20.74><24.88>wncti10}{} +\DeclareFontShape{OT2}{ccr}{m}{sc}{% + <5><6><7><8><9>% + <10><10.95><12><14.4><17.28><20.74><24.88>wnccsc10}{} +% \end{macrocode} +% +% Next, here are the font substitutions for the bold series. Since +% there is no bold series in Concrete, we will use the +% corresponding Computer Modern fonts. +% {\em Added substitution for |\fontseries b| font.} +% +% \begin{macrocode} +%<+ori>\DeclareFontShape{OT2}{ccr}{b}{n}{<->ssub*cmr/b/n}{} +%<+ori>\DeclareFontShape{OT2}{ccr}{bx}{n}{<->ssub*cmr/bx/n}{} +%<+ori>\DeclareFontShape{OT2}{ccr}{bx}{sl}{<->ssub*cmr/bx/sl}{} +%<+ori>\DeclareFontShape{OT2}{ccr}{bx}{it}{<->ssub*cmr/bx/it}{} +%<-ori>\DeclareFontShape{OT2}{ccr}{b}{n}{% +%<-ori> <5><6><7><8><9>% +%<-ori> <10><10.95><12><14.4><17.28><20.74><24.88>wncb10}{} +%<-ori>\DeclareFontShape{OT2}{ccr}{bx}{n}{% +%<-ori> <5><6><7><8><9>gen*wncbx% +%<-ori> <10><10.95><12><14.4><17.28><20.74><24.88>wncbx10}{} +%<-ori>\DeclareFontShape{OT2}{ccr}{bx}{sl}{% +%<-ori> <5><6><7><8><9>% +%<-ori> <10><10.95><12><14.4><17.28><20.74><24.88>wncbxsl10}{} +%<-ori>\DeclareFontShape{OT2}{ccr}{bx}{it}{% +%<-ori> <5><6><7><8><9>% +%<-ori> <10><10.95><12><14.4><17.28><20.74><24.88>wncbxti10}{} +% \end{macrocode} +% +% Next, here are the font substitutions for the semibold series. +% As we shall see below, the \texttt{concmath} package provides a +% `\textsf{boldsans}' option which redefines |\bfdefault| and thus +% turns all bold material into semibold condensed (which will then +% be substituted by semibold condensed sans serif). Since some +% people prefer to use semibold condensed Computer Modern Sans +% Serif in combination with Concrete Roman, this unusual +% substitution allows to switch between both choices by selecting +% or omitting a package option. +% +% \begin{macrocode} +\DeclareFontShape{OT2}{ccr}{sbc}{n} {<->ssub*cmss/sbc/n}{} +\DeclareFontShape{OT2}{ccr}{sbc}{sl}{<->ssub*cmss/sbc/n}{} +\DeclareFontShape{OT2}{ccr}{sbc}{it}{<->ssub*cmss/sbc/n}{} +% \end{macrocode} +% +% Finally, here is the font shape declaration for the special +% purpose condensed slanted font that was used in \textit{Concrete +% Mathematics} for so-called `graffiti'. The \texttt{concmath} +% package does not bother to provide macros for such kinds of +% marginal notes, thus users who want to use this feature will have +% to develop their own. +% +% \begin{macrocode} +\DeclareFontShape{OT2}{ccr}{c}{sl}{<9>wncslc9}{} +%</OT2ccr> +% \end{macrocode} +% +% \section{The font definition files for slides} +% +% \subsection{Concrete Roman} +% +% \begin{macrocode} +%<*lccr> +\DeclareFontFamily{OT2}{lccr}{\hyphenchar\font45 } +\DeclareFontShape{OT2}{lccr}{m}{sc}{% + <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>wnccsc10% + }{} +\DeclareFontShape{OT2}{lccr}{m}{sl}{% + <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>wncslc9% + }{} +\DeclareFontShape{OT2}{lccr}{m}{n}{% + <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>wncr8% + }{} +\DeclareFontShape{OT2}{lccr}{m}{In}{% + <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>iwncr8% + }{} +%</lccr> +% \end{macrocode} +% +% \subsection{Computer Modern Sans} +% +% \begin{macrocode} +%<*lcmss> + \DeclareFontFamily{OT2}{lcmss}{\hyphenchar\font45 } +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{OT2}{lcmss}{m}{n}{% + <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + lwnss8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{OT2}{lcmss}{m}{In}{% + <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + ilwnss8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{OT2}{lcmss}{m}{sl}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + lwnssi8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{OT2}{lcmss}{m}{Isl}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + ilwnssi8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{OT2}{lcmss}{m}{it}{% + <->sub*lcmss/m/sl}{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{OT2}{lcmss}{m}{Iit}{% + <->sub*lcmss/m/Isl}{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{OT2}{lcmss}{bx}{n}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + lwnssb8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{OT2}{lcmss}{bx}{In}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + ilwnssb8% + }{} +% \end{macrocode} +% +% There are extra substitutions for the shape |ui| which are needed +% for |\pounds| to not come out as a \$ sign (mostly). +% \begin{macrocode} +\DeclareFontShape{OT2}{lcmss}{m}{ui}{% + <->sub*cmr/m/ui}{} +\DeclareFontShape{OT2}{lcmss}{bx}{ui}{% + <->sub*cmr/m/ui}{} +%</lcmss> +% \end{macrocode} +% +% \subsection{Computer Modern Typewriter} +% +% \begin{macrocode} +%<*lcmtt> + \DeclareFontFamily{OT2}{lcmtt}{\hyphenchar\font\m@ne} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{OT2}{lcmtt}{m}{n}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + wntt8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{OT2}{lcmtt}{m}{In}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + iwntt8% + }{} +% \end{macrocode} +% +% \begin{macrocode} + \DeclareFontShape{OT2}{lcmtt}{m}{it}{% + <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% + wnitt10% + }{} +% \end{macrocode} +% There are extra substitutions for the shape |ui| which are needed +% for |\pounds| to not come out as a \$ sign (mostly). +% \begin{macrocode} +\DeclareFontShape{OT2}{lcmtt}{m}{ui}{% + <->sub*cmtt/m/it}{} +\DeclareFontShape{OT2}{lcmtt}{bx}{ui}{% + <->sub*cmtt/m/it}{} +%</lcmtt> +% \end{macrocode} +% +% \section{Setting defaults} +% +% The following statements go into the file \texttt{ot2sfonts.def} +% which plays a r\^ole similar to \texttt{fontdef.ltx}. Thus, you may +% want to produce your own local variant of it if you intend to use +% different fonts in your slides. +% \begin{macrocode} +%<*slimain> +\DeclareErrorFont{OT2}{lcmss}{m}{n}{19.907} +\DeclareFontSubstitution{OT2}{lcmss}{m}{n} +\input ot2lcmss.fd +%</slimain> +% \end{macrocode} +% +% \section{CM Bright fonts} +% +% Borrowed code and with adaptations from file \texttt{cmbr.fdd} +% +% \subsection{CM Bright, OT2 encoding} +% +% \begin{macrocode} +%<*ot2cmbr> +\DeclareFontFamily{OT2}{cmbr}{\hyphenchar\font45} +\DeclareFontShape{OT2}{cmbr}{m}{n}{% +<5><6><7><8>wnbr8% +<9>wnbr9% +<10><10.95><12><14.4>wnbr10% +<17.28><20.74><24.88><29.86><35.83>wnbr17% +}{} +\DeclareFontShape{OT2}{cmbr}{m}{sl}{% +<5><6><7><8>wnbrsl8% +<9>wnbrsl9% +<10><10.95><12><14.4>wnbrsl10% +<17.28><20.74><24.88><29.86><35.83>wnbrsl17% +}{} +\DeclareFontShape{OT2}{cmbr}{m}{it}{% +<->ssub*cmbr/m/sl% +}{} +\DeclareFontShape{OT2}{cmbr}{b}{n}{% +<->ssub*cmbr/bx/n% +}{} +\DeclareFontShape{OT2}{cmbr}{bx}{n}{% +<-9>sub*cmbr/m/n% +<9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>wnbrbx10% +}{} +%</ot2cmbr> +% \end{macrocode} +% +% \subsection{CM Typewriter Light, OT2 encoding} +% +% \begin{macrocode} +%<*ot2cmtl> +\DeclareFontFamily{OT2}{cmtl}{\hyphenchar\font\m@ne} +\DeclareFontShape{OT2}{cmtl}{m}{n}{% +<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>wntl10% +}{} +\DeclareFontShape{OT2}{cmtl}{m}{sl}{% +<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>wnsltl10% +}{} +\DeclareFontShape{OT2}{cmtl}{m}{it}{<->ssub*cmtl/m/sl}{} +%</ot2cmtl> +% \end{macrocode} +% +% The next line goes into all files and in addition prevents \dst{} +% from adding any further code from the main source file (such as a +% character table. +% \begin{macrocode} +\endinput +% \end{macrocode} +% +% \Finale +% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} diff --git a/Master/texmf-dist/source/latex/lh/ot2fonts.ins b/Master/texmf-dist/source/latex/lh/ot2fonts.ins new file mode 100644 index 00000000000..ca99a510482 --- /dev/null +++ b/Master/texmf-dist/source/latex/lh/ot2fonts.ins @@ -0,0 +1,57 @@ +% ot2fonts.ins +% extracted and modified cmfonts.ins +% (+slides.ins,cmbr.ins) +% Part of LH fonts package v3.5(d) +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% + +\input docstrip +\usedir{tex/latex/lhfonts} + +\preamble + +This is a generated file. + +This file is part of lhfonts package +Version 3.5 // Patchlevel=2 + +\endpreamble + +\keepsilent + +\generate{%\file{ot2cmss.fd}{\from{ot2fonts.fdd}{OT2cmss}} + %\file{ot2cmr.fd}{\from{ot2fonts.fdd}{OT2cmr}} + \file{lh-ot2.sty}{\from{ot2fonts.fdd}{OT2cmr,OT2cmss}} + \file{ot2cmtt.fd}{\from{ot2fonts.fdd}{OT2cmtt,nowarn}} + \file{ot2cmvtt.fd}{\from{ot2fonts.fdd}{OT2cmvtt}} + \file{ot2cmfib.fd}{\from{ot2fonts.fdd}{OT2cmfib}} + \file{ot2cmfr.fd}{\from{ot2fonts.fdd}{OT2cmfr}} + \file{ot2cmdh.fd}{\from{ot2fonts.fdd}{OT2cmdh}}} + +\generate{\file{ot2ccr.fd}{\from{ot2fonts.fdd}{OT2ccr,ori}} + \file{lh-ot2ccr.sty} {\from{ot2fonts.fdd}{OT2ccr,ori}} + \file{lh-ot2xccr.sty}{\from{ot2fonts.fdd}{OT2ccr}}} + +\generate{\file{ot2lcmss.fd}{\from{ot2fonts.fdd}{lcmss,fd}} + \file{ot2lcmtt.fd}{\from{ot2fonts.fdd}{lcmtt,fd}}} + +\generate{\file{ot2cmbr.fd}{\from{ot2fonts.fdd}{ot2cmbr}} + \file{ot2cmtl.fd}{\from{ot2fonts.fdd}{ot2cmtl}}} + +\ifToplevel{ +\Msg{***********************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* files into a directory searched by TeX:} +\Msg{*} +\Msg{* \space\space All *.fd} +\Msg{*} +\Msg{* To produce the documentation run the files ending with} +\Msg{* `.fdd' through LaTeX.} +\Msg{*} +\Msg{* Happy TeXing} +\Msg{***********************************************************} +} + +\endbatchfile + diff --git a/Master/texmf-dist/source/latex/lh/t2ccfonts.fdd b/Master/texmf-dist/source/latex/lh/t2ccfonts.fdd new file mode 100644 index 00000000000..0885345d4f8 --- /dev/null +++ b/Master/texmf-dist/source/latex/lh/t2ccfonts.fdd @@ -0,0 +1,309 @@ +% \iffalse meta-comment +% t2ccfonts.fdd +% extraction and modification of cc.fdd +% (follows idea of t2lhfnt.fdd) +% Part of LH fonts package v3.5(d) +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \fi +%\CheckSum{58} +% \iffalse meta-comment +% +%<T2Accr&ec, >\ProvidesPackage{lh-t2accr} +%<T2Bccr&ec, >\ProvidesPackage{lh-t2bccr} +%<T2Cccr&ec, >\ProvidesPackage{lh-t2cccr} +%<T2Dccr&ec, >\ProvidesPackage{lh-t2dccr} +%<X2ccr&ec, >\ProvidesPackage{lh-x2ccr} +%<T2Accr&!ec, >\ProvidesPackage{lh-t2axccr} +%<T2Bccr&!ec, >\ProvidesPackage{lh-t2bxccr} +%<T2Cccr&!ec, >\ProvidesPackage{lh-t2cxccr} +%<T2Dccr&!ec, >\ProvidesPackage{lh-t2dxccr} +%<X2ccr&!ec, >\ProvidesPackage{lh-x2xccr} +%<*driver> + \ProvidesFile{t2ccfonts.drv} +%</driver> + [2006/06/08 v0.0a Cyrillic font definitions] +% +%<*driver> +\documentclass[11pt]{ltxdoc} +\setcounter{StandardModuleDepth}{1} +\CodelineNumbered +\GetFileInfo{t2ccfonts.drv} +\begin{document} + \DocInput{t2ccfonts.fdd} +\end{document} +%</driver> +% +%\fi +% +% \title{The file \texttt{t2ccfonts.fdd} for use with +% \LaTeX} +% \date{(\fileversion{} -- \filedate)} +% \author{Olga Lapko} +% \maketitle +% +% \section{Introduction} +% +% This file contains the external font information needed to load the +% Concrete fonts with T2* and X2 encoding into \LaTeX. +% To avoid possible conflict and to follow copyright terms here are created +% packages---style files instead of font definition files. +% +% The Concrete fonts do not contain a boldface font shape. +% We set up the following substitutions: +% \begin{itemize} +% \item fontshape \texttt{bx} $\Rightarrow$ CM Roman boldface extended +% \item fontshape \texttt{sbc} $\Rightarrow$ CM Sans Serif semibold condensed +% \end{itemize} +% \emph{Note.} extended style files (ended by \texttt{xccr}) use boldface fonts +% with ``concrete'' forms of letters CYRD, CYRZH, CYRL, CYRK, CYRYA (to follow +% letter shapes of \texttt{ccr} font). +% +% \StopEventually{} +% +% \section{The font definition files} +% +% \subsection{The Cyrillic (T2) Concrete text fonts} +% Here the `graffiti' font |ccslc9| is included. To avoid conflicts +% with standard Cyrillic fd-files here is created sty-files. +% +% \subsection{Computer Modern Concrete, T2A encoding} +% +% \begin{macrocode} +%<*T2Accr> +\DeclareFontFamily{T2A}{ccr}{} +\DeclareFontShape{T2A}{ccr}{m}{n}{% + <5><6><7><8><9><10>gen*laorm% + <10.95><12><14.4><17.28><20.74><24.88>laorm10% +}{} +\DeclareFontShape{T2A}{ccr}{m}{sl}{% + <5><6><7><8><9><10>gen*laosl% + <10.95><12><14.4><17.28><20.74><24.88>laosl10% +}{} +\DeclareFontShape{T2A}{ccr}{m}{it}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>laoti10% +}{} +\DeclareFontShape{T2A}{ccr}{m}{sc}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>laocc10% +}{} +%<*ec> +\DeclareFontShape{T2A}{ccr}{b}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/b/n% +}{} +\DeclareFontShape{T2A}{ccr}{bx}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/bx/n% +}{} +\DeclareFontShape{T2A}{ccr}{bx}{sl}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/bx/sl% +}{} +\DeclareFontShape{T2A}{ccr}{bx}{it}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/bx/it% +}{} +%</ec> +%<*!ec> +\DeclareFontShape{T2A}{ccr}{bx}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>laob10% +}{} +\DeclareFontShape{T2A}{ccr}{bx}{n}{% + <5><6><7><8><9><10>gen*laobx% + <10.95><12><14.4><17.28><20.74><24.88>laobx10% +}{} +\DeclareFontShape{T2A}{ccr}{bx}{sl}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>laobxsl10% +}{} +\DeclareFontShape{T2A}{ccr}{bx}{it}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>laobxti10% +}{} +%</!ec> +\DeclareFontShape{T2A}{ccr}{sbc}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssubf*lassdc10% +}{} +\DeclareFontShape{T2A}{ccr}{c}{sl}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>laoslc9% +}{} +%</T2Accr> +% \end{macrocode} +% +% \subsection{Computer Modern Concrete, T2B encoding} +% +% \begin{macrocode} +%<*T2Bccr> +\DeclareFontFamily{T2B}{ccr}{} +\DeclareFontShape{T2B}{ccr}{m}{n}{% + <5><6><7><8><9><10>gen*lborm% + <10.95><12><14.4><17.28><20.74><24.88>lborm10% +}{} +\DeclareFontShape{T2B}{ccr}{m}{sl}{% + <5><6><7><8><9><10>gen*lbosl% + <10.95><12><14.4><17.28><20.74><24.88>lbosl10% +}{} +\DeclareFontShape{T2B}{ccr}{m}{it}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>lboti10% +}{} +\DeclareFontShape{T2B}{ccr}{m}{sc}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>lbocc10% +}{} +%<*ec> +\DeclareFontShape{T2B}{ccr}{bx}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/bx/n% +}{} +\DeclareFontShape{T2B}{ccr}{bx}{sl}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/bx/sl% +}{} +\DeclareFontShape{T2B}{ccr}{bx}{it}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/bx/it% +}{} +%</ec> +%<*!ec> +\DeclareFontShape{T2B}{ccr}{bx}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>lbob10% +}{} +\DeclareFontShape{T2B}{ccr}{bx}{n}{% + <5><6><7><8><9><10>gen*lbobx% + <10.95><12><14.4><17.28><20.74><24.88>lbobx10% +}{} +\DeclareFontShape{T2B}{ccr}{bx}{sl}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>lbobxsl10% +}{} +\DeclareFontShape{T2B}{ccr}{bx}{it}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>lbobxti10% +}{} +%</!ec> +\DeclareFontShape{T2B}{ccr}{sbc}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssubf*lbssdc10% +}{} +\DeclareFontShape{T2B}{ccr}{c}{sl}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>lboslc9% +}{} +%</T2Bccr> +% \end{macrocode} +% +% \subsection{Computer Modern Concrete, T2C encoding} +% +% \begin{macrocode} +%<*T2Cccr> +\DeclareFontFamily{T2C}{ccr}{} +\DeclareFontShape{T2C}{ccr}{m}{n}{% + <5><6><7><8><9><10>gen*lcorm% + <10.95><12><14.4><17.28><20.74><24.88>lcorm10% +}{} +\DeclareFontShape{T2C}{ccr}{m}{sl}{% + <5><6><7><8><9><10>gen*lcosl% + <10.95><12><14.4><17.28><20.74><24.88>lcosl10% +}{} +\DeclareFontShape{T2C}{ccr}{m}{it}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>lcoti10% +}{} +\DeclareFontShape{T2C}{ccr}{m}{sc}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>lcocc10% +}{} +%<*ec> +\DeclareFontShape{T2C}{ccr}{bx}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/bx/n% +}{} +\DeclareFontShape{T2C}{ccr}{bx}{sl}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/bx/sl% +}{} +\DeclareFontShape{T2C}{ccr}{bx}{it}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/bx/it% +}{} +%</ec> +%<*!ec> +\DeclareFontShape{T2C}{ccr}{bx}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>lcob10% +}{} +\DeclareFontShape{T2C}{ccr}{bx}{n}{% + <5><6><7><8><9><10>gen*lcobx% + <10.95><12><14.4><17.28><20.74><24.88>lcobx10% +}{} +\DeclareFontShape{T2C}{ccr}{bx}{sl}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>lcobxsl10% +}{} +\DeclareFontShape{T2C}{ccr}{bx}{it}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>lcobxti10% +}{} +%</!ec> +\DeclareFontShape{T2C}{ccr}{sbc}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssubf*lcssdc10% +}{} +\DeclareFontShape{T2C}{ccr}{c}{sl}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>lcoslc9% +}{} +%</T2Cccr> +% \end{macrocode} +% +% \subsection{Computer Modern Concrete, X2 encoding} +% +% \begin{macrocode} +%<*X2ccr> +\DeclareFontFamily{X2}{ccr}{} +\DeclareFontShape{X2}{ccr}{m}{n}{% + <5><6><7><8><9><10>gen*rxorm% + <10.95><12><14.4><17.28><20.74><24.88>rxorm10% +}{} +\DeclareFontShape{X2}{ccr}{m}{sl}{% + <5><6><7><8><9><10>gen*rxosl% + <10.95><12><14.4><17.28><20.74><24.88>rxosl10% +}{} +\DeclareFontShape{X2}{ccr}{m}{it}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>rxoti10% +}{} +\DeclareFontShape{X2}{ccr}{m}{sc}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>rxocc10% +}{} +%<*ec> +\DeclareFontShape{X2}{ccr}{bx}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/bx/n% +}{} +\DeclareFontShape{X2}{ccr}{bx}{sl}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/bx/sl% +}{} +\DeclareFontShape{X2}{ccr}{bx}{it}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssub*cmr/bx/it% +}{} +%</ec> +%<*!ec> +\DeclareFontShape{X2}{ccr}{bx}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>rxob10% +}{} +\DeclareFontShape{X2}{ccr}{bx}{n}{% + <5><6><7><8><9><10>gen*rxobx% + <10.95><12><14.4><17.28><20.74><24.88>rxobx10% +}{} +\DeclareFontShape{X2}{ccr}{bx}{sl}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>rxobxsl10% +}{} +\DeclareFontShape{X2}{ccr}{bx}{it}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>rxobxti10% +}{} +%</!ec> +\DeclareFontShape{X2}{ccr}{sbc}{n}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>ssubf*rxssdc10% +}{} +\DeclareFontShape{X2}{ccr}{c}{sl}{% + <5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>rxoslc9% +}{} +%</X2ccr> +% \end{macrocode} +% +% The next line goes into all files and in addition prevents {\sc docstrip} +% from adding the character table to all modules. +% \begin{macrocode} +\endinput +% \end{macrocode} +% \Finale +% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} diff --git a/Master/texmf-dist/source/latex/lh/t2ccfonts.ins b/Master/texmf-dist/source/latex/lh/t2ccfonts.ins new file mode 100644 index 00000000000..8167e40c62f --- /dev/null +++ b/Master/texmf-dist/source/latex/lh/t2ccfonts.ins @@ -0,0 +1,33 @@ +% t2ccfonts.ins +% extracted and modified ccfonts.ins +% Part of LH fonts package v3.5(d) +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% + +\input docstrip +\usedir{tex/latex/lhfonts} + +\preamble + +This is a generated file. + +This file is part of lhfonts package +Version 3.5 // Patchlevel=2 + +\endpreamble + +\keepsilent + +\generate{% + \file {lh-x2ccr.sty}{\from{t2ccfonts.fdd}{X2ccr,ec}} + \file{lh-t2accr.sty}{\from{t2ccfonts.fdd}{T2Accr,ec}} + \file{lh-t2bccr.sty}{\from{t2ccfonts.fdd}{T2Bccr,ec}} + \file{lh-t2cccr.sty}{\from{t2ccfonts.fdd}{T2Cccr,ec}} + \file {lh-x2xccr.sty}{\from{t2ccfonts.fdd}{X2ccr}} + \file{lh-t2axccr.sty}{\from{t2ccfonts.fdd}{T2Accr}} + \file{lh-t2bxccr.sty}{\from{t2ccfonts.fdd}{T2Bccr}} + \file{lh-t2cxccr.sty}{\from{t2ccfonts.fdd}{T2Cccr}} + } + +\endbatchfile + diff --git a/Master/texmf-dist/tpm/lh.tpm b/Master/texmf-dist/tpm/lh.tpm index 32becd0d03a..e8b592c229d 100644 --- a/Master/texmf-dist/tpm/lh.tpm +++ b/Master/texmf-dist/tpm/lh.tpm @@ -3,31 +3,33 @@ <rdf:Description about="http://texlive.dante.de/texlive/Package/lh.zip"> <TPM:Name>lh</TPM:Name> <TPM:Type>Package</TPM:Type> - <TPM:Date>2006/01/09 00:43:17</TPM:Date> - <TPM:Version>3.4a</TPM:Version> + <TPM:Date>2006/06/20 19:57:00</TPM:Date> + <TPM:Version></TPM:Version> <TPM:Creator>rahtz</TPM:Creator> - <TPM:Title>Olga Lapko's LH fonts.</TPM:Title> + <TPM:Title>LH Cyrillic fonts</TPM:Title> <TPM:Description> The lh fonts for the `T2'/X2 encodings (for cyrillic languages). [description copied from TeX Catalogue] </TPM:Description> - <TPM:Author>Vladimir Volovich</TPM:Author> + <TPM:Author>Olga Lapko, Vladimir Volovich</TPM:Author> <TPM:Size>2451228</TPM:Size> <TPM:Build/> - <TPM:RunFiles size="1967727"> + <TPM:RunFiles size="1849265"> texmf-dist/fonts/source/lh/base/fikparm.mf texmf-dist/fonts/source/lh/base/lcyrbeg.mf texmf-dist/fonts/source/lh/base/lcyrdefs.mf +texmf-dist/fonts/source/lh/base/ldbroman.mf texmf-dist/fonts/source/lh/base/ldcsc.mf texmf-dist/fonts/source/lh/base/ldroman.mf +texmf-dist/fonts/source/lh/base/ldtexset.mf texmf-dist/fonts/source/lh/base/ldtextit.mf texmf-dist/fonts/source/lh/base/ldtitle.mf +texmf-dist/fonts/source/lh/base/lebroman.mf texmf-dist/fonts/source/lh/base/lecsc.mf texmf-dist/fonts/source/lh/base/leroman.mf texmf-dist/fonts/source/lh/base/letextit.mf texmf-dist/fonts/source/lh/base/lgcspl.mf -texmf-dist/fonts/source/lh/base/lgcsplff.mf texmf-dist/fonts/source/lh/base/lgcyracc.mf texmf-dist/fonts/source/lh/base/lgcyri.mf texmf-dist/fonts/source/lh/base/lgcyrl.mf @@ -37,13 +39,11 @@ texmf-dist/fonts/source/lh/base/lgcyru.mf texmf-dist/fonts/source/lh/base/lgengsym.mf texmf-dist/fonts/source/lh/base/lgidigit.mf texmf-dist/fonts/source/lh/base/lgilig.mf -texmf-dist/fonts/source/lh/base/lgiligff.mf texmf-dist/fonts/source/lh/base/lgitalp.mf texmf-dist/fonts/source/lh/base/lgocyrac.mf texmf-dist/fonts/source/lh/base/lgpunct.mf texmf-dist/fonts/source/lh/base/lgrdigit.mf texmf-dist/fonts/source/lh/base/lgrlig.mf -texmf-dist/fonts/source/lh/base/lgrligff.mf texmf-dist/fonts/source/lh/base/lgromp.mf texmf-dist/fonts/source/lh/base/lgrusi.mf texmf-dist/fonts/source/lh/base/lgrusl.mf @@ -57,13 +57,11 @@ texmf-dist/fonts/source/lh/base/lgt2lou.mf texmf-dist/fonts/source/lh/base/lgt2slvi.mf texmf-dist/fonts/source/lh/base/lgt2slvl.mf texmf-dist/fonts/source/lh/base/lgt2slvu.mf -texmf-dist/fonts/source/lh/base/lgt2slxi.mf -texmf-dist/fonts/source/lh/base/lgt2slxl.mf -texmf-dist/fonts/source/lh/base/lgt2slxu.mf texmf-dist/fonts/source/lh/base/lgt2upi.mf texmf-dist/fonts/source/lh/base/lgt2upl.mf texmf-dist/fonts/source/lh/base/lgt2upu.mf texmf-dist/fonts/source/lh/base/lkligtbl.mf +texmf-dist/fonts/source/lh/base/llbligtb.mf texmf-dist/fonts/source/lh/base/llcligtb.mf texmf-dist/fonts/source/lh/base/lliligtb.mf texmf-dist/fonts/source/lh/base/llmligtb.mf @@ -74,310 +72,36 @@ texmf-dist/fonts/source/lh/base/lxpseudo.mf texmf-dist/fonts/source/lh/base/lycyracc.mf texmf-dist/fonts/source/lh/base/lypseudo.mf texmf-dist/fonts/source/lh/base/nodraw.mf -texmf-dist/fonts/source/lh/lh-lcy/ilhcsc10.mf -texmf-dist/fonts/source/lh/lh-lcy/ilhtt8.mf -texmf-dist/fonts/source/lh/lh-lcy/illhss8.mf -texmf-dist/fonts/source/lh/lh-lcy/illhssb8.mf -texmf-dist/fonts/source/lh/lh-lcy/illhssi8.mf -texmf-dist/fonts/source/lh/lh-lcy/lhbr10.mf -texmf-dist/fonts/source/lh/lh-lcy/lhbr17.mf -texmf-dist/fonts/source/lh/lh-lcy/lhbr8.mf -texmf-dist/fonts/source/lh/lh-lcy/lhbr9.mf -texmf-dist/fonts/source/lh/lh-lcy/lhbrbx10.mf -texmf-dist/fonts/source/lh/lh-lcy/lhbrsl10.mf -texmf-dist/fonts/source/lh/lh-lcy/lhbrsl17.mf -texmf-dist/fonts/source/lh/lh-lcy/lhbrsl8.mf -texmf-dist/fonts/source/lh/lh-lcy/lhbrsl9.mf -texmf-dist/fonts/source/lh/lh-lcy/lhccsc10.mf -texmf-dist/fonts/source/lh/lh-lcy/lhcodes.mf -texmf-dist/fonts/source/lh/lh-lcy/lhcr10.mf -texmf-dist/fonts/source/lh/lh-lcy/lhcr5.mf -texmf-dist/fonts/source/lh/lh-lcy/lhcr6.mf -texmf-dist/fonts/source/lh/lh-lcy/lhcr7.mf -texmf-dist/fonts/source/lh/lh-lcy/lhcr8.mf -texmf-dist/fonts/source/lh/lh-lcy/lhcr9.mf -texmf-dist/fonts/source/lh/lh-lcy/lhcsl10.mf -texmf-dist/fonts/source/lh/lh-lcy/lhcsl9.mf -texmf-dist/fonts/source/lh/lh-lcy/lhcslc9.mf -texmf-dist/fonts/source/lh/lh-lcy/lhcti10.mf -texmf-dist/fonts/source/lh/lh-lcy/lhliker.mf -texmf-dist/fonts/source/lh/lh-lcy/lhsltl10.mf -texmf-dist/fonts/source/lh/lh-lcy/lhtl10.mf -texmf-dist/fonts/source/lh/lh-lcy/llhss8.mf -texmf-dist/fonts/source/lh/lh-lcy/llhssb8.mf -texmf-dist/fonts/source/lh/lh-lcy/llhssi8.mf -texmf-dist/fonts/source/lh/lh-ot2/ilwnss8.mf -texmf-dist/fonts/source/lh/lh-ot2/ilwnssb8.mf -texmf-dist/fonts/source/lh/lh-ot2/ilwnssi8.mf -texmf-dist/fonts/source/lh/lh-ot2/iwncsc10.mf -texmf-dist/fonts/source/lh/lh-ot2/iwntt8.mf -texmf-dist/fonts/source/lh/lh-ot2/lwnss8.mf -texmf-dist/fonts/source/lh/lh-ot2/lwnssb8.mf -texmf-dist/fonts/source/lh/lh-ot2/lwnssi8.mf -texmf-dist/fonts/source/lh/lh-ot2/wnbr10.mf -texmf-dist/fonts/source/lh/lh-ot2/wnbr17.mf -texmf-dist/fonts/source/lh/lh-ot2/wnbr8.mf -texmf-dist/fonts/source/lh/lh-ot2/wnbr9.mf -texmf-dist/fonts/source/lh/lh-ot2/wnbrbx10.mf -texmf-dist/fonts/source/lh/lh-ot2/wnbrsl10.mf -texmf-dist/fonts/source/lh/lh-ot2/wnbrsl17.mf -texmf-dist/fonts/source/lh/lh-ot2/wnbrsl8.mf -texmf-dist/fonts/source/lh/lh-ot2/wnbrsl9.mf -texmf-dist/fonts/source/lh/lh-ot2/wnccsc10.mf -texmf-dist/fonts/source/lh/lh-ot2/wncodes.mf -texmf-dist/fonts/source/lh/lh-ot2/wncr10.mf -texmf-dist/fonts/source/lh/lh-ot2/wncr5.mf -texmf-dist/fonts/source/lh/lh-ot2/wncr6.mf -texmf-dist/fonts/source/lh/lh-ot2/wncr7.mf -texmf-dist/fonts/source/lh/lh-ot2/wncr8.mf -texmf-dist/fonts/source/lh/lh-ot2/wncr9.mf -texmf-dist/fonts/source/lh/lh-ot2/wncsl10.mf -texmf-dist/fonts/source/lh/lh-ot2/wncsl9.mf -texmf-dist/fonts/source/lh/lh-ot2/wncslc9.mf -texmf-dist/fonts/source/lh/lh-ot2/wncti10.mf -texmf-dist/fonts/source/lh/lh-ot2/wnliker.mf -texmf-dist/fonts/source/lh/lh-ot2/wnsltl10.mf -texmf-dist/fonts/source/lh/lh-ot2/wntl10.mf -texmf-dist/fonts/source/lh/lh-t2a/ilalb8.mf -texmf-dist/fonts/source/lh/lh-t2a/ilali8.mf -texmf-dist/fonts/source/lh/lh-t2a/ilalo8.mf -texmf-dist/fonts/source/lh/lh-t2a/ilalq8.mf -texmf-dist/fonts/source/lh/lh-t2a/ilaltt8.mf -texmf-dist/fonts/source/lh/lh-t2a/labbx10.mf -texmf-dist/fonts/source/lh/lh-t2a/labmo10.mf -texmf-dist/fonts/source/lh/lh-t2a/labmo17.mf -texmf-dist/fonts/source/lh/lh-t2a/labmo8.mf -texmf-dist/fonts/source/lh/lh-t2a/labmo9.mf -texmf-dist/fonts/source/lh/lh-t2a/labmr10.mf -texmf-dist/fonts/source/lh/lh-t2a/labmr17.mf -texmf-dist/fonts/source/lh/lh-t2a/labmr8.mf -texmf-dist/fonts/source/lh/lh-t2a/labmr9.mf -texmf-dist/fonts/source/lh/lh-t2a/labso10.mf -texmf-dist/fonts/source/lh/lh-t2a/labso17.mf -texmf-dist/fonts/source/lh/lh-t2a/labso8.mf -texmf-dist/fonts/source/lh/lh-t2a/labso9.mf -texmf-dist/fonts/source/lh/lh-t2a/labsr10.mf -texmf-dist/fonts/source/lh/lh-t2a/labsr17.mf -texmf-dist/fonts/source/lh/lh-t2a/labsr8.mf -texmf-dist/fonts/source/lh/lh-t2a/labsr9.mf -texmf-dist/fonts/source/lh/lh-t2a/labtl10.mf -texmf-dist/fonts/source/lh/lh-t2a/labto10.mf -texmf-dist/fonts/source/lh/lh-t2a/lacodes.mf -texmf-dist/fonts/source/lh/lh-t2a/lalb8.mf -texmf-dist/fonts/source/lh/lh-t2a/lali8.mf -texmf-dist/fonts/source/lh/lh-t2a/laliker.mf -texmf-dist/fonts/source/lh/lh-t2a/lalo8.mf -texmf-dist/fonts/source/lh/lh-t2a/lalq8.mf -texmf-dist/fonts/source/lh/lh-t2a/laltt8.mf -texmf-dist/fonts/source/lh/lh-t2a/laocc10.mf -texmf-dist/fonts/source/lh/lh-t2a/laorm10.mf -texmf-dist/fonts/source/lh/lh-t2a/laorm5.mf -texmf-dist/fonts/source/lh/lh-t2a/laorm6.mf -texmf-dist/fonts/source/lh/lh-t2a/laorm7.mf -texmf-dist/fonts/source/lh/lh-t2a/laorm8.mf -texmf-dist/fonts/source/lh/lh-t2a/laorm9.mf -texmf-dist/fonts/source/lh/lh-t2a/laosl10.mf -texmf-dist/fonts/source/lh/lh-t2a/laosl5.mf -texmf-dist/fonts/source/lh/lh-t2a/laosl6.mf -texmf-dist/fonts/source/lh/lh-t2a/laosl7.mf -texmf-dist/fonts/source/lh/lh-t2a/laosl8.mf -texmf-dist/fonts/source/lh/lh-t2a/laosl9.mf -texmf-dist/fonts/source/lh/lh-t2a/laoti10.mf -texmf-dist/fonts/source/lh/lh-t2a/laqi8.mf -texmf-dist/fonts/source/lh/lh-t2a/lasq8.mf -texmf-dist/fonts/source/lh/lh-t2a/lassdc10.mf -texmf-dist/fonts/source/lh/lh-t2b/ilblb8.mf -texmf-dist/fonts/source/lh/lh-t2b/ilbli8.mf -texmf-dist/fonts/source/lh/lh-t2b/ilblo8.mf -texmf-dist/fonts/source/lh/lh-t2b/ilblq8.mf -texmf-dist/fonts/source/lh/lh-t2b/ilbltt8.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbbx10.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbmo10.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbmo17.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbmo8.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbmo9.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbmr10.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbmr17.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbmr8.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbmr9.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbso10.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbso17.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbso8.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbso9.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbsr10.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbsr17.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbsr8.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbsr9.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbtl10.mf -texmf-dist/fonts/source/lh/lh-t2b/lbbto10.mf -texmf-dist/fonts/source/lh/lh-t2b/lbcodes.mf -texmf-dist/fonts/source/lh/lh-t2b/lblb8.mf -texmf-dist/fonts/source/lh/lh-t2b/lbli8.mf -texmf-dist/fonts/source/lh/lh-t2b/lbliker.mf -texmf-dist/fonts/source/lh/lh-t2b/lblo8.mf -texmf-dist/fonts/source/lh/lh-t2b/lblq8.mf -texmf-dist/fonts/source/lh/lh-t2b/lbltt8.mf -texmf-dist/fonts/source/lh/lh-t2b/lbocc10.mf -texmf-dist/fonts/source/lh/lh-t2b/lborm10.mf -texmf-dist/fonts/source/lh/lh-t2b/lborm5.mf -texmf-dist/fonts/source/lh/lh-t2b/lborm6.mf -texmf-dist/fonts/source/lh/lh-t2b/lborm7.mf -texmf-dist/fonts/source/lh/lh-t2b/lborm8.mf -texmf-dist/fonts/source/lh/lh-t2b/lborm9.mf -texmf-dist/fonts/source/lh/lh-t2b/lbosl10.mf -texmf-dist/fonts/source/lh/lh-t2b/lbosl5.mf -texmf-dist/fonts/source/lh/lh-t2b/lbosl6.mf -texmf-dist/fonts/source/lh/lh-t2b/lbosl7.mf -texmf-dist/fonts/source/lh/lh-t2b/lbosl8.mf -texmf-dist/fonts/source/lh/lh-t2b/lbosl9.mf -texmf-dist/fonts/source/lh/lh-t2b/lboti10.mf -texmf-dist/fonts/source/lh/lh-t2b/lbqi8.mf -texmf-dist/fonts/source/lh/lh-t2b/lbsq8.mf -texmf-dist/fonts/source/lh/lh-t2b/lbssdc10.mf -texmf-dist/fonts/source/lh/lh-t2c/ilclb8.mf -texmf-dist/fonts/source/lh/lh-t2c/ilcli8.mf -texmf-dist/fonts/source/lh/lh-t2c/ilclo8.mf -texmf-dist/fonts/source/lh/lh-t2c/ilclq8.mf -texmf-dist/fonts/source/lh/lh-t2c/ilcltt8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbbx10.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbmo10.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbmo17.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbmo8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbmo9.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbmr10.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbmr17.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbmr8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbmr9.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbso10.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbso17.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbso8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbso9.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbsr10.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbsr17.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbsr8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbsr9.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbtl10.mf -texmf-dist/fonts/source/lh/lh-t2c/lcbto10.mf -texmf-dist/fonts/source/lh/lh-t2c/lccodes.mf -texmf-dist/fonts/source/lh/lh-t2c/lclb8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcli8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcliker.mf -texmf-dist/fonts/source/lh/lh-t2c/lclo8.mf -texmf-dist/fonts/source/lh/lh-t2c/lclq8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcltt8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcocc10.mf -texmf-dist/fonts/source/lh/lh-t2c/lcorm10.mf -texmf-dist/fonts/source/lh/lh-t2c/lcorm5.mf -texmf-dist/fonts/source/lh/lh-t2c/lcorm6.mf -texmf-dist/fonts/source/lh/lh-t2c/lcorm7.mf -texmf-dist/fonts/source/lh/lh-t2c/lcorm8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcorm9.mf -texmf-dist/fonts/source/lh/lh-t2c/lcosl10.mf -texmf-dist/fonts/source/lh/lh-t2c/lcosl5.mf -texmf-dist/fonts/source/lh/lh-t2c/lcosl6.mf -texmf-dist/fonts/source/lh/lh-t2c/lcosl7.mf -texmf-dist/fonts/source/lh/lh-t2c/lcosl8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcosl9.mf -texmf-dist/fonts/source/lh/lh-t2c/lcoti10.mf -texmf-dist/fonts/source/lh/lh-t2c/lcqi8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcsq8.mf -texmf-dist/fonts/source/lh/lh-t2c/lcssdc10.mf -texmf-dist/fonts/source/lh/lh-t2d/ildlb8.mf -texmf-dist/fonts/source/lh/lh-t2d/ildli8.mf -texmf-dist/fonts/source/lh/lh-t2d/ildlo8.mf -texmf-dist/fonts/source/lh/lh-t2d/ildlq8.mf -texmf-dist/fonts/source/lh/lh-t2d/ildltt8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbbx10.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbmo10.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbmo17.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbmo8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbmo9.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbmr10.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbmr17.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbmr8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbmr9.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbso10.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbso17.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbso8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbso9.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbsr10.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbsr17.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbsr8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbsr9.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbtl10.mf -texmf-dist/fonts/source/lh/lh-t2d/ldbto10.mf -texmf-dist/fonts/source/lh/lh-t2d/ldcodes.mf -texmf-dist/fonts/source/lh/lh-t2d/ldlb8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldli8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldliker.mf -texmf-dist/fonts/source/lh/lh-t2d/ldlo8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldlq8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldltt8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldocc10.mf -texmf-dist/fonts/source/lh/lh-t2d/ldorm10.mf -texmf-dist/fonts/source/lh/lh-t2d/ldorm5.mf -texmf-dist/fonts/source/lh/lh-t2d/ldorm6.mf -texmf-dist/fonts/source/lh/lh-t2d/ldorm7.mf -texmf-dist/fonts/source/lh/lh-t2d/ldorm8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldorm9.mf -texmf-dist/fonts/source/lh/lh-t2d/ldosl10.mf -texmf-dist/fonts/source/lh/lh-t2d/ldosl5.mf -texmf-dist/fonts/source/lh/lh-t2d/ldosl6.mf -texmf-dist/fonts/source/lh/lh-t2d/ldosl7.mf -texmf-dist/fonts/source/lh/lh-t2d/ldosl8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldosl9.mf -texmf-dist/fonts/source/lh/lh-t2d/ldoti10.mf -texmf-dist/fonts/source/lh/lh-t2d/ldqi8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldsq8.mf -texmf-dist/fonts/source/lh/lh-t2d/ldssdc10.mf -texmf-dist/fonts/source/lh/lh-x2/irxlb8.mf -texmf-dist/fonts/source/lh/lh-x2/irxli8.mf -texmf-dist/fonts/source/lh/lh-x2/irxlo8.mf -texmf-dist/fonts/source/lh/lh-x2/irxlq8.mf -texmf-dist/fonts/source/lh/lh-x2/irxltt8.mf -texmf-dist/fonts/source/lh/lh-x2/rxbbx10.mf -texmf-dist/fonts/source/lh/lh-x2/rxbmo10.mf -texmf-dist/fonts/source/lh/lh-x2/rxbmo17.mf -texmf-dist/fonts/source/lh/lh-x2/rxbmo8.mf -texmf-dist/fonts/source/lh/lh-x2/rxbmo9.mf -texmf-dist/fonts/source/lh/lh-x2/rxbmr10.mf -texmf-dist/fonts/source/lh/lh-x2/rxbmr17.mf -texmf-dist/fonts/source/lh/lh-x2/rxbmr8.mf -texmf-dist/fonts/source/lh/lh-x2/rxbmr9.mf -texmf-dist/fonts/source/lh/lh-x2/rxbso10.mf -texmf-dist/fonts/source/lh/lh-x2/rxbso17.mf -texmf-dist/fonts/source/lh/lh-x2/rxbso8.mf -texmf-dist/fonts/source/lh/lh-x2/rxbso9.mf -texmf-dist/fonts/source/lh/lh-x2/rxbsr10.mf -texmf-dist/fonts/source/lh/lh-x2/rxbsr17.mf -texmf-dist/fonts/source/lh/lh-x2/rxbsr8.mf -texmf-dist/fonts/source/lh/lh-x2/rxbsr9.mf -texmf-dist/fonts/source/lh/lh-x2/rxbtl10.mf -texmf-dist/fonts/source/lh/lh-x2/rxbto10.mf -texmf-dist/fonts/source/lh/lh-x2/rxcodes.mf -texmf-dist/fonts/source/lh/lh-x2/rxlb8.mf -texmf-dist/fonts/source/lh/lh-x2/rxli8.mf -texmf-dist/fonts/source/lh/lh-x2/rxliker.mf -texmf-dist/fonts/source/lh/lh-x2/rxlo8.mf -texmf-dist/fonts/source/lh/lh-x2/rxlq8.mf -texmf-dist/fonts/source/lh/lh-x2/rxltt8.mf -texmf-dist/fonts/source/lh/lh-x2/rxocc10.mf -texmf-dist/fonts/source/lh/lh-x2/rxorm10.mf -texmf-dist/fonts/source/lh/lh-x2/rxorm5.mf -texmf-dist/fonts/source/lh/lh-x2/rxorm6.mf -texmf-dist/fonts/source/lh/lh-x2/rxorm7.mf -texmf-dist/fonts/source/lh/lh-x2/rxorm8.mf -texmf-dist/fonts/source/lh/lh-x2/rxorm9.mf -texmf-dist/fonts/source/lh/lh-x2/rxosl10.mf -texmf-dist/fonts/source/lh/lh-x2/rxosl5.mf -texmf-dist/fonts/source/lh/lh-x2/rxosl6.mf -texmf-dist/fonts/source/lh/lh-x2/rxosl7.mf -texmf-dist/fonts/source/lh/lh-x2/rxosl8.mf -texmf-dist/fonts/source/lh/lh-x2/rxosl9.mf -texmf-dist/fonts/source/lh/lh-x2/rxoti10.mf -texmf-dist/fonts/source/lh/lh-x2/rxqi8.mf -texmf-dist/fonts/source/lh/lh-x2/rxsq8.mf -texmf-dist/fonts/source/lh/lh-x2/rxssdc10.mf +texmf-dist/fonts/source/lh/lh-conc/ccb10.mf +texmf-dist/fonts/source/lh/lh-conc/ccbx10.mf +texmf-dist/fonts/source/lh/lh-conc/ccbx5.mf +texmf-dist/fonts/source/lh/lh-conc/ccbx6.mf +texmf-dist/fonts/source/lh/lh-conc/ccbx7.mf +texmf-dist/fonts/source/lh/lh-conc/ccbx8.mf +texmf-dist/fonts/source/lh/lh-conc/ccbx9.mf +texmf-dist/fonts/source/lh/lh-conc/ccbxsl10.mf +texmf-dist/fonts/source/lh/lh-conc/ccbxti10.mf +texmf-dist/fonts/source/lh/lh-conc/concb10pt.mf +texmf-dist/fonts/source/lh/lh-conc/concbx10pt.mf +texmf-dist/fonts/source/lh/lh-conc/concbx12pt.mf +texmf-dist/fonts/source/lh/lh-conc/concbx5pt.mf +texmf-dist/fonts/source/lh/lh-conc/concbx6pt.mf +texmf-dist/fonts/source/lh/lh-conc/concbx7pt.mf +texmf-dist/fonts/source/lh/lh-conc/concbx8pt.mf +texmf-dist/fonts/source/lh/lh-conc/concbx9pt.mf +texmf-dist/fonts/source/lh/lh-conc/concbxti10.mf +texmf-dist/fonts/source/lh/lh-conc/concc9pt.mf +texmf-dist/fonts/source/lh/lh-conc/eob10.mf +texmf-dist/fonts/source/lh/lh-conc/eobx10.mf +texmf-dist/fonts/source/lh/lh-conc/eobx5.mf +texmf-dist/fonts/source/lh/lh-conc/eobx6.mf +texmf-dist/fonts/source/lh/lh-conc/eobx7.mf +texmf-dist/fonts/source/lh/lh-conc/eobx8.mf +texmf-dist/fonts/source/lh/lh-conc/eobx9.mf +texmf-dist/fonts/source/lh/lh-conc/eobxsl10.mf +texmf-dist/fonts/source/lh/lh-conc/eobxti10.mf +texmf-dist/fonts/source/lh/lh-conc/eoslc9.mf +texmf-dist/fonts/source/lh/lh-conc/readme.txt texmf-dist/fonts/source/lh/nont2/lgbersta.mf texmf-dist/fonts/source/lh/nont2/lgberstb.mf texmf-dist/fonts/source/lh/nont2/lgberstc.mf @@ -390,17 +114,23 @@ texmf-dist/fonts/source/lh/nont2/lgcmodu.mf texmf-dist/fonts/source/lh/nont2/lgcvaci.mf texmf-dist/fonts/source/lh/nont2/lgcvacl.mf texmf-dist/fonts/source/lh/nont2/lgcvacu.mf +texmf-dist/fonts/source/lh/nont2/lgt2slxi.mf +texmf-dist/fonts/source/lh/nont2/lgt2slxl.mf +texmf-dist/fonts/source/lh/nont2/lgt2slxu.mf texmf-dist/fonts/source/lh/nont2/lgunici.mf texmf-dist/fonts/source/lh/nont2/lgunicl.mf texmf-dist/fonts/source/lh/nont2/lgunicu.mf texmf-dist/fonts/source/lh/nont2/lhberest.mf texmf-dist/fonts/source/lh/specific/lgcrusl.mf +texmf-dist/fonts/source/lh/specific/lgcyrcl.mf +texmf-dist/fonts/source/lh/specific/lgcyrcu.mf +texmf-dist/fonts/source/lh/specific/lgnoncl.mf +texmf-dist/fonts/source/lh/specific/lgnoncu.mf texmf-dist/fonts/source/lh/specific/lgrucl.mf texmf-dist/fonts/source/lh/specific/lgrucu.mf texmf-dist/tpm/lh.tpm </TPM:RunFiles> - <TPM:DocFiles size="483501"> -texmf-dist/doc/fonts/lh/INSTALL + <TPM:DocFiles size="268970"> texmf-dist/doc/fonts/lh/beresta/beresta.tex texmf-dist/doc/fonts/lh/beresta/berestax.tex texmf-dist/doc/fonts/lh/beresta/lacodes.tex @@ -410,13 +140,14 @@ texmf-dist/doc/fonts/lh/beresta/ldcodes.tex texmf-dist/doc/fonts/lh/beresta/rxcodes.tex texmf-dist/doc/fonts/lh/beresta/txcodes.tex texmf-dist/doc/fonts/lh/beresta/yycodes.tex -texmf-dist/doc/fonts/lh/dvidrv.mfj texmf-dist/doc/fonts/lh/fonttest/allenc.tex texmf-dist/doc/fonts/lh/fonttest/allenc0.tex texmf-dist/doc/fonts/lh/fonttest/allenc1.tex texmf-dist/doc/fonts/lh/fonttest/allenc2.tex texmf-dist/doc/fonts/lh/fonttest/allenc3.tex texmf-dist/doc/fonts/lh/fonttest/allenc4.tex +texmf-dist/doc/fonts/lh/fonttest/katalog-beresta.tex +texmf-dist/doc/fonts/lh/fonttest/katalog-short.t2 texmf-dist/doc/fonts/lh/fonttest/katalog.lh texmf-dist/doc/fonts/lh/fonttest/katalog.t2 texmf-dist/doc/fonts/lh/fonttest/katalog1.lh @@ -432,6 +163,7 @@ texmf-dist/doc/fonts/lh/fonttest/lh-fmap.tex texmf-dist/doc/fonts/lh/fonttest/lh-text.tex texmf-dist/doc/fonts/lh/fonttest/lh-texx.tex texmf-dist/doc/fonts/lh/fonttest/lh-texy.tex +texmf-dist/doc/fonts/lh/fonttest/t2a-fmap-short.tex texmf-dist/doc/fonts/lh/fonttest/t2a-fmap.tex texmf-dist/doc/fonts/lh/fonttest/t2a-text.tex texmf-dist/doc/fonts/lh/fonttest/t2b-fmap.tex @@ -443,6 +175,7 @@ texmf-dist/doc/fonts/lh/fonttest/t2d-text.tex texmf-dist/doc/fonts/lh/fonttest/testfox.tex texmf-dist/doc/fonts/lh/fonttest/testkern.tex texmf-dist/doc/fonts/lh/fonttest/testtext.tex +texmf-dist/doc/fonts/lh/fonttest/uc-fmap.tex texmf-dist/doc/fonts/lh/fonttest/wn-comp.tex texmf-dist/doc/fonts/lh/fonttest/wn-fmap.tex texmf-dist/doc/fonts/lh/fonttest/wn-text.tex @@ -450,68 +183,77 @@ texmf-dist/doc/fonts/lh/fonttest/x2-fmap.tex texmf-dist/doc/fonts/lh/fonttest/x2-text.tex texmf-dist/doc/fonts/lh/fonttest/xsl-fmap.tex texmf-dist/doc/fonts/lh/fonttest/xsl-text.tex -texmf-dist/doc/fonts/lh/inst-lh.sh texmf-dist/doc/fonts/lh/lhfonts/T1inT2.en -texmf-dist/doc/fonts/lh/lhfonts/TODO texmf-dist/doc/fonts/lh/lhfonts/fonttest.en -texmf-dist/doc/fonts/lh/lhfonts/lhfont34.en -texmf-dist/doc/fonts/lh/lhfonts/lhfont34.ru +texmf-dist/doc/fonts/lh/lhfonts/lhfont35.en +texmf-dist/doc/fonts/lh/lhfonts/lhfont35.ru texmf-dist/doc/fonts/lh/lhfonts/lhfonts.hst -texmf-dist/doc/fonts/lh/tex/01cm-lh.tex -texmf-dist/doc/fonts/lh/tex/03cm-wn.tex -texmf-dist/doc/fonts/lh/tex/04cm-vf.tex -texmf-dist/doc/fonts/lh/tex/11ex-rs.tex -texmf-dist/doc/fonts/lh/tex/11ex-rx.tex -texmf-dist/doc/fonts/lh/tex/12ex-la.tex -texmf-dist/doc/fonts/lh/tex/13ex-lb.tex -texmf-dist/doc/fonts/lh/tex/14ex-lc.tex -texmf-dist/doc/fonts/lh/tex/15ex-ld.tex -texmf-dist/doc/fonts/lh/tex/20cm-ct.tex -texmf-dist/doc/fonts/lh/tex/21cm-ic.tex -texmf-dist/doc/fonts/lh/tex/22cm-wc.tex -texmf-dist/doc/fonts/lh/tex/23cm-mc.tex -texmf-dist/doc/fonts/lh/tex/24cm-kc.tex -texmf-dist/doc/fonts/lh/tex/25cm-uc.tex -texmf-dist/doc/fonts/lh/tex/30cm-lx.tex -texmf-dist/doc/fonts/lh/tex/31cm-ix.tex -texmf-dist/doc/fonts/lh/tex/32cm-wx.tex -texmf-dist/doc/fonts/lh/tex/33cm-mx.tex -texmf-dist/doc/fonts/lh/tex/34cm-kx.tex -texmf-dist/doc/fonts/lh/tex/46cm-ly.tex -texmf-dist/doc/fonts/lh/tex/46cm-lz.tex -texmf-dist/doc/fonts/lh/tex/47ex-tx.tex -texmf-dist/doc/fonts/lh/tex/91berest.tex -texmf-dist/doc/fonts/lh/tex/92check.tex -texmf-dist/doc/fonts/lh/tex/92cm-xx.tex -texmf-dist/doc/fonts/lh/tex/99-cmstd.tex -texmf-dist/doc/fonts/lh/tex/99-t2enc.tex -texmf-dist/doc/fonts/lh/tex/99allenc.tex -texmf-dist/doc/fonts/lh/tex/99tstenc.tex -texmf-dist/doc/fonts/lh/tex/cfhead.tex -texmf-dist/doc/fonts/lh/tex/cfstdedt.tex -texmf-dist/doc/fonts/lh/tex/cod-edt.tex -texmf-dist/doc/fonts/lh/tex/enc-t2.tex -texmf-dist/doc/fonts/lh/tex/fntallcm.tex -texmf-dist/doc/fonts/lh/tex/fntallec.tex -texmf-dist/doc/fonts/lh/tex/fntbasec.tex -texmf-dist/doc/fonts/lh/tex/fntbercm.tex -texmf-dist/doc/fonts/lh/tex/fntberec.tex -texmf-dist/doc/fonts/lh/tex/fntbricm.tex -texmf-dist/doc/fonts/lh/tex/fntbriec.tex -texmf-dist/doc/fonts/lh/tex/fntconcm.tex -texmf-dist/doc/fonts/lh/tex/fntconec.tex -texmf-dist/doc/fonts/lh/tex/fntinvcm.tex -texmf-dist/doc/fonts/lh/tex/fntinvec.tex -texmf-dist/doc/fonts/lh/tex/fntmincm.tex -texmf-dist/doc/fonts/lh/tex/fntminec.tex -texmf-dist/doc/fonts/lh/tex/fnttstcm.tex -texmf-dist/doc/fonts/lh/tex/fnttstec.tex -texmf-dist/doc/fonts/lh/tex/likerdat.tex -texmf-dist/doc/fonts/lh/tex/likergrp.tex -texmf-dist/doc/fonts/lh/tex/likermac.tex -texmf-dist/doc/fonts/lh/tex/rliker.tex -texmf-dist/doc/fonts/lh/tex/setter.tex +texmf-dist/doc/fonts/lh/samples/lh-lcy.tex +texmf-dist/doc/fonts/lh/samples/lh-lcytext.tex +texmf-dist/doc/fonts/lh/samples/lh-ot2.tex +texmf-dist/doc/fonts/lh/samples/lh-ot2text.tex +texmf-dist/doc/fonts/lh/samples/lh-t2a.tex +texmf-dist/doc/fonts/lh/samples/lh-t2atext.tex </TPM:DocFiles> + <TPM:SourceFiles size="244037"> +texmf-dist/source/fonts/lh/tex/01cm-lh.tex +texmf-dist/source/fonts/lh/tex/03cm-wn.tex +texmf-dist/source/fonts/lh/tex/04cm-vf.tex +texmf-dist/source/fonts/lh/tex/11ex-rs.tex +texmf-dist/source/fonts/lh/tex/11ex-rx.tex +texmf-dist/source/fonts/lh/tex/12ex-la.tex +texmf-dist/source/fonts/lh/tex/13ex-lb.tex +texmf-dist/source/fonts/lh/tex/14ex-lc.tex +texmf-dist/source/fonts/lh/tex/15ex-ld.tex +texmf-dist/source/fonts/lh/tex/20cm-ct.tex +texmf-dist/source/fonts/lh/tex/21cm-ic.tex +texmf-dist/source/fonts/lh/tex/22cm-wc.tex +texmf-dist/source/fonts/lh/tex/23cm-mc.tex +texmf-dist/source/fonts/lh/tex/24cm-kc.tex +texmf-dist/source/fonts/lh/tex/25cm-uc.tex +texmf-dist/source/fonts/lh/tex/30cm-lx.tex +texmf-dist/source/fonts/lh/tex/31cm-ix.tex +texmf-dist/source/fonts/lh/tex/32cm-wx.tex +texmf-dist/source/fonts/lh/tex/33cm-mx.tex +texmf-dist/source/fonts/lh/tex/34cm-kx.tex +texmf-dist/source/fonts/lh/tex/46cm-ly.tex +texmf-dist/source/fonts/lh/tex/46cm-lz.tex +texmf-dist/source/fonts/lh/tex/47ex-tx.tex +texmf-dist/source/fonts/lh/tex/91berest.tex +texmf-dist/source/fonts/lh/tex/92check.tex +texmf-dist/source/fonts/lh/tex/92cm-xx.tex +texmf-dist/source/fonts/lh/tex/99-CMstd.tex +texmf-dist/source/fonts/lh/tex/99-T2enc.tex +texmf-dist/source/fonts/lh/tex/99allenc.tex +texmf-dist/source/fonts/lh/tex/99tstenc.tex +texmf-dist/source/fonts/lh/tex/cfhead.tex +texmf-dist/source/fonts/lh/tex/cfstdedt.tex +texmf-dist/source/fonts/lh/tex/cod-edt.tex +texmf-dist/source/fonts/lh/tex/enc-t2.tex +texmf-dist/source/fonts/lh/tex/fntaddcm.tex +texmf-dist/source/fonts/lh/tex/fntaddec.tex +texmf-dist/source/fonts/lh/tex/fntallcm.tex +texmf-dist/source/fonts/lh/tex/fntallec.tex +texmf-dist/source/fonts/lh/tex/fntbasec.tex +texmf-dist/source/fonts/lh/tex/fntbercm.tex +texmf-dist/source/fonts/lh/tex/fntberec.tex +texmf-dist/source/fonts/lh/tex/fntbricm.tex +texmf-dist/source/fonts/lh/tex/fntbriec.tex +texmf-dist/source/fonts/lh/tex/fntconcm.tex +texmf-dist/source/fonts/lh/tex/fntconec.tex +texmf-dist/source/fonts/lh/tex/fntinvcm.tex +texmf-dist/source/fonts/lh/tex/fntinvec.tex +texmf-dist/source/fonts/lh/tex/fntmincm.tex +texmf-dist/source/fonts/lh/tex/fntminec.tex +texmf-dist/source/fonts/lh/tex/fnttstcm.tex +texmf-dist/source/fonts/lh/tex/fnttstec.tex +texmf-dist/source/fonts/lh/tex/likerdat.tex +texmf-dist/source/fonts/lh/tex/likergrp.tex +texmf-dist/source/fonts/lh/tex/likermac.tex +texmf-dist/source/fonts/lh/tex/readme.txt +texmf-dist/source/fonts/lh/tex/rliker.tex +texmf-dist/source/fonts/lh/tex/setter.tex + </TPM:SourceFiles> <TPM:Provides>Package/lh</TPM:Provides> </rdf:Description> </rdf:RDF> |