From 12e838406005e7d86054c1b4a605be7eb2f49080 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 1 Jul 2006 22:18:57 +0000 Subject: lh fonts 3.5d update git-svn-id: svn://tug.org/texlive/trunk@1738 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/fonts/source/lh/base/fikparm.mf | 107 +- Master/texmf-dist/fonts/source/lh/base/lcyrbeg.mf | 21 +- Master/texmf-dist/fonts/source/lh/base/lcyrdefs.mf | 140 +- Master/texmf-dist/fonts/source/lh/base/ldbroman.mf | 184 ++ Master/texmf-dist/fonts/source/lh/base/ldcsc.mf | 10 +- Master/texmf-dist/fonts/source/lh/base/ldroman.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/ldtexset.mf | 152 ++ Master/texmf-dist/fonts/source/lh/base/ldtextit.mf | 18 +- Master/texmf-dist/fonts/source/lh/base/ldtitle.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/lebroman.mf | 82 + Master/texmf-dist/fonts/source/lh/base/lecsc.mf | 16 +- Master/texmf-dist/fonts/source/lh/base/leroman.mf | 18 +- Master/texmf-dist/fonts/source/lh/base/letextit.mf | 16 +- Master/texmf-dist/fonts/source/lh/base/lgcspl.mf | 183 +- Master/texmf-dist/fonts/source/lh/base/lgcsplff.mf | 192 -- Master/texmf-dist/fonts/source/lh/base/lgcyracc.mf | 18 +- Master/texmf-dist/fonts/source/lh/base/lgcyri.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/lgcyrl.mf | 9 +- Master/texmf-dist/fonts/source/lh/base/lgcyrsp.mf | 11 +- Master/texmf-dist/fonts/source/lh/base/lgcyrsym.mf | 71 +- Master/texmf-dist/fonts/source/lh/base/lgcyru.mf | 9 +- Master/texmf-dist/fonts/source/lh/base/lgengsym.mf | 9 +- Master/texmf-dist/fonts/source/lh/base/lgidigit.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/lgilig.mf | 233 +- Master/texmf-dist/fonts/source/lh/base/lgiligff.mf | 242 -- Master/texmf-dist/fonts/source/lh/base/lgitalp.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/lgocyrac.mf | 140 +- Master/texmf-dist/fonts/source/lh/base/lgpunct.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/lgrdigit.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/lgrlig.mf | 175 +- Master/texmf-dist/fonts/source/lh/base/lgrligff.mf | 184 -- Master/texmf-dist/fonts/source/lh/base/lgromp.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/lgrusi.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/lgrusl.mf | 12 +- Master/texmf-dist/fonts/source/lh/base/lgrusu.mf | 12 +- Master/texmf-dist/fonts/source/lh/base/lgt2comi.mf | 14 +- Master/texmf-dist/fonts/source/lh/base/lgt2coml.mf | 11 +- Master/texmf-dist/fonts/source/lh/base/lgt2comu.mf | 13 +- Master/texmf-dist/fonts/source/lh/base/lgt2loi.mf | 22 +- Master/texmf-dist/fonts/source/lh/base/lgt2lol.mf | 136 +- Master/texmf-dist/fonts/source/lh/base/lgt2lou.mf | 84 +- Master/texmf-dist/fonts/source/lh/base/lgt2slvi.mf | 388 +++- Master/texmf-dist/fonts/source/lh/base/lgt2slvl.mf | 37 +- Master/texmf-dist/fonts/source/lh/base/lgt2slvu.mf | 38 +- Master/texmf-dist/fonts/source/lh/base/lgt2slxi.mf | 189 -- Master/texmf-dist/fonts/source/lh/base/lgt2slxl.mf | 843 ------- Master/texmf-dist/fonts/source/lh/base/lgt2slxu.mf | 867 -------- Master/texmf-dist/fonts/source/lh/base/lgt2upi.mf | 10 +- Master/texmf-dist/fonts/source/lh/base/lgt2upl.mf | 124 +- Master/texmf-dist/fonts/source/lh/base/lgt2upu.mf | 83 +- Master/texmf-dist/fonts/source/lh/base/lkligtbl.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/llbligtb.mf | 231 ++ Master/texmf-dist/fonts/source/lh/base/llcligtb.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/lliligtb.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/llmligtb.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/llrligtb.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/llvligtb.mf | 20 +- Master/texmf-dist/fonts/source/lh/base/lwnligs.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/lxpseudo.mf | 27 +- Master/texmf-dist/fonts/source/lh/base/lycyracc.mf | 8 +- Master/texmf-dist/fonts/source/lh/base/lypseudo.mf | 20 +- Master/texmf-dist/fonts/source/lh/base/nodraw.mf | 12 +- Master/texmf-dist/fonts/source/lh/lh-conc/ccb10.mf | 1 + .../texmf-dist/fonts/source/lh/lh-conc/ccbx10.mf | 1 + Master/texmf-dist/fonts/source/lh/lh-conc/ccbx5.mf | 1 + Master/texmf-dist/fonts/source/lh/lh-conc/ccbx6.mf | 1 + Master/texmf-dist/fonts/source/lh/lh-conc/ccbx7.mf | 1 + Master/texmf-dist/fonts/source/lh/lh-conc/ccbx8.mf | 1 + Master/texmf-dist/fonts/source/lh/lh-conc/ccbx9.mf | 1 + .../texmf-dist/fonts/source/lh/lh-conc/ccbxsl10.mf | 1 + .../texmf-dist/fonts/source/lh/lh-conc/ccbxti10.mf | 1 + .../fonts/source/lh/lh-conc/concb10pt.mf | 80 + .../fonts/source/lh/lh-conc/concbx10pt.mf | 80 + .../fonts/source/lh/lh-conc/concbx12pt.mf | 80 + .../fonts/source/lh/lh-conc/concbx5pt.mf | 80 + .../fonts/source/lh/lh-conc/concbx6pt.mf | 80 + .../fonts/source/lh/lh-conc/concbx7pt.mf | 80 + .../fonts/source/lh/lh-conc/concbx8pt.mf | 80 + .../fonts/source/lh/lh-conc/concbx9pt.mf | 80 + .../fonts/source/lh/lh-conc/concbxti10.mf | 78 + .../texmf-dist/fonts/source/lh/lh-conc/concc9pt.mf | 75 + Master/texmf-dist/fonts/source/lh/lh-conc/eob10.mf | 14 + .../texmf-dist/fonts/source/lh/lh-conc/eobx10.mf | 14 + Master/texmf-dist/fonts/source/lh/lh-conc/eobx5.mf | 14 + Master/texmf-dist/fonts/source/lh/lh-conc/eobx6.mf | 14 + Master/texmf-dist/fonts/source/lh/lh-conc/eobx7.mf | 14 + Master/texmf-dist/fonts/source/lh/lh-conc/eobx8.mf | 14 + Master/texmf-dist/fonts/source/lh/lh-conc/eobx9.mf | 14 + .../texmf-dist/fonts/source/lh/lh-conc/eobxsl10.mf | 14 + .../texmf-dist/fonts/source/lh/lh-conc/eobxti10.mf | 14 + .../texmf-dist/fonts/source/lh/lh-conc/eoslc9.mf | 14 + .../texmf-dist/fonts/source/lh/lh-conc/readme.txt | 9 + .../texmf-dist/fonts/source/lh/lh-lcy/ilhcsc10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-lcy/ilhtt8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-lcy/illhss8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-lcy/illhssb8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-lcy/illhssi8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr10.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr17.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr9.mf | 6 - .../texmf-dist/fonts/source/lh/lh-lcy/lhbrbx10.mf | 6 - .../texmf-dist/fonts/source/lh/lh-lcy/lhbrsl10.mf | 6 - .../texmf-dist/fonts/source/lh/lh-lcy/lhbrsl17.mf | 6 - .../texmf-dist/fonts/source/lh/lh-lcy/lhbrsl8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-lcy/lhbrsl9.mf | 6 - .../texmf-dist/fonts/source/lh/lh-lcy/lhccsc10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-lcy/lhcodes.mf | 87 - Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr5.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr6.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr7.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-lcy/lhcsl10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-lcy/lhcsl9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-lcy/lhcslc9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-lcy/lhcti10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-lcy/lhliker.mf | 1197 ---------- .../texmf-dist/fonts/source/lh/lh-lcy/lhsltl10.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-lcy/lhtl10.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-lcy/llhss8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-lcy/llhssb8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-lcy/llhssi8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-ot2/ilwnss8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-ot2/ilwnssb8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-ot2/ilwnssi8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-ot2/iwncsc10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-ot2/iwntt8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-ot2/lwnss8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-ot2/lwnssb8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-ot2/lwnssi8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr10.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr17.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr9.mf | 6 - .../texmf-dist/fonts/source/lh/lh-ot2/wnbrbx10.mf | 6 - .../texmf-dist/fonts/source/lh/lh-ot2/wnbrsl10.mf | 6 - .../texmf-dist/fonts/source/lh/lh-ot2/wnbrsl17.mf | 6 - .../texmf-dist/fonts/source/lh/lh-ot2/wnbrsl8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-ot2/wnbrsl9.mf | 6 - .../texmf-dist/fonts/source/lh/lh-ot2/wnccsc10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-ot2/wncodes.mf | 103 - Master/texmf-dist/fonts/source/lh/lh-ot2/wncr10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-ot2/wncr5.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-ot2/wncr6.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-ot2/wncr7.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-ot2/wncr8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-ot2/wncr9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-ot2/wncsl10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-ot2/wncsl9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-ot2/wncslc9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-ot2/wncti10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-ot2/wnliker.mf | 1543 ------------- .../texmf-dist/fonts/source/lh/lh-ot2/wnsltl10.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-ot2/wntl10.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2a/ilalb8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/ilali8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/ilalo8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/ilalq8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/ilaltt8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/labbx10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/labmo10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/labmo17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/labmo8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/labmo9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/labmr10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/labmr17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/labmr8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/labmr9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/labso10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/labso17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/labso8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/labso9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/labsr10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/labsr17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/labsr8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/labsr9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/labtl10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/labto10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/lacodes.mf | 158 -- Master/texmf-dist/fonts/source/lh/lh-t2a/lalb8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2a/lali8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-t2a/laliker.mf | 1616 -------------- Master/texmf-dist/fonts/source/lh/lh-t2a/lalo8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2a/lalq8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2a/laltt8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-t2a/laocc10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/laorm10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/laorm5.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/laorm6.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/laorm7.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/laorm8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/laorm9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/laosl10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/laosl5.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/laosl6.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/laosl7.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/laosl8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/laosl9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2a/laoti10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2a/laqi8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2a/lasq8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-t2a/lassdc10.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2b/ilblb8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/ilbli8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/ilblo8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/ilblq8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/ilbltt8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbbbx10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbbmo10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbbmo17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbbmr10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbbmr17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbbso10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbbso17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbbsr10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbbsr17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbbtl10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbbto10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbcodes.mf | 158 -- Master/texmf-dist/fonts/source/lh/lh-t2b/lblb8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbli8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-t2b/lbliker.mf | 1359 ------------ Master/texmf-dist/fonts/source/lh/lh-t2b/lblo8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2b/lblq8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbltt8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-t2b/lbocc10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lborm10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lborm5.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lborm6.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lborm7.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lborm8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lborm9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lbosl10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl5.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl6.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl7.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2b/lboti10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbqi8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2b/lbsq8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-t2b/lbssdc10.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2c/ilclb8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/ilcli8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/ilclo8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/ilclq8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/ilcltt8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcbbx10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcbmo10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcbmo17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcbmr10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcbmr17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcbso10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcbso17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcbsr10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcbsr17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcbtl10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcbto10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lccodes.mf | 158 -- Master/texmf-dist/fonts/source/lh/lh-t2c/lclb8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcli8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-t2c/lcliker.mf | 1243 ----------- Master/texmf-dist/fonts/source/lh/lh-t2c/lclo8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2c/lclq8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcltt8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-t2c/lcocc10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcorm10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm5.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm6.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm7.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcosl10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl5.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl6.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl7.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2c/lcoti10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcqi8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2c/lcsq8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-t2c/lcssdc10.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2d/ildlb8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ildli8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ildlo8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ildlq8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ildltt8.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldbbx10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldbmo10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldbmo17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldbmr10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldbmr17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldbso10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldbso17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldbsr10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldbsr17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldbtl10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldbto10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldcodes.mf | 163 -- Master/texmf-dist/fonts/source/lh/lh-t2d/ldlb8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldli8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-t2d/ldliker.mf | 1572 ------------- Master/texmf-dist/fonts/source/lh/lh-t2d/ldlo8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldlq8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldltt8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-t2d/ldocc10.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldorm10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm5.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm6.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm7.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldosl10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl5.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl6.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl7.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl9.mf | 7 - .../texmf-dist/fonts/source/lh/lh-t2d/ldoti10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldqi8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-t2d/ldsq8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-t2d/ldssdc10.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-x2/irxlb8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/irxli8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/irxlo8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/irxlq8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/irxltt8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbbx10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo9.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr9.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbso10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbso17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbso8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbso9.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr17.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr9.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbtl10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxbto10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxcodes.mf | 215 -- Master/texmf-dist/fonts/source/lh/lh-x2/rxlb8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-x2/rxli8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-x2/rxliker.mf | 2304 -------------------- Master/texmf-dist/fonts/source/lh/lh-x2/rxlo8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-x2/rxlq8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-x2/rxltt8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-x2/rxocc10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxorm10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxorm5.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxorm6.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxorm7.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxorm8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxorm9.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxosl10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxosl5.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxosl6.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxosl7.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxosl8.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxosl9.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxoti10.mf | 7 - Master/texmf-dist/fonts/source/lh/lh-x2/rxqi8.mf | 6 - Master/texmf-dist/fonts/source/lh/lh-x2/rxsq8.mf | 6 - .../texmf-dist/fonts/source/lh/lh-x2/rxssdc10.mf | 6 - .../texmf-dist/fonts/source/lh/nont2/lgbersta.mf | 8 +- .../texmf-dist/fonts/source/lh/nont2/lgberstb.mf | 10 +- .../texmf-dist/fonts/source/lh/nont2/lgberstc.mf | 10 +- Master/texmf-dist/fonts/source/lh/nont2/lgcacci.mf | 54 +- Master/texmf-dist/fonts/source/lh/nont2/lgcaccl.mf | 83 +- Master/texmf-dist/fonts/source/lh/nont2/lgcaccu.mf | 99 +- Master/texmf-dist/fonts/source/lh/nont2/lgcmodi.mf | 8 +- Master/texmf-dist/fonts/source/lh/nont2/lgcmodl.mf | 16 +- Master/texmf-dist/fonts/source/lh/nont2/lgcmodu.mf | 8 +- Master/texmf-dist/fonts/source/lh/nont2/lgcvaci.mf | 51 +- Master/texmf-dist/fonts/source/lh/nont2/lgcvacl.mf | 33 +- Master/texmf-dist/fonts/source/lh/nont2/lgcvacu.mf | 9 +- .../texmf-dist/fonts/source/lh/nont2/lgt2slxi.mf | 189 ++ .../texmf-dist/fonts/source/lh/nont2/lgt2slxl.mf | 845 +++++++ .../texmf-dist/fonts/source/lh/nont2/lgt2slxu.mf | 871 ++++++++ Master/texmf-dist/fonts/source/lh/nont2/lgunici.mf | 100 +- Master/texmf-dist/fonts/source/lh/nont2/lgunicl.mf | 221 +- Master/texmf-dist/fonts/source/lh/nont2/lgunicu.mf | 232 +- .../texmf-dist/fonts/source/lh/nont2/lhberest.mf | 10 +- .../texmf-dist/fonts/source/lh/specific/lgcrusl.mf | 8 +- .../texmf-dist/fonts/source/lh/specific/lgcyrcl.mf | 763 +++++++ .../texmf-dist/fonts/source/lh/specific/lgcyrcu.mf | 723 ++++++ .../texmf-dist/fonts/source/lh/specific/lgnoncl.mf | 465 ++++ .../texmf-dist/fonts/source/lh/specific/lgnoncu.mf | 437 ++++ .../texmf-dist/fonts/source/lh/specific/lgrucl.mf | 16 +- .../texmf-dist/fonts/source/lh/specific/lgrucu.mf | 16 +- 422 files changed, 8351 insertions(+), 17290 deletions(-) create mode 100644 Master/texmf-dist/fonts/source/lh/base/ldbroman.mf create mode 100644 Master/texmf-dist/fonts/source/lh/base/ldtexset.mf create mode 100644 Master/texmf-dist/fonts/source/lh/base/lebroman.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/base/lgcsplff.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/base/lgiligff.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/base/lgrligff.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/base/lgt2slxi.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/base/lgt2slxl.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/base/lgt2slxu.mf create mode 100644 Master/texmf-dist/fonts/source/lh/base/llbligtb.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/ccb10.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/ccbx10.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/ccbx5.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/ccbx6.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/ccbx7.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/ccbx8.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/ccbx9.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/ccbxsl10.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/ccbxti10.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/concb10pt.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/concbx10pt.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/concbx12pt.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/concbx5pt.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/concbx6pt.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/concbx7pt.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/concbx8pt.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/concbx9pt.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/concbxti10.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/concc9pt.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/eob10.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/eobx10.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/eobx5.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/eobx6.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/eobx7.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/eobx8.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/eobx9.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/eobxsl10.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/eobxti10.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/eoslc9.mf create mode 100644 Master/texmf-dist/fonts/source/lh/lh-conc/readme.txt delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/ilhcsc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/ilhtt8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/illhss8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/illhssb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/illhssi8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhbr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrbx10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhbrsl9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhccsc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhcodes.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr5.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr6.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr7.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhcr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhcsl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhcsl9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhcslc9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhcti10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhliker.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhsltl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/lhtl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/llhss8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/llhssb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-lcy/llhssi8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/ilwnss8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/ilwnssb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/ilwnssi8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/iwncsc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/iwntt8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/lwnss8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/lwnssb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/lwnssi8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wnbr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrbx10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wnbrsl9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wnccsc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wncodes.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wncr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wncr5.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wncr6.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wncr7.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wncr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wncr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wncsl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wncsl9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wncslc9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wncti10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wnliker.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wnsltl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-ot2/wntl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/ilalb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/ilali8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/ilalo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/ilalq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/ilaltt8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labbx10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labmo10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labmo17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labmo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labmo9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labmr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labmr17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labmr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labmr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labso10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labso17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labso8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labso9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labsr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labsr17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labsr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labsr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labtl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/labto10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/lacodes.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/lalb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/lali8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laliker.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/lalo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/lalq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laltt8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laocc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laorm10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laorm5.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laorm6.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laorm7.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laorm8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laorm9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laosl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laosl5.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laosl6.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laosl7.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laosl8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laosl9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laoti10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/laqi8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/lasq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2a/lassdc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/ilblb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/ilbli8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/ilblo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/ilblq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/ilbltt8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbbx10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmo9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbmr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbso9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbsr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbtl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbbto10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbcodes.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lblb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbli8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbliker.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lblo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lblq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbltt8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbocc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lborm10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lborm5.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lborm6.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lborm7.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lborm8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lborm9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl5.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl6.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl7.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbosl9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lboti10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbqi8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbsq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2b/lbssdc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/ilclb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/ilcli8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/ilclo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/ilclq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/ilcltt8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbbx10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmo9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbmr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbso9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbsr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbtl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcbto10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lccodes.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lclb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcli8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcliker.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lclo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lclq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcltt8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcocc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm5.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm6.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm7.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcorm9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl5.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl6.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl7.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcosl9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcoti10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcqi8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcsq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2c/lcssdc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ildlb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ildli8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ildlo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ildlq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ildltt8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbbx10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmo9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbmr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbso9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbsr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbtl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldbto10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldcodes.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldlb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldli8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldliker.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldlo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldlq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldltt8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldocc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm5.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm6.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm7.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldorm9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl5.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl6.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl7.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldosl9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldoti10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldqi8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldsq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-t2d/ldssdc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/irxlb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/irxli8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/irxlo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/irxlq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/irxltt8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbbx10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbmo9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbmr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbso10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbso17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbso8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbso9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr17.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbsr9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbtl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxbto10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxcodes.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxlb8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxli8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxliker.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxlo8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxlq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxltt8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxocc10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxorm10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxorm5.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxorm6.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxorm7.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxorm8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxorm9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxosl10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxosl5.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxosl6.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxosl7.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxosl8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxosl9.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxoti10.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxqi8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxsq8.mf delete mode 100644 Master/texmf-dist/fonts/source/lh/lh-x2/rxssdc10.mf create mode 100644 Master/texmf-dist/fonts/source/lh/nont2/lgt2slxi.mf create mode 100644 Master/texmf-dist/fonts/source/lh/nont2/lgt2slxl.mf create mode 100644 Master/texmf-dist/fonts/source/lh/nont2/lgt2slxu.mf create mode 100644 Master/texmf-dist/fonts/source/lh/specific/lgcyrcl.mf create mode 100644 Master/texmf-dist/fonts/source/lh/specific/lgcyrcu.mf create mode 100644 Master/texmf-dist/fonts/source/lh/specific/lgnoncl.mf create mode 100644 Master/texmf-dist/fonts/source/lh/specific/lgnoncu.mf (limited to 'Master/texmf-dist/fonts/source/lh') 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 ey$$): 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@6x@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]'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_heightrt 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'r1.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'lx6$: 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 y0x6$: 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/lgt2slxi.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2slxi.mf deleted file mode 100644 index 63940e75808..00000000000 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2slxi.mf +++ /dev/null @@ -1,189 +0,0 @@ -% -% lgt2slxi.mf -% -%% 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: -% -% Italic Old Slav letters -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% List of letternames -% -% vnarrow_e -% zelo -% vuk -% vi_a -% izh_dgr -% Vl_yus -% izh_uml -% olg -% oery -% ohrdsgn -% oo_cdot -% oo_cddot -% Vizh -% t_peter -% zelo_m -% - -LHver_check(3,4); % like |version_check| in ec - -lhchar "Italic Cyrillic letter vnarrow_e"; -cyrcharmoving(vnarrow_e); - -lhchar "Italic Cyrillic letter zelo"; -cyrcharmoving(zelo); - -lhchar "Italic Cyrillic letter vuk - variant uk"; -cyrcharmoving(vuk); - -lhchar "Italic Cyrillic letter vi_a - variant iot a"; -cyrcharmoving(vi_a); - -lhchar "Italic Cyrillic letter izh_dgr - izhitsa double grave"; -cyrchar_twice(izh_dgr,9.5u#,x_height#+acc_height#,0); -italcorr x_height#*slant+.25u#; -adjust_fit(.25u#,max(u#,.5u#+.5flare#)); %izhy_adj -full_h:=h; h:=x_height; -% ital_izh; -numeric left_stem,right_stem,outer_jut,alpha,bulb_diam; -left_stem=stem-stem_corr; bulb_diam=7/8[hair,flare]; -right_stem=min(hair if hefty:-2stem_corr fi,left_stem); -outer_jut=.75jut; x1l=l+letter_fit+outer_jut+.25u; x4r=w-x1l; y1=y4=h; -x2-x1=x4-x3; x2l+apex_corr=x3l; y2=y3=-apex_o; -alpha=diag_ratio(2,right_stem,y1-y2,x4r-x1l-apex_corr); -penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); -penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); -z0=whatever[z1r,z2r]=whatever[z3l,z4l]; -penpos4''(alpha*right_stem,0); -penpos5(vair,90); penpos6(hair,0); penpos7(flare,0); -x5=if serifs:.5[x4'',rt x6r] else: rt x6r fi; top y5r=h+oo; -y4''=min(.9x_height,y5l-vair); z4''=whatever[z3,z4]; -rt x6r=hround(r-.5u-.5); -y6=max(vround(top y5r-.5hair)-1-.5flare, - min(bar_height+.5flare+2vair'+2,.9[bar_height,h]-.5flare)); -cyrbulb(5,6,7); % bulb -penpos1'(alpha*left_stem,0); y1'=3/4x_height; z1'=whatever[z1,z2]; -x10=l+letter_fit; x10:=hround(x10-.5hair)+.5hair; y10=2/3x_height; -penpos9(vair,90); y9r=x_height+oo; x9=min(x1l-.5,x10+u); -if y0>cap_notch_cut: - y0:=cap_notch_cut; - fill z0+.5right{up}...{z4-z3}z4''l...{right}z5r--z5l{left} - ...z4''r{z3-z4}--diag_end(4r,3r,1,1,2l,1l)-- - z1'l{z1-z2}...{left}z9l--z9r{right} - ..tension atleast .75 and 1..{z2-z1}z1'r - ...{down}z0+.5left--cycle; % left and right diagonals -else: - pickup pencircle scaled1; - fill z0--z4''l{z4-z3}...{right}z5r--z5l{left}...{z3-z4}z4''r - --diag_end(4r,3r,1,1,2l,1l)-- - z1'l{z1-z2}...{left}z9l--z9r{right} - ..tension atleast .75 and 1..{z2-z1}z1'r - --cycle; fi % left and right diagonals -pickup fine.nib; -pos9'(vair,90); z9'=z9; pos10(hair,180); -filldraw stroke z10e{up}...z9'e{right}; -%%% -% the accent -if monospace: hpos_corr=-2u; put_gravis; hpos_corr=2u; put_gravis; -else: hpos_corr=-1.5u; put_gravis; hpos_corr=1.5u; put_gravis; fi -repeat_once; -penlabels(0,1,2,3,4); endchar; - -lhchar "Italic Cyrillic letter Vl_yus - like crossed Delta"; -cyrcharmoving(Vl_yus); - -lhchar "Italic Cyrillic letter izh_uml - izhitsa umlaut"; -cyrchar(izh_uml,9.5u#,lc_trema_height#,0); -italcorr x_height#*slant+.25u#; -adjust_fit(.25u#,max(u#,.5u#+.5flare#)); %izhy_adj -h:=x_height; -% ital_izh; -numeric left_stem,right_stem,outer_jut,alpha,bulb_diam; -left_stem=stem-stem_corr; bulb_diam=7/8[hair,flare]; -right_stem=min(hair if hefty:-2stem_corr fi,left_stem); -outer_jut=.75jut; x1l=l+letter_fit+outer_jut+.25u; x4r=w-x1l; y1=y4=h; -x2-x1=x4-x3; x2l+apex_corr=x3l; y2=y3=-apex_o; -alpha=diag_ratio(2,right_stem,y1-y2,x4r-x1l-apex_corr); -penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); -penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); -z0=whatever[z1r,z2r]=whatever[z3l,z4l]; -penpos4''(alpha*right_stem,0); -penpos5(vair,90); penpos6(hair,0); penpos7(flare,0); -x5=if serifs:.5[x4'',rt x6r] else: rt x6r fi; top y5r=h+oo; -y4''=min(.9x_height,y5l-vair); z4''=whatever[z3,z4]; -rt x6r=hround(r-.5u-.5); -y6=max(vround(top y5r-.5hair)-1-.5flare, - min(bar_height+.5flare+2vair'+2,.9[bar_height,h]-.5flare)); -cyrbulb(5,6,7); % bulb -penpos1'(alpha*left_stem,0); y1'=3/4x_height; z1'=whatever[z1,z2]; -x10=l+letter_fit; x10:=hround(x10-.5hair)+.5hair; y10=2/3x_height; -penpos9(vair,90); y9r=x_height+oo; x9=min(x1l-.5,x10+u); -if y0>cap_notch_cut: - y0:=cap_notch_cut; - fill z0+.5right{up}...{z4-z3}z4''l...{right}z5r--z5l{left} - ...z4''r{z3-z4}--diag_end(4r,3r,1,1,2l,1l)-- - z1'l{z1-z2}...{left}z9l--z9r{right} - ..tension atleast .75 and 1..{z2-z1}z1'r - ...{down}z0+.5left--cycle; % left and right diagonals -else: - pickup pencircle scaled1; - fill z0--z4''l{z4-z3}...{right}z5r--z5l{left}...{z3-z4}z4''r - --diag_end(4r,3r,1,1,2l,1l)-- - z1'l{z1-z2}...{left}z9l--z9r{right} - ..tension atleast .75 and 1..{z2-z1}z1'r - --cycle; fi % left and right diagonals -pickup fine.nib; -pos9'(vair,90); z9'=z9; pos10(hair,180); -filldraw stroke z10e{up}...z9'e{right}; -%%% -% the accent -lowercase_umlaut(.5[x1,x4]-.5w,0, 11,12,13,14); -penlabels(0,1,2,3,4,5,6,7,8,9,10, 11,12,13,14); endchar; - -lhchar "Italic Cyrillic letter olg - old soft el (elghe)"; -cyrcharmoving(olg); - -lhchar "Italic Cyrillic letter oery - old ery"; -cyrcharmoving(oery); - -lhchar "Italic Cyrillic letter ohrdsn - old hard sign"; -cyrcharmoving(ohrdsn); - -lhchar "Italic Cyrillic letter oo_cdot - old o cdot"; -cyrcharmoving(oo_cdot); - -lhchar "Italic Cyrillic letter oo_cddot - old o double cdot"; -cyrcharmoving(oo_cddot); - -lhchar "Italic Cyrillic letter vizh - Variant izhitsa"; -cyrcharmoving(vizh); - -lhchar "Italic Cyrillic letter t_peter -- looks like m"; -cyrcharmoving(t_peter); - -lhchar "Italic Cyrillic letter zelo_m -- variant zelo mirror"; -cyrcharmoving(zelo_m); - -lhchar "Italic Cyrillic letter izhei"; -cyrcharmoving(izhei); - -lhchar "Italic Cyrillic letter lo"; -cyrcharmoving(lo); - -lhchar "Italic Cyrillic letter mo"; -cyrcharmoving(mo); - -endinput; -%end of file diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2slxl.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2slxl.mf deleted file mode 100644 index 9960031cc3f..00000000000 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2slxl.mf +++ /dev/null @@ -1,843 +0,0 @@ -% -% lgt2slxl.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: -% -% Lowercase Old Slav letters -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% List of letternames -% -% vnarrow_e -% zelo -% vuk -% vi_a -% izh_dgr -% Vl_yus -% izh_uml -% olg -% oery -% ohrdsgn -% oo_cdot -% oo_cddot -% vizh -% t_peter -% zelo_m -% - -LHver_check(3,4); % like |version_check| in ec - -lhchar "Lowercase Cyrillic letter variant narrow_e"; -cyrchar(vnarrow_e,7u#,x_height#,0); % eng -italcorr x_height#*slant-.2u#; -adjust_fit(if monospace: .5u#,-1.5u# else: 0,-u# fi); -pickup fine.nib; pos2(vair',90); pos4(vair',270); -x2=x4=.5(w+u); top y2r=vround(h+1.5oo); bot y4r=-oo; -pos3(curve,180); lft x3r=hround max(.6u,1.35u-.5curve); y3=.5h; % eng -if serifs: pos1(hair,0); pos0(flare,0); - y1=min(bar_height+2vair'+2,.9[bar_height,h]-flare); - pos5(hair,0); 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); - x6r=x6l+(x1r-x1l)=.5[x2r,x1r]+eps; x7r=x7l+(x5r-x5l)=.5[x4r,x5r]+eps; - forsuffixes e=l,r: path pt.e,pb.e; numeric tt.e,tb.e; - pt.e=z1e{x2-x1,5(y2-y1)}...{left}z2e; - pb.e=z4e{right}..tension .9 and 1..{x5-x4,5(y5-y4)}z5e; - tt.e=ypart(((x6e,0)--(x6e,h)) intersectiontimes pt.e); - tb.e=ypart(((x7e,0)--(x7e,h)) intersectiontimes pb.e); endfor - filldraw stroke subpath(tt.e,1) of pt.e & - pulled_super_arc.e(2,3)(.7superpull) & pulled_super_arc.e(3,4)(.5superpull) - & subpath(0,tb.e) of pb.e; % arc and lower terminal -else: pos1(4/7[vair',flare],80); - rt x1r=hround(w-.6u); top y1r=vround .82[bar_height,top y2r]; - pos5(.6[vair',flare],275); rt x5r=hround(w-.5u); - y5r=good.y(y5r+1/3bar_height-y5); y5l:=good.y y5l; x5l:=good.x x5l; - x6r=x6l+.7(x1r-x1l)=.5[x2r,x1r]+eps; x7r=x7l+.7(x5r-x5l)=.5[x4r,x5r]+eps; - forsuffixes e=l,r: path p.e,pt.e; numeric tt.e,tb.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 - pt.e=term.e(2,1,right,.8,4); % upper terminal - tt.e=ypart(((x6e,0)--(x6e,h+o+eps)) intersectiontimes pt.e); - tb.e=ypart(((x7e,0)--(x7e,h+o+eps)) intersectiontimes p.e); endfor - filldraw stroke subpath(0,tt.e) of pt.e; % upper terminal - filldraw stroke pulled_super_arc.e(2,3)(.7superpull) - & pulled_super_arc.e(3,4)(.5superpull) & subpath(0,tb.e) of p.e; fi % arc and lower terminal -% hstroke -bar_stroke(x3l,0.85[x3l,x7l]-eps); %bar -penlabels(1,1',2,3,4,5,6,7,8,9); endchar; - -lhchar "Lowercase Cyrillic letter zelo"; -cyrchar(zelo,8u#,x_height#,sbeak#); -italcorr x_height#*slant-.5serif_fit#-.3u#; -adjust_fit(0,.5serif_fit#); -numeric arm_thickness[],z_stem; -if hefty: arm_thickness1=Vround(vair-vair_corr); arm_thickness2=vair; - z_stem=.6[vair,stem]; -else: arm_thickness1=vair; arm_thickness2=vair'; z_stem=.9[vair,stem]; fi -pickup tiny.nib; rt x1r=rt x2r=hround(w-.8u); lft x3l=lft x4l=hround 1.25u; -top y1=h; y2=min(y1,h-2/3arm_thickness1); -bot y4=1/6h; y3=max(y4,2/3arm_thickness2); -numeric alpha; alpha=diag_ratio(1,z_stem-tiny,y2-y3,x2r-x3l-slant*(y2-y3)); -penpos1(alpha*(z_stem-tiny),0); penpos2(alpha*(z_stem-tiny),0); -penpos3(alpha*(z_stem-tiny),0); penpos4(alpha*(z_stem-tiny),0); -pair delta; delta=penoffset z3-z2 of currentpen; -fill top lft z1l--z2l+delta---z3l+delta..lft z3l---lft z4l..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); -top y5r=h; x5=x1; lft x6r=hround .75u; y6=good.y(y5l-beak/1.4)-eps; -arm(5,6,a,beak_darkness,-.4beak_jut); % upper arm and beak -if not serifs: pickup fine.nib; fi -pos7(arm_thickness2,-90); pos8(max(currentbreadth+eps,.6[thin_join,vair]),180); -bot y7r=tiny.bot y4; x7=x4r; x0=w+.75u; y0=y7l; -z8l=z0+whatever*(z2-z3); bot y8=-d-o; -path p; p=(z7l{right}.. .45[z0,.5[z7,z8]] ..{z3-z2}z8l); -z9=point 1 of p; pos9(curve,angle(direction 1 of p)-90); -filldraw stroke z7e{right}...z9e{z8-z7}...{z3-z2}z8e; % tail -penlabels(1,2,3,4,5,6,7,8); endchar; - -lhchar "Lowercase Cyrillic letter Vuk -- variant uk"; -cyrchar(vuk,9u#,x_height#+acc_height#,0); -italcorr .7x_height#*slant; -adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi); %o -h:=.8x_height; -% lower_o; -penpos1(vair,90); penpos3(vair',-90); penpos2(curve,180); penpos4(curve,0); -x2r=hround max(.5u,1.25u-.5curve); -x4r=w-x2r; x1=x3=.5w; y1r=h+vround 1.5oo; y3r=-oo; -y2=y4=.5h-vair_corr; y2l:=y4l:=.52h; -penstroke pulled_arc.e(1,2) & pulled_arc.e(2,3) - & pulled_arc.e(3,4) & pulled_arc.e(4,1) & cycle; % bowl -%%%%% -% "hachek" -if serifs: - penpos14(1.2vair',90); penpos15(whatever,0); - x14=x1; y14=h+oo-eps; - x1-x15=x16-x1=good.x 3.25u; y15=y16=x_height+.5acc_height+oo; - 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: - pickup fine.nib; - pos14(3/4[vair,hair],0); pos16(3/4[vair,hair],0); - pos15(7/8[vair,fudged.stem],0); - x1-x14=x16-x1+eps; y15=h+oo-eps; x15=x1; - y14=y16=x_height+.35acc_height+oo; x14l=hround(rt x15r-3.5u-.5vair); - z0=whatever[z14r,z15r]=whatever[z15l,z16l]; y0'=max(y1r,y1l+notch_cut); - pair delta[]; - delta1=penoffset z15-z14 of currentpen; - delta2=penoffset z16-z15 of currentpen; - fill z15l---z14l+delta1..top z14l---top z14r..z14r-delta1 - if y0'cap_notch_cut: y0:=cap_notch_cut; - fill z0+.5right{up}...{z4-z3}z4'l...{right} - if serifs: z5r--z5l - else: - (.5[x4,x4r],y5r)--(fine.lft x5r,y5r)..(x5r,fine.bot y5r)-- - (x5l,fine.top y5l)..(fine.lft x5l,y5l) fi - {left}...z4'r{z3-z4} - --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} - ...{down}z0+.5left--cycle; % left and right diagonals -else: fill z0--z4'l{z4-z3}...{right}z5r--z5l{left}...{z3-z4}z4'r - --diag_end(4r,3r,1,1,2l,1l) - --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals -if serifs: numeric inner_jut; pickup tiny.nib; - prime_points_inside(1,2); - if rt x1'r+jut+.5u+1<=lft x4l-jut+.5tiny: inner_jut=jut; - else: rt x1'r+inner_jut+.5u+1=lft x4l-inner_jut+.5tiny; fi - save slab; slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); fi % upper left serif -%%%%% -endgroup; -% the accent -if monospace: hpos_corr=-2u; put_gravis; hpos_corr=2u; put_gravis; -else: hpos_corr=-1.5u; put_gravis; hpos_corr=1.5u; put_gravis; fi -repeat_once; -penlabels(0,1,2,3,4,5,6,7); endchar; - -lhchar "Lowercase Cyrillic letter Vl_yus - like crossed Delta"; -cyrchar(Vl_yus,10u#+2stem#,x_height#,0); -adjust_fit(serif_fit#,serif_fit#); -numeric left_stem,right_stem,outer_jut,alpha; -right_stem=fudged.stem-stem_corr; -left_stem=min(fudged.hair if hefty:-2stem_corr fi,right_stem); -outer_jut=.75jut; x1l=w-x4r=l+letter_fit+.25u; y1=y4=0; %+outer_jut -x2-x1=x4-x3; x3r=x2r+apex_corr; y2=y3=h+apex_o+apex_oo; -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); -z0=whatever[z1r,z2r]=whatever[z3l,z4l]; -if y0cap_notch_cut: y0:=cap_notch_cut; - fill z0+.5right{up}...{z4-z3}z4'l...{right} - if serifs: z5r--z5l - else: - (.5[x4,x4r],y5r)--(fine.lft x5r,y5r)..(x5r,fine.bot y5r)-- - (x5l,fine.top y5l)..(fine.lft x5l,y5l) fi - {left}...z4'r{z3-z4} - --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} - ...{down}z0+.5left--cycle; % left and right diagonals -else: fill z0--z4'l{z4-z3}...{right}z5r--z5l{left}...{z3-z4}z4'r - --diag_end(4r,3r,1,1,2l,1l) - --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals -if serifs: numeric inner_jut; pickup tiny.nib; - prime_points_inside(1,2); - if rt x1'r+jut+.5u+1<=lft x4l-jut+.5tiny: inner_jut=jut; - else: rt x1'r+inner_jut+.5u+1=lft x4l-inner_jut+.5tiny; fi - save slab; slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); fi % upper left serif -%%%%% -% the accent -lowercase_umlaut(.5[x1,x4]-.5w,0, 8,9,10,11); -penlabels(0,1,2,3,4); endchar; - -lhchar "Lowercase Cyrillic letter ligature olg - old soft el (elghe)"; -cyrchar(olg,10u# % if not serifs:+.5width_adj# fi % dl_width;n_width - ,x_height#,0); -italcorr x_height#*slant-beak_jut#+.25u#; %Gamma->x_height+.5u# -adjust_fit(serif_fit# if not serifs:+.5(stem#-u#) fi, %dl_adj - if serifs: 2u# else: 3u# fi-.5width_adj#); % old_beak_adj -% lower_l; -pickup tiny.nib; pos1(fudged.stem,0); pos2(fudged.stem,0); -rt x1r=rt x2r=w-hround (2.5u-.5fudged.stem-eps); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; %stem -numeric light_hair,bot_vair,bulb_diam,left_jut; -light_hair=if hefty:.5[vair,fudged.hair] else: fudged.hair fi; -bot_vair=Vround(.5[vair,light_hair]); -bulb_diam=hround 7/8[hair,flare]; -left_jut= - if serifs: max(limit_dist,1.1jut) else: hround (w+serif_fit-rt x2r-.5u) fi; -x3=1/3[w-rt x1r-(1/8left_jut),rt x1r] if not serifs: -.5(stem-u) fi +eps; -if serifs: - pos3(light_hair,0); pos4(light_hair,-90); - pos6(bulb_diam,-180); pos5(hair,-180); - top y3=h; y6-.5bulb_diam=.12desc_depth-eps; z6r=z5r; - lft x6r=l+letter_fit+hround(.35u-.5); - x4=max(lft x5r+.5bulb_diam,.4[lft x5r,rt x3r]); - bot y4r=-1.5oo-eps; {{less_tense; bulb(4,5,6)}}; %bulb - filldraw stroke z4e{right} - ..controls (min(15/16[x4,x3],max(x4,lft x6r+1.75bulb_diam))+(x3e-x3),y4e) - and (x3e,max(y4l,min(y6-.5,1/3h+eps))+1/3(y4e-y4))..{up}z3e; % left tail -else: - pos3'(vair,90); pos1'(vair,90); - lft x3'=x3-.5light_hair; rt x1'=x1r; top y3'r=top y1'r=h; - filldraw stroke z3'e--z1'e; % upper bar - pickup fine.nib; pos3(light_hair,0); pos4(bot_vair,-90); pos5(bot_vair,-90); - bot y5r=0; x4=.67[x3l,x5]; - lft x5=l+letter_fit+hround(.35u-.5); bot y4r=bot y5r; y3=y3'; - filldraw stroke z3e{down}..controls (x3e,y5e+.35h) - and (min(7/8[x4e,x3e],x4e+2light_hair)+eps,y4e-eps)..{left}z4e--z5e; fi % left stem -%%% -if serifs: - x0=x3; y0=0; - numeric inner_jut; inner_jut=min(.5(lft x1l-rt x3r)-eps,.5jut); - save slab; slab:=vair; % lower.slab - dish_serif(2,1,a,1/3,jut,b,1/3,jut); %lower right serif - slab:=Vround(vair-vair_corr); % lower.slab - nodish_serif(1,2,c,1/3,inner_jut,d,1/3,.5jut); %!!! %upper right serif - 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 -%%%%% -% (old) lower right beak(2); -if (serifs=false) and (old_cyr=true): - pickup tiny.nib; - pos7(vair,90); top y7r=h; x7=x2; - pos8(vair,90); y8=y7; rt x8r=hround(r-.45u); - filldraw stroke z7e--z8e; % horisontal - pickup fine.nib; pos9(slab,0); pos10(slab,0); - rt x9r=rt x10r=tiny.rt x8r; y9=y8r; bot y10=y8l-.7sbeak; - filldraw stroke z9e--z10e; %vertical -else: - pickup crisp.nib; - pos7(vair,90); top y7r=h; x7=x2; rt x8r=hround(r-.45u); - pos8(hair,0); y8=good.y(y7l-beak/1.4)-eps; - arm(7,8,i,beak_darkness,.4beak_jut); % upper arm and beak -fi -%%% -penlabels(1,2,3,4,5,6,7,8,9,10); endchar; - -lhchar "Lowercase Cyrillic letter oery - old ery"; -cyrchar(oery,9u#,x_height#,0); % v_witdh -italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut -adjust_fit(if serifs: 2u# else: 3u# fi-.5width_adj#, % old_beak_adj - serif_fit#+4u#); -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 -if serifs: - save slab; slab:=Vround(vair-vair_corr); % lower.slab - nodish_serif(1,2,a,1/3,.5jut,b,1/3,.5jut); % upper serif - slab:=vair; % lower.slab - nodish_serif(2,1,c,1/3,jut,d,1/3,.5jut); fi % lower serif -% lsftsn_bowl(2); -_zero:=2; -_one:=3; _two:=4; _three:=5; _four:=6; _five:=7; -% -set_bar_axis; -penpos[_three](curve if hefty:-3stem_corr fi,0); -penpos[_four](vair',-90); penpos[_five](vair',-90); -z[_five]r=bot 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; -x[_two]l=x[_two]r=x[_four]=w-3.75u; %.5v_width+.75u; -x[_one]l=x[_one]r=x[_zero]; 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 -%%% -% (old) lower left beak(2); -if (serifs=false) and (old_cyr=true): - pickup tiny.nib; - pos8(vair,90); top y8r=h; x8=x2; - pos9(vair,90); y9=y8; lft x9r=l+letter_fit+hround.45u; - filldraw stroke z8e--z9e; % horisontal - pickup fine.nib; pos10(slab,0); pos11(slab,0); - lft x10l=lft x11l=tiny.lft x9l; y10=y9r; bot y11=y8l-.7sbeak; - filldraw stroke z10e--z11e; % vertical -else: - pickup crisp.nib; - pos8(vair,90); top y8r=h; x8=x2; lft x9r=l+letter_fit+hround.45u; - pos9(hair,180); y9=good.y(y8l-beak/1.4)-eps; - arm(8,9,i,beak_darkness,-.4beak_jut); % upper arm and beak -fi -% I -w:=w+4u; pickup tiny.nib; rt x12r=rt x13r=w-lft x1l; top y12=h; bot y13=0; -pos12(fudged.stem,0); pos13(fudged.stem,0); -filldraw stroke z12e--z13e; % stem -if serifs: - save slab; slab:=Vround(vair-vair_corr); % lower.slab - dish_serif(12,13,e,1/3,jut,f,1/3,jut); % upper serif - slab:=vair; % lower.slab - dish_serif(13,12,g,1/3,jut,h,1/3,jut); fi % lower serif -penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13); endchar; - -lhchar "Lowercase Cyrillic letter ohrdsn - old hard sign"; -cyrchar(ohrdsn,9u#,x_height#,0); % v_witdh -italcorr .5x_height#*slant+min(.5curve#-.85u#,-.1u#); %p -adjust_fit(if serifs: 2u# else: 3u# fi-.5width_adj#, % old_beak_adj - if monospace:.5u# else:0 fi); -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 -if serifs: save slab; slab:=Vround(vair-vair_corr); % lower.slab - nodish_serif(1,2,a,1/3,.5jut,b,1/3,.5jut); % upper serif - slab:=vair; % lower.slab - nodish_serif(2,1,c,1/3,jut,d,1/3,.5jut); fi % lower serif -% lsftsn_bowl(2); -_zero:=2; -_one:=3; _two:=4; _three:=5; _four:=6; _five:=7; -% -set_bar_axis; -penpos[_three](curve if hefty:-3stem_corr fi,0); -penpos[_four](vair',-90); penpos[_five](vair',-90); -z[_five]r=bot 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; -x[_two]l=x[_two]r=x[_four]=w-3.75u; %.5v_width+.75u; -x[_one]l=x[_one]r=x[_zero]; 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 -%%% -% old lower left beak(2); -if (serifs=false) and (old_cyr=true): - pickup tiny.nib; - pos8(vair,90); top y8r=h; x8=x2; - pos9(vair,90); y9=y8; lft x9r=l+letter_fit+hround.45u; - filldraw stroke z8e--z9e; % horisontal - pickup fine.nib; pos10(slab,0); pos11(slab,0); - lft x10l=lft x11l=tiny.lft x9l; y10=y9r; bot y11=y8l-.7sbeak; - filldraw stroke z10e--z11e; % vertical -else: - pickup crisp.nib; - pos8(vair,90); top y8r=h; x8=x2; lft x9r=l+letter_fit+hround.45u; - pos9(hair,180); y9=good.y(y8l-beak/1.4)-eps; - arm(8,9,i,beak_darkness,-.4beak_jut); % upper arm and beak -fi -penlabels(1,2,3,4,5,6,7,8,9,10,11); endchar; - -lhchar "Lowercase Cyrillic letter oo_cdot - old o cdot"; -cyrchar(oo_cdot,10u#,x_height#,0); %f width-u -italcorr .7x_height#*slant; -adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi); -penpos1(vair,90); penpos3(vair',-90); penpos2(curve,180); penpos4(curve,0); -if serifs: interim superness:=1.05 superness; - else: interim superness:=1.075 superness; fi -x2r=hround max(.5u,1.25u-.5curve); -x4r=w-x2r; x1=x3=.5w; y1r=h+vround 1.5oo; y3r=-oo; -y2=y4=.5h-vair_corr; y2l:=y4l:=.52h; -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))); -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; - -lhchar "Lowercase Cyrillic letter oo_cddot - old o double cdot"; -cyrchar(oo_cddot,11u#,x_height#,0); %f width - eps -italcorr .7x_height#*slant; -adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi); -penpos1(vair,90); penpos3(vair',-90); penpos2(curve,180); penpos4(curve,0); -if serifs: interim superness:=1.05 superness; - else: interim superness:=1.075 superness; fi -x2r=hround max(.5u,1.25u-.5curve); -x4r=w-x2r; x1=x3=.5w; y1r=h+vround 1.5oo; y3r=-oo; -y2=y4=.5h-vair_corr; y2l:=y4l:=.52h; -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))); -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]; -dot([_one],[_two]); % left dot -pos[_three](dot_diam,0); -penpos[_four](y[_two]r-y[_two]l,90); -y[_three]=y[_four]=y[_one]; x[_three]=x[_four]=x[_one]+2.75u; -dot([_three],[_four]); % right dot -penlabels(1,2,3,4); endchar; - -lhchar "Lowercase Cyrillic letter vizh - variant izhitsa"; -cyrchar(vizh,if serifs:9.5u# else:9u# fi,x_height#,desc_depth#); -italcorr x_height#*slant+.25u#; -adjust_fit(serif_fit# if monospace:+\\.5u#,.5u#+ else:,fi\\ serif_fit#); -%letter_old_u; -numeric left_stem,right_stem,bot_stem,bot_vair,outer_jut; -left_stem=fudged.stem-stem_corr; right_stem=fudged.hair if hefty:-2stem_corr fi; -bot_stem=fudged.hair if hefty:-8stem_corr fi; -bot_vair=Vround(if serifs: vair else:.5[vair,bot_stem] fi); outer_jut=.75jut; -x1l=w-x4r=l+letter_fit+outer_jut+.25u; y1=y4r=h; y2=y3=0; x2l=x3l; -numeric alpha,alpha[]; x9=3u; y9=bot_vair-d-oo; -alpha1=diag_ratio(2,bot_stem,y1-y3,x4r-x1l-apex_corr); -alpha2=diag_ratio(1,bot_stem,y1-y9,x4r-x9); -if alpha1notch_cut: y0:=notch_cut; - fill z0+.5right{up}...{z4r-z3r}diag_end(0,4l,1,1,4r,3r) - --z3r--z2l--diag_end(2l,1l,1,1,1r,2r){z2-z1} - ...{down}z0+.5left--cycle; % left and right diagonals -else: fill z0--diag_end(0,4l,1,1,4r,3r)--z3r--z2l - --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals -penpos5(alpha*bot_stem,0); z5r=whatever[z3r,z4r]; bot y5=-d; -if serifs: fill stroke z3e---z5e; % straight arc - numeric inner_jut; pickup tiny.nib; - prime_points_inside(1,2); prime_points_inside(4,3); prime_points_inside(5,3); - 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 - 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); % upper right serif - slab:=vair; % lower.slab - dish_serif(5',3,e,1/2,jut/1.2,f,.6,jut)(dark); % lower serif -else: - fill z3r---diag_end(3r,5r,.75,.75,5l,3l)---z3l--cycle; fi % straight arc -penlabels(0,1,2,3,4,5,6,7,8,9); endchar; - -lhchar "Lowercase Cyrillic letter t_peter - like flipped sh"; -cyrchar(t_peter,14.5u# if serifs:+.5width_adj# fi,x_height#,0); -italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut -adjust_fit(if monospace: 0,0 else: serif_fit#,serif_fit# fi); %wlett_adj -% lower_sh;flip -if odd(fudged.stem-w): change_width; fi % symmetric & all three equal -pickup tiny.nib; -pos1(fudged.stem,0); pos2(fudged.stem,0); pos3(fudged.stem,0); -pos4(fudged.stem,0); pos5(fudged.stem,0); pos6(fudged.stem,0); -lft x1l=lft x2l=hround(2.5u-.5fudged.stem-eps); x3=x4=w-x1; -top y1=top y3=top y5=h; bot y2=bot y4=bot y6=0; -lft x5l=lft x6l=hround (.5[x1,x3]-.5fudged.stem); % middle stem point -filldraw stroke z1e--z2e; % left stem -filldraw stroke z3e--z4e; % right stem -filldraw stroke z5e--z6e; % center stem -if serifs: - numeric inner_jut; - if rt x1r+jut+.5u+1<=lft x5l-jut: inner_jut=jut; - else: rt x1r+inner_jut+.5u+1=lft x5l-inner_jut; fi - save slab; slab:=vair; % lower.slab - dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); % lower left serif - dish_serif(6,5,k,1/3,inner_jut,m,1/3,inner_jut); % lower center serif - dish_serif(4,3,g,1/3,inner_jut,h,1/3,jut); % lower right serif - inner_jut:=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_jut); % upper left serif - nodish_serif(3,4,e,1/3,inner_jut,f,1/3,jut); % upper right serif - nodish_serif(5,6,i,1/3,inner_jut,j,1/3,inner_jut); % upper center serif - fill z.b0--z.b1--z.e1--z.e0--cycle; % upper inter_serif bar -else: - lft x2'= lft x2l; top y2'r=h; pos2'(vair,90); - rt x4'=rt x4r; y4'=y2'; pos4'(vair,90); - filldraw stroke z2'e--z4'e; fi -penlabels(1,2,3,4,5,6); endchar; - -lhchar "Lowercase Cyrillic letter zelo_m - variant zelo mirror"; -cyrchar(zelo_m,7.1u#,x_height#,0); -italcorr .7x_height#*slant; -adjust_fit(if monospace: .4u#,.5u# else: if serifs:0 else:-.2u# fi,0 fi); -numeric theta; theta=90-angle(40u,h); slope:=-h/40u; % angle at middle -numeric s_slab; s_slab=if serifs: vair else: Vround .1[vair,stem] fi; -numeric ess'; ess'=max(fine.breadth,ess); -pickup fine.nib; pos2(max(fine.breadth,s_slab-vround vair_corr),-100); -pos0(ess',theta); pos7(s_slab,-90); x2l=x0=x7=.5w; -top y2l=h+vround 1.5oo; bot y7r=-oo; -y0-.5ess'=y7l+if serifs:.54 else: .52 fi\\(y2r-y7l-ess'); -lft x3l=hround .6u; rt x6r=hround(w-.6u); -x3r-x3l=x6r-x6l=hround .5[s_slab,ess']-fine; -ellipse_set(2l,3l,4l,0l); ellipse_set(2r,3r,4r,0r); y3=y3r; -ellipse_set(7l,6l,5l,0l); ellipse_set(7r,6r,5r,0r); y6=y6r; -interim superness:=more_super; -%mirror -forsuffixes $ = 2l,2,2r,3l,3,3r,4l,4,4r,5l,5,5r,6l,6,6r,7l,7,7r: - x$:=l+(r-x$); endfor; -filldraw stroke super_arc.e(2,3) & z3e{down} - ..z4e---z5e..z6e{down} & super_arc.e(6,7); % main stroke -if serifs: - pos1(hair,180); pos8(hair,180); - rt x1l=hround(w-1.05u); lft x8r=hround .6u; - bot y1=min(bot y2r,vround 1/5[top y5r,h]); - top y8=max(top y7l,vround 5/6 bot y4l); - forsuffixes $ = 1l,1,1r,8l,8,8r: x$:=l+(r-x$); endfor; - filldraw stroke z1e{up}....{right}z2e; % upper arc - filldraw stroke z7e{right}....{x8-x7,5(y8-y7)}z8e; % lower arc - path upper_arc, lower_arc; - upper_arc=z1{up}....{right}z2; lower_arc=z7{right}....{x8-x7,5(y8-y7)}z8; - pos10(.3[fine.breadth,hair],180); pos9(.3[fine.breadth,hair],180); - x10r=x1l; top y10=top y2l; x9l=x8r; bot y9=bot y7r; - x1'-x1l=x8r-x8'=1.6curve-fine; y1'=y1; y8'=y8; - numeric t; t=xpart(upper_arc intersectiontimes(z10l--z1')); - filldraw z1l--z10r--z10l--subpath(t,0) of upper_arc--cycle; % upper barb - t:=xpart(lower_arc intersectiontimes(z9r--z8')); - filldraw z8r--z9l--z9r--subpath(t,1) of lower_arc--cycle; % lower barb -else: - pos1(4/7[s_slab,flare],-100); pos8(flare,-100); - x1l=good.x(x1l+w-u-rt x1); lft x8r=hround .5u; - top y1l=vround(.93h+1.5oo); bot y8r=vround .1h-oo; - forsuffixes $ = 1l,1,1r,8l,8,8r: x$:=l+(r-x$); endfor; - filldraw stroke term.e(2,1,left,.9,4); % upper arc and terminal - filldraw stroke term.e(7,8,right,1,4); fi % lower arc and terminal -penlabels(0,1,1',2,3,4,5,6,7,8,8',9,10); endchar; - -lhchar "Lowercase Cyrillic letter izhei"; -cyrchar(izhei,10u# if not serifs:+.5width_adj# fi,x_height#,0); % n_width -italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut -adjust_fit(serif_fit#,serif_fit#); -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[]; -x5=hround (rt x1r-.5)-eps; x6=hround (lft x3l+.5)+eps; -y5=vround(.45h-eps); y6=vround(.65h-eps); -stem1=7/8[thin_join,vair]; -penpos5(stem1,90); penpos6(stem1,90); -fill stroke z5e--z6e; % 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 -%%%%% -penlabels(1,2,3,4,5,6); endchar; - -lhchar "Lowercase Cyrillic letter lo"; -cyrchar(lo,10u# % if not serifs:+.5width_adj# fi % dl_width;n_width - ,x_height#,0); -italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut -adjust_fit(serif_fit# if not serifs:+.5(stem#-u#) fi, %dl_adj - if monospace: 9.5 else: 9 fi u#); % -% lower_l; -pickup tiny.nib; pos1(fudged.stem,0); pos2(fudged.stem,0); -rt x1r=rt x2r=w-hround (2.5u-.5fudged.stem-eps); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; %stem -numeric light_hair,bot_vair,bulb_diam,left_jut; -light_hair=if hefty:.5[vair,fudged.hair] else: fudged.hair fi; -bot_vair=Vround(.5[vair,light_hair]); -bulb_diam=hround 7/8[hair,flare]; -left_jut= - if serifs: max(limit_dist,1.1jut) else: hround (w+serif_fit-rt x2r-.5u) fi; -x3=1/3[w-rt x1r-(1/8left_jut),rt x1r] if not serifs: -.5(stem-u) fi +eps; -if serifs: - pos3(light_hair,0); pos4(light_hair,-90); - pos6(bulb_diam,-180); pos5(hair,-180); - top y3=h; y6-.5bulb_diam=.12desc_depth-eps; z6r=z5r; - lft x6r=l+letter_fit+hround(.35u-.5); - x4=max(lft x5r+.5bulb_diam,.4[lft x5r,rt x3r]); - bot y4r=-1.5oo-eps; {{less_tense; bulb(4,5,6)}}; %bulb - filldraw stroke z4e{right} - ..controls (min(15/16[x4,x3],max(x4,lft x6r+1.75bulb_diam))+(x3e-x3),y4e) - and (x3e,max(y4l,min(y6-.5,1/3h+eps))+1/3(y4e-y4))..{up}z3e; % left tail -else: - pos3'(vair,90); pos1'(vair,90); - lft x3'=x3-.5light_hair; rt x1'=x1r; top y3'r=top y1'r=h; - filldraw stroke z3'e--z1'e; % upper bar - pickup fine.nib; pos3(light_hair,0); pos4(bot_vair,-90); pos5(bot_vair,-90); - bot y5r=0; x4=.67[x3l,x5]; - lft x5=l+letter_fit+hround(.35u-.5); bot y4r=bot y5r; y3=y3'; - filldraw stroke z3e{down}..controls (x3e,y5e+.35h) - and (min(7/8[x4e,x3e],x4e+2light_hair)+eps,y4e-eps)..{left}z4e--z5e; fi % left stem -%%% -if serifs: - x0=x3; y0=0; - numeric inner_jut; inner_jut=min(.5(lft x1l-rt x3r)-eps,.5jut); - save slab; slab:=vair; % lower.slab - dish_serif(2,1,a,1/3,jut,b,1/3,jut); % lower right serif - 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 - filldraw z.c0--z.c1--z.f1--z.f0--cycle; fi % upper inter_serif bar -%%% -%O_part -full_w:=9u; -_zero:=2; -_one:=9; _two:=10; _three:=11; _four:=12; _five:=13; _six:=14; -penpos[_one](vair,90); penpos[_three](vair',-90); -penpos[_two](curve,180); penpos[_four](curve,0); -x[_two]r=hround max(.5u,1.25u-.5curve); -x[_four]r=full_w-x[_two]r; x[_one]=x[_three]=.5full_w; -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; -penstroke pulled_arc.e([_one],[_two]) & pulled_arc.e([_two],[_three]) - & pulled_arc.e([_three],[_four]) & pulled_arc.e([_four],[_one]) & cycle; % bowl -%%% -bar_stroke(x[_zero],x[_two]); % bar -%%%%% -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 -% lower_m; -numeric stem[]; % thicknesses of the four strokes -stem1=hround(fudged.hair+stem_corr); -stem2=hround(fudged.stem-3stem_corr); -stem3=min(stem2,hround (fudged.hair-2stem_corr)); -stem4=max(stem1,hround(fudged.stem-3stem_corr)); -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 (w-2.5u+.5stem4); -top y1=top y3=h; bot y2=bot y4=0; -filldraw stroke z1e--z2e; % left stem -filldraw stroke z3e--z4e; % right stem -penpos5(stem2,0); penpos6(stem2,0); penpos7(stem3,0); penpos8(stem3,0); -x5l=x1; x6l=x7l; x8=lft x3l; x6-x5=x8-x7; y5=y8=h; y6=y7; -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]; - z0=whatever[z5r,z6r]=whatever[z7l,z8l]; - fill z5l.. - if y1'cap_notch_cut: y0:=cap_notch_cut; - fill z0+.5right{up}...{z4-z3}z5l...{right} - if serifs: z6r--z6l - else: - (.5[x4,x4r],y6r)--(fine.lft x6r,y6r)..(x6r,fine.bot y6r)-- - (x6l,fine.top y6l)..(fine.lft x6l,y6l) fi - {left} - ....z5r{z3-z4}--diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} - ...{down}z0+.5left--cycle; % left and right diagonals -else: fill z0--z5l{z4-z3}...{right}z6r--z6l{left}...{z3-z4}z5r - --diag_end(4r,3r,1,1,2l,1l) - --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals -if serifs: numeric inner_jut; pickup tiny.nib; - prime_points_inside(1,2); - if rt x1'r+cap_jut+.5u+1<=x4l-cap_jut: inner_jut=cap_jut; - else: rt x1'r+inner_jut+.5u+1=x4l-inner_jut; fi - dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); fi % left serif -%%%%% -% the accent -if monospace: - hpos_corr=-2u; put_gravis(cyrcaph); - hpos_corr=2u; put_gravis(cyrcaph); -else: hpos_corr=-1.5u; put_gravis(cyrcaph); - hpos_corr=1.5u; put_gravis(cyrcaph); fi -repeat_once; -penlabels(0,1,2,3,4,5,6,7); endchar; - -lhchar "Uppercase Cyrillic letter VL_YUS - like crossed Delta"; -cyrchar(VL_YUS,13u#+2cap_stem#,cap_height#,0); -if is_small_cap: getcharcode(Vl_yus); fi -adjust_fit(cap_serif_fit#,cap_serif_fit#); -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=l+letter_fit+.5u; y1=y4=0; %+outer_jut -x2-x1=x4-x3; x3r=x2r+apex_corr; y2=y3=h+apex_o+apex_oo; -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); -z0=whatever[z1r,z2r]=whatever[z3l,z4l]; -if y0cap_notch_cut: y0:=cap_notch_cut; - fill z0+.5right{up}...{z4-z3}z5l...{right} - if serifs: z6r--z6l - else: - (.5[x4,x4r],y6r)--(fine.lft x6r,y6r)..(x6r,fine.bot y6r)-- - (x6l,fine.top y6l)..(fine.lft x6l,y6l) fi - {left} - ....z5r{z3-z4}--diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} - ...{down}z0+.5left--cycle; % left and right diagonals -else: fill z0--z5l{z4-z3}...{right}z6r--z6l{left}...{z3-z4}z5r - --diag_end(4r,3r,1,1,2l,1l) - --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals -if serifs: numeric inner_jut; pickup tiny.nib; - prime_points_inside(1,2); - if rt x1'r+cap_jut+.5u+1<=x4l-cap_jut: inner_jut=cap_jut; - else: rt x1'r+inner_jut+.5u+1=x4l-inner_jut; fi - dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); fi % left serif -%%%%% -% the accent -h:=full_h; uppercase_umlaut(.5[x1,x4]-.5w,0, 9,10,11,12); -penlabels(0,1,2,3,4,5,6,7,8, 9,10,11,12); endchar; - -lhchar "Uppercase Cyrillic letter ligature OLG - Old soft EL (ELGHE)"; -cyrchar(OLG,13.5u#,cap_height#,0); % DL_width:N_width -if is_small_cap: getcharcode(olg); fi; -italcorr cap_height#*slant-beak_jut#; %Gamma+.25u -adjust_fit(cap_serif_fit# if not serifs:+.5(cap_stem#-u#) fi, %DL_adj - if not serifs:.5u#+ fi - min(4.5u#-.5stem#,3.5u#)-.5width_adj#); % Beak_adj+.5u -% 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; -filldraw stroke z1e--z2e; %stem -numeric bulb_diam; bulb_diam=flare+(cap_stem-stem); -numeric light_hair,bot_vair,left_jut; -light_hair=max(tiny.breadth,fudged.hair if hefty:-4stem_corr fi); -left_jut= - if serifs: max(limit_dist,1.1cap_jut) - else: hround (w+cap_serif_fit-rt x2r-.65u) fi; -bot_vair=Vround(.5[vair,light_hair]); -x3=1/3[w-rt x1r-(1/6left_jut),rt x1r] if not serifs:-.5(cap_stem-u) fi+eps; -if serifs: - pos3(light_hair,0); pos4(light_hair,-90); - pos6(bulb_diam,-180); pos5(cap_hair,-180); - top y3=h; y6=1/6h-max(0,flare-stem-2vair_corr-.5); z6r=z5r; - lft x6r=l+letter_fit+hround(.5u-.5); - x4=max(lft x5r+.5bulb_diam,.4[lft x5r,rt x3r]); bot y4r=-o; - filldraw stroke z4e{right}.. - controls (min(15/16[x4,x3],max(x4,lft x6r+2flare))+(x3e-x3)+eps,y4e) - and (x3e,good.y(min(y6-.5,1/3h)+1/3(y4e-y4))-eps)..z3e; % left tail - {{less_tense; bulb(4,5,6)}}; -else: - pos3'(slab,90); pos1'(slab,90); - lft x3'=x3-.5light_hair; rt x1'=x1r; top y3'r=top y1'r=h; - filldraw stroke z3'e--z1'e; - pickup fine.nib; pos3(max(fine.breadth,light_hair),0); pos4(bot_vair,-90); pos5(bot_vair,-90); - bot y5r=0; x4=2/3[x3l,x5r]; lft x5=l+letter_fit+hround(.35u-.5); - bot y4r=bot y5r; y3=y3'; x4l:=.25[x4,x5]; - path p; - p=stroke z3{down} - ..controls (x3,y5+.35h-eps) and (min(7/8[x4,x3],x5+2.5light_hair+.5u),y4) - ..{left}z4--z5; - z6=point .35 of p; - pos6(max(fine.breadth,7/8[bot_vair,light_hair]),angle(direction .35 of p)+90); - filldraw stroke z3e{down}...z6e{direction .35 of p}...{left}z4e--z5e; fi % arc -%%% -if serifs: - x0=x3; y0=0; - numeric inner_jut; inner_jut=min(.5(lft x1l-rt x3r)-eps,.5cap_jut); - dish_serif(2,1,a,1/3,cap_jut,b,1/3,cap_jut); %lower right serif - nodish_serif(1,2,c,1/3,inner_jut,d,1/3,cap_jut); %upper right serif - 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 -%%%%% -% (old) upper right beak(2); -if (serifs=false) and (old_cyr=true): - pickup tiny.nib; - pos7(slab,90); top y7r=h; x7=x2; - pos8(slab,90); y8=y7; rt x8r=hround(r-.65u); - filldraw stroke z7e--z8e; % horisontal - pickup fine.nib; pos9(.3[slab,cap_stem],0); pos10(.3[slab,cap_stem],0); - rt x9r=rt x10r=tiny.rt x8r; y9=y8r; bot y10=y8l-sbeak; - filldraw stroke z9e--z10e; % vertical -else: - pickup crisp.nib; - pos7(slab,90); top y7r=h; x7=x2; rt x8r=hround(r-.65u); - pos8(hair,0); y8=good.y(y7l-beak)-eps; - arm(7,8,i,beak_darkness,.7beak_jut); % upper arm and beak -fi -penlabels(1,2,3,4,5,6,7,8,9,10); endchar; - -lhchar "Uppercase Cyrillic letter OERY - Old ERY"; -cyrchar(OERY,12.5u#,cap_height#,0); %V_width#=12.5u# -if is_small_cap: getcharcode(oery); fi -italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); -adjust_fit(if not serifs:.5u#+ fi - min(4.5u#-.5stem#,3.5u#)-.5width_adj#, % Beak_adj+.5u - cap_serif_fit#+4.5u#); %ERYadj -numeric left_stem; left_stem=cap_stem-hround 2stem_corr; -pickup tiny.nib; pos1(left_stem,0); pos2(left_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5left_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -if serifs: nodish_serif(1,2,a,1/3,.5cap_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 -% usftsn_bowl(2); -_zero:=2; -_one:=3; _two:=4; _three:=5; _four:=6; _five:=7; -% -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=bot z[_zero]; y[_four]=y[_five]; -y[_three]=.5[y[_four],y[_two]]; -x[_one]=x[_zero]r; 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[x[_zero],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[x[_zero],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 -%%% -% (old) upper left beak(2); -if (serifs=false) and (old_cyr=true): - pickup tiny.nib; - pos8(slab,90); top y8r=h; x8=x2; - pos9(slab,90); y8=y9; lft x9r=l+letter_fit+hround.65u; - filldraw stroke z8e--z9e; % horisontal - pickup fine.nib; pos10(.3[slab,cap_stem],0); pos11(.3[slab,cap_stem],0); - lft x10l=lft x11l=tiny.lft x9; y10=y9r; bot y11=y9l-sbeak; - filldraw stroke z10e--z11e; % vertical -else: - pickup crisp.nib; - pos8(slab,90); top y8r=h; x8=x2; lft x9r=l+letter_fit+hround.65u; - pos9(hair,180); y9=good.y(y8l-beak)-eps; - arm(8,9,i,beak_darkness,-.7beak_jut); % upper arm and beak -fi -% I -w:=w+4.5u; pickup tiny.nib; -rt x13r=rt x14r=w-hround max(2u,3u-.5stem); -top y13=h; bot y14=0; pos13(cap_stem,0); pos14(cap_stem,0); -filldraw stroke z13e--z14e; -if serifs: dish_serif(13,14,e,1/3,cap_jut,f,1/3,cap_jut); - dish_serif(14,13,g,1/3,cap_jut,h,1/3,cap_jut); fi -penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13,14); endchar; - -lhchar "Uppercase Cyrillic letter OHRDSN - Old HARD SIGN"; -cyrchar(OHRDSN,12.5u#,cap_height#,0); %V_width#=12.5u# -if is_small_cap: getcharcode(ohrdsn); fi -italcorr .52*.7cap_height#*slant-.5u#; % D*.52h -adjust_fit(if not serifs:.5u#+ fi - min(4.5u#-.5stem#,3.5u#)-.5width_adj#, % Beak_adj+.5u - 0); -numeric left_stem; left_stem=cap_stem-hround 2stem_corr; -pickup tiny.nib; pos1(left_stem,0); pos2(left_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5left_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -if serifs: nodish_serif(1,2,a,1/3,.5cap_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 -% usftsn_bowl(2); -_zero:=2; -_one:=3; _two:=4; _three:=5; _four:=6; _five:=7; -% -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=bot z[_zero]; y[_four]=y[_five]; -y[_three]=.5[y[_four],y[_two]]; -x[_one]=x[_zero]r; 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[x[_zero],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[x[_zero],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 -%%% -% (old) upper left beak(2); -if (serifs=false) and (old_cyr=true): - pickup tiny.nib; - pos8(slab,90); top y8r=h; x8=x2; - pos9(slab,90); y8=y9; lft x9r=l+letter_fit+hround.65u; - filldraw stroke z8e--z9e; % horisontal - pickup fine.nib; pos10(.3[slab,cap_stem],0); pos11(.3[slab,cap_stem],0); - lft x10l=lft x11l=tiny.lft x9; y10=y9r; bot y11=y9l-sbeak; - filldraw stroke z10e--z11e; % vertical -else: - pickup crisp.nib; - pos8(slab,90); top y8r=h; x8=x2; lft x9r=l+letter_fit+hround.65u; - pos9(hair,180); y9=good.y(y8l-beak)-eps; - arm(8,9,i,beak_darkness,-.7beak_jut); % upper arm and beak -fi -penlabels(1,2,3,4,5,6,7,8,9,10,11); endchar; - -lhchar "Uppercase Cyrillic letter OO_cdot - Old O cdot"; -cyrchar(OO_cdot,15u#,cap_height#,0); %F width-u -if is_small_cap: getcharcode(oo_cdot); fi -italcorr .7cap_height#*slant-.5u#; -adjust_fit(0,0); -penpos1(vair',90); penpos3(vround(vair+1.5vair_corr),-90); -penpos2(cap_curve,180); penpos4(cap_curve,0); -if monospace: x2r=hround 1.5u; - interim superness:=sqrt superness; % make |"O"|, not |"0"| -else: if serifs: interim superness:=1.05 superness; - else: interim superness:=1.075 superness; fi x2r=hround u; fi -x4r=w-x2r; x1=x3=.5w; y1r=h+o; y3r=-o; -y2=y4=.5h-vair_corr; y2l:=y4l:=.52h; -penstroke pulled_super_arc.e(1,2)(.5superpull) - & pulled_super_arc.e(2,3)(.5superpull) - & pulled_super_arc.e(3,4)(.5superpull) - & pulled_super_arc.e(4,1)(.5superpull) & 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))); -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, 5,5); endchar; - -lhchar "Uppercase Cyrillic letter OO_cddot - Old double cdot"; -cyrchar(OO_cddot,17u#,cap_height#,0); %F width+u -if is_small_cap: getcharcode(oo_cddot); fi -italcorr .7cap_height#*slant-.5u#; -adjust_fit(0,0); -penpos1(vair',90); penpos3(vround(vair+1.5vair_corr),-90); -penpos2(cap_curve,180); penpos4(cap_curve,0); -if monospace: x2r=hround 1.5u; - interim superness:=sqrt superness; % make |"O"|, not |"0"| -else: if serifs: interim superness:=1.05 superness; - else: interim superness:=1.075 superness; fi x2r=hround u; fi -x4r=w-x2r; x1=x3=.5w; y1r=h+o; y3r=-o; -y2=y4=.5h-vair_corr; y2l:=y4l:=.52h; -penstroke pulled_super_arc.e(1,2)(.5superpull) - & pulled_super_arc.e(2,3)(.5superpull) - & pulled_super_arc.e(3,4)(.5superpull) - & pulled_super_arc.e(4,1)(.5superpull) & cycle; % bowl -% -_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))); -pickup tiny.nib; -pos[_one](dot_diam,0); pos[_two](dot_diam,90); -x[_one]=x[_two]=max(x2l+.5dot_diam+1+eps,.5w-2.25u); y[_one]=y[_two]=.5[y1,y3]; -dot([_one],[_two]); % left dot -pos[_three](dot_diam,0); penpos[_four](y[_two]r-y[_two]l,90); -y[_three]=y[_four]=y[_one]; -x[_three]=x[_four]=min(x4r-.5dot_diam-1-eps,x[_one]+4u); -dot([_three],[_four]); % right dot -penlabels(1,2,3,4, 5,6,7,8); endchar; - -lhchar "Uppercase Cyrillic letter VIZH - variant IZHITSA"; -cyrcharmoving(VIZH); if is_small_cap: cyrcharmoving(vizh); fi - -lhchar "Uppercase Cyrillic letter T_peter -- like flipped SH"; -cyrchar(T_peter,19.75u#+width_adj#,cap_height#,0); -if is_small_cap: getcharcode(t_peter); fi -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#,cap_serif_fit# fi); %uwlett_adj -% upper_sh;flip -if odd(fudged.cap_stem-w): change_width; fi % symmetric & all three equal -pickup tiny.nib; -pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0); -pos3(fudged.cap_stem,0); pos4(fudged.cap_stem,0); -pos5(fudged.cap_stem,0); pos6(fudged.cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); x3=x4=w-x1; -top y1=top y3=top y5=h; bot y2=bot y4=bot y6=0; -lft x5l=lft x6l=hround (.5[x1,x3]-.5cap_stem); % middle stem point -filldraw stroke z1e--z2e; % left stem -filldraw stroke z3e--z4e; % right stem -filldraw stroke z5e--z6e; % center stem -numeric inner_jut,arm_thickness; -arm_thickness=vround(slab+vair_corr); -if serifs: - begingroup - save slab; slab:=arm_thickness; % bottom.bar.slab - if rt x1r+cap_jut+.5u+1<=lft x5l-cap_jut: inner_jut=cap_jut; - else: rt x1r+inner_jut+.5u+1=lft x5l-inner_jut; fi - dish_serif(2,1,c,1/3,cap_jut,d,1/3,inner_jut); % lower left serif - dish_serif(6,5,k,1/3,inner_jut,m,1/3,inner_jut); % lower center serif - dish_serif(4,3,g,1/3,inner_jut,h,1/3,cap_jut); % lower right serif - endgroup; - inner_jut:=min(.5(lft x3l-rt x1r)-eps,.5cap_jut); - nodish_serif(1,2,a,1/3,cap_jut,b,1/3,inner_jut); % upper left serif - nodish_serif(3,4,e,1/3,inner_jut,f,1/3,cap_jut); % upper right serif - nodish_serif(5,6,i,1/3,inner_jut,j,1/3,inner_jut); % upper center serif - fill z.b0--z.b1--z.e1--z.e0--cycle; % upper inter_serif bar -else: - save slab; slab:=arm_thickness; % upper.bar.slab - lft x2'= lft x2l; top y2'r=h; pos2'(slab,90); - rt x4'=rt x4r; y4'=y2'; pos4'(slab,90); - filldraw stroke z2'e--z4'e; fi % upper bar -%%%%% -penlabels(1,2,3,4,5,6); endchar; - -lhchar "Uppercase Cyrillic letter ZELO_m - Variant ZELO mirror"; -cyrchar(ZELO_m,10u#,cap_height#,0); -if is_small_cap: getcharcode(zelo_m); fi -italcorr .7cap_height#*slant-.5u#; %O -adjust_fit(0,0); -numeric theta; theta=90-angle(50u,h); slope:=-h/50u; % angle at middle -numeric s_slab; s_slab=if serifs:slab else:vround .2[slab,cap_stem] fi; -numeric ess'; ess'=max(fine.breadth,cap_ess); -pickup fine.nib; pos2(max(fine.breadth,s_slab-vround vair_corr),-90); -pos0(ess',theta); pos7(s_slab,-90); -x2+x7=2x0=w; x7-x2=if serifs: u else: 0 fi; top y2l=h+o; bot y7r=-o; -y0=.52h; lft x3l=hround u; rt x6r=hround(w-u); -x3r-x3l=x6r-x6l=hround .5[s_slab,ess']-fine; -ellipse_set(2l,3l,4l,0l); ellipse_set(2r,3r,4r,0r); y3=y3r; -ellipse_set(7l,6l,5l,0l); ellipse_set(7r,6r,5r,0r); y6=y6r; -%mirror -forsuffixes $ = 2l,2,2r,3l,3,3r,4l,4,4r,5l,5,5r,6l,6,6r,7l,7,7r: - x$:=l+(r-x$); endfor; -filldraw stroke super_arc.e(2,3) & z3e{down} - ..z4e---z5e..z6e{down} & super_arc.e(6,7); % main stroke mirror -if serifs: - pos1(hair,180); pos8(hair,180); - rt x1l=hround(w-1.5u); lft x8r=hround u; - bot y1=vround 2/3h+1; top y8=vround 1/3h-1; - %mirror - forsuffixes $ = 1l,1,1r,8l,8,8r: x$:=l+(r-x$); y$:=y$; endfor; - filldraw stroke z1e{x2-x1,10(y2-y1)}....{right}z2e; % upper arc mirror - filldraw stroke z7e{right}....{up}z8e; % lower arc - path upper_arc, lower_arc; - upper_arc=z1{x2-x1,10(y2-y1)}....{right}z2; - lower_arc=z7{right}....{up}z8; - pos10(.3[fine.breadth,cap_hair],180); pos9(.3[fine.breadth,cap_hair],180); - x10r=x1l; top y10=top y2l; x9l=x8r; bot y9=bot y7r; - x1'-x1l=x8r-x8'=1.6cap_curve-fine; y1'=y1; y8'=y8; - numeric t; t=xpart(upper_arc intersectiontimes(z10l--z1')); - filldraw z1l--z10r--z10l--subpath(t,0) of upper_arc--cycle; % upper barb - t:=xpart(lower_arc intersectiontimes(z9r--z8')); - filldraw z8r--z9l--z9r--subpath(t,1) of lower_arc--cycle; % lower barb -else: - pos1(1.2flare,-100); pos8(1.2flare,-100); - x1l=good.x(x1l+w-1.75u-rt x1); lft x8r=hround .8u; - top y1l=vround .93h+o; bot y8r=vround .1h-o; - forsuffixes $ = 1l,1,1r,8l,8,8r: x$:=l+(r-x$); endfor; - filldraw stroke term.e(2,1,left,.9,4); % upper arc and terminal - filldraw stroke term.e(7,8,right,1,4); fi % lower arc and terminal -penlabels(0,1,1',2,3,4,5,6,7,8,8',9,10); endchar; - -lhchar "Uppercase Cyrillic letter IZHEI "; -cyrchar(IZHEI,13.5u#,cap_height#,0); % N_width -if is_small_cap: getcharcode(izhei); fi -italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); -adjust_fit(cap_serif_fit#,cap_serif_fit#); -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[]; -y5=vround(.4h-eps); y6=vround(.6h-eps); -x5=hround (rt x1r-.5)-eps; x6=hround (lft x3l+.5)+eps; -stem1=max(tiny.breadth,fudged.hair); -penpos5(stem1,90); penpos6(stem1,90); -fill stroke z5e--z6e; % 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 -%%%%% -penlabels(1,2,3,4,5,6); endchar; - -lhchar "Uppercase Cyrillic letter LO"; -cyrchar(LO,13.5u#,cap_height#,0); % DL_width:N_width -if is_small_cap: getcharcode(lo); 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#) fi, %DL_adj - 13.5u#); % -% 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; -filldraw stroke z1e--z2e; %stem -numeric bulb_diam; bulb_diam=flare+(cap_stem-stem); -numeric light_hair,bot_vair,left_jut; -light_hair=max(tiny.breadth,fudged.hair if hefty:-4stem_corr fi); -left_jut= - if serifs: max(limit_dist,1.1cap_jut) - else: hround (w+cap_serif_fit-rt x2r-.65u) fi; -bot_vair=Vround(.5[vair,light_hair]); -x3=1/3[w-rt x1r-(1/6left_jut),rt x1r] if not serifs:-.5(cap_stem-u) fi+eps; -if serifs: - pos3(light_hair,0); pos4(light_hair,-90); - pos6(bulb_diam,-180); pos5(cap_hair,-180); - top y3=h; y6=1/6h-max(0,flare-stem-2vair_corr-.5); z6r=z5r; - lft x6r=l+letter_fit+hround(.5u-.5); - x4=max(lft x5r+.5bulb_diam,.4[lft x5r,rt x3r]); bot y4r=-o; - filldraw stroke z4e{right}.. - controls (min(15/16[x4,x3],max(x4,lft x6r+2flare))+(x3e-x3)+eps,y4e) - and (x3e,good.y(min(y6-.5,1/3h)+1/3(y4e-y4))-eps)..z3e; % left tail - {{less_tense; bulb(4,5,6)}}; -else: - pos3'(slab,90); pos1'(slab,90); - lft x3'=x3-.5light_hair; rt x1'=x1r; top y3'r=top y1'r=h; - filldraw stroke z3'e--z1'e; - pickup fine.nib; pos3(max(fine.breadth,light_hair),0); pos4(bot_vair,-90); pos5(bot_vair,-90); - bot y5r=0; x4=2/3[x3l,x5r]; lft x5=l+letter_fit+hround(.35u-.5); - bot y4r=bot y5r; y3=y3'; x4l:=.25[x4,x5]; - path p; - p=stroke z3{down} - ..controls (x3,y5+.35h-eps) and (min(7/8[x4,x3],x5+2.5light_hair+.5u),y4) - ..{left}z4--z5; - z6=point .35 of p; - pos6(max(fine.breadth,7/8[bot_vair,light_hair]),angle(direction .35 of p)+90); - filldraw stroke z3e{down}...z6e{direction .35 of p}...{left}z4e--z5e; fi % arc -%%% -if serifs: x0=x3; y0=0; - numeric inner_jut; inner_jut=min(.5(lft x1l-rt x3r)-eps,.5cap_jut); - dish_serif(2,1,a,1/3,cap_jut,b,1/3,cap_jut); %lower right serif - nodish_serif(1,2,c,1/3,inner_jut,d,1/3,cap_jut); %upper right serif - 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 -%%% -%O_part -full_w:=13.5u; -_zero:=2; -_one:=7; _two:=8; _three:=9; _four:=10; _five:=11; _six:=12; -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; -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; -penstroke pulled_super_arc.e([_one],[_two])(.5superpull) - & pulled_super_arc.e([_two],[_three])(.5superpull) - & pulled_super_arc.e([_three],[_four])(.5superpull) - & pulled_super_arc.e([_four],[_one])(.5superpull) & cycle; % bowl -%%% -x[_five]=x[_zero]; y[_five]=y[_two]; -x[_six]=x[_two]; y[_six]=y[_five]; -pos[_five](cap_bar,90); pos[_six](cap_bar,90); -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); -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#); -% upper_m; -numeric stem[]; % thicknesses of the four strokes -stem1=hround(fudged.hair+stem_corr); -stem2=hround(fudged.cap_stem-4stem_corr); -stem3=hround(fudged.hair-stem_corr); -stem4=hround(fudged.cap_stem-3stem_corr); -if stem4x_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#; +%<<>>!!! + "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#, + %<<>>!!! + "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#, + %<<>>!!! + 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#; +%<<>>!!! + "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#, + %<<>>!!! + "W" kern kk#, "V" kern kk#, + %<<>>!!! + "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#, + %<<>>!!! +ligtable "e": "V" kern kk#; % eV +%<< 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 @@ -551,75 +552,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; -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); @@ -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]l1.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/nont2/lgt2slxi.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgt2slxi.mf new file mode 100644 index 00000000000..bb9cfe58556 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgt2slxi.mf @@ -0,0 +1,189 @@ +% +% lgt2slxi.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: +% +% Italic Old Slav letters +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% List of letternames +% +% vnarrow_e +% zelo +% vuk +% vi_a +% izh_dgr +% Vl_yus +% izh_uml +% olg +% oery +% ohrdsgn +% oo_cdot +% oo_cddot +% Vizh +% t_peter +% zelo_m +% + +LHver_check(3,5); % like |version_check| in ec + +lhchar "Italic Cyrillic letter vnarrow_e"; +cyrcharmoving(vnarrow_e); + +lhchar "Italic Cyrillic letter zelo"; +cyrcharmoving(zelo); + +lhchar "Italic Cyrillic letter vuk - variant uk"; +cyrcharmoving(vuk); + +lhchar "Italic Cyrillic letter vi_a - variant iot a"; +cyrcharmoving(vi_a); + +lhchar "Italic Cyrillic letter izh_dgr - izhitsa double grave"; +cyrchar_twice(izh_dgr,9.5u#,x_height#+acc_height#,0); +italcorr x_height#*slant+.25u#; +adjust_fit(.25u#,max(u#,.5u#+.5flare#)); %izhy_adj +full_h:=h; h:=x_height; +% ital_izh; +numeric left_stem,right_stem,outer_jut,alpha,bulb_diam; +left_stem=stem-stem_corr; bulb_diam=7/8[hair,flare]; +right_stem=min(hair if hefty:-2stem_corr fi,left_stem); +outer_jut=.75jut; x1l=l+letter_fit+outer_jut+.25u; x4r=w-x1l; y1=y4=h; +x2-x1=x4-x3; x2l+apex_corr=x3l; y2=y3=-apex_o; +alpha=diag_ratio(2,right_stem,y1-y2,x4r-x1l-apex_corr); +penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); +penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); +z0=whatever[z1r,z2r]=whatever[z3l,z4l]; +penpos4''(alpha*right_stem,0); +penpos5(vair,90); penpos6(hair,0); penpos7(flare,0); +x5=if serifs:.5[x4'',rt x6r] else: rt x6r fi; top y5r=h+oo; +y4''=min(.9x_height,y5l-vair); z4''=whatever[z3,z4]; +rt x6r=hround(r-.5u-.5); +y6=max(vround(top y5r-.5hair)-1-.5flare, + min(bar_height+.5flare+2vair'+2,.9[bar_height,h]-.5flare)); +cyrbulb(5,6,7); % bulb +penpos1'(alpha*left_stem,0); y1'=3/4x_height; z1'=whatever[z1,z2]; +x10=l+letter_fit; x10:=hround(x10-.5hair)+.5hair; y10=2/3x_height; +penpos9(vair,90); y9r=x_height+oo; x9=min(x1l-.5,x10+u); +if y0>cap_notch_cut: + y0:=cap_notch_cut; + fill z0+.5right{up}...{z4-z3}z4''l...{right}z5r--z5l{left} + ...z4''r{z3-z4}--diag_end(4r,3r,1,1,2l,1l)-- + z1'l{z1-z2}...{left}z9l--z9r{right} + ..tension atleast .75 and 1..{z2-z1}z1'r + ...{down}z0+.5left--cycle; % left and right diagonals +else: + pickup pencircle scaled1; + fill z0--z4''l{z4-z3}...{right}z5r--z5l{left}...{z3-z4}z4''r + --diag_end(4r,3r,1,1,2l,1l)-- + z1'l{z1-z2}...{left}z9l--z9r{right} + ..tension atleast .75 and 1..{z2-z1}z1'r + --cycle; fi % left and right diagonals +pickup fine.nib; +pos9'(vair,90); z9'=z9; pos10(hair,180); +filldraw stroke z10e{up}...z9'e{right}; +%%% +% the accent +if monospace: hpos_corr=-2u; put_gravis; hpos_corr=2u; put_gravis; +else: hpos_corr=-1.5u; put_gravis; hpos_corr=1.5u; put_gravis; fi +repeat_once; +penlabels(0,1,2,3,4); endchar; + +lhchar "Italic Cyrillic letter Vl_yus - like crossed Delta"; +cyrcharmoving(Vl_yus); + +lhchar "Italic Cyrillic letter izh_uml - izhitsa umlaut"; +cyrchar(izh_uml,9.5u#,lc_trema_height#,0); +italcorr x_height#*slant+.25u#; +adjust_fit(.25u#,max(u#,.5u#+.5flare#)); %izhy_adj +h:=x_height; +% ital_izh; +numeric left_stem,right_stem,outer_jut,alpha,bulb_diam; +left_stem=stem-stem_corr; bulb_diam=7/8[hair,flare]; +right_stem=min(hair if hefty:-2stem_corr fi,left_stem); +outer_jut=.75jut; x1l=l+letter_fit+outer_jut+.25u; x4r=w-x1l; y1=y4=h; +x2-x1=x4-x3; x2l+apex_corr=x3l; y2=y3=-apex_o; +alpha=diag_ratio(2,right_stem,y1-y2,x4r-x1l-apex_corr); +penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); +penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); +z0=whatever[z1r,z2r]=whatever[z3l,z4l]; +penpos4''(alpha*right_stem,0); +penpos5(vair,90); penpos6(hair,0); penpos7(flare,0); +x5=if serifs:.5[x4'',rt x6r] else: rt x6r fi; top y5r=h+oo; +y4''=min(.9x_height,y5l-vair); z4''=whatever[z3,z4]; +rt x6r=hround(r-.5u-.5); +y6=max(vround(top y5r-.5hair)-1-.5flare, + min(bar_height+.5flare+2vair'+2,.9[bar_height,h]-.5flare)); +cyrbulb(5,6,7); % bulb +penpos1'(alpha*left_stem,0); y1'=3/4x_height; z1'=whatever[z1,z2]; +x10=l+letter_fit; x10:=hround(x10-.5hair)+.5hair; y10=2/3x_height; +penpos9(vair,90); y9r=x_height+oo; x9=min(x1l-.5,x10+u); +if y0>cap_notch_cut: + y0:=cap_notch_cut; + fill z0+.5right{up}...{z4-z3}z4''l...{right}z5r--z5l{left} + ...z4''r{z3-z4}--diag_end(4r,3r,1,1,2l,1l)-- + z1'l{z1-z2}...{left}z9l--z9r{right} + ..tension atleast .75 and 1..{z2-z1}z1'r + ...{down}z0+.5left--cycle; % left and right diagonals +else: + pickup pencircle scaled1; + fill z0--z4''l{z4-z3}...{right}z5r--z5l{left}...{z3-z4}z4''r + --diag_end(4r,3r,1,1,2l,1l)-- + z1'l{z1-z2}...{left}z9l--z9r{right} + ..tension atleast .75 and 1..{z2-z1}z1'r + --cycle; fi % left and right diagonals +pickup fine.nib; +pos9'(vair,90); z9'=z9; pos10(hair,180); +filldraw stroke z10e{up}...z9'e{right}; +%%% +% the accent +lowercase_umlaut(.5[x1,x4]-.5w,0, 11,12,13,14); +penlabels(0,1,2,3,4,5,6,7,8,9,10, 11,12,13,14); endchar; + +lhchar "Italic Cyrillic letter olg - old soft el (elghe)"; +cyrcharmoving(olg); + +lhchar "Italic Cyrillic letter oery - old ery"; +cyrcharmoving(oery); + +lhchar "Italic Cyrillic letter ohrdsn - old hard sign"; +cyrcharmoving(ohrdsn); + +lhchar "Italic Cyrillic letter oo_cdot - old o cdot"; +cyrcharmoving(oo_cdot); + +lhchar "Italic Cyrillic letter oo_cddot - old o double cdot"; +cyrcharmoving(oo_cddot); + +lhchar "Italic Cyrillic letter vizh - Variant izhitsa"; +cyrcharmoving(vizh); + +lhchar "Italic Cyrillic letter t_peter -- looks like m"; +cyrcharmoving(t_peter); + +lhchar "Italic Cyrillic letter zelo_m -- variant zelo mirror"; +cyrcharmoving(zelo_m); + +lhchar "Italic Cyrillic letter izhei"; +cyrcharmoving(izhei); + +lhchar "Italic Cyrillic letter lo"; +cyrcharmoving(lo); + +lhchar "Italic Cyrillic letter mo"; +cyrcharmoving(mo); + +endinput; +%end of file diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgt2slxl.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgt2slxl.mf new file mode 100644 index 00000000000..db95574ad13 --- /dev/null +++ b/Master/texmf-dist/fonts/source/lh/nont2/lgt2slxl.mf @@ -0,0 +1,845 @@ +% +% lgt2slxl.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 Old Slav letters +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% List of letternames +% +% vnarrow_e +% zelo +% vuk +% vi_a +% izh_dgr +% Vl_yus +% izh_uml +% olg +% oery +% ohrdsgn +% oo_cdot +% oo_cddot +% vizh +% t_peter +% zelo_m +% + +LHver_check(3,5); % like |version_check| in ec + +lhchar "Lowercase Cyrillic letter variant narrow_e"; +cyrchar(vnarrow_e,7u#,x_height#,0); % eng +italcorr x_height#*slant-.2u#; +adjust_fit(if monospace: .5u#,-1.5u# else: 0,-u# fi); +pickup fine.nib; pos2(vair',90); pos4(vair',270); +x2=x4=.5(w+u); top y2r=vround(h+1.5oo); bot y4r=-oo; +pos3(curve,180); lft x3r=hround max(.6u,1.35u-.5curve); y3=.5h; % eng +if serifs: pos1(hair,0); pos0(flare,0); + y1=min(bar_height+2vair'+2,.9[bar_height,h]-flare); + pos5(hair,0); 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); + x6r=x6l+(x1r-x1l)=.5[x2r,x1r]+eps; x7r=x7l+(x5r-x5l)=.5[x4r,x5r]+eps; + forsuffixes e=l,r: path pt.e,pb.e; numeric tt.e,tb.e; + pt.e=z1e{x2-x1,5(y2-y1)}...{left}z2e; + pb.e=z4e{right}..tension .9 and 1..{x5-x4,5(y5-y4)}z5e; + tt.e=ypart(((x6e,0)--(x6e,h)) intersectiontimes pt.e); + tb.e=ypart(((x7e,0)--(x7e,h)) intersectiontimes pb.e); endfor + filldraw stroke subpath(tt.e,1) of pt.e & + pulled_super_arc.e(2,3)(.7superpull) & pulled_super_arc.e(3,4)(.5superpull) + & subpath(0,tb.e) of pb.e; % arc and lower terminal +else: pos1(4/7[vair',flare],80); + rt x1r=hround(w-.6u); top y1r=vround .82[bar_height,top y2r]; + pos5(.6[vair',flare],275); rt x5r=hround(w-.5u); + y5r=good.y(y5r+1/3bar_height-y5); y5l:=good.y y5l; x5l:=good.x x5l; + x6r=x6l+.7(x1r-x1l)=.5[x2r,x1r]+eps; x7r=x7l+.7(x5r-x5l)=.5[x4r,x5r]+eps; + forsuffixes e=l,r: path p.e,pt.e; numeric tt.e,tb.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 + pt.e=term.e(2,1,right,.8,4); % upper terminal + tt.e=ypart(((x6e,0)--(x6e,h+o+eps)) intersectiontimes pt.e); + tb.e=ypart(((x7e,0)--(x7e,h+o+eps)) intersectiontimes p.e); endfor + filldraw stroke subpath(0,tt.e) of pt.e; % upper terminal + filldraw stroke pulled_super_arc.e(2,3)(.7superpull) + & pulled_super_arc.e(3,4)(.5superpull) & subpath(0,tb.e) of p.e; fi % arc and lower terminal +% hstroke +bar_stroke(x3l,0.85[x3l,x7l]-eps); %bar +penlabels(1,1',2,3,4,5,6,7,8,9); endchar; + +lhchar "Lowercase Cyrillic letter zelo"; +cyrchar(zelo,8u#,x_height#,sbeak#); +italcorr x_height#*slant-.5serif_fit#-.3u#; +adjust_fit(0,.5serif_fit#); +numeric arm_thickness[],z_stem; +if hefty: arm_thickness1=Vround(vair-vair_corr); arm_thickness2=vair; + z_stem=.6[vair,stem]; +else: arm_thickness1=vair; arm_thickness2=vair'; z_stem=.9[vair,stem]; fi +pickup tiny.nib; rt x1r=rt x2r=hround(w-.8u); lft x3l=lft x4l=hround 1.25u; +top y1=h; y2=min(y1,h-2/3arm_thickness1); +bot y4=1/6h; y3=max(y4,2/3arm_thickness2); +numeric alpha; alpha=diag_ratio(1,z_stem-tiny,y2-y3,x2r-x3l-slant*(y2-y3)); +penpos1(alpha*(z_stem-tiny),0); penpos2(alpha*(z_stem-tiny),0); +penpos3(alpha*(z_stem-tiny),0); penpos4(alpha*(z_stem-tiny),0); +pair delta; delta=penoffset z3-z2 of currentpen; +fill top lft z1l--z2l+delta---z3l+delta..lft z3l---lft z4l..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); +top y5r=h; x5=x1; lft x6r=hround .75u; y6=good.y(y5l-beak/1.4)-eps; +arm(5,6,a,beak_darkness,-.4beak_jut); % upper arm and beak +if not serifs: pickup fine.nib; fi +pos7(arm_thickness2,-90); pos8(max(currentbreadth+eps,.6[thin_join,vair]),180); +bot y7r=tiny.bot y4; x7=x4r; x0=w+.75u; y0=y7l; +z8l=z0+whatever*(z2-z3); bot y8=-d-o; +path p; p=(z7l{right}.. .45[z0,.5[z7,z8]] ..{z3-z2}z8l); +z9=point 1 of p; pos9(curve,angle(direction 1 of p)-90); +filldraw stroke z7e{right}...z9e{z8-z7}...{z3-z2}z8e; % tail +penlabels(1,2,3,4,5,6,7,8); endchar; + +lhchar "Lowercase Cyrillic letter Vuk -- variant uk"; +cyrchar(vuk,9u#,x_height#+acc_height#,0); +italcorr .7x_height#*slant; +adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi); %o +h:=.8x_height; +% lower_o; +penpos1(vair,90); penpos3(vair',-90); penpos2(curve,180); penpos4(curve,0); +x2r=hround max(.5u,1.25u-.5curve); +x4r=w-x2r; x1=x3=.5w; y1r=h+vround 1.5oo; y3r=-oo; +y2=y4=.5h-vair_corr; y2l:=y4l:=.52h; +penstroke pulled_arc.e(1,2) & pulled_arc.e(2,3) + & pulled_arc.e(3,4) & pulled_arc.e(4,1) & cycle; % bowl +%%%%% +% "hachek" +if serifs: + penpos14(1.2vair',90); penpos15(whatever,0); + x14=x1; y14=h+oo-eps; + x1-x15=x16-x1=good.x 3.25u; y15=y16=x_height+.5acc_height+oo; + 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: + pickup fine.nib; + pos14(3/4[vair,hair],0); pos16(3/4[vair,hair],0); + pos15(7/8[vair,fudged.stem],0); + x1-x14=x16-x1+eps; y15=h+oo-eps; x15=x1; + y14=y16=x_height+.35acc_height+oo; x14l=hround(rt x15r-3.5u-.5vair); + z0=whatever[z14r,z15r]=whatever[z15l,z16l]; y0'=max(y1r,y1l+notch_cut); + pair delta[]; + delta1=penoffset z15-z14 of currentpen; + delta2=penoffset z16-z15 of currentpen; + fill z15l---z14l+delta1..top z14l---top z14r..z14r-delta1 + if y0'cap_notch_cut: y0:=cap_notch_cut; + fill z0+.5right{up}...{z4-z3}z4'l...{right} + if serifs: z5r--z5l + else: + (.5[x4,x4r],y5r)--(fine.lft x5r,y5r)..(x5r,fine.bot y5r)-- + (x5l,fine.top y5l)..(fine.lft x5l,y5l) fi + {left}...z4'r{z3-z4} + --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{down}z0+.5left--cycle; % left and right diagonals +else: fill z0--z4'l{z4-z3}...{right}z5r--z5l{left}...{z3-z4}z4'r + --diag_end(4r,3r,1,1,2l,1l) + --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals +if serifs: numeric inner_jut; pickup tiny.nib; + prime_points_inside(1,2); + if rt x1'r+jut+.5u+1<=lft x4l-jut+.5tiny: inner_jut=jut; + else: rt x1'r+inner_jut+.5u+1=lft x4l-inner_jut+.5tiny; fi + save slab; slab:=Vround(vair-vair_corr); % lower.slab + dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); fi % upper left serif +%%%%% +endgroup; +% the accent +if monospace: hpos_corr=-2u; put_gravis; hpos_corr=2u; put_gravis; +else: hpos_corr=-1.5u; put_gravis; hpos_corr=1.5u; put_gravis; fi +repeat_once; +penlabels(0,1,2,3,4,5,6,7); endchar; + +lhchar "Lowercase Cyrillic letter Vl_yus - like crossed Delta"; +cyrchar(Vl_yus,10u#+2stem#,x_height#,0); +adjust_fit(serif_fit#,serif_fit#); +numeric left_stem,right_stem,outer_jut,alpha; +right_stem=fudged.stem-stem_corr; +left_stem=min(fudged.hair if hefty:-2stem_corr fi,right_stem); +outer_jut=.75jut; x1l=w-x4r=l+letter_fit+.25u; y1=y4=0; %+outer_jut +x2-x1=x4-x3; x3r=x2r+apex_corr; y2=y3=h+apex_o+apex_oo; +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); +z0=whatever[z1r,z2r]=whatever[z3l,z4l]; +if y0cap_notch_cut: y0:=cap_notch_cut; + fill z0+.5right{up}...{z4-z3}z4'l...{right} + if serifs: z5r--z5l + else: + (.5[x4,x4r],y5r)--(fine.lft x5r,y5r)..(x5r,fine.bot y5r)-- + (x5l,fine.top y5l)..(fine.lft x5l,y5l) fi + {left}...z4'r{z3-z4} + --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{down}z0+.5left--cycle; % left and right diagonals +else: fill z0--z4'l{z4-z3}...{right}z5r--z5l{left}...{z3-z4}z4'r + --diag_end(4r,3r,1,1,2l,1l) + --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals +if serifs: numeric inner_jut; pickup tiny.nib; + prime_points_inside(1,2); + if rt x1'r+jut+.5u+1<=lft x4l-jut+.5tiny: inner_jut=jut; + else: rt x1'r+inner_jut+.5u+1=lft x4l-inner_jut+.5tiny; fi + save slab; slab:=Vround(vair-vair_corr); % lower.slab + dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); fi % upper left serif +%%%%% +% the accent +lowercase_umlaut(.5[x1,x4]-.5w,0, 8,9,10,11); +penlabels(0,1,2,3,4); endchar; + +lhchar "Lowercase Cyrillic letter ligature olg - old soft el (elghe)"; +cyrchar(olg,10u# % if not serifs:+.5width_adj# fi % dl_width;n_width + ,x_height#,0); +italcorr x_height#*slant-beak_jut#+.25u#; %Gamma->x_height+.5u# +adjust_fit(serif_fit# if not serifs:+.5(stem#-u#) fi, %dl_adj + if serifs: 2u# else: 3u# fi-.5width_adj#); % old_beak_adj +% lower_l; +pickup tiny.nib; pos1(fudged.stem,0); pos2(fudged.stem,0); +rt x1r=rt x2r=w-hround (2.5u-.5fudged.stem-eps); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; %stem +numeric light_hair,bot_vair,bulb_diam,left_jut; +light_hair=if hefty:.5[vair,fudged.hair] else: fudged.hair fi; +bot_vair=Vround(.5[vair,light_hair]); +bulb_diam=hround 7/8[hair,flare]; +left_jut= + if serifs: max(limit_dist,1.1jut) else: hround (w+serif_fit-rt x2r-.5u) fi; +x3=1/3[w-rt x1r-(1/8left_jut),rt x1r] if not serifs: -.5(stem-u) fi +eps; +if serifs: + pos3(light_hair,0); pos4(light_hair,-90); + pos6(bulb_diam,-180); pos5(hair,-180); + top y3=h; y6-.5bulb_diam=.12desc_depth-eps; z6r=z5r; + lft x6r=l+letter_fit+hround(.35u-.5); + x4=max(lft x5r+.5bulb_diam,.4[lft x5r,rt x3r]); + bot y4r=-1.5oo-eps; {{less_tense; bulb(4,5,6)}}; %bulb + filldraw stroke z4e{right} + ..controls (min(15/16[x4,x3],max(x4,lft x6r+1.75bulb_diam))+(x3e-x3),y4e) + and (x3e,max(y4l,min(y6-.5,1/3h+eps))+1/3(y4e-y4))..{up}z3e; % left tail +else: + pos3'(vair,90); pos1'(vair,90); + lft x3'=x3-.5light_hair; rt x1'=x1r; top y3'r=top y1'r=h; + filldraw stroke z3'e--z1'e; % upper bar + pickup fine.nib; pos3(light_hair,0); pos4(bot_vair,-90); pos5(bot_vair,-90); + bot y5r=0; x4=.67[x3l,x5]; + lft x5=l+letter_fit+hround(.35u-.5); bot y4r=bot y5r; y3=y3'; + filldraw stroke z3e{down}..controls (x3e,y5e+.35h) + and (min(7/8[x4e,x3e],x4e+2light_hair)+eps,y4e-eps)..{left}z4e--z5e; fi % left stem +%%% +if serifs: + x0=x3; y0=0; + numeric inner_jut; inner_jut=min(.5(lft x1l-rt x3r)-eps,.5jut); + save slab; slab:=vair; % lower.slab + dish_serif(2,1,a,1/3,jut,b,1/3,jut); %lower right serif + slab:=Vround(vair-vair_corr); % lower.slab + nodish_serif(1,2,c,1/3,inner_jut,d,1/3,.5jut); %!!! %upper right serif + 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 +%%%%% +% (old) lower right beak(2); +if (serifs=false) and (old_cyr=true): + pickup tiny.nib; + pos7(vair,90); top y7r=h; x7=x2; + pos8(vair,90); y8=y7; rt x8r=hround(r-.45u); + filldraw stroke z7e--z8e; % horisontal + pickup fine.nib; pos9(slab,0); pos10(slab,0); + rt x9r=rt x10r=tiny.rt x8r; y9=y8r; bot y10=y8l-.7sbeak; + filldraw stroke z9e--z10e; %vertical +else: + pickup crisp.nib; + pos7(vair,90); top y7r=h; x7=x2; rt x8r=hround(r-.45u); + pos8(hair,0); y8=good.y(y7l-beak/1.4)-eps; + arm(7,8,i,beak_darkness,.4beak_jut); % upper arm and beak +fi +%%% +penlabels(1,2,3,4,5,6,7,8,9,10); endchar; + +lhchar "Lowercase Cyrillic letter oery - old ery"; +cyrchar(oery,9u#,x_height#,0); % v_witdh +italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut +adjust_fit(if serifs: 2u# else: 3u# fi-.5width_adj#, % old_beak_adj + serif_fit#+4u#); +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 +if serifs: + save slab; slab:=Vround(vair-vair_corr); % lower.slab + nodish_serif(1,2,a,1/3,.5jut,b,1/3,.5jut); % upper serif + slab:=vair; % lower.slab + nodish_serif(2,1,c,1/3,jut,d,1/3,.5jut); fi % lower serif +% lsftsn_bowl(2); +_zero:=2; +_one:=3; _two:=4; _three:=5; _four:=6; _five:=7; +% +set_bar_axis; +penpos[_three](curve if hefty:-3stem_corr fi,0); +penpos[_four](vair',-90); penpos[_five](vair',-90); +z[_five]r=bot 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; +x[_two]l=x[_two]r=x[_four]=w-3.75u; %.5v_width+.75u; +x[_one]l=x[_one]r=x[_zero]; 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 +%%% +% (old) lower left beak(2); +if (serifs=false) and (old_cyr=true): + pickup tiny.nib; + pos8(vair,90); top y8r=h; x8=x2; + pos9(vair,90); y9=y8; lft x9r=l+letter_fit+hround.45u; + filldraw stroke z8e--z9e; % horisontal + pickup fine.nib; pos10(slab,0); pos11(slab,0); + lft x10l=lft x11l=tiny.lft x9l; y10=y9r; bot y11=y8l-.7sbeak; + filldraw stroke z10e--z11e; % vertical +else: + pickup crisp.nib; + pos8(vair,90); top y8r=h; x8=x2; lft x9r=l+letter_fit+hround.45u; + pos9(hair,180); y9=good.y(y8l-beak/1.4)-eps; + arm(8,9,i,beak_darkness,-.4beak_jut); % upper arm and beak +fi +% I +w:=w+4u; pickup tiny.nib; rt x12r=rt x13r=w-lft x1l; top y12=h; bot y13=0; +pos12(fudged.stem,0); pos13(fudged.stem,0); +filldraw stroke z12e--z13e; % stem +if serifs: + save slab; slab:=Vround(vair-vair_corr); % lower.slab + dish_serif(12,13,e,1/3,jut,f,1/3,jut); % upper serif + slab:=vair; % lower.slab + dish_serif(13,12,g,1/3,jut,h,1/3,jut); fi % lower serif +penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13); endchar; + +lhchar "Lowercase Cyrillic letter ohrdsn - old hard sign"; +cyrchar(ohrdsn,9u#,x_height#,0); % v_witdh +italcorr .5x_height#*slant+min(.5curve#-.85u#,-.1u#); %p +adjust_fit(if serifs: 2u# else: 3u# fi-.5width_adj#, % old_beak_adj + if monospace:.5u# else:0 fi); +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 +if serifs: save slab; slab:=Vround(vair-vair_corr); % lower.slab + nodish_serif(1,2,a,1/3,.5jut,b,1/3,.5jut); % upper serif + slab:=vair; % lower.slab + nodish_serif(2,1,c,1/3,jut,d,1/3,.5jut); fi % lower serif +% lsftsn_bowl(2); +_zero:=2; +_one:=3; _two:=4; _three:=5; _four:=6; _five:=7; +% +set_bar_axis; +penpos[_three](curve if hefty:-3stem_corr fi,0); +penpos[_four](vair',-90); penpos[_five](vair',-90); +z[_five]r=bot 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; +x[_two]l=x[_two]r=x[_four]=w-3.75u; %.5v_width+.75u; +x[_one]l=x[_one]r=x[_zero]; 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 +%%% +% old lower left beak(2); +if (serifs=false) and (old_cyr=true): + pickup tiny.nib; + pos8(vair,90); top y8r=h; x8=x2; + pos9(vair,90); y9=y8; lft x9r=l+letter_fit+hround.45u; + filldraw stroke z8e--z9e; % horisontal + pickup fine.nib; pos10(slab,0); pos11(slab,0); + lft x10l=lft x11l=tiny.lft x9l; y10=y9r; bot y11=y8l-.7sbeak; + filldraw stroke z10e--z11e; % vertical +else: + pickup crisp.nib; + pos8(vair,90); top y8r=h; x8=x2; lft x9r=l+letter_fit+hround.45u; + pos9(hair,180); y9=good.y(y8l-beak/1.4)-eps; + arm(8,9,i,beak_darkness,-.4beak_jut); % upper arm and beak +fi +penlabels(1,2,3,4,5,6,7,8,9,10,11); endchar; + +lhchar "Lowercase Cyrillic letter oo_cdot - old o cdot"; +cyrchar(oo_cdot,10u#,x_height#,0); %f width-u +italcorr .7x_height#*slant; +adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi); +penpos1(vair,90); penpos3(vair',-90); penpos2(curve,180); penpos4(curve,0); +if serifs: interim superness:=1.05 superness; + else: interim superness:=1.075 superness; fi +x2r=hround max(.5u,1.25u-.5curve); +x4r=w-x2r; x1=x3=.5w; y1r=h+vround 1.5oo; y3r=-oo; +y2=y4=.5h-vair_corr; y2l:=y4l:=.52h; +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:=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; + +lhchar "Lowercase Cyrillic letter oo_cddot - old o double cdot"; +cyrchar(oo_cddot,11u#,x_height#,0); %f width - eps +italcorr .7x_height#*slant; +adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi); +penpos1(vair,90); penpos3(vair',-90); penpos2(curve,180); penpos4(curve,0); +if serifs: interim superness:=1.05 superness; + else: interim superness:=1.075 superness; fi +x2r=hround max(.5u,1.25u-.5curve); +x4r=w-x2r; x1=x3=.5w; y1r=h+vround 1.5oo; y3r=-oo; +y2=y4=.5h-vair_corr; y2l:=y4l:=.52h; +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:=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]; +dot([_one],[_two]); % left dot +pos[_three](dot_diam,0); +penpos[_four](y[_two]r-y[_two]l,90); +y[_three]=y[_four]=y[_one]; x[_three]=x[_four]=x[_one]+2.75u; +dot([_three],[_four]); % right dot +penlabels(1,2,3,4); endchar; + +lhchar "Lowercase Cyrillic letter vizh - variant izhitsa"; +cyrchar(vizh,if serifs:9.5u# else:9u# fi,x_height#,desc_depth#); +italcorr x_height#*slant+.25u#; +adjust_fit(serif_fit# if monospace:+\\.5u#,.5u#+ else:,fi\\ serif_fit#); +%letter_old_u; +numeric left_stem,right_stem,bot_stem,bot_vair,outer_jut; +left_stem=fudged.stem-stem_corr; right_stem=fudged.hair if hefty:-2stem_corr fi; +bot_stem=fudged.hair if hefty:-8stem_corr fi; +bot_vair=Vround(if serifs: vair else:.5[vair,bot_stem] fi); outer_jut=.75jut; +x1l=w-x4r=l+letter_fit+outer_jut+.25u; y1=y4r=h; y2=y3=0; x2l=x3l; +numeric alpha,alpha[]; x9=3u; y9=bot_vair-d-oo; +alpha1=diag_ratio(2,bot_stem,y1-y3,x4r-x1l-apex_corr); +alpha2=diag_ratio(1,bot_stem,y1-y9,x4r-x9); +if alpha1notch_cut: y0:=notch_cut; + fill z0+.5right{up}...{z4r-z3r}diag_end(0,4l,1,1,4r,3r) + --z3r--z2l--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{down}z0+.5left--cycle; % left and right diagonals +else: fill z0--diag_end(0,4l,1,1,4r,3r)--z3r--z2l + --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals +penpos5(alpha*bot_stem,0); z5r=whatever[z3r,z4r]; bot y5=-d; +if serifs: fill stroke z3e---z5e; % straight arc + numeric inner_jut; pickup tiny.nib; + prime_points_inside(1,2); prime_points_inside(4,3); prime_points_inside(5,3); + 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 + 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); % upper right serif + slab:=vair; % lower.slab + dish_serif(5',3,e,1/2,jut/1.2,f,.6,jut)(dark); % lower serif +else: + fill z3r---diag_end(3r,5r,.75,.75,5l,3l)---z3l--cycle; fi % straight arc +penlabels(0,1,2,3,4,5,6,7,8,9); endchar; + +lhchar "Lowercase Cyrillic letter t_peter - like flipped sh"; +cyrchar(t_peter,14.5u# if serifs:+.5width_adj# fi,x_height#,0); +italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut +adjust_fit(if monospace: 0,0 else: serif_fit#,serif_fit# fi); %wlett_adj +% lower_sh;flip +if odd(fudged.stem-w): change_width; fi % symmetric & all three equal +pickup tiny.nib; +pos1(fudged.stem,0); pos2(fudged.stem,0); pos3(fudged.stem,0); +pos4(fudged.stem,0); pos5(fudged.stem,0); pos6(fudged.stem,0); +lft x1l=lft x2l=hround(2.5u-.5fudged.stem-eps); x3=x4=w-x1; +top y1=top y3=top y5=h; bot y2=bot y4=bot y6=0; +lft x5l=lft x6l=hround (.5[x1,x3]-.5fudged.stem); % middle stem point +filldraw stroke z1e--z2e; % left stem +filldraw stroke z3e--z4e; % right stem +filldraw stroke z5e--z6e; % center stem +if serifs: + numeric inner_jut; + if rt x1r+jut+.5u+1<=lft x5l-jut: inner_jut=jut; + else: rt x1r+inner_jut+.5u+1=lft x5l-inner_jut; fi + save slab; slab:=vair; % lower.slab + dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); % lower left serif + dish_serif(6,5,k,1/3,inner_jut,m,1/3,inner_jut); % lower center serif + dish_serif(4,3,g,1/3,inner_jut,h,1/3,jut); % lower right serif + inner_jut:=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_jut); % upper left serif + nodish_serif(3,4,e,1/3,inner_jut,f,1/3,jut); % upper right serif + nodish_serif(5,6,i,1/3,inner_jut,j,1/3,inner_jut); % upper center serif + fill z.b0--z.b1--z.e1--z.e0--cycle; % upper inter_serif bar +else: + lft x2'= lft x2l; top y2'r=h; pos2'(vair,90); + rt x4'=rt x4r; y4'=y2'; pos4'(vair,90); + filldraw stroke z2'e--z4'e; fi +penlabels(1,2,3,4,5,6); endchar; + +lhchar "Lowercase Cyrillic letter zelo_m - variant zelo mirror"; +cyrchar(zelo_m,7.1u#,x_height#,0); +italcorr .7x_height#*slant; +adjust_fit(if monospace: .4u#,.5u# else: if serifs:0 else:-.2u# fi,0 fi); +numeric theta; theta=90-angle(40u,h); slope:=-h/40u; % angle at middle +numeric s_slab; s_slab=if serifs: vair else: Vround .1[vair,stem] fi; +numeric ess'; ess'=max(fine.breadth,ess); +pickup fine.nib; pos2(max(fine.breadth,s_slab-vround vair_corr),-100); +pos0(ess',theta); pos7(s_slab,-90); x2l=x0=x7=.5w; +top y2l=h+vround 1.5oo; bot y7r=-oo; +y0-.5ess'=y7l+if serifs:.54 else: .52 fi\\(y2r-y7l-ess'); +lft x3l=hround .6u; rt x6r=hround(w-.6u); +x3r-x3l=x6r-x6l=hround .5[s_slab,ess']-fine; +ellipse_set(2l,3l,4l,0l); ellipse_set(2r,3r,4r,0r); y3=y3r; +ellipse_set(7l,6l,5l,0l); ellipse_set(7r,6r,5r,0r); y6=y6r; +interim superness:=more_super; +%mirror +forsuffixes $ = 2l,2,2r,3l,3,3r,4l,4,4r,5l,5,5r,6l,6,6r,7l,7,7r: + x$:=l+(r-x$); endfor; +filldraw stroke super_arc.e(2,3) & z3e{down} + ..z4e---z5e..z6e{down} & super_arc.e(6,7); % main stroke +if serifs: + pos1(hair,180); pos8(hair,180); + rt x1l=hround(w-1.05u); lft x8r=hround .6u; + bot y1=min(bot y2r,vround 1/5[top y5r,h]); + top y8=max(top y7l,vround 5/6 bot y4l); + forsuffixes $ = 1l,1,1r,8l,8,8r: x$:=l+(r-x$); endfor; + filldraw stroke z1e{up}....{right}z2e; % upper arc + filldraw stroke z7e{right}....{x8-x7,5(y8-y7)}z8e; % lower arc + path upper_arc, lower_arc; + upper_arc=z1{up}....{right}z2; lower_arc=z7{right}....{x8-x7,5(y8-y7)}z8; + pos10(.3[fine.breadth,hair],180); pos9(.3[fine.breadth,hair],180); + x10r=x1l; top y10=top y2l; x9l=x8r; bot y9=bot y7r; + x1'-x1l=x8r-x8'=1.6curve-fine; y1'=y1; y8'=y8; + numeric t; t=xpart(upper_arc intersectiontimes(z10l--z1')); + filldraw z1l--z10r--z10l--subpath(t,0) of upper_arc--cycle; % upper barb + t:=xpart(lower_arc intersectiontimes(z9r--z8')); + filldraw z8r--z9l--z9r--subpath(t,1) of lower_arc--cycle; % lower barb +else: + pos1(4/7[s_slab,flare],-100); pos8(flare,-100); + x1l=good.x(x1l+w-u-rt x1); lft x8r=hround .5u; + top y1l=vround(.93h+1.5oo); bot y8r=vround .1h-oo; + forsuffixes $ = 1l,1,1r,8l,8,8r: x$:=l+(r-x$); endfor; + filldraw stroke term.e(2,1,left,.9,4); % upper arc and terminal + filldraw stroke term.e(7,8,right,1,4); fi % lower arc and terminal +penlabels(0,1,1',2,3,4,5,6,7,8,8',9,10); endchar; + +lhchar "Lowercase Cyrillic letter izhei"; +cyrchar(izhei,10u# if not serifs:+.5width_adj# fi,x_height#,0); % n_width +italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut +adjust_fit(serif_fit#,serif_fit#); +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[]; +x5=hround (rt x1r-.5)-eps; x6=hround (lft x3l+.5)+eps; +y5=vround(.45h-eps); y6=vround(.65h-eps); +stem1=7/8[thin_join,vair]; +penpos5(stem1,90); penpos6(stem1,90); +fill stroke z5e--z6e; % 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 +%%%%% +penlabels(1,2,3,4,5,6); endchar; + +lhchar "Lowercase Cyrillic letter lo"; +cyrchar(lo,10u# % if not serifs:+.5width_adj# fi % dl_width;n_width + ,x_height#,0); +italcorr x_height#*slant-serif_fit#+jut#-2u#+.5stem#; %d->x_height+jut +adjust_fit(serif_fit# if not serifs:+.5(stem#-u#) fi, %dl_adj + if monospace: 9.5 else: 9 fi u#); % +% lower_l; +pickup tiny.nib; pos1(fudged.stem,0); pos2(fudged.stem,0); +rt x1r=rt x2r=w-hround (2.5u-.5fudged.stem-eps); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; %stem +numeric light_hair,bot_vair,bulb_diam,left_jut; +light_hair=if hefty:.5[vair,fudged.hair] else: fudged.hair fi; +bot_vair=Vround(.5[vair,light_hair]); +bulb_diam=hround 7/8[hair,flare]; +left_jut= + if serifs: max(limit_dist,1.1jut) else: hround (w+serif_fit-rt x2r-.5u) fi; +x3=1/3[w-rt x1r-(1/8left_jut),rt x1r] if not serifs: -.5(stem-u) fi +eps; +if serifs: + pos3(light_hair,0); pos4(light_hair,-90); + pos6(bulb_diam,-180); pos5(hair,-180); + top y3=h; y6-.5bulb_diam=.12desc_depth-eps; z6r=z5r; + lft x6r=l+letter_fit+hround(.35u-.5); + x4=max(lft x5r+.5bulb_diam,.4[lft x5r,rt x3r]); + bot y4r=-1.5oo-eps; {{less_tense; bulb(4,5,6)}}; %bulb + filldraw stroke z4e{right} + ..controls (min(15/16[x4,x3],max(x4,lft x6r+1.75bulb_diam))+(x3e-x3),y4e) + and (x3e,max(y4l,min(y6-.5,1/3h+eps))+1/3(y4e-y4))..{up}z3e; % left tail +else: + pos3'(vair,90); pos1'(vair,90); + lft x3'=x3-.5light_hair; rt x1'=x1r; top y3'r=top y1'r=h; + filldraw stroke z3'e--z1'e; % upper bar + pickup fine.nib; pos3(light_hair,0); pos4(bot_vair,-90); pos5(bot_vair,-90); + bot y5r=0; x4=.67[x3l,x5]; + lft x5=l+letter_fit+hround(.35u-.5); bot y4r=bot y5r; y3=y3'; + filldraw stroke z3e{down}..controls (x3e,y5e+.35h) + and (min(7/8[x4e,x3e],x4e+2light_hair)+eps,y4e-eps)..{left}z4e--z5e; fi % left stem +%%% +if serifs: + x0=x3; y0=0; + numeric inner_jut; inner_jut=min(.5(lft x1l-rt x3r)-eps,.5jut); + save slab; slab:=vair; % lower.slab + dish_serif(2,1,a,1/3,jut,b,1/3,jut); % lower right serif + 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 + filldraw z.c0--z.c1--z.f1--z.f0--cycle; fi % upper inter_serif bar +%%% +%O_part +full_w:=9u; +_zero:=2; +_one:=9; _two:=10; _three:=11; _four:=12; _five:=13; _six:=14; +penpos[_one](vair,90); penpos[_three](vair',-90); +penpos[_two](curve,180); penpos[_four](curve,0); +x[_two]r=hround max(.5u,1.25u-.5curve); +x[_four]r=full_w-x[_two]r; x[_one]=x[_three]=.5full_w; +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; +penstroke pulled_arc.e([_one],[_two]) & pulled_arc.e([_two],[_three]) + & pulled_arc.e([_three],[_four]) & pulled_arc.e([_four],[_one]) & cycle; % bowl +%%% +bar_stroke(x[_zero],x[_two]); % bar +%%%%% +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,7.5u# else: serif_fit#,9u# fi); %wlett_adj +% lower_m; +numeric stem[]; % thicknesses of the four strokes +stem1=hround(fudged.hair+stem_corr); +stem2=hround(fudged.stem-3stem_corr); +stem3=min(stem2,hround (fudged.hair-2stem_corr)); +stem4=max(stem1,hround(fudged.stem-3stem_corr)); +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 (w-2.5u+.5stem4); +top y1=top y3=h; bot y2=bot y4=0; +filldraw stroke z1e--z2e; % left stem +filldraw stroke z3e--z4e; % right stem +penpos5(stem2,0); penpos6(stem2,0); penpos7(stem3,0); penpos8(stem3,0); +x5l=x1; x6l=x7l; x8=lft x3l; x6-x5=x8-x7; y5=y8=h; y6=y7; +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'=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'cap_notch_cut: y0:=cap_notch_cut; + fill z0+.5right{up}...{z4-z3}z5l...{right} + if serifs: z6r--z6l + else: + (.5[x4,x4r],y6r)--(fine.lft x6r,y6r)..(x6r,fine.bot y6r)-- + (x6l,fine.top y6l)..(fine.lft x6l,y6l) fi + {left} + ....z5r{z3-z4}--diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{down}z0+.5left--cycle; % left and right diagonals +else: fill z0--z5l{z4-z3}...{right}z6r--z6l{left}...{z3-z4}z5r + --diag_end(4r,3r,1,1,2l,1l) + --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals +if serifs: numeric inner_jut; pickup tiny.nib; + prime_points_inside(1,2); + if rt x1'r+cap_jut+.5u+1<=x4l-cap_jut: inner_jut=cap_jut; + else: rt x1'r+inner_jut+.5u+1=x4l-inner_jut; fi + dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); fi % left serif +%%%%% +% the accent +if monospace: + hpos_corr=-2u; put_gravis(cyrcaph); + hpos_corr=2u; put_gravis(cyrcaph); +else: hpos_corr=-1.5u; put_gravis(cyrcaph); + hpos_corr=1.5u; put_gravis(cyrcaph); fi +repeat_once; +penlabels(0,1,2,3,4,5,6,7); endchar; + +lhchar "Uppercase Cyrillic letter VL_YUS - like crossed Delta"; +cyrchar(VL_YUS,13u#+2cap_stem#,cap_height#,0); +if is_small_cap: getcharcode(Vl_yus); fi +adjust_fit(cap_serif_fit#,cap_serif_fit#); +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=l+letter_fit+.5u; y1=y4=0; %+outer_jut +x2-x1=x4-x3; x3r=x2r+apex_corr; y2=y3=h+apex_o+apex_oo; +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); +z0=whatever[z1r,z2r]=whatever[z3l,z4l]; +if y0cap_notch_cut: y0:=cap_notch_cut; + fill z0+.5right{up}...{z4-z3}z5l...{right} + if serifs: z6r--z6l + else: + (.5[x4,x4r],y6r)--(fine.lft x6r,y6r)..(x6r,fine.bot y6r)-- + (x6l,fine.top y6l)..(fine.lft x6l,y6l) fi + {left} + ....z5r{z3-z4}--diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} + ...{down}z0+.5left--cycle; % left and right diagonals +else: fill z0--z5l{z4-z3}...{right}z6r--z6l{left}...{z3-z4}z5r + --diag_end(4r,3r,1,1,2l,1l) + --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals +if serifs: numeric inner_jut; pickup tiny.nib; + prime_points_inside(1,2); + if rt x1'r+cap_jut+.5u+1<=x4l-cap_jut: inner_jut=cap_jut; + else: rt x1'r+inner_jut+.5u+1=x4l-inner_jut; fi + dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); fi % left serif +%%%%% +% the accent +h:=full_h; uppercase_umlaut(.5[x1,x4]-.5w,0, 9,10,11,12); +penlabels(0,1,2,3,4,5,6,7,8, 9,10,11,12); endchar; + +lhchar "Uppercase Cyrillic letter ligature OLG - Old soft EL (ELGHE)"; +cyrchar(OLG,13.5u#,cap_height#,0); % DL_width:N_width +if is_small_cap: getcharcode(olg); fi; +italcorr cap_height#*slant-beak_jut#; %Gamma+.25u +adjust_fit(cap_serif_fit# if not serifs:+.5(cap_stem#-u#) fi, %DL_adj + if not serifs:.5u#+ fi + min(4.5u#-.5stem#,3.5u#)-.5width_adj#); % Beak_adj+.5u +% 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; +filldraw stroke z1e--z2e; %stem +numeric bulb_diam; bulb_diam=flare+(cap_stem-stem); +numeric light_hair,bot_vair,left_jut; +light_hair=max(tiny.breadth,fudged.hair if hefty:-4stem_corr fi); +left_jut= + if serifs: max(limit_dist,1.1cap_jut) + else: hround (w+cap_serif_fit-rt x2r-.65u) fi; +bot_vair=Vround(.5[vair,light_hair]); +x3=1/3[w-rt x1r-(1/6left_jut),rt x1r] if not serifs:-.5(cap_stem-u) fi+eps; +if serifs: + pos3(light_hair,0); pos4(light_hair,-90); + pos6(bulb_diam,-180); pos5(cap_hair,-180); + top y3=h; y6=1/6h-max(0,flare-stem-2vair_corr-.5); z6r=z5r; + lft x6r=l+letter_fit+hround(.5u-.5); + x4=max(lft x5r+.5bulb_diam,.4[lft x5r,rt x3r]); bot y4r=-o; + filldraw stroke z4e{right}.. + controls (min(15/16[x4,x3],max(x4,lft x6r+2flare))+(x3e-x3)+eps,y4e) + and (x3e,good.y(min(y6-.5,1/3h)+1/3(y4e-y4))-eps)..z3e; % left tail + {{less_tense; bulb(4,5,6)}}; +else: + pos3'(slab,90); pos1'(slab,90); + lft x3'=x3-.5light_hair; rt x1'=x1r; top y3'r=top y1'r=h; + filldraw stroke z3'e--z1'e; + pickup fine.nib; pos3(max(fine.breadth,light_hair),0); pos4(bot_vair,-90); pos5(bot_vair,-90); + bot y5r=0; x4=2/3[x3l,x5r]; lft x5=l+letter_fit+hround(.35u-.5); + bot y4r=bot y5r; y3=y3'; x4l:=.25[x4,x5]; + path p; + p=stroke z3{down} + ..controls (x3,y5+.35h-eps) and (min(7/8[x4,x3],x5+2.5light_hair+.5u),y4) + ..{left}z4--z5; + z6=point .35 of p; + pos6(max(fine.breadth,7/8[bot_vair,light_hair]),angle(direction .35 of p)+90); + filldraw stroke z3e{down}...z6e{direction .35 of p}...{left}z4e--z5e; fi % arc +%%% +if serifs: + x0=x3; y0=0; + numeric inner_jut; inner_jut=min(.5(lft x1l-rt x3r)-eps,.5cap_jut); + dish_serif(2,1,a,1/3,cap_jut,b,1/3,cap_jut); %lower right serif + nodish_serif(1,2,c,1/3,inner_jut,d,1/3,cap_jut); %upper right serif + 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 +%%%%% +% (old) upper right beak(2); +if (serifs=false) and (old_cyr=true): + pickup tiny.nib; + pos7(slab,90); top y7r=h; x7=x2; + pos8(slab,90); y8=y7; rt x8r=hround(r-.65u); + filldraw stroke z7e--z8e; % horisontal + pickup fine.nib; pos9(.3[slab,cap_stem],0); pos10(.3[slab,cap_stem],0); + rt x9r=rt x10r=tiny.rt x8r; y9=y8r; bot y10=y8l-sbeak; + filldraw stroke z9e--z10e; % vertical +else: + pickup crisp.nib; + pos7(slab,90); top y7r=h; x7=x2; rt x8r=hround(r-.65u); + pos8(hair,0); y8=good.y(y7l-beak)-eps; + arm(7,8,i,beak_darkness,.7beak_jut); % upper arm and beak +fi +penlabels(1,2,3,4,5,6,7,8,9,10); endchar; + +lhchar "Uppercase Cyrillic letter OERY - Old ERY"; +cyrchar(OERY,12.5u#,cap_height#,0); %V_width#=12.5u# +if is_small_cap: getcharcode(oery); fi +italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); +adjust_fit(if not serifs:.5u#+ fi + min(4.5u#-.5stem#,3.5u#)-.5width_adj#, % Beak_adj+.5u + cap_serif_fit#+4.5u#); %ERYadj +numeric left_stem; left_stem=cap_stem-hround 2stem_corr; +pickup tiny.nib; pos1(left_stem,0); pos2(left_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5left_stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +if serifs: nodish_serif(1,2,a,1/3,.5cap_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 +% usftsn_bowl(2); +_zero:=2; +_one:=3; _two:=4; _three:=5; _four:=6; _five:=7; +% +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=bot z[_zero]; y[_four]=y[_five]; +y[_three]=.5[y[_four],y[_two]]; +x[_one]=x[_zero]r; 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[x[_zero],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[x[_zero],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 +%%% +% (old) upper left beak(2); +if (serifs=false) and (old_cyr=true): + pickup tiny.nib; + pos8(slab,90); top y8r=h; x8=x2; + pos9(slab,90); y8=y9; lft x9r=l+letter_fit+hround.65u; + filldraw stroke z8e--z9e; % horisontal + pickup fine.nib; pos10(.3[slab,cap_stem],0); pos11(.3[slab,cap_stem],0); + lft x10l=lft x11l=tiny.lft x9; y10=y9r; bot y11=y9l-sbeak; + filldraw stroke z10e--z11e; % vertical +else: + pickup crisp.nib; + pos8(slab,90); top y8r=h; x8=x2; lft x9r=l+letter_fit+hround.65u; + pos9(hair,180); y9=good.y(y8l-beak)-eps; + arm(8,9,i,beak_darkness,-.7beak_jut); % upper arm and beak +fi +% I +w:=w+4.5u; pickup tiny.nib; +rt x13r=rt x14r=w-hround max(2u,3u-.5stem); +top y13=h; bot y14=0; pos13(cap_stem,0); pos14(cap_stem,0); +filldraw stroke z13e--z14e; +if serifs: dish_serif(13,14,e,1/3,cap_jut,f,1/3,cap_jut); + dish_serif(14,13,g,1/3,cap_jut,h,1/3,cap_jut); fi +penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13,14); endchar; + +lhchar "Uppercase Cyrillic letter OHRDSN - Old HARD SIGN"; +cyrchar(OHRDSN,12.5u#,cap_height#,0); %V_width#=12.5u# +if is_small_cap: getcharcode(ohrdsn); fi +italcorr .52*.7cap_height#*slant-.5u#; % D*.52h +adjust_fit(if not serifs:.5u#+ fi + min(4.5u#-.5stem#,3.5u#)-.5width_adj#, % Beak_adj+.5u + 0); +numeric left_stem; left_stem=cap_stem-hround 2stem_corr; +pickup tiny.nib; pos1(left_stem,0); pos2(left_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5left_stem); top y1=h; bot y2=0; +filldraw stroke z1e--z2e; % stem +if serifs: nodish_serif(1,2,a,1/3,.5cap_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 +% usftsn_bowl(2); +_zero:=2; +_one:=3; _two:=4; _three:=5; _four:=6; _five:=7; +% +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=bot z[_zero]; y[_four]=y[_five]; +y[_three]=.5[y[_four],y[_two]]; +x[_one]=x[_zero]r; 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[x[_zero],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[x[_zero],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 +%%% +% (old) upper left beak(2); +if (serifs=false) and (old_cyr=true): + pickup tiny.nib; + pos8(slab,90); top y8r=h; x8=x2; + pos9(slab,90); y8=y9; lft x9r=l+letter_fit+hround.65u; + filldraw stroke z8e--z9e; % horisontal + pickup fine.nib; pos10(.3[slab,cap_stem],0); pos11(.3[slab,cap_stem],0); + lft x10l=lft x11l=tiny.lft x9; y10=y9r; bot y11=y9l-sbeak; + filldraw stroke z10e--z11e; % vertical +else: + pickup crisp.nib; + pos8(slab,90); top y8r=h; x8=x2; lft x9r=l+letter_fit+hround.65u; + pos9(hair,180); y9=good.y(y8l-beak)-eps; + arm(8,9,i,beak_darkness,-.7beak_jut); % upper arm and beak +fi +penlabels(1,2,3,4,5,6,7,8,9,10,11); endchar; + +lhchar "Uppercase Cyrillic letter OO_cdot - Old O cdot"; +cyrchar(OO_cdot,15u#,cap_height#,0); %F width-u +if is_small_cap: getcharcode(oo_cdot); fi +italcorr .7cap_height#*slant-.5u#; +adjust_fit(0,0); +penpos1(vair',90); penpos3(vround(vair+1.5vair_corr),-90); +penpos2(cap_curve,180); penpos4(cap_curve,0); +if monospace: x2r=hround 1.5u; + interim superness:=sqrt superness; % make |"O"|, not |"0"| +else: if serifs: interim superness:=1.05 superness; + else: interim superness:=1.075 superness; fi x2r=hround u; fi +x4r=w-x2r; x1=x3=.5w; y1r=h+o; y3r=-o; +y2=y4=.5h-vair_corr; y2l:=y4l:=.52h; +penstroke pulled_super_arc.e(1,2)(.5superpull) + & pulled_super_arc.e(2,3)(.5superpull) + & pulled_super_arc.e(3,4)(.5superpull) + & pulled_super_arc.e(4,1)(.5superpull) & 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))); +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, 5,5); endchar; + +lhchar "Uppercase Cyrillic letter OO_cddot - Old double cdot"; +cyrchar(OO_cddot,17u#,cap_height#,0); %F width+u +if is_small_cap: getcharcode(oo_cddot); fi +italcorr .7cap_height#*slant-.5u#; +adjust_fit(0,0); +penpos1(vair',90); penpos3(vround(vair+1.5vair_corr),-90); +penpos2(cap_curve,180); penpos4(cap_curve,0); +if monospace: x2r=hround 1.5u; + interim superness:=sqrt superness; % make |"O"|, not |"0"| +else: if serifs: interim superness:=1.05 superness; + else: interim superness:=1.075 superness; fi x2r=hround u; fi +x4r=w-x2r; x1=x3=.5w; y1r=h+o; y3r=-o; +y2=y4=.5h-vair_corr; y2l:=y4l:=.52h; +penstroke pulled_super_arc.e(1,2)(.5superpull) + & pulled_super_arc.e(2,3)(.5superpull) + & pulled_super_arc.e(3,4)(.5superpull) + & pulled_super_arc.e(4,1)(.5superpull) & cycle; % bowl +% +_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))); +pickup tiny.nib; +pos[_one](dot_diam,0); pos[_two](dot_diam,90); +x[_one]=x[_two]=max(x2l+.5dot_diam+1+eps,.5w-2.25u); y[_one]=y[_two]=.5[y1,y3]; +dot([_one],[_two]); % left dot +pos[_three](dot_diam,0); penpos[_four](y[_two]r-y[_two]l,90); +y[_three]=y[_four]=y[_one]; +x[_three]=x[_four]=min(x4r-.5dot_diam-1-eps,x[_one]+4u); +dot([_three],[_four]); % right dot +penlabels(1,2,3,4, 5,6,7,8); endchar; + +lhchar "Uppercase Cyrillic letter VIZH - variant IZHITSA"; +cyrcharmoving(VIZH); if is_small_cap: cyrcharmoving(vizh); fi + +lhchar "Uppercase Cyrillic letter T_peter -- like flipped SH"; +cyrchar(T_peter,19.75u#+width_adj#,cap_height#,0); +if is_small_cap: getcharcode(t_peter); fi +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#,cap_serif_fit# fi); %uwlett_adj +% upper_sh;flip +if odd(fudged.cap_stem-w): change_width; fi % symmetric & all three equal +pickup tiny.nib; +pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0); +pos3(fudged.cap_stem,0); pos4(fudged.cap_stem,0); +pos5(fudged.cap_stem,0); pos6(fudged.cap_stem,0); +lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); x3=x4=w-x1; +top y1=top y3=top y5=h; bot y2=bot y4=bot y6=0; +lft x5l=lft x6l=hround (.5[x1,x3]-.5cap_stem); % middle stem point +filldraw stroke z1e--z2e; % left stem +filldraw stroke z3e--z4e; % right stem +filldraw stroke z5e--z6e; % center stem +numeric inner_jut,arm_thickness; +arm_thickness=vround(slab+vair_corr); +if serifs: + begingroup + save slab; slab:=arm_thickness; % bottom.bar.slab + if rt x1r+cap_jut+.5u+1<=lft x5l-cap_jut: inner_jut=cap_jut; + else: rt x1r+inner_jut+.5u+1=lft x5l-inner_jut; fi + dish_serif(2,1,c,1/3,cap_jut,d,1/3,inner_jut); % lower left serif + dish_serif(6,5,k,1/3,inner_jut,m,1/3,inner_jut); % lower center serif + dish_serif(4,3,g,1/3,inner_jut,h,1/3,cap_jut); % lower right serif + endgroup; + inner_jut:=min(.5(lft x3l-rt x1r)-eps,.5cap_jut); + nodish_serif(1,2,a,1/3,cap_jut,b,1/3,inner_jut); % upper left serif + nodish_serif(3,4,e,1/3,inner_jut,f,1/3,cap_jut); % upper right serif + nodish_serif(5,6,i,1/3,inner_jut,j,1/3,inner_jut); % upper center serif + fill z.b0--z.b1--z.e1--z.e0--cycle; % upper inter_serif bar +else: + save slab; slab:=arm_thickness; % upper.bar.slab + lft x2'= lft x2l; top y2'r=h; pos2'(slab,90); + rt x4'=rt x4r; y4'=y2'; pos4'(slab,90); + filldraw stroke z2'e--z4'e; fi % upper bar +%%%%% +penlabels(1,2,3,4,5,6); endchar; + +lhchar "Uppercase Cyrillic letter ZELO_m - Variant ZELO mirror"; +cyrchar(ZELO_m,10u#,cap_height#,0); +if is_small_cap: getcharcode(zelo_m); fi +italcorr .7cap_height#*slant-.5u#; %O +adjust_fit(0,0); +numeric theta; theta=90-angle(50u,h); slope:=-h/50u; % angle at middle +numeric s_slab; s_slab=if serifs:slab else:vround .2[slab,cap_stem] fi; +numeric ess'; ess'=max(fine.breadth,cap_ess); +pickup fine.nib; pos2(max(fine.breadth,s_slab-vround vair_corr),-90); +pos0(ess',theta); pos7(s_slab,-90); +x2+x7=2x0=w; x7-x2=if serifs: u else: 0 fi; top y2l=h+o; bot y7r=-o; +y0=.52h; lft x3l=hround u; rt x6r=hround(w-u); +x3r-x3l=x6r-x6l=hround .5[s_slab,ess']-fine; +ellipse_set(2l,3l,4l,0l); ellipse_set(2r,3r,4r,0r); y3=y3r; +ellipse_set(7l,6l,5l,0l); ellipse_set(7r,6r,5r,0r); y6=y6r; +%mirror +forsuffixes $ = 2l,2,2r,3l,3,3r,4l,4,4r,5l,5,5r,6l,6,6r,7l,7,7r: + x$:=l+(r-x$); endfor; +filldraw stroke super_arc.e(2,3) & z3e{down} + ..z4e---z5e..z6e{down} & super_arc.e(6,7); % main stroke mirror +if serifs: + pos1(hair,180); pos8(hair,180); + rt x1l=hround(w-1.5u); lft x8r=hround u; + bot y1=vround 2/3h+1; top y8=vround 1/3h-1; + %mirror + forsuffixes $ = 1l,1,1r,8l,8,8r: x$:=l+(r-x$); y$:=y$; endfor; + filldraw stroke z1e{x2-x1,10(y2-y1)}....{right}z2e; % upper arc mirror + filldraw stroke z7e{right}....{up}z8e; % lower arc + path upper_arc, lower_arc; + upper_arc=z1{x2-x1,10(y2-y1)}....{right}z2; + lower_arc=z7{right}....{up}z8; + pos10(.3[fine.breadth,cap_hair],180); pos9(.3[fine.breadth,cap_hair],180); + x10r=x1l; top y10=top y2l; x9l=x8r; bot y9=bot y7r; + x1'-x1l=x8r-x8'=1.6cap_curve-fine; y1'=y1; y8'=y8; + numeric t; t=xpart(upper_arc intersectiontimes(z10l--z1')); + filldraw z1l--z10r--z10l--subpath(t,0) of upper_arc--cycle; % upper barb + t:=xpart(lower_arc intersectiontimes(z9r--z8')); + filldraw z8r--z9l--z9r--subpath(t,1) of lower_arc--cycle; % lower barb +else: + pos1(1.2flare,-100); pos8(1.2flare,-100); + x1l=good.x(x1l+w-1.75u-rt x1); lft x8r=hround .8u; + top y1l=vround .93h+o; bot y8r=vround .1h-o; + forsuffixes $ = 1l,1,1r,8l,8,8r: x$:=l+(r-x$); endfor; + filldraw stroke term.e(2,1,left,.9,4); % upper arc and terminal + filldraw stroke term.e(7,8,right,1,4); fi % lower arc and terminal +penlabels(0,1,1',2,3,4,5,6,7,8,8',9,10); endchar; + +lhchar "Uppercase Cyrillic letter IZHEI "; +cyrchar(IZHEI,13.5u#,cap_height#,0); % N_width +if is_small_cap: getcharcode(izhei); fi +italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); +adjust_fit(cap_serif_fit#,cap_serif_fit#); +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[]; +y5=vround(.4h-eps); y6=vround(.6h-eps); +x5=hround (rt x1r-.5)-eps; x6=hround (lft x3l+.5)+eps; +stem1=max(tiny.breadth,fudged.hair); +penpos5(stem1,90); penpos6(stem1,90); +fill stroke z5e--z6e; % 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 +%%%%% +penlabels(1,2,3,4,5,6); endchar; + +lhchar "Uppercase Cyrillic letter LO"; +cyrchar(LO,13.5u#,cap_height#,0); % DL_width:N_width +if is_small_cap: getcharcode(lo); 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#) fi, %DL_adj + 13.5u#); % +% 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; +filldraw stroke z1e--z2e; %stem +numeric bulb_diam; bulb_diam=flare+(cap_stem-stem); +numeric light_hair,bot_vair,left_jut; +light_hair=max(tiny.breadth,fudged.hair if hefty:-4stem_corr fi); +left_jut= + if serifs: max(limit_dist,1.1cap_jut) + else: hround (w+cap_serif_fit-rt x2r-.65u) fi; +bot_vair=Vround(.5[vair,light_hair]); +x3=1/3[w-rt x1r-(1/6left_jut),rt x1r] if not serifs:-.5(cap_stem-u) fi+eps; +if serifs: + pos3(light_hair,0); pos4(light_hair,-90); + pos6(bulb_diam,-180); pos5(cap_hair,-180); + top y3=h; y6=1/6h-max(0,flare-stem-2vair_corr-.5); z6r=z5r; + lft x6r=l+letter_fit+hround(.5u-.5); + x4=max(lft x5r+.5bulb_diam,.4[lft x5r,rt x3r]); bot y4r=-o; + filldraw stroke z4e{right}.. + controls (min(15/16[x4,x3],max(x4,lft x6r+2flare))+(x3e-x3)+eps,y4e) + and (x3e,good.y(min(y6-.5,1/3h)+1/3(y4e-y4))-eps)..z3e; % left tail + {{less_tense; bulb(4,5,6)}}; +else: + pos3'(slab,90); pos1'(slab,90); + lft x3'=x3-.5light_hair; rt x1'=x1r; top y3'r=top y1'r=h; + filldraw stroke z3'e--z1'e; + pickup fine.nib; pos3(max(fine.breadth,light_hair),0); pos4(bot_vair,-90); pos5(bot_vair,-90); + bot y5r=0; x4=2/3[x3l,x5r]; lft x5=l+letter_fit+hround(.35u-.5); + bot y4r=bot y5r; y3=y3'; x4l:=.25[x4,x5]; + path p; + p=stroke z3{down} + ..controls (x3,y5+.35h-eps) and (min(7/8[x4,x3],x5+2.5light_hair+.5u),y4) + ..{left}z4--z5; + z6=point .35 of p; + pos6(max(fine.breadth,7/8[bot_vair,light_hair]),angle(direction .35 of p)+90); + filldraw stroke z3e{down}...z6e{direction .35 of p}...{left}z4e--z5e; fi % arc +%%% +if serifs: x0=x3; y0=0; + numeric inner_jut; inner_jut=min(.5(lft x1l-rt x3r)-eps,.5cap_jut); + dish_serif(2,1,a,1/3,cap_jut,b,1/3,cap_jut); %lower right serif + nodish_serif(1,2,c,1/3,inner_jut,d,1/3,cap_jut); %upper right serif + 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 +%%% +%O_part +full_w:=13.5u; +_zero:=2; +_one:=7; _two:=8; _three:=9; _four:=10; _five:=11; _six:=12; +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; +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; +penstroke pulled_super_arc.e([_one],[_two])(.5superpull) + & pulled_super_arc.e([_two],[_three])(.5superpull) + & pulled_super_arc.e([_three],[_four])(.5superpull) + & pulled_super_arc.e([_four],[_one])(.5superpull) & cycle; % bowl +%%% +x[_five]=x[_zero]; y[_five]=y[_two]; +x[_six]=x[_two]; y[_six]=y[_five]; +pos[_five](cap_bar,90); pos[_six](cap_bar,90); +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# 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#,if monospace: 6.5u# else: 13.5u# fi); +% upper_m; +numeric stem[]; % thicknesses of the four strokes +stem1=hround(fudged.hair+stem_corr); +stem2=hround(fudged.cap_stem-4stem_corr); +stem3=hround(fudged.hair-stem_corr); +stem4=hround(fudged.cap_stem-3stem_corr); +if stem4x_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'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'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(.6[thin_join, vair]-eps)) or (y5lx_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 y0y1): 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 y0stem#)) +%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.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 y0y1): 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 y0stem#)) +%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 y0stem#)) +%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