summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-04-30 16:54:00 +0000
committerKarl Berry <karl@freefriends.org>2008-04-30 16:54:00 +0000
commit68582b35271a43592ed1bc148d8a71e2a469fb56 (patch)
treecec09f67542d2f9f995225558d923ea50c3835e2
parent06d7ba232c516289a0b08773e656df54c543727d (diff)
rm cb, we use cbfonts-all now
git-svn-id: svn://tug.org/texlive/trunk@7747 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/cb/README25
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cb/CB.enc269
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cb/gmtr.enc258
-rw-r--r--Master/texmf-dist/fonts/map/dvips/cb/cbgreek.map70
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbaccent.mf638
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbbase.mf318
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbdigits.mf1053
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbgreek.mf60
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbgrk.mf197
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cblig.mf201
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbligit.mf682
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbligrm.mf491
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbligsc.mf176
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbligtt.mf120
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cblower.mf4581
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbmetre.mf892
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbpunct.mf435
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbspline.mf112
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/cbupper.mf858
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glic.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glic1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glii.mf8
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glii1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glin.mf8
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glin1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glio.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glio1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gliu.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gliu1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gljc.mf10
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gljc1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gljn.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gljn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gljo.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gljo1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glmc.mf85
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glmc1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glmi.mf86
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glmi1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glmn.mf83
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glmn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glmo.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glmo1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glmu.mf86
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glmu1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gltc.mf86
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gltc1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gltn.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gltn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glto.mf85
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glto1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glwc.mf10
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glwc1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glwi.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glwi1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glwn.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glwn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glwo.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glwo1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glwu.mf10
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glwu1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glxc.mf86
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glxc1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glxi.mf87
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glxi1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glxn.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glxn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glxo.mf85
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glxo1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glxu.mf87
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/glxu1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gmmn.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gmmn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gmmo.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gmmo1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gmtr.mf83
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gmtr1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gmxn.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gmxn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gmxo.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gmxo1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gomc.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gomc1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gomi.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gomi1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gomn.mf8
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gomn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gomo.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gomo1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gomu.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gomu1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/goxc.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/goxc1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/goxi.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/goxi1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/goxn.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/goxn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/goxo.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/goxo1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/goxu.mf9
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/goxu1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grbl.mf85
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grbl1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grmc.mf85
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grmc1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grmi.mf86
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grmi1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grml.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grml1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grmn.mf83
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grmn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grmo.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grmo1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grmu.mf86
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grmu1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grxc.mf86
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grxc1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grxi.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grxi1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grxl.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grxl1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grxn.mf83
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grxn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grxo.mf83
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grxo1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grxu.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/grxu1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsmc.mf85
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsmc1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsmi.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsmi1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsmn.mf83
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsmn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsmo.mf83
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsmo1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsmu.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsmu1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsxc.mf85
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsxc1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsxi.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsxi1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsxn.mf83
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsxn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsxo.mf83
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsxo1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsxu.mf84
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gsxu1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gttc.mf88
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gttc1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gtti.mf88
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gtti1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gttn.mf85
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gttn1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gtto.mf86
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gtto1000.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gttu.mf88
-rw-r--r--Master/texmf-dist/fonts/source/public/cb/gttu1000.mf2
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glic1000.tfmbin3832 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glii1000.tfmbin5784 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glin1000.tfmbin2764 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glio1000.tfmbin2864 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gliu1000.tfmbin5684 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gljc1000.tfmbin3640 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gljn1000.tfmbin2016 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gljo1000.tfmbin2028 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glmc1000.tfmbin3832 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glmi1000.tfmbin5784 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glmn1000.tfmbin2764 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glmo1000.tfmbin2864 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glmu1000.tfmbin5684 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gltc1000.tfmbin3640 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gltn1000.tfmbin2016 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glto1000.tfmbin2028 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glwc1000.tfmbin3872 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glwi1000.tfmbin5800 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glwn1000.tfmbin2780 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glwo1000.tfmbin2880 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glwu1000.tfmbin5700 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glxc1000.tfmbin3872 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glxi1000.tfmbin5800 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glxn1000.tfmbin2780 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glxo1000.tfmbin2880 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/glxu1000.tfmbin5700 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gmmn1000.tfmbin5228 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gmmo1000.tfmbin5344 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gmtr1000.tfmbin716 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gmxn1000.tfmbin5256 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gmxo1000.tfmbin5376 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gomc1000.tfmbin3796 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gomi1000.tfmbin5792 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gomn1000.tfmbin2748 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gomo1000.tfmbin2856 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gomu1000.tfmbin5684 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/goxc1000.tfmbin3848 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/goxi1000.tfmbin5844 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/goxn1000.tfmbin2808 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/goxo1000.tfmbin2920 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/goxu1000.tfmbin5732 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grbl1000.tfmbin6188 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grmc1000.tfmbin3796 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grmi1000.tfmbin5792 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grml1000.tfmbin6184 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grmn1000.tfmbin2748 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grmo1000.tfmbin2856 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grmu1000.tfmbin5684 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grxc1000.tfmbin3848 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grxi1000.tfmbin5844 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grxl1000.tfmbin6216 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grxn1000.tfmbin2808 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grxo1000.tfmbin2920 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/grxu1000.tfmbin5732 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gsmc1000.tfmbin3852 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gsmi1000.tfmbin2856 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gsmn1000.tfmbin2756 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gsmo1000.tfmbin2856 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gsmu1000.tfmbin2756 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gsxc1000.tfmbin3832 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gsxi1000.tfmbin2844 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gsxn1000.tfmbin2744 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gsxo1000.tfmbin2840 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gsxu1000.tfmbin2752 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gttc1000.tfmbin3636 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gtti1000.tfmbin2032 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gttn1000.tfmbin2012 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gtto1000.tfmbin2028 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cb/gttu1000.tfmbin2016 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glic1000.pfbbin14527 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glii1000.pfbbin14527 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glin1000.pfbbin14527 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glio1000.pfbbin14527 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gliu1000.pfbbin14527 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gljc1000.pfbbin14519 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gljn1000.pfbbin14519 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gljo1000.pfbbin14519 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glmc1000.pfbbin65262 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glmi1000.pfbbin80404 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glmn1000.pfbbin82359 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glmo1000.pfbbin81472 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glmu1000.pfbbin79932 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gltc1000.pfbbin83753 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gltn1000.pfbbin81164 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glto1000.pfbbin85192 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glwc1000.pfbbin14539 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glwi1000.pfbbin14539 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glwn1000.pfbbin14539 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glwo1000.pfbbin14539 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glwu1000.pfbbin14539 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glxc1000.pfbbin63843 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glxi1000.pfbbin76393 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glxn1000.pfbbin78383 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glxo1000.pfbbin78557 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/glxu1000.pfbbin75866 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gmmn1000.pfbbin98281 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gmmo1000.pfbbin99267 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gmtr1000.pfbbin17749 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gmxn1000.pfbbin87292 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gmxo1000.pfbbin89189 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gomc1000.pfbbin193709 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gomi1000.pfbbin153280 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gomn1000.pfbbin157659 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gomo1000.pfbbin152346 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gomu1000.pfbbin160552 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/goxc1000.pfbbin199479 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/goxi1000.pfbbin150489 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/goxn1000.pfbbin159816 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/goxo1000.pfbbin152757 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/goxu1000.pfbbin155760 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/grbl1000.pfbbin90023 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/grmc1000.pfbbin90188 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/grmi1000.pfbbin89129 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/grmn1000.pfbbin89351 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/grmo1000.pfbbin88774 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/grmu1000.pfbbin87441 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/grxc1000.pfbbin81657 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/grxi1000.pfbbin83065 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/grxn1000.pfbbin83476 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/grxo1000.pfbbin84157 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/grxu1000.pfbbin81936 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gsmc1000.pfbbin49698 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gsmi1000.pfbbin80371 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gsmn1000.pfbbin73732 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gsmo1000.pfbbin76278 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gsmu1000.pfbbin74478 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gsxc1000.pfbbin65099 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gsxi1000.pfbbin77727 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gsxn1000.pfbbin81575 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gsxo1000.pfbbin79346 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gsxu1000.pfbbin80413 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gttc1000.pfbbin82289 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gtti1000.pfbbin81077 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gttn1000.pfbbin83537 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gtto1000.pfbbin83457 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cb/gttu1000.pfbbin85122 -> 0 bytes
-rw-r--r--Master/tlpkg/tlpsrc/cb.tlpsrc3
294 files changed, 0 insertions, 15681 deletions
diff --git a/Master/texmf-dist/doc/fonts/cb/README b/Master/texmf-dist/doc/fonts/cb/README
deleted file mode 100644
index 168c8a93605..00000000000
--- a/Master/texmf-dist/doc/fonts/cb/README
+++ /dev/null
@@ -1,25 +0,0 @@
-Currently, for each driver file of the CB font family there is a corresponding
-Type 1 font, which implies that PS/PDF files become too large when these
-fonts are included. In addition, these fonts were created using a wrong
-encoding vector and so the ToUnicode feature of PDF viewers does not
-work properly when dealing with PDF files created with these fonts. To
-overcome these problems, it was more than necessary to write down a proper
-encoding vector and, consequently, to regenerate the basic CB fonts (i.e.,
-only the xxxx1000 fonts were generated). Clearly, this option makes things
-a little bit difficult for people willing to write Greek since the old
-font definition files expect various font sizes and not just one. Fortunately,
-this problem disappears when the package type1ec is used. More specifically,
-the following command should appear just after the \documentclass command:
-
-\usepackage[10pt]{type1ec}
-
-Certainly, there are plans to update the various font definition files, but
-this will happen when the new (virtual) x7 fonts will be ready.
-
-Apostolos Syropoulos
-Xanthi, Greece
-8 July 2005
-
-PS I would like to thank Werner Lemberg for his help and assistance.
-PPS Comments and/or suggestions should be addressed to
-apostolo@obelix.ee.duth.gr
diff --git a/Master/texmf-dist/fonts/enc/dvips/cb/CB.enc b/Master/texmf-dist/fonts/enc/dvips/cb/CB.enc
deleted file mode 100644
index 4c4a495954b..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cb/CB.enc
+++ /dev/null
@@ -1,269 +0,0 @@
-% @@psencodingfile@{
-% author = "Apostolos Syropoulos",
-% version = "1.0",
-% date = "2005/07/04",
-% filename = "CB.enc",
-% email = "apostolo@obelix.ee.duth.gr",
-% docstring = "The CBGreek font encoding vector.
-% Follows Adobe Glyph List Conventions,
-% based on Unicode Standard version 4.1."
-% @}
-%
-/CBencoding [
-/endash % 0--U+2013 EN DASH
-/uni0020032F % 1--SPACE + COMBINING INVERTED BREVE BELOW
-/u10144 % 2--GREEK ACROPHONIC ATTIC FIFTY
-/u10145 % 3--GREEK ACROPHONIC ATTIC FIVE HUNDRED
-/u10146 % 4--GREEK ACROPHONIC ATTIC FIVE THOUSAND
-/u10147 % 5--GREEK ACROPHONIC ATTIC FIFTY THOUSAND
-/uni03DB % 6--GREEK SMALL LETTER STIGMA
-/uni03DB.var % 7--GREEK SMALL LETTER STIGMA (variant)
-/uni1FBE % 8--GREEK PROSGEGRAMMENI
-/uni1FBC % 9--GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
-/uni1FCC % 10--GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
-/uni1FFC % 11--GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
-/uni0391.alt % 12
-/uni03AB.alt % 13
-/uni03B1.alt % 14
-/uni03CB.alt % 15
-/uni02CF % 16--MODIFIER LETTER LOW ACUTE ACCENT
-/uni02CE % 17--MODIFIER LETTER LOW GRAVE ACCENT
-/uni03DF % 18--GREEK SMALL LETTER KOPPA
-/uni03D9 % 19--GREEK SMALL LETTER ARCHAIC KOPPA
-/uni0020032E % 20--SPACE + COMBINING BREVE BELOW
-/uni03D8 % 21--GREEK LETTER ARCHAIC KOPPA
-/uni03DA.var % 22--GREEK LETTER STIGMA (variant)
-/uni03E0 % 23--GREEK LETTER SAMPI
-/Euro % 24--U+20AC EURO SIGN
-/perthousand % 25--U+2030 PER MILLE SIGN
-/uni0259 % 26--LATIN SMALL LETTER SCHWA
-/uni03E1 % 27--GREEK SMALL LETTER SAMPI
-/quoteleft % 28--U+2018 LEFT SINGLE QUOTATION MARK
-/quoteright % 29--U+2019 RIGHT SINGLE QUOTATION MARK
-/breve % 30--U+02D8 BREVE (vrachy)
-/macron % 31--U+00AF MACRON
-/uni1FC1 % 32--GREEK DIALYTIKA AND PERISPOMENI
-/exclam % 33--U+0021 EXCLAMATION MARK
-/dieresis % 34--U+00A8 DIAERESIS (dialytika)
-/dieresistonos % 35--U+0385 GREEK DIALYTIKA TONOS
-/uni1FED % 36--GREEK DIALYTIKA AND VARIA
-/percent % 37--U+0025 PERCENT SIGN
-/periodcentered % 38--U+00B7 MIDDLE DOT (ano-teleia)
-/tonos % 39--U+0384 GREEK TONOS
-/parenleft % 40--U+0028 LEFT PARENTHESIS
-/parenright % 41--U+0029 RIGHT PARENTHESIS
-/asterisk % 42--U+002A ASTERISK
-/plus % 43--U+002B PLUS SIGN
-/comma % 44--U+002C COMMA
-/hyphen % 45--U+002D HYPHEN-MINUS
-/period % 46--U+002E FULL STOP
-/slash % 47--U+002F SOLIDUS
-/zero % 48--U+0030 DIGIT ZERO
-/one % 49--U+0031 DIGIT ONE
-/two % 50--U+0032 DIGIT TWO
-/three % 51--U+0033 DIGIT THREE
-/four % 52--U+0034 DIGIT FOUR
-/five % 53--U+0035 DIGIT FIVE
-/six % 54--U+0036 DIGIT SIX
-/seven % 55--U+0037 DIGIT SEVEN
-/eight % 56--U+0038 DIGIT EIGHT
-/nine % 57--U+0039 DIGIT NINE
-/colon % 58--U+003A COLON
-/anoteleia % 59--U+0387 GREEK ANO TELEIA
-/uni1FFE % 60--GREEK DASIA
-/equal % 61--U+003D EQUALS SIGN
-/uni1FBF % 62--GREEK PSILI
-/semicolon % 63--instead of GREEK QUESTION MARK
-/uni1FDF % 64--GREEK DASIA AND PERISPOMENI
-/Alpha % 65--U+0391 GREEK CAPITAL LETTER ALPHA
-/Beta % 66--U+0392 GREEK CAPITAL LETTER BETA
-/uni1FDD % 67--GREEK DASIA AND VARIA
-/uni0394 % 68--GREEK CAPITAL LETTER DELTA
-/Epsilon % 69--U+0395 GREEK CAPITAL LETTER EPSILON
-/Phi % 70--U+03A6 GREEK CAPITAL LETTER PHI
-/Gamma % 71--U+0393 GREEK CAPITAL LETTER GAMMA
-/Eta % 72--U+0397 GREEK CAPITAL LETTER ETA
-/Iota % 73--U+0399 GREEK CAPITAL LETTER IOTA
-/Theta % 74--U+0398 GREEK CAPITAL LETTER THETA
-/Kappa % 75--U+039A GREEK CAPITAL LETTER KAPPA
-/Lambda % 76--U+039B GREEK CAPITAL LETTER LAMDA
-/Mu % 77--U+039C GREEK CAPITAL LETTER MU
-/Nu % 78--U+039D GREEK CAPITAL LETTER NU
-/Omicron % 79--U+039F GREEK CAPITAL LETTER OMICRON
-/Pi % 80--U+03A0 GREEK CAPITAL LETTER PI
-/Chi % 81--U+03A7 GREEK CAPITAL LETTER CHI
-/Rho % 82--U+03A1 GREEK CAPITAL LETTER RHO
-/Sigma % 83--U+03A3 GREEK CAPITAL LETTER SIGMA
-/Tau % 84--U+03A4 GREEK CAPITAL LETTER TAU
-/Upsilon % 85--U+03D2 GREEK CAPITAL LETTER USPILON
-/uni1FDE % 86--GREEK DASIA AND OXIA
-/uni03A9 % 87--GREEK CAPITAL LETTER OMEGA
-/Xi % 88--U+039E GREEK CAPITAL LETTER XI
-/Psi % 89--U+03A8 GREEK CAPITAL LETTER PSI
-/Zeta % 90--U+0396 GREEK CAPITAL LETTER ZETA
-/bracketleft % 91--U+005B LEFT SQUARE BRACKET
-/uni1FCF % 92--GREEK PSILI AND PERISPOMENI
-/bracketright % 93--U+005D RIGHT SQUARE BRACKET
-/uni1FCE % 94--GREEK PSILI AND OXIA
-/uni1FCD % 95--GREEK PSILI AND VARIA
-/uni1FEF % 96--GREEK VARIA
-/alpha % 97--U+03B1 GREEK SMALL LETTER ALPHA
-/beta % 98--U+03B2 GREEK SMALL LETTER BETA
-/sigma1 % 99--U+03C2 GREEK SMALL LETTER FINAL SIGMA
-/delta % 100--U+03B4 GREEK SMALL LETTER DELTA
-/epsilon % 101--U+03B5 GREEK SMALL LETTER EPSILON
-/phi % 102--U+03C6 GREEK SMALL LETTER PHI
-/gamma % 103--U+03B3 GREEK SMALL LETTER GAMMA
-/eta % 104--U+03B7 GREEK SMALL LETTER ETA
-/iota % 105--U+03B9 GREEK SMALL LETTER IOTA
-/theta % 106--U+03B8 GREEK SMALL LETTER THETA
-/kappa % 107--U+03BA GREEK SMALL LETTER KAPPA
-/lambda % 108--U+03BB GREEK SMALL LETTER LAMDA
-/uni03BC % 109--GREEK SMALL LETTER MU
-/nu % 110--U+03BD GREEK SMALL LETTER NU
-/omicron % 111--U+03BF GREEK SMALL LETTER OMIKRON
-/pi % 112--U+03C0 GREEK SMALL LETTER PI
-/chi % 113--U+03C7 GREEK SMALL LETTER CHI
-/rho % 114--U+03C1 GREEK SMALL LETTER RHO
-/sigma % 115--U+03C3 GREEK SMALL LETTER SIGMA
-/tau % 116--U+03C4 GREEK SMALL LETTER TAU
-/upsilon % 117--U+03C5 GREEK SMALL LETTER USPILON
-/internalchar2 % 118--used only for ligature formation
-/omega % 119--U+03C9 GREEK SMALL LETTER OMEGA
-/xi % 120--U+03BE GREEK SMALL LETTER XI
-/psi % 121--U+03C8 GREEK SMALL LETTER PSI
-/zeta % 122--U+03B6 GREEK SMALL LETTER ZETA
-/guillemotleft % 123--U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-/uni037A % 124--GREEK YPOGEGRAMMENI
-/guillemotright % 125--U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-/uni1FC0 % 126--GREEK PERISPOMENI
-/emdash % 127--U+2014 EM DASH
-/uni1F70 % 128--GREEK SMALL LETTER ALPHA WITH VARIA
-/uni1F01 % 129--GREEK SMALL LETTER ALPHA WITH DASIA
-/uni1F00 % 130--GREEK SMALL LETTER ALPHA WITH PSILI
-/uni1F03 % 131--GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-/uni1FB2 % 132--GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
-/uni1F81 % 133--GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
-/uni1F80 % 134--GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
-/uni1F83 % 135--GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-/alphatonos % 136--U+03AC GREEK SMALL LETTER ALPHA WITH TONOS
-/uni1F05 % 137--GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-/uni1F04 % 138--GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-/uni1F02 % 139--GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-/uni1FB4 % 140--GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-/uni1F85 % 141--GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-/uni1F84 % 142--GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-/uni1F82 % 143--GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-/uni1FB6 % 144--GREEK SMALL LETTER ALPHA WITH PERISPOMENI
-/uni1F07 % 145--GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-/uni1F06 % 146--GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-/uni03DD % 147--GREEK SMALL LETTER DIGAMMA
-/uni1FB7 % 148--GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
-/uni1F87 % 149--GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-/uni1F86 % 150--GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-/uni0020035D % 151--SPACE + COMBINING DOUBLE BREVE?
-/uni1F74 % 152--GREEK SMALL LETTER ETA WITH VARIA
-/uni1F21 % 153--GREEK SMALL LETTER ETA WITH DASIA
-/uni1F20 % 154--GREEK SMALL LETTER ETA WITH PSILI
-/.notdef % 155
-/uni1FC2 % 156--GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
-/uni1F91 % 157--GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
-/uni1F90 % 158--GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
-/internalchar1 % 159--NULL
-/etatonos % 160--U+03AE GREEK SMALL LETTER ETA WITH TONOS
-/uni1F25 % 161--GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-/uni1F24 % 162--GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-/uni1F23 % 163--GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-/uni1FC4 % 164--GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-/uni1F95 % 165--GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-/uni1F94 % 166--GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-/uni1F93 % 167--GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-/uni1FC6 % 168--GREEK SMALL LETTER ETA WITH PERISPOMENI
-/uni1F27 % 169--GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-/uni1F26 % 170--GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-/uni1F22 % 171--GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-/uni1FC7 % 172--GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
-/uni1F97 % 173--GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-/uni1F96 % 174--GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-/uni1F92 % 175--GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-/uni1F7C % 176--GREEK SMALL LETTER OMEGA WITH VARIA
-/uni1F61 % 177--GREEK SMALL LETTER OMEGA WITH DASIA
-/uni1F60 % 178--GREEK SMALL LETTER OMEGA WITH PSILI
-/uni1F63 % 179--GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-/uni1FF2 % 180--GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
-/uni1FA1 % 181--GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
-/uni1FA0 % 182--GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
-/uni1FA3 % 183--GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-/omegatonos % 184--U+03CE GREEK SMALL LETTER OMEGA WITH TONOS
-/uni1F65 % 185--GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-/uni1F64 % 186--GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-/uni1F62 % 187--GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-/uni1FF4 % 188--GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-/uni1FA5 % 189--GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-/uni1FA4 % 190--GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-/uni1FA2 % 191--GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-/uni1FF6 % 192--GREEK SMALL LETTER OMEGA WITH PERISPOMENI
-/uni1F67 % 193--GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-/uni1F66 % 194--GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-/uni03DC % 195--GREEK LETTER DIGAMMA
-/uni1FF7 % 196--GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
-/uni1FA7 % 197--GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-/uni1FA6 % 198--GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-/.notdef % 199
-/uni1F76 % 200--GREEK SMALL LETTER IOTA WITH VARIA
-/uni1F31 % 201--GREEK SMALL LETTER IOTA WITH DASIA
-/uni1F30 % 202--GREEK SMALL LETTER IOTA WITH PSILI
-/uni1F33 % 203--GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-/uni1F7A % 204--GREEK SMALL LETTER UPSILON WITH VARIA
-/uni1F51 % 205--GREEK SMALL LETTER UPSILON WITH DASIA
-/uni1F50 % 206--GREEK SMALL LETTER UPSILON WITH PSILI
-/uni1F53 % 207--GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-/iotatonos % 208--U+03AF GREEK SMALL LETTER IOTA WITH TONOS
-/uni1F35 % 209--GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-/uni1F34 % 210--GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-/uni1F32 % 211--GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-/upsilontonos % 212--U+03CD GREEK SMALL LETTER UPSILON WITH TONOS
-/uni1F55 % 213--GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-/uni1F54 % 214--GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-/uni1F52 % 215--GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-/uni1FD6 % 216--GREEK SMALL LETTER IOTA WITH PERISPOMENI
-/uni1F37 % 217--GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-/uni1F36 % 218--GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-/Iotadieresis % 219--U+03AA GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-/uni1FE6 % 220--GREEK SMALL LETTER UPSILON WITH PERISPOMENI
-/uni1F57 % 221--GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-/uni1F56 % 222--GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-/Upsilondieresis % 223--U+03AB GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-/uni1F72 % 224--GREEK SMALL LETTER EPSILON WITH VARIA
-/uni1F11 % 225--GREEK SMALL LETTER EPSILON WITH DASIA
-/uni1F10 % 226--GREEK SMALL LETTER EPSILON WITH PSILI
-/uni1F13 % 227--GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-/uni1F78 % 228--GREEK SMALL LETTER OMICRON WITH VARIA
-/uni1F41 % 229--GREEK SMALL LETTER OMICRON WITH DASIA
-/uni1F40 % 230--GREEK SMALL LETTER OMICRON WITH PSILI
-/uni1F43 % 231--GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-/epsilontonos % 232--U+03AD GREEK SMALL LETTER EPSILON WITH TONOS
-/uni1F15 % 233--GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-/uni1F14 % 234--GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-/uni1F12 % 235--GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-/omicrontonos % 236--U+03CC GREEK SMALL LETTER OMICRON WITH TONOS
-/uni1F45 % 237--GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-/uni1F44 % 238--GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-/uni1F42 % 239--GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-/iotadieresis % 240--U+03CA GREEK SMALL LETTER IOTA WITH DIALYTIKA
-/uni1FD2 % 241--GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-/iotadieresistonos % 242--U+0390 GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-/uni1FD7 % 243--GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
-/upsilondieresis % 244--U+03CB GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-/uni1FE2 % 245--GREEK SMALL LETTER UPSILON WITH DAILYTIKA AND VARIA
-/upsilondieresistonos % 246--U+03B0 GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-/uni1FE7 % 247--GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
-/uni1FB3 % 248--GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
-/uni1FC3 % 249--GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
-/uni1FF3 % 250--GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
-/uni1FE5 % 251--GREEK SMALL LETTER RHO WITH DASIA
-/uni1FE4 % 252--GREEK SMALL LETTER RHO WITH PSILI
-/.notdef % 253
-/uni0374 % 254--GREEK NUMERAL SIGN (dexia keraia)
-/uni0375 % 255--GREEK LOWER NUMERAL SIGN (aristeri keraia)
-] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/cb/gmtr.enc b/Master/texmf-dist/fonts/enc/dvips/cb/gmtr.enc
deleted file mode 100644
index 8b650e7ff76..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cb/gmtr.enc
+++ /dev/null
@@ -1,258 +0,0 @@
-/gmtr-Enc [
- /.notdef % 0x00
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /uni201A
- /invertedcomma
- /.notdef
- /uni201C % 0x10
- /uni201D
- /uni201E
- /uni2018
- /corona
- /coronainversa
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /Ring
- /Dot
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef % 0x20
- /mediaQuadraApertaInferior
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /RightApex
- /parenleft
- /parenright
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef % 0x30
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /mediaQuadraClausaInferior
- /mediaQuadraClausaSuperior
- /uncinataAperta
- /.notdef
- /uncinataClausa
- /mediaQuadraApertaSuperior
- /.notdef % 0x40
- /Hemiobelion
- /Tetartemorion
- /Stater
- /Dracma
- /Denarius
- /FinisCarmen
- /Etos
- /Hyatus
- /BaseEolica2
- /BaseEolica3
- /BaseEolica4
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef % 0x50
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /anceps
- /ancepsSuperlineata
- /ancepsDuplaBreveSupersignata
- /quadraAperta
- /.notdef
- /quadraClausa
- /circumflexusLatinus
- /.notdef
- /LeftApex % 0x60
- /.notdef
- /brevis
- /duplaBrevis
- /brevisSublineata
- /longaDuplaBrevis
- /apicataLongaDuplaBrevis
- /catalepsis
- /ipercatalepsis
- /brevisSuperlineata
- /duplaBrevisSuperlineata
- /LongaSublineataBrece
- /longa
- /.notdef
- /.notdef
- /.notdef
- /.notdef % 0x70
- /.notdef
- /.notdef
- /sinafia
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /slopingzeugma
- /Crux
- /raisingzeugma
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef % 0x80
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef % 0x90
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef % 0xa0
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef % 0xb0
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef % 0xc0
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef % 0xd0
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef % 0xe0
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef % 0xf0
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
- /.notdef
-] def
diff --git a/Master/texmf-dist/fonts/map/dvips/cb/cbgreek.map b/Master/texmf-dist/fonts/map/dvips/cb/cbgreek.map
deleted file mode 100644
index bbf3dbd6fca..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/cb/cbgreek.map
+++ /dev/null
@@ -1,70 +0,0 @@
-% File: cbgreek.map
-% Date: 06/07/2005
-%
-glic1000 glic1000 <glic1000.pfb
-glii1000 glii1000 <glii1000.pfb
-glin1000 glin1000 <glin1000.pfb
-glio1000 glio1000 <glio1000.pfb
-gliu1000 gliu1000 <gliu1000.pfb
-gljc1000 gljc1000 <gljc1000.pfb
-gljn1000 gljn1000 <gljn1000.pfb
-gljo1000 gljo1000 <gljo1000.pfb
-glmc1000 glmc1000 <glmc1000.pfb
-glmi1000 glmi1000 <glmi1000.pfb
-glmn1000 glmn1000 <glmn1000.pfb
-glmo1000 glmo1000 <glmo1000.pfb
-glmu1000 glmu1000 <glmu1000.pfb
-gltc1000 gltc1000 <gltc1000.pfb
-gltn1000 gltn1000 <gltn1000.pfb
-glto1000 glto1000 <glto1000.pfb
-glwc1000 glwc1000 <glwc1000.pfb
-glwi1000 glwi1000 <glwi1000.pfb
-glwn1000 glwn1000 <glwn1000.pfb
-glwo1000 glwo1000 <glwo1000.pfb
-glwu1000 glwu1000 <glwu1000.pfb
-glxc1000 glxc1000 <glxc1000.pfb
-glxi1000 glxi1000 <glxi1000.pfb
-glxn1000 glxn1000 <glxn1000.pfb
-glxo1000 glxo1000 <glxo1000.pfb
-glxu1000 glxu1000 <glxu1000.pfb
-gmmn1000 gmmn1000 <gmmn1000.pfb
-gmmo1000 gmmo1000 <gmmo1000.pfb
-gmtr1000 gmtr1000 <gmtr1000.pfb
-gmxn1000 gmxn1000 <gmxn1000.pfb
-gmxo1000 gmxo1000 <gmxo1000.pfb
-gomc1000 gomc1000 <gomc1000.pfb
-gomi1000 gomi1000 <gomi1000.pfb
-gomn1000 gomn1000 <gomn1000.pfb
-gomo1000 gomo1000 <gomo1000.pfb
-gomu1000 gomu1000 <gomu1000.pfb
-goxc1000 goxc1000 <goxc1000.pfb
-goxi1000 goxi1000 <goxi1000.pfb
-goxn1000 goxn1000 <goxn1000.pfb
-goxo1000 goxo1000 <goxo1000.pfb
-goxu1000 goxu1000 <goxu1000.pfb
-grbl1000 grbl1000 <grbl1000.pfb
-grmc1000 grmc1000 <grmc1000.pfb
-grmi1000 grmi1000 <grmi1000.pfb
-grmn1000 grmn1000 <grmn1000.pfb
-grmo1000 grmo1000 <grmo1000.pfb
-grmu1000 grmu1000 <grmu1000.pfb
-grxc1000 grxc1000 <grxc1000.pfb
-grxi1000 grxi1000 <grxi1000.pfb
-grxn1000 grxn1000 <grxn1000.pfb
-grxo1000 grxo1000 <grxo1000.pfb
-grxu1000 grxu1000 <grxu1000.pfb
-gsmc1000 gsmc1000 <gsmc1000.pfb
-gsmi1000 gsmi1000 <gsmi1000.pfb
-gsmn1000 gsmn1000 <gsmn1000.pfb
-gsmo1000 gsmo1000 <gsmo1000.pfb
-gsmu1000 gsmu1000 <gsmu1000.pfb
-gsxc1000 gsxc1000 <gsxc1000.pfb
-gsxi1000 gsxi1000 <gsxi1000.pfb
-gsxn1000 gsxn1000 <gsxn1000.pfb
-gsxo1000 gsxo1000 <gsxo1000.pfb
-gsxu1000 gsxu1000 <gsxu1000.pfb
-gttc1000 gttc1000 <gttc1000.pfb
-gtti1000 gtti1000 <gtti1000.pfb
-gttn1000 gttn1000 <gttn1000.pfb
-gtto1000 gtto1000 <gtto1000.pfb
-gttu1000 gttu1000 <gttu1000.pfb
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbaccent.mf b/Master/texmf-dist/fonts/source/public/cb/cbaccent.mf
deleted file mode 100644
index 09ea74658c1..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbaccent.mf
+++ /dev/null
@@ -1,638 +0,0 @@
-% Copyright (C) 1997, 1999, 2001, 2002 Claudio Beccari
-% file cbaccent.mf v.2.0f 2001/04/09
-% Added cap-cedilla and sloping sides of nexus 2001/02/25
-% modified circumflex for the cbleipzig fonts 2001/04/22
-%
-% The accent macros that follow are used by all the vowel macros for
-% generating the ligatures; they mostly come from Computer Modern.
-%
-% CB added the tests on boolean monotoniko whose value is set either by the
-% driver files or it is false by default. Fixed the currentbreadth problem,
-% and changed several dimensions so as to work well with different parameter
-% settings.
-%
-% Several accents were completely redesigned, in particular grave and acute
-% and their combinations with diaeresis or breaths are such that do not
-% change according to the letter they accompany; in a different way
-% also the circumflex and the diaeresis have been modified accordingly.
-%
-% Booleans monotoniko and toniko are remains of a previous test version
-% where the monotoniko accent was the single one for modern Greek designed as
-% a vertical stroke; thanks to Apostolos Syropoulos this feature has been
-% eliminated.
-% (1999) CB added definitions for adscript iota to be used with upper
-% case Alpha, Eta and Omega, and for the corresponding small cap variants.
-boolean toniko, squeeze;
-% minimum distance between vowel and accent
-def separator=max(1,vround(x_height/10)) enddef;
-def grave(expr center) =
-numeric acc_sgn,acc_displ; acc_displ:=center;
-if monotoniko:
- acc_sgn:=0;
-else:
- acc_sgn:=+1;
-fi
-generate_grave;
-enddef;
-def acute(expr center) =
-numeric acc_sgn,acc_displ; acc_displ:=center;
-if monotoniko:
- acc_sgn:=0;
-else:
- acc_sgn:=-1;
-fi
-generate_grave;
-enddef;
-% The next definition draws both the grave (as its name suggests) and the
-% acute accents, the difference being the value of acc_sgn, where
-% acc_sgn=+1 tilts the accent to the left (grave)
-% acc_sgn=-1 tilts the accent to the right (acute)
-% acc_sgn=0 does not tilt the accent (monotoniko)
-vardef generate_grave=
- numeric accent_tilt, alto, basso; accent_tilt:=if cbleipzig or cbroman:20else:30fi;
- alto:=h; basso:=vround .8[h,x_height];
- 1/3[x22,x21]=acc_displ;
-if serifs: pickup crisp.nib;
- accent_tilt:= acc_sgn*(accent_tilt+angle(alto-basso,.5currentbreadth));
- pos22(max(stem/5,currentbreadth+eps),accent_tilt); pos21(stem,accent_tilt);
- if monotoniko:
- bot y22=basso; top y21=alto; x22-x21=(alto-basso)*sind accent_tilt;
- else:
- bot y22=basso; top y21+.5stem=alto;
- z21-z22=whatever*dir(90+accent_tilt);
- fi
- filldraw circ_stroke z21e--z22e; % diagonal
-else: pickup fine.nib;
- accent_tilt:= acc_sgn*accent_tilt;
- pos21(stem,0); pos22(vair,0);
- top y21=alto; bot y22=basso; x22-x21=(alto-basso)*sind accent_tilt;
- filldraw stroke z21e--z22e; % diagonal
-fi
-penlabels(21,22);
-currentbreadth:=0;
-enddef;
-def circumflex(expr center)=
-if monotoniko:
- grave(center);
-else:
- generate_circumflex(center);
-fi
-enddef;
-def generate_circumflex(expr center)=
-numeric mid_width;
-if slitex: % for slides it looks like a cap
- mid_width=vair;
- pos21(vair,-180); pos23(vair,0); y21=y23;
- lft x21r=hround(center-if monospace and (w<6u):1.5u else:max(3u,2w/5)fi);
- .5[rt x23r,lft x21r]=center;
- x22=center; pos22(mid_width,90);
- bot y23=vround(max(h-2mid_width,x_height+mid_width));
- top y22r=h+o;
- if bot y23>=top y22r: bot y23:= top y22r-mid_width; fi
- filldraw stroke z21e{up}...z22e...{down}z23e;
-elseif cbleipzig:
- h':=if h=Circ_ht:h else:10/7x_height fi;
- numeric theta; theta=angle(1/6(6u-vair),1/4(asc_height-x_height));
- pickup crisp.nib;
- mid_width=.4[vair,stem];
- pos[21](vair,theta+90);
- pos[22](vair,theta+90);
- pos[23](vair,theta+90);
- pos[24](vair,theta+90);
- z[22]-z[21]= z[24]-z[23]=(mid_width-crisp)*dir theta;
- lft x[21]r=hround(center-max(3u,w/2-2.5u));
- rt x[24]l=hround(center+max(3u,w/2-2.5u));
- top y[24]r=h';
- pair delta;
- ypart delta=3(y[23]l-y[21]l);
- delta=whatever*dir theta;
- numeric deltay; deltay=vround(Circ_ht-(y24r-y23r)-(.4(bot y[21]l-top y[21]r)+2/3[x_height,Circ_ht]));
- bot y[21]l=y23l-deltay;
- %if h=Circ_ht:
- % vround(bot y[21]l-top y[21]r+min(2/3[x_height,Circ_ht],y[23]l-.25vair));
- %else:
- % vround(y[23]l-.5dot_size)
- %fi;
- filldraw z[21]l..controls(z[21]l+delta)and(z[23]l-delta)..z[23]l..z[24]l--z[24]r..
- controls(z[24]r-delta)and(z[22]r+delta)..z[22]r..z[21]r--cycle; % stroke
-else:
- mid_width:=if squeeze:.3 else: .5 fi [vair,stem];
- pickup fine.nib;
- pos21(hround(mid_width-eps),180);
- pos22(vair,90);
- pos23(mid_width,45);
- pos24(vair,90);
- pos25(hround(mid_width-eps),180);
- lft x21r=hround(center-if monospace:
- if(w<5u):1.5u else:max(3u,w/3)fi
- else:
- max(3u,w/3)
- fi);
- .5[rt x25l,lft x21r]=center;
- (x22-x21)=x23-x22=x24-x23=(x25-x24);
- if h=Circ_ht:
- bot y21l=bot y24l=vround(.45[h,x_height+.5mid_width]);
- else:
- bot y21l=bot y24l=vround(max(.5[h,x_height],x_height if not SansSerif:+o fi+separator));
- fi
- top y22r=top y25r=h;
- y23=.5[y22,y24];
- filldraw stroke z21e{up}...z22e{right}..z23e..{right}z24e...{up}z25e; % stroke
-fi
-penlabels(21,22,23,24,25);
-currentbreadth:=0;
-enddef;
-vardef diaeresis(expr center)=
- generate_diaeresis(center,dot_size,dot_size+1.75u,h,x_height+separator);
-enddef;
-vardef diaeresis_acute(expr center)=
- acute(center);
- generate_diaeresis(center,6/8dot_size,13/8dot_size if cbleipzig or SansSerif:+u fi,.5[h,x_height],x_height+separator);
-enddef;
-vardef diaeresis_grave(expr center)=
- grave(center);
- generate_diaeresis(center,6/8dot_size,13/8dot_size if cbleipzig or SansSerif:+u fi,.5[h,x_height],x_height+separator);
-enddef;
-vardef diaeresis_circumflex(expr center)=
- if monotoniko:
- grave(center);
- generate_diaeresis(center,.9dot_size,-1,.5[h,x_height],x_height+separator);
- else:
- generate_circumflex(center);
- numeric sp_bottom, sp_top;
- if (not slitex):
- sp_top=vround(.15[bot y21l,x_height]);
- sp_top+sp_bottom=bot y21l+x_height;
- else:
- sp_top=vround(.5[bot y21l,bot y22l]-separator);
- sp_bottom=vround(x_height+separator);
- fi
- generate_diaeresis(center,6/8dot_size,11/8dot_size if cbleipzig:+u fi,sp_top,sp_bottom);
- fi
-enddef;
-vardef generate_diaeresis(expr center,target_dot_diam,sep,eff_h,base)=
-pickup tiny.nib; numeric dot_diam;
-dot_diam:=max(tiny.breadth,hround(target_dot_diam));
-pos31(dot_diam,0); pos32(dot_diam,90); x31=x32; top y32r=vround(eff_h);
-if bot y32l<base: y32l:=min(y32r-eps,base+.5currentbreadth); fi
-y31=.5[y32l,y32r];
-pos33(dot_diam,0); penpos34(y32r-y32l,90); y33=y34=y31; x33=x34;
-if sep>=0 :
- center=.5[x31,x33]; x33-x31=sep;
-else:
- y35l=y35r=.5[y31,y32]; z35l=whatever[z21l,z22l]; z35r=whatever[z21r,z22r];
- rt x31r=hround((min(x35l,x35r)-.5currentbreadth)-.05w);
- lft x33l=hround((max(x35l,x35r)+.5currentbreadth)+.05w);
-fi
-dot(31,32); dot(33,34);
-penlabels(31,32,33,34,35);
-currentbreadth:=0;
-enddef;
-def rough(suffix $,@)(expr dot_size,depth,shear) =
- if (not monotoniko):
- pickup fine.nib; pos$(dot_size,90);
- if square_dots:
- pos$'(dot_size,180); z$'=z$; dot($',$); % squarish dot
- comma_join_:=max(fine.breadth,floor .7dot_size);
- comma_bot_:=max(fine.breadth,floor .5dot_size);
- pos@0(comma_join_,180); pos@1(comma_join_,180);
- pos@2(comma_bot_,180); y@0=y$; y@1=y$l; y@2=y@1+dot_size-depth;
- x@0r=x@1r=x$'r; lft x@2r=good.x(x$-eps);
- filldraw stroke z@0e--z@1e..z@2e; % tail
- else:
- tail_thick:=if cbleipzig:
- max(.4dot_size,currentbreadth+eps);
- elseif SansSerif:
- max(dot_size/2,currentbreadth+eps);
- else:
- if (fine>.2dot_size):floor(min(fine.breadth,vair))
- else:max(vair/2,currentbreadth+eps)fi
- fi;
- pos@1(tail_thick,90); pos@2(tail_thick,180); pos@3(tail_thick,-90);
- z@1r=z$r; lft x@2r=hround(x$-.5depth+.5shear if (cbleipzig and (top y$r<Circ_ht)):-.2dot_size fi);
- x@3+.5tail_thick=x$+.5dot_size+shear;
- y@2=.5[y@1,y@3]; bot y@3r=vround(top y@1r-depth);
- y_:=ypart((z@1{left}...z@2{down}...z@3)
- intersectiontimes (z$l{left}..{right}z$r)); if y_<0: y_:=1; fi
- filldraw z$r{right}..subpath (0,y_) of (z$l{left}..{right}z$r)--cycle; % dot
- if monospace: % tail
- draw z@1{left}...z@2{down}...{right}z@3;
- else:
- filldraw stroke z@1e{left}...z@2e{down}...{right}z@3e;
- fi
- fi
- penlabels(@1,@2,@3,$);
- fi
- currentbreadth:=0;
- enddef;
-def smooth(suffix $,@)(expr dot_size,depth,shear) =
- if not monotoniko:
- pickup fine.nib; pos$(dot_size,90);
- if square_dots:
- pos$'(dot_size,0); z$'=z$; dot($',$); % squarish dot
- comma_join_:=max(fine.breadth,floor .7dot_size);
- comma_bot_:=max(fine.breadth,floor .5dot_size);
- pos@0(comma_join_,0); pos@1(comma_join_,0);
- pos@2(comma_bot_,0); y@0=y$; y@1=y$l; y@2=y@1+dot_size-depth;
- x@0r=x@1r=x$'r; rt x@2r=good.x(x$-eps);
- filldraw stroke z@0e--z@1e..z@2e; % tail
- else:
- tail_thick:=if cbleipzig:
- max(.4dot_size,currentbreadth+eps);
- elseif SansSerif:
- max(dot_size/2,currentbreadth+eps);
- else:
- if (fine>.2dot_size):floor(min(fine.breadth,vair))
- else:max(vair/2,currentbreadth+eps)fi
- fi;
- pos@1(tail_thick,90); pos@2(tail_thick,0); pos@3(tail_thick,-90);
- z@1r=z$r; rt x@2r=hround(x$+.5depth+.5shear if (cbleipzig and (top y$r<Circ_ht)):+.3dot_size fi);
- x@3-.5tail_thick=hround(x$-.5dot_size+shear);
- y@2=.5[y@1,y@3]; bot y@3r=vround(top y@1r-depth);
- y_:=ypart((z@1{right}...z@2{down}...z@3)
- intersectiontimes (z$l{right}..{left}z$r)); if y_<0: y_:=1; fi
- filldraw z$r{left}..subpath (0,y_) of (z$l{right}..{left}z$r)--cycle; % dot
- if monospace: % tail
- draw z@1{right}...z@2{down}...{left}z@3;
- else:
- filldraw stroke z@1e{right}...z@2e{down}...{left}z@3e;
- fi
- fi
- penlabels(@1,@2,@3,$);
- fi
- currentbreadth:=0;
- enddef;
-vardef spirit(expr center) text type=
-numeric sp_bottom, sp_height;
-sp_bottom=h-sp_height=max(.8[h,x_height],x_height+o+separator);
-numeric dot_diam#; dot_diam# = if SansSerif:1else:3/4fi dot_size#;
-define_whole_blacker_pixels(dot_diam);
-dot_diam:=max(fine.breadth,min(dot_diam,floor(2/3sp_height)));
-x31 if1type0:-else:+fi.5dot_diam=hround(center if1type0:-else:+fi.5dot_diam);
-y31+.5dot_diam=h;
-if1type0:smooth else:rough fi (31,a,dot_diam,sp_height,0);
-penlabels(31);
-enddef;
-vardef spirit_acute(expr center) text type =
-numeric sp_bottom, sp_height, sp_box;
-sp_box:=if cbleipzig:.95else:.8*fi(h-x_height);
-sp_bottom=h-sp_height=max(.8[h,x_height],x_height+o+separator);
-numeric dot_diam#; dot_diam# = if SansSerif:1else:3/4fi dot_size#;
-define_whole_blacker_pixels(dot_diam);
-dot_diam:=max(fine.breadth,min(dot_diam,floor(2/3sp_height)));
-if monotoniko:
- grave(center);
-else:
- acute(center+if slitex:6/20 else:4/20fi sp_box);
- if 1type0:
- x31=hround(lft x22l-if serifs:if cbleipzig:.51else:.5fi
- elseif slitex: .2
- else:.4
- fi sp_box);% smooth acute
- else:
- x31+.5dot_diam=
- hround(lft x22l if serifs:-1/20
- elseif slitex: -2/20
- else:+1/20
- fi sp_box); % rough acute
- fi
- y31+.5dot_diam=h;
- if1type0:smooth else:rough fi (31,a,dot_diam,sp_height,0);
-fi
-enddef;
-vardef spirit_grave(expr center) text type =
-numeric sp_bottom, sp_height,sp_box;
-sp_box:=.8*(h-x_height);
-sp_bottom=h-sp_height=max(.8[h,x_height],x_height+o+separator);
-numeric dot_diam#; dot_diam# = if SansSerif:1else:3/4fi dot_size#;
-define_whole_blacker_pixels(dot_diam);
-dot_diam:=max(fine.breadth,min(dot_diam,floor(2/3sp_height)));
-if monotoniko:
- grave(center);
-else:
- grave(center+if serifs:if cbleipzig or cbroman:9else:11fi elseif slitex:10 else:9fi/20sp_box);
- if 1type0:
- x31=hround(lft x21l-.5sp_height if serifs:- 1/10sp_box fi); %smooth grave
- else:
- x31+.5dot_diam=hround(lft x21l if serifs or slitex:-3/20sp_box fi); % rough grave
- fi
- y31+.5dot_diam=h;
- if1type0:smooth else:rough fi (31,a,dot_diam,sp_height,0);
-fi
-enddef;
-vardef spirit_circumflex(expr center) text type=
-if monotoniko:
- grave(center);
-else:
- generate_circumflex(center);
- numeric sp_bottom, sp_height, sp_top, box_top;
- box_top=bot if slitex: y22l else: y23l if cbleipzig:-.5u fi fi;
- sp_top=sp_bottom+sp_height=vround(.15[box_top,x_height]);
- sp_bottom=x_height+separator;
- numeric dot_diam#; dot_diam# = 5/8dot_size#;
- define_whole_blacker_pixels(dot_diam);
- pickup fine.nib;
- dot_diam:=max(fine.breadth,min(dot_diam,floor(2/3sp_height-eps)));
- x31 if1type0:-else:+fi.5dot_diam=hround(center if1type0:-else:+fi.5dot_diam);
- y31+.5dot_diam=vround(sp_top);
- if1type0:smooth else:rough fi (31,a,dot_diam,sp_height,0);
-fi
-penlabels(31);
-enddef;
-def iota_sub(expr pos_stem) =
-if not monotoniko:
- if known pic.iota:
- addto currentpicture also pic.iota shifted (hround(pos_stem),0);
- else:
- picture temp_picture; temp_picture=currentpicture; clearit;
- if cursive and serifs and not (monospace or small_caps):
- pickup pencircle xscaled stem yscaled hair;
- x51=0;
- top y51=vround(-o-separator);
- x52=x51;
- bot y52=vround(-desc_depth);
- draw z52--z51;
- pickup pencircle scaled hair;
- y53=y52+1/2hair;
- lft x53=hround(x52+u);
- draw z53--(z52+(.5u,0))--z52;
- elseif cbleipzig or cbroman:
- pos50(stem,0);x50=0;top y50+.5stem=vround(-o-.5separator);
- pos51(stem,0) ; x51=x50; y51=y53;
- x52r=.5[x51r,x53r];x52l=.5[x51l,x53l];
- bot y52l=vround(-desc_depth); y52r-y52l=.3[hair,stem]; z52=.5[z52r,z52l];
- pos53(hair,if cbroman:135else:180fi);
- lft x53r=hround(x51r+3u/4);y53l=y52r+min(u/2,hair);
- filldraw double_circ_stroke z50e---z51e{down}...{right}z52e...{up}z53e;
- else:
- if small_caps:
- numeric iota_stem; iota_stem:=.5[vair,stem];
- pickup tiny.nib; pos51(iota_stem,0); pos52(iota_stem,0);
- lft x51l=lft x52l=hround(-.5iota_stem);
- top y51 - bot y52= 1.2iota_dp;
- .5[top y51,bot y52]=0;
- filldraw stroke z51e--z52e; % stem
- if serifs or slitex:
- if monospace:
- dish_serif(51,52,a,1/3,.3jut,b,1/3,.3jut); % upper serif
- dish_serif(52,51,c,1/3,.3jut,d,1/3,.3jut); % lower serif
- else:
- numeric s_jut; s_jut :=if slitex: .5iota_stem else:.5jut fi;
- dish_serif(51,52,a,1/3,s_jut,b,1/3,s_jut); % upper serif
- dish_serif(52,51,c,1/3,s_jut,d,1/3,s_jut); % lower serif
- fi
- fi
- else:
- pickup fine.nib;
- x51=0; pos51(stem,180); top y51=vround(-o-separator);
- x52=x51; pos52(stem,180); bot y52=-iota_dp;
- filldraw circ_stroke z52e--z51e;
- fi
- fi
- if not working_hard : picture pic.iota; pic.iota=currentpicture; fi
- currentpicture:=currentpicture shifted (hround(pos_stem),0);
- addto currentpicture also temp_picture;
- fi
-fi
-penlabels(51,52,53);
-currentbreadth:=0;
-enddef;
-def Iota_sub(expr pos_stem) =
-if not monotoniko:
- if known pic.Iota:
- addto currentpicture also pic.Iota shifted (hround(pos_stem),0);
- else:
- picture temp_picture; temp_picture=currentpicture; clearit;
- numeric I_stem; I_stem:=.6[hair,stem];
- pickup tiny.nib; pos51(I_stem,0); pos52(I_stem,0);
- lft x51l=lft x52l=hround(-.5I_stem);
- top y51 - bot y52=2(iota_dp-separator);.5[top y51,bot y52]=0;
- filldraw stroke z51e--z52e; % stem
- if serifs or slitex:
- if monospace:
- dish_serif(51,52,a,1/3,.3jut,b,1/3,.3jut); % upper serif
- dish_serif(52,51,c,1/3,.3jut,d,1/3,.3jut); % lower serif
- else:
- dish_serif(51,52,a,1/3,.7jut,b,1/3,.7jut); % upper serif
- dish_serif(52,51,c,1/3,.7jut,d,1/3,.7jut); % lower serif
- fi
- fi
- picture pic.Iota; pic.Iota=currentpicture;
- currentpicture:=currentpicture shifted (hround(pos_stem),0);
- addto currentpicture also temp_picture;
- fi % endfi " known pic.Iota"
-fi %endfi "not monotoniko"
-currentbreadth:=0;
-enddef;
-cmchar "Adscript Iota";
-beginchar(oct"010",if monospace:9else:4fi u#,x_height#,desc_depth#);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-Iota_sub(.5w); monotoniko:=toniko;
-endchar;% "Adscript Iota"
-numeric acc_width#; acc_width#:=if monotoniko: 4u# else:9u# fi;
-cmchar "Grave accent";
-beginchar("`",if monospace:9else:3fi u#,acc_ht#,0);
-adjust_fit(0,0);
-numeric center;
-numeric acc_sgn; acc_sgn:=+1;
-grave(if monospace:19/36else:2/3fi w);
-endchar;% "Grave accent"
-cmchar "Acute accent";
-beginchar("'",if monospace:9else:3fi u#,acc_ht#,0);
-adjust_fit(0,0);
-numeric center;
-numeric acc_sgn; acc_sgn:=-1;
-acute(if monospace:17/36else:1/3fi w);
-endchar;% "Acute accent"
-cmchar "Circumflex accent";
-beginchar("~",if monospace:9else:6fi u#,circ_ht#,0);
-adjust_fit(0,0);
-numeric center;
-numeric mid_width;
-squeeze:=false;
-generate_circumflex(w/2);
-penlabels(21,22,23,24,25);
-currentbreadth:=0;
-endchar;% "Circumflex accent"
-cmchar "Diaeresis";
-beginchar(oct"042",if monospace:9else:4fi u#,circ_ht#,0);
-adjust_fit(0,0);
-numeric dot_diam, center, sep;
-sep:=4u-tiny; center:=.5w;
-dot_diam:=max(tiny.breadth,hround(dot_size));
-pos31(dot_diam,0); pos32(dot_diam,90); x31=x32;
-y32=.5[x_height+separator,circ_ht];
-y31=.5[y32l,y32r];
-pos33(dot_diam,0); penpos34(y32r-y32l,90); y33=y34=y31; x33=x34;
-if sep>0 :
- center=.5[x31,x33]; x33-x31=sep;
-else:
- y35l=y35r=.5[y31,y32]; z35l=whatever[z21l,z22l]; z35r=whatever[z21r,z22r];
- rt x31r=hround((min(x35l,x35r)-.5currentbreadth)-.05w);
- lft x33l=hround((max(x35l,x35r)+.5currentbreadth)+.05w);
-fi
-dot(31,32); dot(33,34);
-penlabels(31,32,33,34,35);
-endchar;% "Diaeresis"
-cmchar "Rough breathing";
-beginchar("<",if monospace:9else:4fi u#,acc_ht#,0);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-spirit(.5w)<; monotoniko:=toniko;
-endchar;% "Rough breathing"
-cmchar "Smooth breathing";
-beginchar(">",if monospace:9else:4fi u#,acc_ht#,0);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-spirit(.5w)>; monotoniko:=toniko;
-endchar;% "Smooth breathing"
-cmchar "Rough breathing with acute";
-beginchar(oct"126",if monospace:9else:5fi u#,acc_ht#,0);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-spirit_acute(.5w)<; monotoniko:=toniko;
-endchar;% "Rough breathing with acute"
-cmchar "Rough breathing with grave";
-beginchar(oct"103",if monospace:9else:5fi u#,acc_ht#,0);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-spirit_grave(.5w)<; monotoniko:=toniko;
-endchar;% "Rough breathing with grave"
-cmchar "Rough breathing with circumflex";
-beginchar(oct"100",if monospace:9else:6fi u#,Circ_ht#,0);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-squeeze:=true;
-spirit_circumflex(.5w)<; monotoniko:=toniko;
-endchar;% "Rough breathing with circumflex"
-cmchar "Smooth breathing with acute";
-beginchar(oct"136",if monospace:9else:5fi u#,acc_ht#,0);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-spirit_acute(.5w)>; monotoniko:=toniko;
-endchar;% "Smooth breathing with acute"
-cmchar "Smooth breathing with grave";
-beginchar(oct"137",if monospace:9else:5fi u#,acc_ht#,0);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-spirit_grave(.5w)>; monotoniko:=toniko;
-endchar;% "Smooth breathing with grave"
-cmchar "Smooth breathing and circumflex";
-beginchar(oct"134",if monospace:9else:6fi u#,Circ_ht#,0);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-squeeze:=true;
-spirit_circumflex(.5w)>; monotoniko:=toniko;
-endchar;% "Smooth breathing and circumflex"
-cmchar "Diaeresis with acute";
-beginchar(oct"043",if monospace:9else:5fi u#,acc_ht#,0);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-diaeresis_acute(.5w); monotoniko:=toniko;
-endchar;% "Diaeresis with acute"
-cmchar "Diaeresis with grave";
-beginchar(oct"044",if monospace:9else:5fi u#,acc_ht#,0);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-diaeresis_grave(.5w); monotoniko:=toniko;
-endchar;% "Diaeresis with grave"
-cmchar "Diaeresis with circumflex";
-beginchar(oct"040",if monospace:9else:8fi u#,Circ_ht#,0);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-squeeze:=true;
-diaeresis_circumflex(.5w);
-monotoniko:=toniko;
-endchar;% "Diaeresis with circumflex"
-cmchar "Iota subscript";
-beginchar("|",if monospace:9else:2fi u#,0,.6desc_depth#);
-adjust_fit(0,0);
-toniko:=monotoniko; monotoniko:=false;
-iota_sub(.5w); monotoniko:=toniko;
-endchar;% "Iota subscript"
-cmchar "Breve accent";
-beginchar(oct"036",7u#,min(asc_height#,2x_height#),0);
-italcorr h#*slant+.5vair#-1.5u#;
-adjust_fit(0,0);
-pickup crisp.nib; pos1(vair,-180); pos3(vair,0);
-top y1=top y3=h; lft x1r=w-rt x3r=0;
-numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
-pos2(mid_thickness,-90); x2=.5w;
-bot y2r=vround (1/3[x_height,h]+o-.5mid_thickness);
-filldraw stroke z1e{down}...z2e{right}...{up}z3e; % stroke
-currentbreadth:=0;
-endchar;% "Breve accent"
-cmchar"Wide breve accent";
-beginchar(oct"227",12u#,min(asc_height#,2x_height#),0);
-italcorr h#*slant+.5vair#-1.5u#;
-adjust_fit(0,0);
-pickup crisp.nib; pos1(vair,-180); pos3(vair,0);
-top y1=top y3=h; lft x1r=w-rt x3r=0;
-numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
-pos2(mid_thickness,-90); x2=.5w;
-bot y2r=vround (1/3[x_height,h]+o-.5mid_thickness);
-filldraw stroke z1e{(1,-1)}...z2e{right}...{1,1}z3e; % stroke
-currentbreadth:=0;
-penlabels(1,2,3,4,5);
-endchar;% "Wide breve accent"
-cmchar "Macron (bar) accent";
-numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
-beginchar(oct"037",7u#,.15[x_height#,asc_height#]+macron_breadth#,0);
-italcorr h#*slant-.75u#;
-adjust_fit(0,0);
-numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
-pickup if serifs: crisp.nib else: fine.nib fi;
-pos1(macron_breadth,90); pos2(macron_breadth,90);
-%top y1r=top y2r=h+o;
-lft x1=w-rt x2=0;
-bot y1l=bot y2l=vround (h+o);
-filldraw stroke z1e--z2e; % bar
-currentbreadth:=0;
-endchar;% "Macron (bar) accent"
-cmchar "Lowered cap to go under iota or upsilon";
-beginchar(oct"001",6u#,0,desc_depth#);
-adjust_fit(0,0);
-numeric mid_width;mid_width=1/3[vair,stem];
-pickup if serifs: crisp.nib else: fine.nib fi;
-pos1(vair,135); pos2(mid_width,90); pos3(vair,45);
-lft x1r=0; rt x3r=w; bot y1l=max(-d,-3mid_width)-separator=bot y3l;
-x2=.5[lft x1r,rt x3r]; top y2r=-separator;
-filldraw double_circ_stroke z1e..z2e..z3e;
-penlabels(1,2,3);
-currentbreadth:=0;
-endchar;% "Lowered cap to go under iota or upsilon"
-cmchar "Small tie to go under any letter";
-beginchar(oct"024",6u#,0,desc_depth#);
-adjust_fit(0,0);
-numeric mid_width;mid_width=1/3[vair,stem];
-pickup if serifs: crisp.nib else: fine.nib fi;
-pos1(vair,-135); pos2(mid_width,-90); pos3(vair,-45);
-lft x1r=0; rt x3r=w; top y1l=-separator=top y3l;
-x2=.5[lft x1r,rt x3r]; bot y2r=max(-d,-3mid_width)-separator;
-filldraw double_circ_stroke z1e..z2e..z3e;
-penlabels(1,2,3);
-currentbreadth:=0;
-endchar;% "Small tie to go under any letter"
-%endinput;
-% questi sono i due lati di un circonflesso ^ col vertice alla base
-cmchar "Left side of nexus";
-beginchar(oct"020",2.5u#,0,desc_depth#);
-adjust_fit(0,0);
-pickup if serifs: crisp.nib else: fine.nib fi;
-pos1(hair,135); pos2(1.5u,angle((-slant,1)));
-lft x1r=0; bot y1l=-d; rt x2l=hround(w+eps); top y2r=h;
-filldraw circ_stroke z1e--z2e;
-penlabels(1,2);
-endchar;% "Left side of nexus"
-cmchar "Right side of nexus";
-beginchar(oct"021",3.5u#,0,desc_depth#);
-adjust_fit(0,0);
-pickup if serifs: crisp.nib else: fine.nib fi;
-pos2(hair,45); pos1(1.5u,angle((-slant,1)));
-lft x1l=hround(0-eps); top y1r=h; rt x2r=w; bot y2l=-d;
-filldraw circ_stroke z2e--z1e;
-penlabels(1,2);
-endchar;% "Right side of nexus"
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbbase.mf b/Master/texmf-dist/fonts/source/public/cb/cbbase.mf
deleted file mode 100644
index c2b73b897ce..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbbase.mf
+++ /dev/null
@@ -1,318 +0,0 @@
-% Copyright (C) 1997---2001, 2002 Claudio Beccari
-% version 2.2b 2002/02/23
-% The greatest part of this file was written by Silvio Levy; CB aknowledges
-% Silvio's work.
-% CB added some material at the end and "corrected" some definitions,
-% in particular those that produced overflows at high resolutions and
-% magnifications.
-% The file was renamed in order to distinguish it from Silvio's one.
-numeric cbbase; cbbase:=1; %don't read this file twice
-% make reference to file in subdirectories less painful
-def readfrom(expr filename) = scantokens ("input " & filename); enddef;
-% we start by defining a few more font parameters:
-boolean monowidth; %are the widths of all strokes roughly the same?
-boolean straight; %are certain strokes straight?
-let old_font_setup = font_setup;
-def font_setup =
- define_whole_vertical_pixels(acc_ht,circ_ht,Circ_ht,iota_dp); %accent heights
- old_font_setup;
-enddef;
-%Since many of our characters are composite (for instance, accent+vowel),
-%we avoid recomputing many pictures by saving them.
-%But if we're using various definitions for the same letter (as when
-%running 6test.mf) we can't use this trick, so we set working_hard:=true.
-boolean working_hard; %are we to recompute letters every time?
-working_hard:=false;
-def this_letter =
- italcorr ital; adjust_fit(fit_params);
- if known savedpicture: currentpicture:=savedpicture; else: gen_letter; fi
- if not working_hard: picture savedpicture; savedpicture:=currentpicture; fi
-enddef;
-%The following routines are for use with double characters.
-boolean is_double; is_double:=false;
-let oldendchar=endchar;
-def begindoublechar(expr c,w_sharp,h_sharp,d_sharp) =
- is_double:=true; beginchar(c,w_sharp,h_sharp,d_sharp);
-enddef;
-def doublecharkern(expr k_sharp) =
- if not monospace: k:=hround(k_sharp*hppp); r:=r+k; charwd:=charwd+k_sharp; fi
-enddef;
-def middoublechar(expr w_sharp,h_sharp,d_sharp) =
- scantokens extra_endchar;
- forsuffixes e=r,l,w,charwd: numeric first.e; first.e:=e; endfor
- w:=hround(w_sharp*hppp); h:=vround(h_sharp*hppp); d:=vround(d_sharp*hppp);
- charwd:=w_sharp; charht:=max(charht,h_sharp); chardp:=max(chardp,d_sharp);
- picture first.glyph; first.glyph=currentpicture;
- clearxy;
- clearit;
- clearpen;
-enddef;
-def endchar =
- if is_double :
- charwd:=first.charwd+charwd;
- picture second_glyph; second_glyph=currentpicture shifted (first.r-l,0);
- currentpicture:= first.glyph; addto currentpicture also second_glyph;
- scantokens extra_endchar;
- w:=first.w+w; r:=first.r-l+r; l:=first.l;
- chardx:=first.w+w; interim xoffset:= -l;
- if proofing>0: makebox(proofrule); fi
- shipit;
- if displaying>0: makebox(screenrule); showit; fi
- endgroup;
- is_double:=false
- else : oldendchar
- fi
-enddef;
-% The new definition of endchar must be memorized so that
-% the macro `iff' keeps working
-let endchar_=endchar;
-%By convention, we reserve the name z1' for the direction at z1, and so on.
-%The direction at z1r is z1'r, or zdir1r.
-vardef zdir[]@#= z@'@# enddef;
-vardef assign_z@#(expr zz)= x@#:=xpart(zz); y@#:=ypart(zz) enddef;
-vardef sgn(expr x)= if (x>0): 1 elseif (x<0): -1 else: 0 fi enddef;
-vardef double_circ_stroke text t =
- forsuffixes e = l,r: path_.e:=t; endfor
- if cycle path_.l: errmessage "Beware: `stroke' isn't intended for cycles"; fi
- path_.l .. reverse path_.r .. cycle enddef;
-vardef drawloop(suffix $,$$,@@,@)=
- numeric temp[], sup;
- sup=superness;
- forsuffixes e=r,l:
- path curv[]e; numeric S[]e;
- curv1e=pulled_super_arc.e($,$$)(.5superpull);
- curv2e=pulled_super_arc.e(@,@@)(.5superpull); endfor
- (S1r,S2r)=curv1r intersectiontimes curv2r;
- (temp1,S2l)=curv1r intersectiontimes curv2l;
- (S1l,temp2)=curv1l intersectiontimes curv2r;
- for i=1 upto 9:
- exitif (temp1>=S1r) and (temp2>=S2r);
- begingroup
- numeric S[]r, S[]l, temp[]; pair p;
- interim superness:=(i/10)[sup,1];
- message"change in superness required; increased to "; show superness;
- curv1r:=pulled_super_arc.r($,$$)(0);
- curv2r:=pulled_super_arc.r(@,@@)(0);
- (S1r,S2r)=curv1r intersectiontimes curv2r;
- (temp1,S2l)=curv1r intersectiontimes curv2l;
- (S1l,temp2)=curv1l intersectiontimes curv2r;
- endgroup;
- endfor;
- if S1l=-1 : S1l:=2; fi
- if S2l=-1 : S2l:=2; fi
- filldraw stroke subpath(0,S1e+eps) of curv1e;
- filldraw stroke subpath(0,S2e+eps) of curv2e;
- filldraw subpath (S1r+eps,2) of curv1r...subpath(2,S2r+eps) of curv2r..cycle;
-enddef ;
-% helpful macro for deciding the quadrant in gr_arc.$ ($=r,l)
-vardef signum(expr x)=if x<0: -1 else: 1 fi enddef;
-vardef gr_arc.r(suffix $,$$,$$$)(expr min,max,tilt)=
- pair center, corner;
- if signum(y$$$r-y$r)*signum(x$$$r-x$r) < 0 : %first or third quadrant
- center=(x$$$r,y$r); corner=(x$r,y$$$r);
- else :
- center=(x$r,y$$$r); corner=(x$$$r,y$r);
- fi
- z$r{corner-z$r}...superness[center,corner]{z$$$r-z$r}...
- {z$$$r-corner}z$$$r
-enddef;
-vardef gr_arc.l(suffix $,$$,$$$)(expr min,max,tilt)=
- save p,q,wdth;
- pair center, corner, temp;
- numeric wdth, t, s;
- path p,q;
- if signum(y$$$r-y$r)*signum(x$$$r-x$r) < 0 : %first or third quadrant
- center=(x$$$r,y$r); corner=(x$r,y$$$r);
- if tilt>=0 : wdth:=min; other_wdth:=max; t:=2(1-tilt);
- else : wdth:=max; other_wdth:=min; t:=-2tilt; fi
- else :
- center=(x$r,y$$$r); corner=(x$$$r,y$r);
- if tilt>=0 : wdth:=max; other_wdth:=min; t:=2(1-tilt);
- else : wdth:=min; other_wdth:=max; t:=-2tilt; fi
- fi
- p:=z$r{corner-z$r}...superness[center,corner]{z$$$r-z$r}...
- {z$$$r-corner}z$$$r;
- pos$$(wdth,angle direction t of p - 90);
- z$$r=point t of p;
- assign_z$$'l(direction t of p);
- assign_z$$'r(z$$'l);
- if other_wdth<=currentbreadth: errmessage "bad pos"; fi
- temp:=point (2-t) of p-
- (other_wdth-currentbreadth,0) rotated (angle direction (2-t) of p - 90);
- boolean k[]; k1:=false; k2:=false;
- if unknown x$l:
- k1:=true;
- assign_z$l(temp);
- assign_z$'l(direction(2-t) of p);
- if signum(y$$$r-y$r)*signum(x$$$r-x$r) < 0 : %first or third quadrant
- y$l:=2ypart center-y$l;
- x$'l:=-x$'l;
- else:
- x$l:=2xpart center-x$l;
- y$'l:=-y$'l;
- fi
- fi
- if unknown x$$$l:
- k2:=true;
- assign_z$$$l(temp);
- assign_z$$$'l(direction(2-t) of p);
- if signum(y$$$r-y$r)*signum(x$$$r-x$r) < 0 : %first or third quadrant
- x$$$l:=2xpart center-x$$$l;
- y$$$'l:=-y$$$'l;
- else:
- y$$$l:=2ypart center-y$$$l;
- x$$$'l:=-x$$$'l;
- fi
- fi
- q:=z$l{z$'l}...z$$l{z$$'l}...z$$$l{z$$$'l};
- if k1 :
- t := xpart(q intersectiontimes (center---z$r));
- if t=-1 : t:=0; fi
- assign_z$l(point t of q);
- assign_z$'l(direction t of q);
- assign_z$'r(corner-z$r);
- z$l+z$r=2z$;
- else: t:=0;
- fi
- if k2 :
- s := xpart(q intersectiontimes (center---z$$$r));
- if s=-1 : s:=2; fi
- assign_z$$$l(point s of q);
- assign_z$$$'l(direction s of q);
- assign_z$$$'r(z$$$r-corner);
- z$$$l+z$$$r=2z$$$;
- else: s:=2;
- fi
- subpath (t,s) of q
-enddef;
-vardef doodah(suffix $,$$,$$$)=
- if known x$$:
- vardef ward(expr gr)=
- sgn(xpart direction 1 of (z${zdir$}..(x$$,gr)..{zdir$$$}z$$$)) <> sgn(x$-x$$)
- enddef;
- y$$=solve ward(y$,y$$$);
- else:
- vardef ward(expr gr)=
- sgn(ypart direction 1 of (z${zdir$}..(gr,y$$)..{zdir$$$}z$$$)) <> sgn(y$-y$$)
- enddef;
- x$$=solve ward(x$,x$$$);
- fi
- (z${zdir$}..z$$..{zdir$$$}z$$$)
-enddef;
-forsuffixes e=r,l:
- vardef club.e(suffix $,$$,$$$)= doodah($e,$$e,$$$e) enddef; endfor
-screen_rows:=600; screen_cols:=1000;
-vardef alpha_tail(suffix $,$$) =
- pos$$(hair,180); top y$$=vround 4/3[bot y$l,top y$r]; %tip of hook
- rt x$$l=hround(x$+(y$$-y$)+.5hair); %central arc is round
-enddef;
-vardef pi_bar =
- pos3(vstem,-90); rt x3=hround(w-.75u); top y3l=x_height; %top right
- pos2(vstem,-90); y2=y3; x2=.25w; %top left
- x1 if SansSerif: +.25hair else:-.5hair fi =hround.75u; y1-.5hair=4/3[top y2l,bot y2r]; %tip of bar
- numeric slope; slope=angle((z2-z1)yscaled 2); pos1(hair,slope-90);
- forsuffixes e=l,r: z1'e=(z2e-z1e)yscaled 2; endfor
- if SansSerif: %bar
- filldraw stroke z1e{z1'e}...z2e---z3e;
- else:
- filldraw circ_stroke z1e{z1'e}...z2e---z3e;
- fi
-enddef;
-vardef cblpi_bar =
- pos2(vstem,-90); top y2l=x_height; x2=.3w; %top left
- x1-.5hair=hround.75u; y1=y2r-u; %tip of bar
- numeric slope; slope=angle((z2-z1)yscaled 2); pos1(hair,slope-90);
- forsuffixes e=l,r: z1'e=(z2e-z1e)yscaled 2; endfor
- pos3(vstem,-90); x2+x3=w+.8u; z3=z2+whatever*dir(-4); % Tilt adjusted after Dimitri Fillippou
- pos11(hair,slope-90); x11=w-u; y11l=h; %right tip
- forsuffixes e=l,r: z11'e=(z11e-z3e)yscaled 2; endfor
- filldraw double_circ_stroke z1e{z1'e}...z2e---z3e...{z11'e}z11e; %bar
-enddef;
-%
-vardef cbltau_bar =
- numeric cbtilt; cbtilt=angle(-slant,1)+180;
- pos2(vstem,cbtilt); top y2l=x_height; x2=.25w; %top left
- x1-.5hair=hround.75u; y1=bot y2r-.5u; %tip of bar
- numeric slope; slope=angle((z2-z1)yscaled 2); pos1(hair,slope-90);
- forsuffixes e=l,r: z1'e=(z2e-z1e)yscaled 2; endfor
- pos3(vstem,cbtilt); x2+x3=w; z3=z2+whatever*dir(-4); % Tilt adjusted after Dimitri Fillippou
- pos11(hair,slope-90); z11+z1=z2+z3; %right tip
- forsuffixes e=l,r: z11'e=(z11e-z3e)yscaled 2; endfor
- filldraw double_circ_stroke z1e{z1'e}...z2e---z3e...{z11'e}z11e; %bar
-enddef;
-%% Extension for font paramemeter calculations with splines
-% ---------------------------------------------------------------------------
-%
-%
-%
-% some extra font parameters
-%
-def font_cap_height expr x = fontdimen 8: x enddef;
-def font_asc_height expr x = fontdimen 9: x enddef;
-def font_acc_cap_height expr x = fontdimen 10: x enddef;
-def font_desc_depth expr x = fontdimen 11: x enddef;
-def font_max_height expr x = fontdimen 12: x enddef;
-def font_max_depth expr x = fontdimen 13: x enddef;
-def font_digit_width expr x = fontdimen 14: x enddef;
-def font_cap_stem expr x = fontdimen 15: x enddef;
-def font_baselineskip expr x = fontdimen 16: x enddef;
-% Some booleans
-boolean slitex, straight, monowidth, barebones, cursive,cbleipzig,cbroman;
-barebones:=false; cursive:=false; cbleipzig:=false; cbroman:=false;
-if unknown invisibile: boolean invisibile; invisibile:=false; fi
-extra_endchar:=extra_endchar&"if invisibile: clearit;fi";
-% For modern monotoniko spelling we need another boolean that might
-% have been already defined in another driver file
-if unknown monotoniko: boolean monotoniko; monotoniko:=false; fi
-boolean small_caps; small_caps:=false;
-numeric sclc; sclc:=1;
-boolean metrics; metrics:=false;
-boolean SansSerif; SansSerif:=false;
-% For ouline fonts
-% The body is the solution of exercise 13.23 of MFbook
-% Thanks to Don Hosek who added "minor" enhancements for writewhite
-% printers and high resolution printers
-if unknown outlining: boolean outlining; outlining:=false; fi
-% do outline only when explicitly told to do so by means of the declaration
-% outlining:=true;
-% in the font driver file
- def outline =
- cull currentpicture keeping (1,infinity);% start of solution of ex.13.23
- picture v; v:=currentpicture;
- cull currentpicture keeping (1,1) withweight 3;
- addto currentpicture also v - v shifted right
- -v shifted left - v shifted up - v shifted down;
- cull currentpicture keeping (1,4);% end of solution of ex.13.23
- % next code for high resolution typesetters
- % replacing each pixel x with the following pattern of
- % pixels in the currentpicture:
- % X
- % XxX
- % X
- % to create darker lines for outlines.
- % Adjacent x pixels superimpose their X companions
- if (pixels_per_inch >= 1200) :
- v:=currentpicture;
- addto currentpicture also v shifted right +
- v shifted left + v shifted up + v shifted down;
- cullit;
- % and the next code is for medium resolution printers such
- % as the Varityper(600dpi) and the APSu5(723dpi) or
- % write-white laser printers such as the Xerox 8790
- % replacing pixel x with:
- % X
- % Xx
- % to create slightly darker lines for outlines.
- % Adjacent x pixels (again) superimpose their X companions
- elseif (pixels_per_inch >= 600)
- or (write_white=1): % See below
- addto currentpicture also currentpicture shifted left;
- addto currentpicture also currentpicture shifted up;
- fi
- enddef;
-% Specify write_white:=1 in MF command line or define new modes that
-% include write_white:=1 among their parameters
-% otherwise the default holds true:
-if unknown write_white: write_white:=0; fi
-readfrom("cbspline");
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbdigits.mf b/Master/texmf-dist/fonts/source/public/cb/cbdigits.mf
deleted file mode 100644
index 9398edaf6bf..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbdigits.mf
+++ /dev/null
@@ -1,1053 +0,0 @@
-% file cbdigits.mf
-%
-% The first part of this file is the same as Computer Modern's romand.mf.
-% It contains the ten digits in so-called roman style.
-% Character codes '060 through '071 are generated.
-%
-% The rest is Copyright (C) 1997, 1999, 2000, 2001, 2002 Claudio Beccari
-% v.2.6 2002/04/09
-% The second part contains the `greek numerals' and special signs for such
-% numerals. The last part contains the 'Athenian numerals'.
-
-% All digits have the same height, width, depth, and italic correction.
-
-cmchar "The numeral 0";
-beginchar("0",9u#,fig_height#,0);
-italcorr fig_height#*slant-.5u#;
-adjust_fit(0,0);
-penpos1(vair,90); penpos3(vair,-90); penpos2(curve,180); penpos4(curve,0);
-if not monospace: interim superness:=sqrt(more_super*hein_super); fi
-x2r=hround max(.7u,1.45u-.5curve); x4r=w-x2r; x1=x3=.5w;
-y1r=h+o; y3r=-o; 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
-penlabels(1,2,3,4); endchar;
-
-currentbreadth:=0;
-
-cmchar "The numeral 1";
-beginchar("1",9u#,fig_height#,0);
-italcorr fig_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric light_stem; light_stem=hround .4[stem',cap_stem'];
-pickup tiny.nib;
-% CB statement added in order to overcome rounding errors with
-% small pixel densities
-if light_stem<=currentbreadth: light_stem:=currentbreadth+eps; fi
-%
-pos1(light_stem,0); pos2(light_stem,0);
-lft x1l=lft x2l=hround(.5(w+.5u)-.5cap_stem'); top y1=h+o; bot y2=0;
-filldraw stroke z1e--z2e; % stem
-if not serifs: save slab; slab=bar; fi
-dish_serif(2,1,a,1/3,min(2.25u,lft x2l-1.5u),
- b,1/3,min(2.25u,w-1.25u-rt x2r)); % serif
-pickup crisp.nib; pos3(slab,-90); pos4(bar,-90);
-top y3l=h+o; top y4l=if monospace: .8 else: .9 fi\\ h+o;
-lft x4=max(1.25u,tiny.lft x1l-2.35u);
-tiny.rt x1r=lft x3+.25[tiny,hair];
-erase fill z3l{x4l-x3l,3(y4l-y3l)}...z4l{left}
- --(x4l,h+o+1)--(x3l,h+o+1)--cycle; % erase excess at top
-filldraw stroke z3e{x4e-x3e,3(y4e-y3e)}..z4e{left}; % point
-penlabels(1,2,3,4); endchar;
-
-currentbreadth:=0;
-
-cmchar "The numeral 2";
-beginchar("2",9u#,fig_height#,0);
-italcorr fig_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric arm_thickness, hair_vair; hair_vair=.25[vair,hair];
-arm_thickness=Vround(if hefty:slab+2stem_corr else:.4[stem,cap_stem] fi);
-pickup crisp.nib; pos7(arm_thickness,-90); pos8(hair,0);
-bot y7r=0; lft x7=hround .9u; rt x8r=hround(w-.9u); y8=good.y(y7l+beak/2)+eps;
-arm(7,8,a,.3beak_darkness,beak_jut); % arm and beak
-pickup fine.nib; pos2(slab,90); pos3(.4[curve,cap_curve],0);
-top y2r=h+o; x2=.5(w-.5u); rt x3r=hround(w-.9u); y3+.5vair=.75h;
-if serifs: numeric bulb_diam; bulb_diam=hround(flare+2/3(cap_stem-stem));
- pos0(bulb_diam,180); pos1(cap_hair,180);
- lft x1r=hround .9u; y1-.5bulb_diam=2/3h;
- (x,y2l)=whatever[z1l,z2r]; x2l:=x; bulb(2,1,0); % bulb and arc
-else: x2l:=x2l-.25u; pos1(flare,angle(-9u,h));
- lft x1r=hround .75u; bot y1l=vround .7h; y1r:=good.y y1r; x1l:=good.x x1l;
- filldraw stroke term.e(2,1,left,.9,4); fi % terminal and arc
-pos4(.25[hair_vair,cap_stem],0);
-pos5(hair_vair,0); pos6(hair_vair,0);
-y5=arm_thickness; y4=.3[y5,y3]; top y6=min(y5,slab,top y7l);
-lft x6l=crisp.lft x7; z4l=whatever[z6l,(x3l,bot .58h)]; z5l=whatever[z6l,z4l];
-erase fill z4l--z6l--lft z6l--(lft x6l,y4l)--cycle; % erase excess at left
-filldraw stroke z2e{right}..tension atleast .9 and atleast 1
- ..z3e{down}.. z4e---z5e--z6e; % stroke
-penlabels(0,1,2,3,4,5,6,7,8); endchar;
-
-currentbreadth:=0;
-
-cmchar "The numeral 3";
-beginchar("3",9u#,fig_height#,0);
-italcorr fig_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric top_thickness,mid_thickness,bot_thickness;
-top_thickness=max(fine.breadth,vround(slab-2vair_corr));
-mid_thickness=max(fine.breadth,vround 2/3vair);
-bot_thickness=max(fine.breadth,vround(slab-vair_corr));
-pickup fine.nib; pos2(top_thickness,90); top y2r=h+o;
-pos3(max(fine.breadth,.6[curve,cap_curve]-stem_corr),0);
-rt x3r=hround(w-1.25u);
-pos4(vair,-90); pos5(vair,-90);
-pos6(mid_thickness,90); x2=x6=x8=.5[1.5u,x7];
-pos7(cap_curve,0); rt x7r=hround(w-.75u); lft x5=min(hround 3u,lft x6)-eps;
-pos8(bot_thickness,-90); bot y8r=-o;
-y3=.6[top y4l,bot y2l]; y7=.5[bot y6l,top y8l];
-top y5l=vround(.54h+.5vair); y5r=y6l;
-x4=1/3[x5,x3l]; z4=z5+whatever*(150u,h);
-filldraw stroke pulled_super_arc.e(2,3)(.5superpull)
- & z3e{down}...z4e---z5e; % upper bowl
-filldraw z5r--z6l--z6r--z5l---cycle; % middle tip
-filldraw stroke pulled_super_arc.e(6,7)(.5superpull)
- & pulled_super_arc.e(7,8)(.5superpull); % lower bowl
-if serifs: numeric bulb_diam[];
- bulb_diam1=flare+.5(cap_stem-stem); bulb_diam2=flare+cap_stem-stem;
- pos0(bulb_diam1,180); pos1(hair,180);
- lft x0r=hround 1.25u; y0=min(.9h-.5bulb_diam1,.75h+.5bulb_diam1);
- bulb(2,1,0); % upper bulb
- pos10(bulb_diam2,-180); pos9(cap_hair,-180);
- lft x10r=hround .75u; y10=max(.1h+.5bulb_diam2,.3h-.5bulb_diam2);
- bulb(8,9,10); % lower bulb
-else: pos1(.5[vair,flare],angle(-8u,h));
- lft x1r=hround u; bot y1l=vround .75h+o;
- y1r:=good.y y1r+eps; x1l:=good.x x1l;
- pos9(bot_thickness,angle(-2u,-h));
- lft x9r=hround .75u; top y9l=vround .25h-o;
- y9r:=good.y y9r-eps; x9l:=good.x x9l;
- filldraw stroke term.e(2,1,left,1,4); % upper terminal
- filldraw stroke term.e(8,9,left,1,4); fi % lower terminal
-penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar;
-
-currentbreadth:=0;
-
-cmchar "The numeral 4";
-beginchar("4",9u#,fig_height#,0);
-italcorr fig_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric light_stem, light_stem', diag_stem, alpha, cut; cut=.75notch_cut;
-light_stem=hround .4[fudged.stem,fudged.cap_stem];
-light_stem'=hround max(tiny.breadth,light_stem-2stem_corr);
-diag_stem=max(tiny.breadth,.4[vair,fudged.hair]);
-pickup crisp.nib; pos5(cap_bar,90); pos6(cap_bar,90);
-lft x5=hround .5u; rt x6=hround(w-.5u);
-top y5r=vround(if serifs: 5/18[slab,h-light_stem]+1
- else:.35(h-light_stem) fi+.5cap_bar);
-z4l=top lft z5r; y2=y2'=y5=y6; x1r=x2r=hround(w-3u+.5light_stem);
-penpos1(light_stem',0); penpos2(light_stem',0); y1=y3=h+apex_o+apex_oo;
-x3r+apex_corr=x1r; alpha=diag_ratio(1,diag_stem,y3-y4l,x3r-x4l);
-penpos3(alpha*diag_stem,0); penpos4(alpha*diag_stem,0);
-x0=x1l; z0=whatever[z3r,z4r];
-x5'=x5; z5''=z5'+penoffset z4-z3 of currentpen=whatever[z4l,z3l];
-fill diag_end(2r,1r,1,.5,3l,4l)---z5''...lft z5'
- ---lft z5l -- (x4r,y5l) -- z4r
- if y0<h-cut:{z3r-z4r}...{up}(x1l-1,h-cut)
- --(x1l,h-cut) else: -- z0 fi
- --z2l--z2r--cycle; % diagonal and upper stem
-filldraw stroke z5e--z6e; % bar
-pickup tiny.nib; pos7(light_stem,0); rt x7r=x1r; bot y7=0;
-pos2'(light_stem,0); x2'=x7;
-filldraw stroke z2'e--z7e; % lower stem
-if serifs: dish_serif(7,2',a,1/3,1.75u,
- b,1/3,min(1.75u,w-.5u-rt x7r)); fi % serif
-penlabels(0,1,2,3,4,5,6,7); endchar;
-
-currentbreadth:=0;
-
-cmchar "The numeral 5";
-beginchar("5",9u#,fig_height#,0);
-italcorr fig_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric bot_thickness,light_hair;
-bot_thickness=max(fine.breadth,vround(slab-vair_corr));
-light_hair=hround(cap_hair if hefty: -\\2stem_corr fi);
-pickup tiny.nib; pos5(vair,180); pos6(vair,90);
-bot y5=vround(.53h-vair); top y6r=vround .61803h+o;
-pos3(light_hair,0); pos4(light_hair,0);
-lft x3l=max(1.35u,2.1u-.5light_hair); x3=x4=x5; y4=y5;
-top y3=h if not hefty: +\\o fi;
-filldraw stroke z3e--z4e; % thin stem
-penpos7(cap_stem-fine,0); penpos8(bot_thickness-fine,-90);
-fine.rt x7r=hround(w-.9u); x8=.5[u,x7]; x6=.5[x5,x7];
-erase fill z5--bot z5--(x6,bot y5)--z6{left}
- ..tension .9 and 1..{x5-x6,3(y5-y6)}cycle; % erase excess in middle
-filldraw stroke z6e{left}..tension .9 and 1..{x5-x6,3(y5-y6)}z5e; % link
-pickup fine.nib; pos6'(vair,90); z6'=z6;
-y7=.5[y6,y8]; bot y8r=-o;
-filldraw stroke pulled_arc.e(6',7) & pulled_arc.e(7,8); % bowl
-if serifs: pos9(hair,-180); y9=.5y5; lft x9r=hround .9u;
- pos10(flare+1/3(cap_stem-stem),-180); bulb(8,9,10); % bulb
-else: pos9(3/7[bot_thickness,flare],angle(-7u,-h));
- lft x9r=hround(tiny.lft x3l-.75u); bot y9r=vround .15h-o;
- x9l:=good.x x9l; y9l:=good.y y9l;
- filldraw stroke term.e(8,9,left,1,4); fi % terminal
-if hefty: pickup crisp.nib; pos1(slab,90); pos2(hair,0);
- top y1r=h; x1=x4; rt x2r=hround(w-1.5u); y2=y1l-eps;
- arm(1,2,a,0,0); % arm
-else: numeric flag_breadth; flag_breadth=7/8[vair,cap_curve];
- pos1(flag_breadth,90); pos2(flag_breadth,60);
- pos0(vair,90); top y1r=tiny.top y3; top y2r=vround .95h+o; y0r=y1r;
- lft x1=tiny.lft x3l; x2r=.5[x1,x0]; rt x0=hround(w-1.6u);
- erase fill top z1r--z1r...{right}z2r
- --(x2r,top y1r)--cycle; % erase excess at top
- filldraw stroke z1e...{right}z2e...z0e; fi % flag
-penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar;
-
-currentbreadth:=0;
-
-cmchar "The numeral 6";
-beginchar("6",9u#,fig_height#,0);
-italcorr fig_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric top_thickness,bot_thickness,side_thickness,pull;
-top_thickness=max(fine.breadth,vround(slab-2vair_corr));
-bot_thickness=max(fine.breadth,vround(slab-vair_corr));
-side_thickness=max(fine.breadth,hround 1/3[curve,cap_curve]);
-pull=min(.25,1.5superpull);
-pickup fine.nib; pos2(top_thickness,-270);
-pos3(side_thickness,-180); pos4(bot_thickness,-90);
-pos5(side_thickness,0); pos6(vair,90);
-lft x3r=w-rt x5r=hround max(.75u,1.5u-.5side_thickness);
-x4=x6-.1u=x2-u=.5w;
-top y2r=h+o; y3=.5[y2,y4]; bot y4r=-o;
-y5=.5[y4,y6]; top y6=vround 5/8h+o;
-path p; p=pulled_super_arc.l(3,4)(pull);
-numeric t; t=xpart(p intersectiontimes((x3r,y5)--(x4,y5)));
-pos7(thin_join,180); z7l=point t of p;
-(x,y6r)=whatever[z7l,z6l]; x6r:=min(x,.5[x5r,x6]);
-filldraw stroke pulled_super_arc.e(2,3)(pull)
- & {{interim superness:=more_super; pulled_super_arc.e(3,4)(pull)}}
- & {{less_tense; pulled_super_arc.e(4,5)(pull) & pulled_super_arc.e(5,6)(pull)}}
- & z6e{left}...{direction t of p}z7e; % arc and bowl
-if serifs: pos1(hair,-360); pos0(flare,-360);
- rt x0r=max(rt x2+eps,hround(w-1.2u));
- y0=vround min(.9h-.5flare,.85h+.5flare)+o;
- {{less_tense; bulb(2,1,0)}}; % arc and bulb
-else: pos1(vround .1[top_thickness,flare],90);
- top y1r=vround .97h+o; rt x1=hround(x5-.5);
- filldraw stroke term.e(2,1,right,.9,4); fi % terminal
-penlabels(0,1,2,3,4,5,6,7); endchar;
-
-currentbreadth:=0;
-
-cmchar "The numeral 7";
-beginchar("7",9u#,fig_height#,0);
-italcorr fig_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric arm_thickness, bot_width, top_shift, top_hair;
-if hefty: arm_thickness=Vround(slab+2stem_corr); top_shift=0;
- bot_width=hround .51[curve,cap_curve]; top_hair=.4[thin_join,bot_width];
-else: arm_thickness=Vround .4[stem,cap_stem]; top_shift=.5u;
- bot_width=flare; top_hair=cap_hair; fi
-if top_hair<tiny.breadth: top_hair:=tiny.breadth; fi
-pickup crisp.nib; pos2(arm_thickness,90); pos1(hair,180);
-top y2r=h; rt x2=hround(w-.75u+top_shift);
-lft x1r=hround(.75u+.5top_shift); y1=good.y(y2l-beak/2)-eps;
-arm(2,1,a,.3beak_darkness,-beak_jut); % arm and beak
-pos3(hair,180); y3=good.y(y2r+beak/6)+eps; z3r=whatever[z1r,z.a0];
-penpos2'(eps,-90); z2'=z2r;
-arm(2',3,b,beak_darkness,x3r-x.a0); % upward extension of beak
-pickup tiny.nib; pos4(top_hair,0); pos6(bot_width,0);
-bot y4=max(h-arm_thickness,h-slab,bot y2l); rt x4r=crisp.rt x2;
-lft x6l=hround(3.5u+top_shift-.5bot_width);
-if serifs: y6-.5bot_width=-o; filldraw z6l{down}..{up}z6r--cycle; % bulb
-else: bot y6=-oo; fi
-if hefty: erase fill rt z4r--z4r...{down}z6r
- --(rt x4r,y6)--cycle; % erase excess at top
- filldraw stroke z4e...{down}z6e; % stroke
-else: pos5(top_hair,0); y5=2/3h; z5=whatever[z4,(.75u,y6)];
- erase fill rt z4r--z4r--z5r--(rt x4r,y5)--cycle; % erase excess at top
- filldraw stroke z4e---z5e...{down}z6e; fi % stroke
-penlabels(1,2,3,4,5,6); endchar;
-
-currentbreadth:=0;
-
-cmchar "The numeral 8";
-beginchar("8",9u#,fig_height#,0);
-italcorr fig_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric top_thickness,mid_thickness,bot_thickness,upper_side,lower_side,theta;
-top_thickness=max(fine.breadth,vround(slab-2vair_corr));
-bot_thickness=max(fine.breadth,vround(slab-vair_corr));
-x0=.5w; y0=.54h;
-if hefty: mid_thickness=vround 2/3vair; upper_side=hround(stem-3stem_corr);
- lower_side=hround min(.5[curve,cap_curve]-stem_corr,upper_side+.25u);
- penpos1(top_thickness,90); penpos2(upper_side,180);
- penpos3(mid_thickness,270); penpos8(upper_side,360);
- penpos4(mid_thickness,90); penpos7(lower_side,180);
- penpos6(bot_thickness,270); penpos5(lower_side,360);
- penpos0(vair,90); z3l=z0r; z4l=z0l;
- x1=x6=.5w; x2r=w-x8r=hround u; x7r=w-x5r=hround .75u;
- top y1r=h+o; bot y6r=-o; y2=y8=.5[y1l,y3l]; y7=y5=.5[y4l,y6l];
- filldraw stroke pulled_arc.e(1,2)
- & pulled_arc.e(2,3); % left half of upper bowl
- filldraw stroke pulled_arc.e(4,5)
- & pulled_arc.e(5,6); % right half of lower bowl
- filldraw stroke pulled_arc.e(6,7)
- & pulled_arc.e(7,4); % left half of lower bowl
- filldraw stroke pulled_arc.e(3,8)
- & pulled_arc.e(8,1); % right half of upper bowl
-else: pickup fine.nib; theta=90-angle(18u,h); slope:=-h/18u;
- upper_side=max(fine.breadth,hround(.5[hair,stem]-stem_corr));
- lower_side=hround(.5[hair,stem]+stem_corr);
- 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 .75u;
- x2r-x2l=upper_side-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));
- filldraw stroke z1e{left}..tension atleast tau..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 z1e{right}..tension atleast tau..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; fi % lower left stroke
-penlabels(0,1,2,3,4,5,6,7,8,9); endchar;
-
-currentbreadth:=0;
-
-cmchar "The numeral 9";
-beginchar("9",9u#,fig_height#,0);
-italcorr fig_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric top_thickness,bot_thickness,side_thickness,pull;
-top_thickness=max(fine.breadth,vround(slab-2vair_corr));
-bot_thickness=max(fine.breadth,vround(slab-vair_corr));
-side_thickness=max(fine.breadth,hround 1/3[curve,cap_curve]);
-pull=min(.25,1.5superpull);
-pickup fine.nib; pos2(bot_thickness,-90);
-pos3(side_thickness,0); pos4(top_thickness,90);
-pos5(side_thickness,180); pos6(vair,270);
-w-rt x3r=lft x5r=hround max(.75u,1.5u-.5side_thickness);
-x4-.1u=x6+.1u=x2+.75u=.5w;
-bot y2r=-o; y3=.5[y2,y4]; top y4r=h+o;
-y5=.5[y4,y6]; bot y6=vround 3/8h-o;
-path p; p=pulled_super_arc.l(3,4)(pull);
-numeric t; t=xpart(p intersectiontimes((x3r,y5)--(x4,y5)));
-pos7(thin_join,360); z7l=point t of p;
-(x,y6r)=whatever[z7l,z6l]; x6r:=max(x,.5[x5r,x6]);
-filldraw stroke pulled_super_arc.e(2,3)(pull)
- & {{interim superness:=more_super; pulled_super_arc.e(3,4)(pull)}}
- & {{less_tense; pulled_super_arc.e(4,5)(pull) & pulled_super_arc.e(5,6)(pull)}}
- & z6e{right}...{direction t of p}z7e; % arc and bowl
-if serifs: pos1(hair,-180); pos0(flare,-180);
- lft x0r=min(lft x2-eps,hround 1.2u);
- y0=vround max(.1h+.5flare,.15h-.5flare)-o;
- {{less_tense; bulb(2,1,0)}}; % arc and bulb
-else: pos1(.1[bot_thickness,flare],-120);
- bot y1r=vround .07h-o; lft x1r=hround 1.3u;
- filldraw stroke term.e(2,1,left,.9,4); fi % terminal
-penlabels(0,1,2,3,4,5,6,7); endchar;
-
-currentbreadth:=0;
-
-
-% Here we start with the greek numerals; the three numerals stigma, qoppa,
-% and sampi, are expressly designed with the suggestions of Apostolos
-% Styropoulos and taking into account the variant shapes that exist for
-% these glyphs.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-
-cmchar "The lowercase numeral stigma";
-beginchar(6,9u#,x_height#,0);
-adjust_fit(0,0);
- if cursive:
- if slitex or monospace: pickup fine.nib else: pickup crisp.nib fi;
- pos1(hair,90); top y1r=h+oo; rt x1=w-u;
- pos2(stem,180); lft x2r=u;
- pos3(hair,-90); y3=.9bar_height; y2=.5[y1,y3];
- rt x3=.5[rt x4,rt x1r];
- pos4(.6[hair,stem],0); y4=y3;
- pos5(.6[hair,stem],0); bot y5=0;
- x5=x4=.5[x2,x1];
- filldraw stroke z1e{left}..{down}z2e..{right}z3e;
- filldraw stroke z5e--z4e;
- elseif cbleipzig or cbroman:
- pickup fine.nib; numeric slope;
- pos4(hair,-180); y4=.5h; lft x4r=hround .75u; %left bulge
- pos6(hair,-180); rt x6l=hround(w-.75u); %bottom right
- top y3r=h+oo; x3=x5; pos3(vstem,90);
- pos10(vstem,90); y10=y3;x10=x3+2.5u; %top inflecton
- pos5(vstem,-90); bot y5r=0; %bottom inflection
- x5-x4l=.5(y3l-y5l);
- pos7(hair,-270); y6=.5[y7r,y5r]; x7-.5vstem=hround x5;
- pos9(hair,180); x9=x6; y9-y3=y5-y6;
- bot y7l=-if not slitex:.5fi desc_depth;
- pair za; za=.5[z3,z5]; slope=angle((0,h)-za);
- pos1(.25[hair,stem],slope); pos2(.25[hair,stem],360-slope);
- y4=.5[y1l,y2l]; x1l=x2l;
- z1l=za+1.05*((z4l-za) rotated -(180-slope));
- pos8(vstem,-90); y8=y5;x8=x5+2u;
- filldraw double_circ_stroke
- z7e{right}...z6e...z8e...z5e{left}..z2e..%
- z4e{up}..z1e..z3e{right}...z10e..{up}z9e;
- else:
- if serifs: pickup crisp.nib; else: pickup fine.nib; fi
- pos1(stem,90); top y1r=h+o; if serifs: if monospace:rt x1 = w-u+o;
- else:rt x1 +.5stem =w-u+o;
- fi
- else: rt x1=w-u;
- fi
- pos6(.55[vair,stem],90); top y6r= top y1r;
- pos2(vair,180); lft x2r=u if serifs: -o fi;
- pos3(stem,-90); y3=.9bar_height; y2=.5[y1,y3];
- x3=.5w+u if not serifs:+.5stem fi;
- pos4(vair,0); y4=y3;
- pos5(stem,0); if serifs: if monospace: bot y5=-o;
- else: bot y5=.5stem -o;
- fi
- else: bot y5=0;
- fi
- x5=x4=.5[x2,x1]; x6=.5[x4,x3];
- if serifs:
- filldraw double_circ_stroke z1e..z6e..{down}z2e..{right}z3e;
- filldraw circ_stroke z5e--z4e;
- else:
- filldraw stroke z1e..z6e..{down}z2e..{right}z3e;
- filldraw stroke z5e--z4e;
- fi
- fi
-penlabels(1,2,3,4,5,6,7,8,9,10);
-endchar;
-
-currentbreadth:=0;
-
-cmchar "The lowercase variant stigma";
-beginchar(7,if cbroman:9else:10fi u#,%
- if cbroman:x_height# else:body_height# fi,%
- if cursive:desc_depth# elseif cbroman:0else:2cap_stem# fi);
-adjust_fit(0,0);
- if cursive:
- if slitex or monospace: pickup fine.nib else: pickup crisp.nib fi;
- pos0(hair,90); pos3(stem,if serifs:60else:90fi);
- pos4(cap_stem,180);
- pos5(cap_stem,225); pos6(stem,180); pos7(hair,90);
- w-rt x0r=3/4u=lft x4r; rt x0r=rt x6l;
- top y0r=.3[h,x_height]; y4=x_height;
- path curva,mediana; curva=z4r{up}..{right}z0r; mediana=(w/2,-d)--(w/2,h);
- z3r=(curva intersectionpoint mediana);
- %x3=w/2; top y3r=top y0r;
- x5=w/2; y5=.5[y4,y6]; y6=.5[y5,y7];
- bot y7l=-oo; x7=.3[x4,x5];
- filldraw stroke z0e{left}..z3e..{down}z4e..z5e..{down}z6e..{left}z7e;
- path curva; curva=z7{right}..{up}z6;
- pair zA,zB;
- zA= mediana intersectiontimes curva;
- z8=.5[point xpart zA of mediana, point ypart zA of curva];
- zB= direction ypart zA of curva;
- pos8(stem,angle zB); pos9(stem,if serifs:45else:60fi); pos10(hair,90);
- bot y9l=-d-oo; lft x9l=rt x8r; y10=top y9r; x9=.5[x8,x10];
- filldraw stroke z8e{down}..{right}z9e..z10e;
- path mediana, curva; pair zA,zB;
- elseif cbroman: % No variant stigma (2000/07/23)
- pickup fine.nib; numeric slope;
- pos4(hair,-180); y4=.5h; lft x4r=hround .75u; %left bulge
- pos6(hair,-180); rt x6l=hround(w-.75u); %bottom right
- top y3r=h+oo; x3=x5; pos3(vstem,90);
- pos10(vstem,90); y10=y3;x10=x3+2.5u; %top inflecton
- pos5(vstem,-90); bot y5r=0; %bottom inflection
- x5-x4l=.5(y3l-y5l);
- pos7(hair,-270); y6=.5[y7r,y5r]; x7-.5vstem=hround x5;
- pos9(hair,180); x9=x6; y9-y3=y5-y6;
- bot y7l=-if not slitex:.5fi desc_depth;
- pair za; za=.5[z3,z5]; slope=angle((0,h)-za);
- pos1(.25[hair,stem],slope); pos2(.25[hair,stem],360-slope);
- y4=.5[y1l,y2l]; x1l=x2l;
- z1l=za+1.05*((z4l-za) rotated -(180-slope));
- pos8(vstem,-90); y8=y5;x8=x5+2u;
- filldraw double_circ_stroke
- z7e{right}...z6e...z8e...z5e{left}..z2e..%
- z4e{up}..z1e..z3e{right}...z10e..{up}z9e;
- else:
- pickup fine.nib;
- pos0(hair,-180); pos3(cap_stem,90);
- pos4(hair,-180); pos5(cap_stem,-90);
- pos6(hair,180); pos8(hair,90);
- pos7(cap_stem,90); pos9(hair,-90);
- pos10(hair,-180);pos11(hair,-90);
- pos12(hair,-135); pos13(hair,-180); pos14(hair,-90);
- z8=z10;
- bot y9r=-2cap_stem; bot y8l=0; bot y7l=0; y5=y4-.5cap_stem;
- y6=.5[y5r,y8r];
- y4=math_axis+.7cap_stem;
- y3l=x_height; y0=min(body_height,x_height+2cap_stem);
- y11=min(.5[y4,y7],y7+2cap_stem); y12l=y14l=y13l=y9l;
- x8=.5w; x9=x8+cap_stem; x7=.25w;
- x6=.25[x0,x5];
- x5=x8;
- lft x4r=.5u;
- x3=x5;
- x11=x7;
- rt x0l=w-u; x12l=x14l=x13l; x13=x8;
- filldraw circ_stroke z0e{down}...z3e{left}...z4e{down};
- filldraw double_circ_stroke z4e{down}...z11e{right}...z5e{right}...
- z6e{down}...z8e{left};
- filldraw circ_stroke z8e{left}...z7e{left};
- filldraw circ_stroke z9e{left}---z14e...z12e...z13e---z10e{up};
- fi
-penlabels(0,3,4,5,6,7,8,9,10,11,12,13,14);
-endchar;
-
-currentbreadth:=0;
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-cmchar "The lowercase numeral qoppa";
-beginchar(18,if monospace:9else:7fi u#,%
- if cbleipzig or cbroman:0else:0.5fi[asc_height#,x_height#],%
- if cbleipzig or cbroman:desc_depth# else:0fi);
- if cursive and not (slitex or monospace):
- adjust_fit(.5u#,.5u#); pickup crisp.nib;
- pos1(stem,180); pos2(stem,225);
- pos4(stem,225); pos5(stem,180);
- .5[z1,z5]=.5[z2,z4]=z3=(.5w,bar_height);
- top y1r=h; lft x1r=u; x2r= x1; y2l=bar_height;
- pos3(hair,angle(z4-z2)-90);
- filldraw %stroke
- z1r{down}..z2r{right}..z3r{z4-z2}..{down}z5r--
- z5l{up}..z4l{left}..z3l{z2-z4}..{up}z1l--cycle;
- elseif cbleipzig or cbroman:
- adjust_fit(0,0); numeric qhair; qhair=.5[hair,stem];
- pos1(qhair,0); x1l=u;y1=h;
- pos6(qhair,0);x6r=w-u;y6=-d;
- z0=.5[z1l,z6r]; z0=.5[z5r,z2l]; z0=.5[z6r,z1l];
- pos2(qhair,0); x2l=.5u; y2l=y0-stem/2;
- pos3(stem,angle(z1l-z2l)); z3l=z2l;
- pos4(stem,angle(z5r-z6r)); z4r=z5r;
- pos5(qhair,0);
- filldraw stroke z1e--z2e; filldraw stroke z3e--z4e; filldraw stroke z5e--z6e;
- else:
- adjust_fit(0,0);
- numeric q_sl, q_rad;
- if serifs:
- pickup crisp.nib;
- else:
- pickup fine.nib;
- fi
- q_rad=.8[vair,stem];
- q_sl=if not monospace:1.414* fi(vair);
- pos1(q_rad,180); pos4(q_rad,180);
- pos5(q_sl,225);
- pos7(q_sl,225);
- lft x1r =lft x5r=u; top y1r=h;
- top y5l=bar_height;
- .5[z5,z7]= .5[z1,z4]=(.5w,bar_height);
- if serifs:
- filldraw double_circ_stroke
- z1e{down}..{down}z5e--z7e{down}..{down}z4e;
- else:
- filldraw stroke
- z1e{down}..{down}z5e--z7e{down}..{down}z4e;
- fi
- fi
-penlabels(1,2,3,4,5,6,7,8);
-endchar;
-
-currentbreadth:=0;
-
-
-cmchar "The lowercase variant numeral qoppa";
-beginchar(19,9u#,if cbleipzig or cbroman:1else:.5fi[body_height#,x_height#],
-if cursive:.2elseif cbleipzig or cbroman:1else:0fi desc_depth# );
-adjust_fit(0,0);
- if cursive:
- if slitex or monospace: pickup fine.nib else: pickup crisp.nib fi;
- pos1(hair,90); pos2(stem,180); pos3(hair,270); pos4(stem,0);
- lft x2r = w-rt x4r=u; y2=y4=.5[y1,y3]; x1=x3=w/2;
- top y1r=h+oo; bot y3r=3/4bar_height;
- filldraw stroke z1e{left}..z2e..z3e..z4e..{left}z1e;
- pos5(if not monospace:.8fi stem,0); pos6(stem,0); z5=z3;
- x6=x5; bot y6=-d;
- filldraw stroke z5e--z6e;
- elseif cbleipzig or cbroman:
- if cbroman:pickup tiny.nib;fi
- pos1(if cbleipzig:fine else:hair fi,90); pos2(stem,180);
- pos3(if cbleipzig:fine else:hair fi,270); pos4(stem,0);
- lft x2r = w-rt x4r=u; y2=y4=.5[y1,y3]; x1=x3=w/2;
- top y1r=h+oo; bot y3r=-oo;
- filldraw stroke z1e{left}..z2e..z3e..z4e..{left}z1e;
- pos5(if cbroman:stem else:hair fi,0); pos6(stem,0); z5=z3;
- x6=x5; bot y6=-d if cbleipzig:+.5stem fi;
- if cbroman:
- filldraw stroke z5e--z6e;
- dish_serif(6,5,a,1/3,.8jut,b,1/3,.8jut);
- else:
- filldraw circ_stroke z6e--z5e;
- fi
- else:
- pickup pencircle xscaled vstem yscaled .5vstem rotated 30;
- x1=1.5u; x2=w-x1;
- y1=y2=x_height-.3vstem;
- draw z1..z2..cycle;
- penpos3(hair,0); penpos4(stem,0);
- y3=y1-.5(x2-x1);
- x3=x4=.5w; y4=0;
- filldraw circ_stroke z4e---z3e;
- fi
- penlabels(1,2,3,4,5,6);
-endchar;
-
-currentbreadth:=0;
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-cmchar "The lowercase numeral sanpi";
-beginchar(oct"033",if monospace:9else:13fi u#,asc_height#,0);
- adjust_fit(0,0);
- if cursive:
- if slitex or monospace: pickup fine.nib else: pickup crisp.nib fi;
- pos1(.3[hair,stem],90); pos2(stem,0);
- lft x1r=w-rt x2r=u; top y1r=h+oo; bot y2r=0;
- path p_san; p_san:= z1{right}..{down}z2;
- filldraw stroke z1e{right}..{down}z2e;
- pair zA,zB; z3= point 1/3 of p_san; z4=point 2/3 of p_san;
- zA= direction 1/3 of p_san; zB=direction 2/3 of p_san;
- pos3(hair,angle(zA)); pos4(hair,angle(zB));
- z0=(x1,bar_height); numeric base_dir; base_dir=1/4angle(z2-z0);
- z5=1/4[z0,z2]; z6=.5[z5,z2];
- pos5(stem,base_dir); pos6(stem,base_dir);
- filldraw stroke z5e{dir(90+base_dir)}..{zA zscaled(0,1)}z3e;
- filldraw stroke z6e{dir(90+base_dir)}..{zB zscaled(0,1)}z4e;
- elseif cbleipzig or cbroman:
- if cbroman: pickup tiny.nib; fi
- numeric s_width, S_width; s_width=.25[hair,stem]; S_width=.5[hair,stem];
- pos1(S_width,90); pos2(stem,0);
- lft x1r-s_width/2=w-rt x2r=u; top y1r=h+oo; bot y2r=s_width/2-oo;
- path p_san; p_san:= z1{right}..{down}z2;
- filldraw double_circ_stroke z1e{right}..{down}z2e;
- pair zA,zB,zC; z3= point 2/5 of p_san; z4=point 3/5 of p_san;
- zA= direction 2/5 of p_san; zB=direction 3/5 of p_san;
- zC=direction 1/2 of p_san rotated -90;
- pos3(s_width,angle(zA)); pos4(s_width,angle(zB));
- z5=z3+5u*dir(angle(zC)); z6=z4+5u*dir(angle(zC));
- pos5(s_width,angle(zC)+90); pos6(s_width,angle(zC)+90);
- filldraw circ_stroke z5e..z3e;
- filldraw circ_stroke z6e..z4e;
- else:
- if serifs: pickup crisp.nib; else: pickup fine.nib; fi
- pos1(vstem,90);
- pos2(stem,0);
- rt x2r=hround(w-.75u);
- if serifs:
- bot y2-.5(stem-currentbreadth)=-o;
- top y1r=h;
- x1-.5(vstem-currentbreadth)+x2r=w;
- filldraw double_circ_stroke z1e{right}..{down}z2e;
- else:
- y2=0;
- top y1r=h;
- lft x1+x2r=w;
- filldraw stroke z1e{right}..{down}z2e;
- fi
- path p_san; p_san:= z1{right}..{down}z2;
- numeric a_dir, b_dir; a_dir= 40; b_dir=60;
- pos3(vair,-a_dir); pos4(stem,0);
- pos5(vair,-b_dir); pos6(stem,0);
- z3=directionpoint dir(-a_dir) of p_san;
- z5=directionpoint dir(-b_dir) of p_san;
- x4l=x1; y4=if slitex:.8 fi bar_height;
- x6=.5w; y6=.5y4;
- if serifs:
- filldraw circ_stroke z4e{up}..{dir(90-a_dir)}z3e;
- filldraw circ_stroke z6e{up}..{dir(90-b_dir)}z5e;
- else:
- filldraw stroke z4e{up}..{dir(90-a_dir)}z3e;
- filldraw stroke z6e{up}..{dir(90-b_dir)}z5e;
- fi
- fi
- path p_san; numeric a_dir,b_dir;
-penlabels(1,2,3,4,5,6);
-endchar;
-
-currentbreadth:=0;
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-cmchar "The greek numeral right apex anw tonos";
- beginchar(oct"376",3.5u#,acc_ht#,0);
- adjust_fit(0,0);
- acute(2/5w);
-endchar;
-
-currentbreadth:=0;
-
-cmchar "The greek numeral left apex katw tonos";
-beginchar(oct"377",3.5u#,acc_ht#,desc_depth#);
- adjust_fit(0,0);
- numeric accent_tilt, alto, basso; accent_tilt:=-30;
- alto:=-.8(acc_ht - x_height); basso:=0;
- 2/3[x22,x21]=.5w;
-if serifs: pickup crisp.nib;
- accent_tilt:= (accent_tilt+angle(alto-basso,.5currentbreadth));
- pos22(max(stem/5,currentbreadth+eps),accent_tilt); pos21(stem,accent_tilt);
- top y22=basso; bot y21-.5stem=alto;
- z21-z22=whatever*dir(90+accent_tilt);
- filldraw circ_stroke z21e--z22e; % diagonal
-else: pickup fine.nib;
- accent_tilt:= accent_tilt;
- pos21(stem,0); pos22(vair,0);
- bot y21=alto; top y22=basso; x22-x21=(alto-basso)*sind accent_tilt;
- filldraw stroke z21e--z22e; % diagonal
-fi
-penlabels(21,22);
-currentbreadth:=0;
-endchar;
-
-currentbreadth:=0;
-
-cmchar "The greek numeral centered dot";
-beginchar(oct"046",5u#,dot_size#,0);
- adjust_fit(0,0); pickup fine.nib;
- pos1(dot_diam,0); pos2(dot_diam,90);
- lft x1l=hround(.5w-.5dot_diam); y2=0; z1=z2; dot(1,2); % dot
- currentpicture:=currentpicture shifted (0,math_axis);
-endchar;
-
-currentbreadth:=0;
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Capital Greek numerals
-
-
-cmchar "Capital Qoppa";
-beginchar(oct"025",9u#,cap_height#,0);
-adjust_fit(0,0);
-pickup fine.nib;
-pos1(cap_stem,0); x1=w/2; y1=.65x_height;
-pos2(cap_stem,0); x2=x1; bot y2=0;
-filldraw stroke z1e--z2e;
-if serifs:
- dish_serif(2,1,a,1/3,cap_jut,b,1/3,cap_jut); % serif
-fi
-pickup crisp.nib;
-z3=z7=z1; pos3(hair,-90); pos7(hair,-90);
-pos5(hair,90); x5=x3; top y5r=h+oo;
-pos4(cap_stem,0-angle((1,slant))); %y4=.5[y3,y5]; x1=.5[x6,x4];
-pos6(cap_stem,180-angle((1,slant))); %y6=y4; lft x6r=.6u;
-.5[z4,z6]=.5[z3,z5]; z4-z6=whatever*(1,-.25slant); lft x6r=.6u;
-filldraw stroke z3e{right}...z4e...z5e...z6e...{right}z7e;
-penlabels(1,2,3,4,5,6,7,8,9);
-endchar;
-
-
-
-
-cmchar "Capital Stigma";
-beginchar(oct"026",14u#,cap_height#,0);
-italcorr cap_height#*slant-beak_jut#-.25u#;
-adjust_fit(0,0);
-h:=vround(h-2stem_corr);
-pickup tiny.nib;
-pos1(cap_stem,0); pos2(cap_stem,0);
-lft x1l=lft x2l=hround(.6w-.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-.65u); y4=good.y(y3l-beak)-eps;
-if serifs:
- arm(3,4,e,beak_darkness,.7beak_jut); % right arm and beak
- serif(2,1,b,1/3,cap_jut); % bottom serif
-fi
-pickup crisp.nib;
-pos5(cap_stem,90);x5r=x1l-tiny/2; y5r=y3r;
-pos6(cap_stem,-90); x6r=x5r; y6r=y2r-tiny/2;
-pos7(cap_stem,180); lft x7r=w-x4r; y7=.5[y1,y2];
-pos8(hair,90); pos9(hair,-90); x8=x9=.55[x7l,x2l]; y9r=y2l-tiny/2; y8r=y3r;
-filldraw stroke z8e{left}..z7e..z9e{right};
-filldraw z5r--z8r--z8l{right}...{down}z5l--cycle;
-filldraw z6r--z9r--z9l{right}...{up}z6l--cycle;
-x10=x2;y10=y2-tiny/2; filldraw z10--z6r--z6--cycle;
-penlabels(1,2,3,4,5,6,7,8,9,10);
-endchar;
-
-
-
-cmchar"Capital Sampi";
-beginchar(oct"027",12u#,cap_height#,0);
-adjust_fit(if serifs:-.2u#,2u# else:-u#,0.5 u# fi);
-pickup tiny.nib;
-z1r=(w/4,h); z2r=(w-tiny/2,tiny/2);
-pos2(cap_stem,0); z1l-z2l=whatever*(z1r-z2r); z1r-z1l=whatever*up; z1=.5[z1r,z1l];
-filldraw stroke z1e--z2e;
-z3=.2[z1l,z2l]; pos3(stem,angle(z1l-z2l));
-numeric angolo; angolo=angle((z1l-z2l)xscaled-.4);
-z4-z3=whatever*dir(angolo); y4=tiny/2;
-z4r-z3r=whatever*(z4-z3); y4r=tiny/2; z4=.5[z4r,z4l];
-filldraw stroke z3e--z4e;
-z5=.4[z3l,z2l];pos5(stem,angle(z1l-z2l));
-z6=z5+whatever*dir(angolo); y6=y4;
-z6r=z5r+whatever*(z5-z6); y6r=y6; z6=.5[z6r,z6l];
-filldraw stroke z5e--z6e;
-if serifs:
-dish_serif(2,1,a,1/3,cap_jut,b,1/3,.8cap_jut); % right serif
-dish_serif(4,3,c,1/3,jut,d,1/3,jut); % left serif
-dish_serif(6,5,e,1/3,jut,f,1/3,jut); % center serif
-fi
-penlabels(1,2,3,4,5,6,7,8);
-endchar;
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% Athenian digits; this is the subset that includes the multiples of 50
-
-
-
-cmchar "Athenian numeral pente-deka";
-beginchar(2,15u#,cap_height#,0);
-adjust_fit(0,0);
-numeric PIstem; PIstem:=fudged.cap_stem-3stem_corr;
-if monospace and (gensize < 10): % small typewriter sizes!
- numeric penna; penna:= PIstem*(.5+gensize/20);
- pickup pencircle scaled penna;
- x1=u+PIstem+penna; .5[x1,x4]=.5w;
- y1=y4=.5penna;
- x2-x1=x4-x3; x3=x2+apex_corr;
- y2=y3=h-PIstem-penna;
- draw z1--z2--z3--z4--z1;
-else:
- numeric left_stem,alpha;
- left_stem=cap_hair if hefty: -3stem_corr fi;
- x1l=w-x4r=u+1.5stem;
- y1=y4=0;
- x2-x1=x4-x3; x3r=x2r+apex_corr;
- y2=y3=h-1.5PIstem;
- alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr);
- penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0);
- penpos3(alpha*cap_stem,0); penpos4(alpha*cap_stem,0);
- fill diag_end(2l,1l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)--cycle; % triangle
- z0=whatever[z1r,z2r]=whatever[z3l,z4l];
- y5=y6=cap_vstem; z5=whatever[z1r,z2r]; z6=whatever[z3l,z4l];
- if y0<y3-cap_notch_cut: y0:=y3-cap_notch_cut;
- if gensize>7:
- unfill z0+.5right...{z4-z3}z6--z5{z2-z1}...z0+.5left--cycle; % counter
- else:
- unfill z0--z5--z6--cycle;
- fi
- else:
- unfill z0--z5--z6--cycle;
- fi % counter
-fi
-%
-pickup if monospace:pencircle else:pensquare fi scaled PIstem slanted slant;
-lft x50=lft x51=u = w-rt x53; x53=x52;
-bot y50=bot y53=0; top y51=top y52=h;
-draw (z50)--(z51)--(z52)--(z53);
-penlabels(0,1,2,3,4,5,6,50,51,52,53);
-endchar;
-
-currentbreadth:=0;
-
-
-cmchar "Athenian numeral pente-hkaton";
-beginchar(3,15u#,cap_height#,0);
-italcorr cap_height#*slant-.5u;
-adjust_fit(0,0);
-numeric PIstem; PIstem:=fudged.cap_stem-3stem_corr;
-pickup tiny.nib; pos1(stem,0); pos2(stem,0);
-pos3(stem,0); pos4(stem,0);
-lft x1l=lft x2l=hround (u+1.5PIstem if serifs:+if monospace:.3else:.5fi cap_jut fi);
-x3=x4=w-x1;
-top y1=top y3=h-1.5PIstem; bot y2=bot y4=0;
-filldraw stroke z1e--z2e; % left stem
-filldraw stroke z3e--z4e; % right stem
-penpos5(bar,90); penpos6(bar,90);
-x5=x1; x6=x3; y5=y6=.52y1;
-fill stroke z5e--z6e; % bar
-if serifs:
- numeric inner_jut,outer_jut;
- if monospace:
- outer_jut=.4jut; inner_jut=.3jut;
- else:
- outer_jut=.7jut;inner_jut=.5stem;
- fi
- dish_serif(1,2,a,1/3,outer_jut,b,1/3,inner_jut); % upper left serif
- dish_serif(2,1,c,1/3,outer_jut,d,1/3,inner_jut); % lower left serif
- dish_serif(3,4,e,1/3,inner_jut,f,1/3,outer_jut); % upper right serif
- dish_serif(4,3,g,1/3,inner_jut,h,1/3,outer_jut); % lower right serif
-fi
-%
-pickup if monospace:pencircle else:pensquare fi scaled PIstem slanted slant;
-lft x50=lft x51=u = w-rt x53; x53=x52;
-bot y50=bot y53=0; top y51=top y52=h;
-draw (z50)--(z51)--(z52)--(z53);
-penlabels(1,2,3,4,5,6);
-endchar;
-
-currentbreadth:=0;
-
-cmchar "Athenian numeral pente-qilioi";
-beginchar(4,15u#,cap_height#,0);
-italcorr cap_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric stem[],outer_jut,xjut,alpha[];
-stem1=cap_stem-2stem_corr; stem2=min(cap_hair,stem1);
-outer_jut=if monospace:-.2else:.7fi jut ; xjut= if serifs: (stem1-stem2)/4 else: 0 fi;
-numeric PIstem; PIstem:=fudged.cap_stem-3stem_corr;
-%
-lft x1l=u+1.5PIstem+outer_jut; % top left
-lft x3l=x1l+xjut; % bottom left
-%
-rt x2r=x4r-xjut; % top right
-rt x4r=w-u-1.5PIstem-outer_jut; % bottom right
-%
-top y1=top y2=h-1.5PIstem; bot y3= bot y4=0;
-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);
-if hefty: z0=whatever[z1,z4]=whatever[z2,z3];
- x12=x34=x0; y13=y24=y0;
- z12=whatever[z2l,z3l]; z13=whatever[z2l,z3l];
- z24=whatever[z2r,z3r]; z34=whatever[z2r,z3r];
- forsuffixes $=13,24,34: z$'=.1[z$,z0]; endfor
- fill diag_end(12,1r,.5,1,1l,13')--z13'--diag_end(13',3l,1,.5,3r,34')--z34'
- --diag_end(34',4l,.5,1,4r,24')--z24'
- --diag_end(24',2r,1,.5,2l,12)--z12--cycle; % diagonals
-else: fill diag_end(4r,1r,.5,1,1l,4l)
- --diag_end(1l,4l,.5,1,4r,1r)--cycle; % left diagonal
- fill diag_end(2l,3l,.5,1,3r,2r)
- --diag_end(3r,2r,.5,1,2l,3l)--cycle; fi % right diagonal
-if serifs and (not monospace):
- pickup tiny.nib;
- numeric inner_jut[];
- prime_points_inside(1,4); prime_points_inside(2,3);
- prime_points_inside(3,2); prime_points_inside(4,1);
- 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
- 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
- dish_serif(1',4,a,1/3,outer_jut,b,2/3,inner_jut1); % upper left serif
- dish_serif(4',1,c,2/3,inner_jut2,d,1/3,outer_jut); % lower right serif
- dish_serif(2',3,e,2/3,inner_jut1+xjut,f,1/2,outer_jut+xjut)(dark); % upper right serif
- dish_serif(3',2,g,1/2,outer_jut+xjut,h,2/3,inner_jut2+xjut)(dark); % lower left serif
-fi
-%
-pickup if monospace:pencircle else:pensquare fi scaled PIstem slanted slant;
-lft x50=lft x51=u = w-rt x53; x53=x52;
-bot y50=bot y53=0; top y51=top y52=h;
-draw (z50)--(z51)--(z52)--(z53);
-penlabels(0,1,2,3,4,12,13,24,34,50,51,52,53);
-endchar;
-
-currentbreadth:=0;
-
-cmchar "Athenian numeral pente-muria";
-beginchar(5,15u#,cap_height#,0);
-italcorr cap_height#*slant-.5u#;
-adjust_fit(0,0);
-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 stem4<stem1: stem4:=stem1; fi
-pickup tiny.nib;
-numeric PIstem; PIstem:=fudged.cap_stem-3stem_corr;
-pos1(stem1,0); pos2(stem1,0);
-pos3(stem4,0); pos4(stem4,0);
-x1=x2; x3=x4; x1l=w-x3r;
-rt x3r=hround (w-u-1.5PIstem if monospace:-.3else:-.7fi jut);
-top y1=top y3=h-1.5PIstem; 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;
-top y5=top y8=top y1 if serifs:+1/4slab elseif slitex:+.5tiny fi; y6=y7;
-if monospace:
- y6=vround (1/2*(y1));
- filldraw stroke z1--z6--z3;
-else:
- if hefty: y6=o;
- numeric upper_notch,lower_notch;
- upper_notch=top y1-notch_cut; lower_notch=y6+notch_cut;
- 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'<upper_notch: {right}(x1'+1,upper_notch){down}... fi
- {z6-z5}diag_in(5l,6l,1,6r)..diag_out(7l,1,7r,8r){z8-z7}
- if y3'<upper_notch: ...{up}(x3'-1,upper_notch){right} fi
- ..z8r--diag_out(8r,1,8l,7l){z7-z8}
- if y0<=lower_notch: ..{z7-z8}z0{z5-z6}..
- else: ...{down}(x0+.5,lower_notch)--(x0-.5,lower_notch){up}... fi
- {z5-z6}diag_in(6r,5r,1,5l)--cycle; % diagonals
- else: y6=0; z0=whatever[z5r,z6r]=whatever[z7l,z8l];
- fill z5l..{z6-z5}diag_in(5l,6l,1,6r)..diag_out(7l,1,7r,8r){z8-z7}
- ..z8r--diag_out(8r,1,8l,7l){z7-z8}..{z7-z8}z0{z5-z6}
- ..{z5-z6}diag_in(6r,5r,1,5l)--cycle; fi % diagonals
-fi
-if serifs and(not monospace):
- serif(1,2,a,1/3,-.7jut); % upper left serif
- serif(3,4,d,1/3,.7jut); % upper right serif
-fi
-if serifs: numeric low_i_jut,low_o_jut;
-low_i_jut:=if monospace:.3else:.7fi jut;
-low_o_jut:=if monospace:.4else:.7fi jut;
- dish_serif(2,1,b,1/2,low_o_jut,c,1/2,low_i_jut)(dark); % lower left serif
- dish_serif(4,3,e,1/3,low_i_jut,f,1/3,low_o_jut); % lower right serif
-fi
-%
-pickup if monospace: pencircle else:pensquare fi scaled PIstem slanted slant;
-lft x50=lft x51=u = w-rt x53; x53=x52;
-bot y50=bot y53=0; top y51=top y52=h;
-draw (z50)--(z51)--(z52)--(z53);
-penlabels(0,1,1',2,3,3',4,5,6,7,8); endchar;
-
-currentbreadth:=0;
-
-
-
-endinput;
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% The symbol Tao may be inserted for compatibility with the previous use
-% of the Greek fonts that relied on Yannis Haralambous' rgrsc10 font
-% which included this symbol. I redesigned it completely in order
-% to have it turn out acceptably with all shapes. It is not a digit, but
-% it is neither a punctuation mark nor a letter, so I leave it in this
-% file. (CB)
-
-
-cmchar "The symbol Tao";
-beginchar(1,18u# if slitex:-3u# fi,body_height#,desc_depth#);
-adjust_fit(0,0);
-% always draw this symbol unslanted
-transform t_tao; t_tao=currenttransform;
-currenttransform:=currenttransform slanted (-slant);
-numeric raggio; raggio=.5min(w,h+d);
-pickup pencircle scaled (raggio/18);
-y3=math_axis; x3=.5w;
-z1=z3+(0,raggio);
-z3=.5[z1,z2]=.5[z4,z7]=.5[z5,z6];
-z4=z3+(0,.7raggio);
-.5[z4,z5]=.5[z3,z1];
-path pa,pb,pc,pe,pf,pg;
-pa:=z2..z1..cycle; pg:= subpath (0,1) of pa;
-pb:=z1..z3..cycle; pe:= subpath (0,1) of pb;
-pc:=z2..z3..cycle; pf:= subpath (0,1) of pc;
-draw pa; % external circle
-fill pg & pe & reverse pf & cycle; % right black part
-unfill z4..z5..cycle; % right white circle
-fill z6..z7..cycle; % left black circle
-penlabels(1,2,3,4,5,6,7);numeric raggio;
-path pa,pb,pc,pe,pf,pg;
-currenttransform:=t_tao; transform t_tao;
-endchar;
-
-currentbreadth:=0;
-
-
-
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbgreek.mf b/Master/texmf-dist/fonts/source/public/cb/cbgreek.mf
deleted file mode 100644
index ad2d3791a6a..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbgreek.mf
+++ /dev/null
@@ -1,60 +0,0 @@
-% file cbgreek.mf version 2.0c 2002/02/03
-% Copyright 1997 --- 2002 Claudio Beccari
-% It extracts the design size from the font name and calls the suitable
-% general parameter file for the specified font
-%
-% If the specific font driver file defines the gensize and calls the suitable
-% paramenter file, this cbgreek.mf gets input just once (font files generated
-% by Apostolos Syropoulos tex facility); otherwise this file gets input twice,
-% but the second time, thanks to the trick of defining the number cbgreek, it
-% gets immediately closed. This improves version 1.x, where the file was input
-% and completely parsed both times.
-if known cbgreek: expandafter endinput fi;
-if unknown gensize:
- message "Computing gensize from file name";
- string f_name, f_size;
- f_name:=substring(0,4) of jobname;
- f_size:=substring(4,8) of jobname;
- scantokens("gensize:="&substring(0,2)of f_size&"."&substring(2,4)of f_size);
- numeric cbgreek; cbgreek:=1;
- scantokens("input "&f_name);
-fi
- message "Generating glyphs";
- if not (serifs or slitex): SansSerif:=true fi;
- mode_setup;
- font_setup;
- if metrics:
- readfrom("cbmetre");
- else:
- readfrom("cbaccent");
- readfrom("cbupper");
- readfrom("cblower");
- readfrom("cbdigits");
- readfrom("cbpunct");
- fi
- boundarychar:=oct"375";
- if not metrics:
- if small_caps:
- readfrom("cbligsc");
- elseif monospace:
- readfrom("cbligtt");
- elseif SansSerif:
- readfrom("cblig");
- elseif cursive or cbleipzig:
- readfrom("cbligit");
- elseif cbroman:
- readfrom("cbligrm");
- else:
- readfrom("cblig");
- fi 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#;
- else: font_normal_space 6u#+2letter_fit#;
- font_normal_stretch 3u#; font_normal_shrink 2u#;
- font_quad 18u#+4letter_fit#;
- font_extra_space 2u#;
- fi
-bye.
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbgrk.mf b/Master/texmf-dist/fonts/source/public/cb/cbgrk.mf
deleted file mode 100644
index f4ffeabdb68..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbgrk.mf
+++ /dev/null
@@ -1,197 +0,0 @@
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-boolean varepsilon; varepsilon:=false;
-%mode:=smoke;
-gensize:=10;
-%gensize:=100;
-%gensize:=30;
-%gensize:=9;
-%gensize:=8;
-%gensize:=12;
-%gensize:=14.4;
-%gensize:=20;
-%gensize:=5;
-%gensize:=6;
-%gensize:=7;
-
-let generate=gobble;
-
-%input grmn;
-%input grxn;
-%input gsmn;
-%input gsxn;
-%input glmn;
-%input glin; % invisibile !
-%input glxn;
-%input gttn;
-%
-%input grmc;
-%input grxc;
-%input gsmc;
-%input gsxc;
-%input glmc;
-%input glxc;
-%input gttc;
-%
-%input grmo;
-%input grxo;
-%input gsmo;
-%input gsxo;
-%input glmo;
-%input glxo;
-%input gtto;
-%
-%input grmi;
-%input grxi;
-%input gsmi
-%input gsxi;
-%input glmi;
-%input glxi;
-%input gtti;
-%
-%input grmu;
-%input grxu;
-%input gsmu
-%input gsxu;
-%input glmu;
-%input glxu;
-%input gttu;
-%
-input gsme;
-%input gsxe;
-%input gsma;
-%input gsxa;
-%
-%input gomn
-%input goxn
-%input gomc
-%input gomi
-%input gomu
-%input goxi
-%input goxu
-%
-%input gltn
-%input gltc
-%input glto
-%
-%input grml
-%input grbl
-%input grxl
-%
-%input gmmn
-%input gmxn
-%input gmmo
-%input gmxo
-
-%input gmtr
-
-% mode_def proof = % HPLJ 6L
-% proofing:=1;
-% fontmaking:=0;
-% tracingtitles:=1;
-% pixels_per_inch:=600;
-% blacker:=.75;
-% fillin:=0.3;cursive:=true;
-
-% o_correction:=1;
-% let makebox=maketicks;
-% enddef;
-
-% mode_def proof = % HPLJ 4 %
-% proofing:=1; % mode_param (pixels_per_inch, 600); %
-% fontmaking:=0; % mode_param (blacker, .25); %
-% tracingtitles:=1; % mode_param (fillin, 0); %
-% pixels_per_inch:=600; % mode_param (o_correction, 1); %
-% blacker:=.25; %
-% fillin:=0.; %
-% o_correction:=1; %
-% let makebox=maketicks; %
-% enddef; %
-
-
-% mode_def proof = % HPLJ IIP
-% proofing:=1;
-% fontmaking:=0;
-% tracingtitles:=1;
-% pixels_per_inch:=300;
-% blacker:=0;
-% fillin:=0.2;
-% o_correction:=.6;
-% let makebox=maketicks;
-% enddef;
-
-
-% mode_def proof = % linotzzh a 2540 dpi
-% proofing:=1;
-% fontmaking:=0;
-% tracingtitles:=1;
-% pixels_per_inch:=2540;
-% blacker:=0.2;
-% fillin:=0.2;
-% o_correction:=1;
-% enddef;
-
-
-% mode_def proof = % 9-pin Epson MX/FX (240x216dpi)
-% proofing:=2;
-% tracingtitles:=1;
-% fontmaking:=0;
-% pixels_per_inch:= 240;
-% aspect_ratio:= 216 / pixels_per_inch;
-% blacker:= 0;
-% fillin:= 0;
-% o_correction:= .2;
-% let makebox=maketicks;
-% enddef;
-
-
-mode_setup;
-font_setup;
-%grayfont gray;%
-if cbleipzig:
-slantfont slant15;
-else:
-slantfont slant12;
-fi
-
-% screenchars;% non funziona con mf di MiKTeX
-if not boolean toniko: boolean toniko; fi
-
-% minimum distance between vowel and accent
-def separator=max(1,vround(1/10x_height)) enddef;
-def m_width=.6[hair,stem] enddef; % definito anche in gmetre.mf
-dot_diam#=dot_size#;dot_diam=dot_size;
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% non cancellare le righe precedenti !
-boolean squeeze;
-boolean SansSerif; if not (serifs or slitex): SansSerif:=true else: SansSerif:=false fi;
-%cursive:=true;
-%outlining:=true;
-%barebones:=true; proofing:=0; let makebox=maketicks;% per fare tutto l'alfabeto minuscolo senza accenti
-%input cbaccent;
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-
-bye.
-
-endinput;
-
-
-
-
-
-
-
-
-bye.
-
-%input cbmetre
-
-%input cbupper;
-
-%input cblower;
-
-input cbdigits;
-
-bye.
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/cblig.mf b/Master/texmf-dist/fonts/source/public/cb/cblig.mf
deleted file mode 100644
index 7d59fa286ed..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cblig.mf
+++ /dev/null
@@ -1,201 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari v.2.0b (2000/08/03)
-% Ligature and kerning table
-% CB added kernings with initial capitals preceded by spirits with or
-% without accents 1997/03/10; accent-spirit ligatures added 1997/11/03
-% Ligatures with void char corrected 1999/04/07
-% Modified ligatures for group A"U
-%
-% Thanks to Andreas Schwab for spotting some bugs and suggesting
-% the corrections
-
-diaer=oct"042"; % diaeresis (double quote key)
-Idiaer=oct"333"; % Iota with diaeresis
-Udiaer=oct"337"; % Upsilon with diaeresis
-AUkern#:=2.5u#; % check definition in cbupper.mf
-%
-ligtable "-": "-" =: oct"000"; % en-dash
-ligtable oct"000": "-" =: oct"177"; % em-dash
-ligtable "(": "(" =: oct"173"; % open quotes
-ligtable ")": ")" =: oct"175"; % close quotes
-
-ligtable "<": % rough breathing
- "~" =: oct"100", "'" =: oct"126", "`" =: oct"103",
- "a" =: oct"201", "e" =: oct"341", "h" =: oct"231", "r" =: oct"373",
- "o" =: oct"345", "w" =: oct"261", "i" =: oct"311", "u" =: oct"315",
- "A" kern-3u#, "O" kern-u#, "W" kern-.5u#;
-
-ligtable ">": % smooth breathing
- "~" =: oct"134", "'" =: oct"136", "`" =: oct"137",
- "a" =: oct"202", "e" =: oct"342", "h" =: oct"232", "r" =: oct"374",
- "o" =: oct"346", "w" =: oct"262", "i" =: oct"312", "u" =: oct"316",
- "A" kern-2.5u#, "O" kern-u#, "W" kern-.5u#;
-
-ligtable diaer: % diaeresis
- "~" =: oct"040", "'" =: oct"043", "`" =: oct"044",
- oct"375" =:| oct"035", % diaeresis at end of word becomes apostrophe
- "i" =: oct"360", "u" =: oct"364",
- "I" =: oct"333", "U" =: oct"337";
-
-ligtable oct"044": % diaeresis and grave
- "i" =: oct"361", "u" =: oct"365";
-
-ligtable oct"043": % diaeresis and acute
- "i" =: oct"362", "u" =: oct"366";
-
-ligtable oct"040": % diaeresis and circumflex
- "i" =: oct"363", "u" =: oct"367";
-
-ligtable "`": % grave
- diaer =: oct"044", "`" =: oct"034", "<"=: oct"103", ">"=: oct"137",
- "a" =: oct"200", "h" =: oct"230", "w" =: oct"260",
- "e" =: oct"340", "o" =: oct"344", "i" =: oct"310", "u" =: oct"314",
- "A" kern-2u#, "O" kern-u#, "W" kern-.5u#;
-
-ligtable "'": % acute
- diaer =: oct"043", "'" =: oct"035", "<"=: oct"126", ">"=: oct"136",
- "a" =: oct"210", "h" =: oct"240", "w" =: oct"270",
- "e" =: oct"350", "o" =: oct"354", "i" =: oct"320", "u" =: oct"324",
- "A" kern-2u#, "O" kern-u#, "W" kern-.5u#;
-
-ligtable oct"126": % rough breathing and acute
- "a" =: oct"211", "h" =: oct"241", "w" =: oct"271",
- "e" =: oct"351", "o" =: oct"355", "i" =: oct"321", "u" =: oct"325",
- "A" kern-1.5u#, "O" kern-.5u#;
-
-ligtable oct"136": % smooth breathing and acute
- "a" =: oct"212", "h" =: oct"242", "w" =: oct"272",
- "e" =: oct"352", "o" =: oct"356", "i" =: oct"322", "u" =: oct"326",
- "A" kern-1.5u#, "O" kern-.5u#;
-
-ligtable oct"137": % smooth breathing and grave
- "a" =: oct"213", "h" =: oct"253", "w" =: oct"273",
- "e" =: oct"353", "o" =: oct"357", "i" =: oct"323", "u" =: oct"327",
- "A" kern-1.5u#, "O" kern-.5u#;
-
-ligtable oct"103": % rough breathing and grave
- "a" =: oct"203", "h" =: oct"243", "w" =: oct"263",
- "e" =: oct"343", "o" =: oct"347", "i" =: oct"313", "u" =: oct"317",
- "A" kern-1.5u#, "O" kern-.5u#;
-ligtable "~": % circumflex
- diaer =: oct"040", "<"=: oct"100", ">"=: oct"134",
- "a" =: oct"220", "h" =: oct"250", "w" =: oct"300",
- "i" =: oct"330", "u" =: oct"334","A" kern-2u#;
-
-ligtable oct"100": % rough breathing and circumflex
- "a" =: oct"221", "h" =: oct"251", "w" =: oct"301",
- "i" =: oct"331", "u" =: oct"335", "A" kern-2u#;
-
-ligtable oct"134": % smooth breathing and circumflex
- "a" =: oct"222", "h" =: oct"252", "w" =: oct"302",
- "i" =: oct"332", "u" =: oct"336","A" kern-2u#;
- % iota subscripts
-ligtable "a": "|" =: oct"370";
-ligtable "h": "|" =: oct"371";
-ligtable "w": "|" =: oct"372";
-ligtable oct"200": "|" =: oct"204";
-ligtable oct"201": "|" =: oct"205";
-ligtable oct"202": "|" =: oct"206";
-ligtable oct"203": "|" =: oct"207";
-ligtable oct"210": "|" =: oct"214";
-ligtable oct"211": "|" =: oct"215";
-ligtable oct"212": "|" =: oct"216";
-ligtable oct"213": "|" =: oct"217";
-ligtable oct"220": "|" =: oct"224";
-ligtable oct"221": "|" =: oct"225";
-ligtable oct"222": "|" =: oct"226";
-ligtable oct"230": "|" =: oct"234";
-ligtable oct"231": "|" =: oct"235";
-ligtable oct"232": "|" =: oct"236";
-ligtable oct"240": "|" =: oct"244";
-ligtable oct"241": "|" =: oct"245";
-ligtable oct"242": "|" =: oct"246";
-ligtable oct"243": "|" =: oct"247";
-ligtable oct"250": "|" =: oct"254";
-ligtable oct"251": "|" =: oct"255";
-ligtable oct"252": "|" =: oct"256";
-ligtable oct"253": "|" =: oct"257";
-ligtable oct"260": "|" =: oct"264";
-ligtable oct"261": "|" =: oct"265";
-ligtable oct"262": "|" =: oct"266";
-ligtable oct"263": "|" =: oct"267";
-ligtable oct"270": "|" =: oct"274";
-ligtable oct"271": "|" =: oct"275";
-ligtable oct"272": "|" =: oct"276";
-ligtable oct"273": "|" =: oct"277";
-ligtable oct"300": "|" =: oct"304";
-ligtable oct"301": "|" =: oct"305";
-ligtable oct"302": "|" =: oct"306";
-
-
- % sigma ligatures
-% left sigma is replaced with final sigma, while right character is preserved
-
-ligtable "s":"." =:| "c", "," =:| "c", ";" =:| "c",
- ":" =:| "c", "?" =:| "c", "!" =:| "c",
- ")" =:| "c", "/" =:| "c", "]" =:| "c",
- oct"375" =:| "c", oct"052" =:| "c", oct"035" =:| "c";
-
-ligtable "v": "v"=: "v", "A"=: "A", "B"=: "B", "G"=: "G", "D"=: "D",
- "E"=: "E", "Z"=: "Z", "H"=: "H", "J"=: "J", "I"=: "I",
- "K"=: "K", "L"=: "L", "M"=: "M", "N"=: "N", "X"=: "X",
- "O"=: "O", "P"=: "P", "R"=: "R", "S"=: "S", "T"=: "T",
- "U"=: "U", "F"=: "F", "Q"=: "Q", "Y"=: "Y", "W"=: "W";.
-
- % kernings
-
-ligtable "i": oct"310": oct"311": oct"312": oct"320": oct"321": oct"322":
- oct"330": oct"331": oct"332": oct"360": oct"361": oct"362": oct"363":
-"t" kern-.5u#, "n" kern-u#, "c" kern-.5u#, "s" kern-.5u#, "o" kern-.5u#,
- "h" kern-.3u#, "g" kern-.5u#, "j" kern-.3u#, "q" kern-.5u#;
-ligtable "o": oct"344": oct"345": oct"346": oct"354": oct"355": oct"356":
-"l" kern-.5u#, "g" kern-.5u#, "n" kern-.4u#, "t" kern-.4u#, "q" kern-.5u#;
-ligtable "t": "a" kern-.5u#, oct"200" kern-.5u#, oct"201" kern-.5u#,
- oct"202" kern-.5u#, oct"204" kern-.5u#, oct"205" kern-.5u#,
- oct"206" kern-.5u#, oct"210" kern-.5u#, oct"211" kern-.5u#,
- oct"212" kern-.5u#, oct"214" kern-.5u#, oct"215" kern-.5u#,
- oct"216" kern-.5u#, oct"220" kern-.5u#, oct"221" kern-.5u#,
- oct"222" kern-.5u#, oct"224" kern-.5u#, oct"225" kern-.5u#,
- oct"226" kern-.5u#,
- "w" kern-.5u#, oct"260" kern-.5u#, oct"261" kern-.5u#,
- oct"262" kern-.5u#, oct"264" kern-.5u#, oct"265" kern-.5u#,
- oct"266" kern-.5u#, oct"270" kern-.5u#, oct"271" kern-.5u#,
- oct"272" kern-.5u#, oct"274" kern-.5u#, oct"275" kern-.5u#,
- oct"276" kern-.5u#, oct"300" kern-.5u#, oct"301" kern-.5u#,
- oct"302" kern-.5u#, oct"304" kern-.5u#, oct"305" kern-.5u#,
- oct"306" kern-.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"345" kern-.5u#,
- oct"346" kern-.5u#, oct"354" kern-.5u#, oct"355" kern-.5u#,
- oct"356" kern-.5u#;
-%
-% oct"014"=A" is the same glyph as A, but is in a different position
-% oct"015" is a version of Udiaer preshifted by the amount AUkern to the left
-%
-ligtable oct"014": "U" |=: oct"015", % (A")+(U)-> (A")+(shifted Udiaer)
- "I" |=: Idiaer, % (A")+(I)-> (A")+(Idiaer)
- "~" |=: oct"040", % (A")+(')-> (A")+("~)
- "`" |=: oct"044", % (A")+(')-> (A")+("`)
- "'" |=: oct"043"; % (A")+(')-> (A")+("')
-ligtable "A": "|"=: oct"011",
- diaer =: oct"014", % (A)+(") -> (A")
- "U" kern-2.5u#, Udiaer kern-AUkern#,
- "J" kern-1.5u#, "O" kern-1.5u#, "T" kern-1.5u#, "F" kern-1.5u#, "Y" kern-2.2u#;
-ligtable "H": "|"=: oct"012";
-ligtable "O": "A" kern-1.5u#, "S" kern-u#;
-ligtable "U": Udiaer: oct"015": "A" kern-AUkern#, "D" kern-2.5u#, "L" kern-2.5u#;
-ligtable "W": "|"=: oct"013", "'"=:"W", "`"=:"W", "<"=:"W", ">"=:"W", "~"=:"W";
-
-ligtable "G": "A" kern -2.4u#, "D" kern -2u#, "L" kern -2.2u#;
-ligtable "D": "U" kern-2.5u#, "O" kern-.6u#;
-ligtable "J": "A" kern-1.5u#;
-ligtable "K": "O" kern-1.5u#;
-ligtable "L": "U" kern-1.8u#, "O" kern-.6u#;
-ligtable "N": "A" kern -1.5u#;
-ligtable "R": "A" kern-3u#;
-ligtable "S": "A" kern-.5u#;
-ligtable "T": "A" kern-1.5u#;
-ligtable "F": "A" kern-1.5u#;
-ligtable "Y": "A" kern-2.2u#;
-
-
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbligit.mf b/Master/texmf-dist/fonts/source/public/cb/cbligit.mf
deleted file mode 100644
index 7b88cbea320..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbligit.mf
+++ /dev/null
@@ -1,682 +0,0 @@
-% Copyright (C) 1998, 2000, 2001 Claudio Beccari v.2.0f (2001/01/29)
-% Ligature and kerning table: italic/cursive/leipzig fonts
-% (CB modified ligatures and kerns for group A"U 2000/02/13)
-%
-% Thanks to Andreas Schwab for spotting some bugs and suggesting
-% the corrections
-% Ligatures with void char corrected 1999/04/07
-% ligatures between capital and iota adscript 1999/10/25
-% added ligatures for cbleipzig greek 2001/01/29
-
-diaer=oct"042"; % diaeresis (double quote key)
-Idiaer=oct"333"; % Iota with diaeresis
-Udiaer=oct"337"; % Upsilon with diaeresis
-AUkern#:=2.5u#; % check definition in cbupper.mf
-sampi=oct"33"; % with cbleipzig some kernings are needed when
- % writing milesian numbers
-%
-ligtable "-": "-" =: oct"000"; % en-dash
-ligtable oct"000": "-" =: oct"177"; % em-dash
-ligtable "(": "(" =: oct"173"; % open quotes
-ligtable ")": ")" =: oct"175"; % close quotes
-
-ligtable "<": % rough breathing
- "~" =: oct"100", "'" =: oct"126", "`" =: oct"103",
- "a" =: oct"201", "e" =: oct"341", "h" =: oct"231", "r" =: oct"373",
- "o" =: oct"345", "w" =: oct"261", "i" =: oct"311", "u" =: oct"315",
- "A" kern-3u#, "O" kern-u#, "W" kern-.5u#;
-
-ligtable ">": % smooth breathing
- "~" =: oct"134", "'" =: oct"136", "`" =: oct"137",
- "a" =: oct"202", "e" =: oct"342", "h" =: oct"232", "r" =: oct"374",
- "o" =: oct"346", "w" =: oct"262", "i" =: oct"312", "u" =: oct"316",
- "A" kern-2.5u#, "O" kern-u#, "W" kern-.5u#;
-
-ligtable diaer: % diaeresis
- "~" =: oct"040", "'" =: oct"043", "`" =: oct"044",
- oct"375" =:| oct"035", % diaeresis at end of word becomes apostrophe
- "i" =: oct"360", "u" =: oct"364",
- "I" =: oct"333", "U" =: oct"337";
-
-ligtable oct"044": % diaeresis and grave
- "i" =: oct"361", "u" =: oct"365";
-
-ligtable oct"043": % diaeresis and acute
- "i" =: oct"362", "u" =: oct"366";
-
-ligtable oct"040": % diaeresis and circumflex
- "i" =: oct"363", "u" =: oct"367";
-
-ligtable "`": % grave
- diaer =: oct"044", "`" =: oct"034", "<"=: oct"103", ">"=: oct"137",
- "a" =: oct"200", "h" =: oct"230", "w" =: oct"260",
- "e" =: oct"340", "o" =: oct"344", "i" =: oct"310", "u" =: oct"314",
- "A" kern-2u#, "O" kern-u#, "W" kern-.5u#;
-
-ligtable "'": % acute
- diaer =: oct"043", "'" =: oct"035", "<"=: oct"126", ">"=: oct"136",
- "a" =: oct"210", "h" =: oct"240", "w" =: oct"270",
- "e" =: oct"350", "o" =: oct"354", "i" =: oct"320", "u" =: oct"324",
- "A" kern-2u#, "O" kern-u#, "W" kern-.5u#;
-
-ligtable oct"126": % rough breathing and acute
- "a" =: oct"211", "h" =: oct"241", "w" =: oct"271",
- "e" =: oct"351", "o" =: oct"355", "i" =: oct"321", "u" =: oct"325",
- "A" kern-1.5u#, "O" kern-.5u#;
-
-ligtable oct"136": % smooth breathing and acute
- "a" =: oct"212", "h" =: oct"242", "w" =: oct"272",
- "e" =: oct"352", "o" =: oct"356", "i" =: oct"322", "u" =: oct"326",
- "A" kern-1.5u#, "O" kern-.5u#;
-
-ligtable oct"137": % smooth breathing and grave
- "a" =: oct"213", "h" =: oct"253", "w" =: oct"273",
- "e" =: oct"353", "o" =: oct"357", "i" =: oct"323", "u" =: oct"327",
- "A" kern-1.5u#, "O" kern-.5u#;
-
-ligtable oct"103": % rough breathing and grave
- "a" =: oct"203", "h" =: oct"243", "w" =: oct"263",
- "e" =: oct"343", "o" =: oct"347", "i" =: oct"313", "u" =: oct"317",
- "A" kern-1.5u#, "O" kern-.5u#;
-ligtable "~": % circumflex
- diaer =: oct"040", "<"=: oct"100", ">"=: oct"134",
- "a" =: oct"220", "h" =: oct"250", "w" =: oct"300",
- "i" =: oct"330", "u" =: oct"334","A" kern-2u#;
-
-ligtable oct"100": % rough breathing and circumflex
- "a" =: oct"221", "h" =: oct"251", "w" =: oct"301",
- "i" =: oct"331", "u" =: oct"335", "A" kern-2u#;
-
-ligtable oct"134": % smooth breathing and circumflex
- "a" =: oct"222", "h" =: oct"252", "w" =: oct"302",
- "i" =: oct"332", "u" =: oct"336","A" kern-2u#;
- % iota subscripts
-ligtable "a": "|" =: oct"370",
- oct"370":
- if cbleipzig:
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- oct"334" kern-1.5u#, oct"316" kern-1.5u#, oct"325" kern-1.5u#,
- oct"326" kern-1.5u#, oct"327" kern-1.5u#,
- oct"334" kern-1.5u#, oct"335" kern-1.5u#, oct"336" kern-1.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#,
- sampi kern-4u#, "j" kern-1.5u#,
- else:
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- fi
- "n" kern if cbleipzig:-1.7else:-.8fi u#, "t" kern if cbleipzig:-1.5else:-.8fi u#,
- "p" kern -.8u#, "q" kern -1.5u#,
- "y" kern -.5u#,
- if not cbleipzig:"m" kern -u#,fi
- "g" kern -1.5u#;
-ligtable oct"200": "|" =: oct"204",
- oct"204":
- if cbleipzig:
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#, "j" kern-1.5u#,
- else:
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- fi
- "n" kern if cbleipzig:-1.5else:-.8fi u#, "t" kern if cbleipzig:-1.5else:-.8fi u#, "p" kern -.8u#, "q" kern -1.5u#,
- "y" kern -.5u#, if not cbleipzig:"m" kern -u#,fi "g" kern -1.5u#;
-ligtable oct"201": "|" =: oct"205",
- oct"205":
- if cbleipzig:
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#, "j" kern-1.5u#,
- else:
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- fi
- "n" kern if cbleipzig:-1.5else:-.8fi u#, "t" kern if cbleipzig:-1.5else:-.8fi u#, "p" kern -.8u#, "q" kern -1.5u#,
- "y" kern -.5u#, if not cbleipzig:"m" kern -u#,fi "g" kern -1.5u#;
-ligtable oct"202": "|" =: oct"206",
- oct"206":
- if cbleipzig:
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#, "j" kern-1.5u#,
- else:
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- fi
- "n" kern if cbleipzig:-1.5else:-.8fi u#, "t" kern if cbleipzig:-1.5else:-.8fi u#, "p" kern -.8u#, "q" kern -1.5u#,
- "y" kern -.5u#, if not cbleipzig:"m" kern -u#,fi "g" kern -1.5u#;
-ligtable oct"203": "|" =: oct"207",
- oct"207":
- if cbleipzig:
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#, "j" kern-1.5u#,
- else:
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- fi
- "n" kern if cbleipzig:-1.5else:-.8fi u#, "t" kern if cbleipzig:-1.5else:-.8fi u#, "p" kern -.8u#, "q" kern -1.5u#,
- "y" kern -.5u#, if not cbleipzig:"m" kern -u#,fi "g" kern -1.5u#;
-ligtable oct"210": "|" =: oct"214",
- oct"214":
- if cbleipzig:
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#, "j" kern-1.5u#,
- else:
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- fi
- "n" kern if cbleipzig:-1.5else:-.8fi u#, "t" kern if cbleipzig:-1.5else:-.8fi u#, "p" kern -.8u#, "q" kern -1.5u#,
- "y" kern -.5u#, if not cbleipzig:"m" kern -u#,fi "g" kern -1.5u#;
-ligtable oct"211": "|" =: oct"215",
- oct"215":
- if cbleipzig:
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#, "j" kern-1.5u#,
- else:
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- fi
- "n" kern -.8u#, "t" kern if cbleipzig:-1.5else:-.8fi u#, "p" kern -.8u#, "q" kern -1.5u#,
- "y" kern -.5u#, if not cbleipzig:"m" kern -u#,fi "g" kern -1.5u#;
-ligtable oct"212": "|" =: oct"216",
- oct"216":
- if cbleipzig:
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#, "j" kern-1.5u#,
- else:
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- fi
- "n" kern if cbleipzig:-1.5else:-.8fi u#, "t" kern if cbleipzig:-1.5else:-.8fi u#, "p" kern -.8u#, "q" kern -1.5u#,
- "y" kern -.5u#, if not cbleipzig:"m" kern -u#,fi "g" kern -1.5u#;
-ligtable oct"213": "|" =: oct"217",
- oct"217":
- if cbleipzig:
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#, "j" kern-1.5u#,
- else:
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- fi
- "n" kern if cbleipzig:-1.5else:-.8fi u#, "t" kern if cbleipzig:-1.5else:-.8fi u#, "p" kern -.8u#, "q" kern -1.5u#,
- "y" kern -.5u#, if not cbleipzig:"m" kern -u#,fi "g" kern -1.5u#;
-ligtable oct"220": "|" =: oct"224",
- oct"224":
- if cbleipzig:
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#, "j" kern-1.5u#,
- else:
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- fi
- "n" kern if cbleipzig:-1.5else:-.8fi u#, "t" kern if cbleipzig:-1.5else:-.8fi u#, "p" kern -.8u#, "q" kern -1.5u#,
- "y" kern -.5u#, if not cbleipzig:"m" kern -u#,fi "g" kern -1.5u#;
-ligtable oct"221": "|" =: oct"225",
- oct"225":
- if cbleipzig:
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#, "j" kern-1.5u#,
- else:
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- fi
- "n" kern if cbleipzig:-1.5else:-.8fi u#, "t" kern if cbleipzig:-1.5else:-.8fi u#, "p" kern -.8u#, "q" kern -1.5u#,
- "y" kern -.5u#, if not cbleipzig:"m" kern -u#,fi "g" kern -1.5u#;
-ligtable oct"222": "|" =: oct"226",
- oct"226":
- if cbleipzig:
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#, "j" kern-1.5u#,
- else:
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- fi
- "n" kern if cbleipzig:-1.5else:-.8fi u#, "t" kern if cbleipzig:-1.5else:-.8fi u#, "p" kern -.8u#, "q" kern -1.5u#,
- "y" kern -.5u#, if not cbleipzig:"m" kern -u#,fi "g" kern -1.5u#;
-
-ligtable "h": "|" =: oct"371",
- oct"371": if cbleipzig: sampi kern-3u#, fi
- if not cbleipzig:"g" kern-u#,fi "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"230": "|" =: oct"234",
- oct"234":
- if not cbleipzig:"g" kern-u#,fi "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"231": "|" =: oct"235",
- oct"235":
- if not cbleipzig:"g" kern-u#,fi "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"232": "|" =: oct"236",
- oct"236":
- if not cbleipzig:"g" kern-u#,fi "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"240": "|" =: oct"244",
- oct"244":
- if not cbleipzig:"g" kern-u#,fi "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"241": "|" =: oct"245",
- oct"245":
- if not cbleipzig:"g" kern-u#,fi "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"242": "|" =: oct"246",
- oct"246":
- if not cbleipzig:"g" kern-u#,fi "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"243": "|" =: oct"247",
- oct"247":
- if not cbleipzig:"g" kern-u#,fi "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"250": "|" =: oct"254",
- oct"254":
- if not cbleipzig:"g" kern-u#,fi "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"251": "|" =: oct"255",
- oct"255":
- if not cbleipzig:"g" kern-u#,fi "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"252": "|" =: oct"256",
- oct"256":
- if not cbleipzig:"g" kern-u#,fi "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"253": "|" =: oct"257",
- oct"257":
- if not cbleipzig:"g" kern-u#, fi "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-
-ligtable "w": "|" =: oct"372",
- oct"372": "x" kern .5u#, if cbleipzig: sampi kern-3u#, fi
- "g" kern-2u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -if cbleipzig:.5else:2fi u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- if cbleipzig: "t" kern -.85u#,fi
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-ligtable oct"260": "|" =: oct"264",
- oct"264": "x" kern .5u#,
- "g" kern-2u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -if cbleipzig:.5else:2fi u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- if cbleipzig: "t" kern -.85u#,fi
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-ligtable oct"261": "|" =: oct"265",
- oct"265": "x" kern .5u#,
- "g" kern-2u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -if cbleipzig:.5else:2fi u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- if cbleipzig: "t" kern -.85u#,fi
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-ligtable oct"262": "|" =: oct"266",
- oct"266": "x" kern .5u#,
- "g" kern-2u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -if cbleipzig:.5else:2fi u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- if cbleipzig: "t" kern -.85u#,fi
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-ligtable oct"263": "|" =: oct"267",
- oct"267": "x" kern .5u#,
- "g" kern-2u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -if cbleipzig:.5else:2fi u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- if cbleipzig: "t" kern -.85u#,fi
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-ligtable oct"270": "|" =: oct"274",
- oct"274": "x" kern .5u#,
- "g" kern-2u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -if cbleipzig:.5else:2fi u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- if cbleipzig: "t" kern -.85u#,fi
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-ligtable oct"271": "|" =: oct"275",
- oct"275": "x" kern .5u#,
- "g" kern-2u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -if cbleipzig:.5else:2fi u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- if cbleipzig: "t" kern -.85u#,fi
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-ligtable oct"272": "|" =: oct"276",
- oct"276": "x" kern .5u#,
- "g" kern-2u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -if cbleipzig:.5else:2fi u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- if cbleipzig: "t" kern -.85u#,fi
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-ligtable oct"273": "|" =: oct"277",
- oct"277": "x" kern .5u#,
- "g" kern-2u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -if cbleipzig:.5else:2fi u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- if cbleipzig: "t" kern -.85u#,fi
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-ligtable oct"300": "|" =: oct"304",
- oct"304": "x" kern .5u#,
- "g" kern-2u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -if cbleipzig:.5else:2fi u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- if cbleipzig: "t" kern -.85u#,fi
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-ligtable oct"301": "|" =: oct"305",
- oct"305": "x" kern .5u#,
- "g" kern-2u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -if cbleipzig:.5else:2fi u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- if cbleipzig: "t" kern -.85u#,fi
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-ligtable oct"302": "|" =: oct"306",
- oct"306": "x" kern .5u#,
- "g" kern-2u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -if cbleipzig:.5else:2fi u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- if cbleipzig: "t" kern -.85u#,fi
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-
-
- % sigma ligatures
- % left sigma is replaced with final sigma, while right character is preserved
-
-ligtable "s":"." =:| "c", "," =:| "c", ";" =:| "c",
- ":" =:| "c", "?" =:| "c", "!" =:| "c",
- ")" =:| "c", "/" =:| "c", "]" =:| "c",
- oct"375" =:| "c", oct"052" =:| "c", oct"035" =:| "c",
- "a" kern-.8u#, oct"200" kern-.8u#, oct"204" kern-.8u#,
- oct"210" kern-.8u#, oct"214" kern-.8u#, oct"220" kern-.8u#,
- oct"224" kern-.8u#, oct"370" kern-.8u#,
- "w" kern-.5u#, oct"260" kern-.5u#, oct"264" kern-.5u#,
- oct"270" kern-.5u#, oct"274" kern-.5u#, oct"300" kern-.5u#,
- oct"304" kern-.5u#, oct"372" kern-.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#,
- if cbleipzig: sampi kern-3u#, fi
- if not cbleipzig:"e" kern-.5u#, oct"340" kern-.5u#, oct"350" kern-.5u#,fi
- "r" kern-.5u#, oct"373" kern-.5u#, oct"374" kern-.5u#;
-
-ligtable "v": "v"=: "v", "A"=: "A", "B"=: "B", "G"=: "G", "D"=: "D",
- "E"=: "E", "Z"=: "Z", "H"=: "H", "J"=: "J", "I"=: "I",
- "K"=: "K", "L"=: "L", "M"=: "M", "N"=: "N", "X"=: "X",
- "O"=: "O", "P"=: "P", "R"=: "R", "S"=: "S", "T"=: "T",
- "U"=: "U", "F"=: "F", "Q"=: "Q", "Y"=: "Y", "W"=: "W";.
-
- % kernings
-
-ligtable "i": oct"310": oct"311": oct"312": oct"320": oct"321": oct"322":
- oct"330": oct"331": oct"332": oct"360": oct"361": oct"362": oct"363":
- "t" kern if cbleipzig:-1.5else:-1fi u#, "n" kern if cbleipzig:-1else:-.3fi u#,
- "c" kern-.5u#, "s" kern-.5u#, if cbleipzig: sampi kern-3u#, fi
- "h" kern-.3u#, "g" kern if cbleipzig: -1.25else:-2fi u# ,
- "j" if cbleipzig:kern-.6u# else:kern-.3u# fi, "q" kern-1u#, "k" kern if cbleipzig:-1else:.5fi u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"345" kern-.5u#,
- oct"346" kern-.5u#, oct"354" kern-.5u#, oct"355" kern-.5u#,
- oct"356" kern-.5u#;
-
-ligtable "e": oct"340": oct"341": oct"342": oct"343": oct"350":
- oct"351": oct"352": oct"353": if cbleipzig: sampi kern-3u#, fi
- "a" kern-.5u#, oct"200" kern-.5u#, oct"204" kern-.5u#,
- oct"210" kern-.5u#, oct"214" kern-.5u#, oct"220" kern-.5u#,
- oct"224" kern-.5u#, oct"370" kern-.5u#,
- "d" kern-.5u#, "q" kern-if cbleipzig:.15else:1fi u#, "s" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable "o": oct"344": oct"345": oct"346": oct"347":
- oct"354": oct"355": oct"356": oct"357": if cbleipzig: sampi kern-3u#, fi
- "l" kern-.5u#, "g" kern-.5u#, "n" kern-.7u#, "t" kern-.6u#,
- "q" kern-if cbleipzig:.5else:2fi u#, "m" kern if cbleipzig:-0.2else:-.7fi u#,
- "u" kern-u#, oct"314" kern-u#, oct"324" kern-u#,
- oct"334" kern-u#;
-
-ligtable "u": oct"314": oct"315": oct"316": oct"317": oct"324":
- oct"325": oct"326": oct"327": oct"334": oct"335":
- oct"336": oct"364": oct"365": oct"366": oct"367":
- if not cbleipzig:"g" kern-u#, fi
- if cbleipzig: sampi kern-3u#, "j" kern-.5u#, fi
- if cbleipzig: "m" kern-.2u# else:"m" kern-.8u# fi,
- "n" kern-.7u#,
- "q" kern-.5u#,
- "y" kern .5u#;
-
-ligtable "z":
- "g" kern-2u#, "d" kern-u#, "j" kern-u#, "m" kern-u#, "n" kern-1.6u#,
- "p" kern-1.5u#, "s" kern-1.5u#, "t" kern-1.5u#, "f" kern-1.5u#,
- "q" kern-1.5u#,"y" kern-.5u#, if cbleipzig: sampi kern-u#, fi
- "h" kern-1.5u#, oct"371" kern-1.5u#, oct"230" kern-1.5u#,
- oct"234" kern-1.5u#, oct"240" kern-1.5u#, oct"244" kern-1.5u#,
- oct"250" kern-1.5u#, oct"254" kern-1.5u#,
- "u" kern-1.5u#, oct"314" kern-1.5u#, oct"324" kern-1.5u#,
- oct"334" kern-1.5u#,
- "a" kern-1.5u#, oct"200" kern-1.5u#, oct"204" kern-1.5u#,
- oct"210" kern-1.5u#, oct"214" kern-1.5u#, oct"220" kern-1.5u#,
- oct"224" kern-1.5u#, oct"370" kern-1.5u#,
- "w" kern-1.5u#, oct"260" kern-1.5u#, oct"264" kern-1.5u#,
- oct"270" kern-1.5u#, oct"274" kern-1.5u#, oct"300" kern-1.5u#,
- oct"304" kern-1.5u#, oct"372" kern-1.5u#,
- "o" kern-1.5u#, oct"344" kern-1.5u#, oct"354" kern-1.5u#,
- "e" kern-1.5u#, oct"340" kern-1.5u#, oct"350" kern-1.5u#;
-
-ligtable "t": "q" kern -.5u#, if cbleipzig: sampi kern-3u#, fi
- "a" kern-.5u#, oct"200" kern-.5u#, oct"204" kern-.5u#,
- oct"210" kern-.5u#, oct"214" kern-.5u#, oct"220" kern-.5u#,
- oct"224" kern-.5u#, oct"370" kern-.5u#,
- "w" kern-.5u#, oct"260" kern-.5u#, oct"264" kern-.5u#,
- oct"270" kern-.5u#, oct"274" kern-.5u#, oct"300" kern-.5u#,
- oct"304" kern-.5u#, oct"372" kern-.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#,
- "e" kern-.5u#, oct"340" kern-.5u#, oct"350" kern-.5u#;
-
-ligtable "j": "y" kern .5u#, if cbleipzig: sampi kern-u#, fi
- "i" kern .5u#, oct"310" kern .5u#, oct"320" kern .5u#,
- oct"330" kern .5u#
- if cbleipzig:, "e" kern.5u#, oct"340" kern.5u#, oct"350" kern.5u#fi;
-
-ligtable "k": "b" kern .5u#
- if cbleipzig:, sampi kern-3u#, "n" kern-.5u# fi;
-
-ligtable "l": "g" kern-2.5u#, "m" kern if cbleipzig:.25else:-.5fi u#, "n" kern if cbleipzig:-1.5else:-.5fi u#,
- "s" kern-.5u#, if cbleipzig: "j" kern-.8u#,fi
- "t" kern-.5u#, "q" kern-u#, if cbleipzig: sampi kern-3u#, fi
- "u" kern-u#, oct"314" kern-u#, oct"324" kern-u#,
- oct"334" kern-u#,
- if cbleipzig:
- "a" kern-.25u#, oct"200" kern-.25u#, oct"204" kern-.25u#,
- oct"210" kern-.25u#, oct"214" kern-.25u#, oct"220" kern-.25u#,
- oct"224" kern-.25u#, oct"370" kern-.25u#
- else:
- "a" kern-u#, oct"200" kern-u#, oct"204" kern-u#,
- oct"210" kern-u#, oct"214" kern-u#, oct"220" kern-u#,
- oct"224" kern-u#, oct"370" kern-u#
- fi
- if cbleipzig:;else:,"e" kern-u#, oct"340" kern-u#, oct"350" kern-u#;fi
-
-ligtable "m":
- "g" kern-1.5u#,
- "n" if cbleipzig: kern-1.5u# else:kern-.5u# fi,
- "s" kern-.5u#,
- "f" kern-.5u#,
- "q" kern-1.05u#,
- "z" kern-.5u#,
- "p" kern -.5u#,
- if cbleipzig: "j" kern -1.1u#, fi
- if not cbleipzig:
- "i" kern-.5u#, oct"310" kern-.5u#, oct"320" kern-.5u#,
- oct"330" kern-.5u#,fi if cbleipzig: sampi kern-4u#, fi
- "u" kern-u#, oct"314" kern-u#, oct"324" kern-u#,
- oct"334" kern-u#,
- "a" kern-u#, oct"200" kern-u#, oct"204" kern-u#,
- oct"210" kern-u#, oct"214" kern-u#, oct"220" kern-u#,
- oct"224" kern-u#, oct"370" kern-u#,
- "w" kern-.5u#, oct"260" kern-.5u#, oct"264" kern-.5u#,
- oct"270" kern-.5u#, oct"274" kern-.5u#, oct"300" kern-.5u#,
- oct"304" kern-.5u#, oct"372" kern-.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#;
-
-ligtable "b": "y" kern u#, "t" kern .5u#, "f" kern .5u#, "q" kern -.5u#,
- "i" kern .5u#, oct"310" kern .5u#, oct"320" kern .5u#,
- oct"330" kern .5u#, if cbleipzig: sampi kern-u#,fi
- "o" kern .5u#, oct"344" kern .5u#, oct"354" kern .5u#,
- "e" kern .5u#, oct"340" kern .5u#, oct"350" kern .5u#;
-
-if cbleipzig:
- ligtable "g": sampi kern-3u#, "q" kern.3u#;
-else:
- ligtable "g": "m" kern-u#, "n" kern-u# ;
-fi
-
-ligtable "d": "m" kern-.8u#, "n" kern-.7u#, "g" kern-1.5u#, "p" kern-.5u#,
- "q" if cbleipzig:kern-.3u# else:kern-1.5u# fi,
- if cbleipzig: sampi kern-3u#, fi
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "a" kern-.5u#, oct"200" kern-.5u#, oct"204" kern-.5u#,
- oct"210" kern-.5u#, oct"214" kern-.5u#, oct"220" kern-.5u#,
- oct"224" kern-.5u#, oct"370" kern-.5u#;
-
-ligtable "n": if not cbleipzig:"m" kern-.5u#,fi
- "n" kern-.5u#,
- if not cbleipzig: "p" kern-.5u#, fi
- "r" if cbleipzig: kern-.1u# else: kern-.5u# fi,
- if cbleipzig: "l" kern-.8u#,fi
- if not cbleipzig: "q" kern-u#, fi
- if cbleipzig: sampi kern-3u#, fi
- "a" kern if cbleipzig:-.4else:-.8fi u#, oct"200" kern if cbleipzig:-.4else:-.8fi u#, oct"204" kern if cbleipzig:-.4else:-.8fi u#,
- oct"210" kern if cbleipzig:-.4else:-.8fi u#, oct"214" kern if cbleipzig:-.4else:-.8fi u#, oct"220" kern if cbleipzig:-.4else:-.8fi u#,
- oct"224" kern if cbleipzig:-.4else:-.8fi u#, oct"370" kern if cbleipzig:-.4else:-.8fi u#,
- if cbleipzig:
- "w" kern .15u#, oct"260" kern .15u#, oct"264" kern .15u#,
- oct"270" kern .15u#, oct"274" kern .15u#, oct"300" kern .15u#,
- oct"304" kern .15u#, oct"372" kern .15u#,
- else:
- "w" kern-.5u#, oct"260" kern-.5u#, oct"264" kern-.5u#,
- oct"270" kern-.5u#, oct"274" kern-.5u#, oct"300" kern-.5u#,
- oct"304" kern-.5u#, oct"372" kern-.5u#,
- fi
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#
- if not cbleipzig:,"e" kern-.7u#, oct"340" kern-.7u#, oct"350" kern-.7u# fi;
-
-ligtable "x": "g" kern-.7u#,"s" kern-u#, "t" kern-.5u#, "f" kern-.7u#,
- "q" kern-.5u#, if cbleipzig: sampi kern-u#, "v" kern-.5u#,fi
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "a" kern if cbleipzig:-.5else:-1.5fi u#, oct"200" kern if cbleipzig:-.5else:-1.5fi u#, oct"204" kern if cbleipzig:-.5else:-1.5fi u#,
- oct"210" kern if cbleipzig:-.5else:-1.5fi u#, oct"214" kern if cbleipzig:-.5else:-1.5fi u#, oct"220" kern if cbleipzig:-.5else:-1.5fi u#,
- oct"224" kern if cbleipzig:-.5else:-1.5fi u#, oct"370" kern if cbleipzig:-.5else:-1.5fi u#,
- "o" kern-u#, oct"344" kern-u#, oct"354" kern-u#,
- "e" kern-u#, oct"340" kern-u#, oct"350" kern-u#;
-
-ligtable "p": "k" kern .5u#, "y" kern .5u#,
- "i" kern .5u#, oct"310" kern .5u#, oct"320" kern .5u#,
- oct"330" kern .5u#
- if cbleipzig:,"o" kern-u#, oct"344" kern-u#, oct"354" kern-u#, sampi kern-3u#
- fi;
-
-ligtable "r": oct"373": oct"374":
- "g" kern -u#, "z" kern .5u#, "y" kern .3u#,
- "q" if cbleipzig:kern-.2u# else:kern-.7u# fi,
- "s" kern .5u#, if cbleipzig: sampi kern-3u#, "n" kern-.9u#, fi
- "i" kern .5u#, oct"310" kern .5u#, oct"320" kern .5u#,
- oct"330" kern .5u#,
- "o" kern .5u#, oct"344" kern .5u#, oct"354" kern .5u#;
-
-ligtable "f": "g" kern -u#, "m" kern -.7u#, "n" kern -.7u#, "t" kern -.5u#,
- "q" if cbleipzig:kern -.2u# else:kern -2u# fi,
- if cbleipzig: sampi kern-3u#, fi
- "h" kern-.5u#, oct"371" kern-.5u#, oct"230" kern-.5u#,
- oct"234" kern-.5u#, oct"240" kern-.5u#, oct"244" kern-.5u#,
- oct"250" kern-u#, oct"254" kern-u#,
- "u" kern-u#, oct"314" kern-u#, oct"324" kern-u#,
- oct"334" kern-u#;
-
-ligtable "q": "s" kern -.7u#,
- if cbleipzig:
- sampi kern-3u#, "j" kern-u#, "g" kern-.8u#, "d" kern-1.2u#,
- "k" kern-u#, "l" kern-1.2u#,
- "n" kern-1.5u#, "x" kern-.8u#, "p" kern-.8u#, "r" kern-.8u#,
- "t" kern-.8u#, "f" kern -1.5u#, "y" kern-.5u#,
- "a" kern-1.2u#, oct"200" kern-1.2u#, oct"204" kern-1.2u#,
- oct"210" kern-1.2u#, oct"214" kern-1.2u#, oct"220" kern-1.2u#,
- oct"224" kern-1.2u#, oct"370" kern-1.2u#,
- "i" kern -.5u#, oct"310" kern -.5u#, oct"320" kern -.5u#,
- oct"330" kern -.5u#,
- "h" kern-1.05u#, oct"371" kern-1.05u#, oct"230" kern-1.05u#,
- oct"234" kern-1.05u#, oct"240" kern-1.05u#, oct"244" kern-1.05u#,
- oct"250" kern-1.05u#, oct"254" kern-1.05u#,
- "u" kern-.8u#, oct"314" kern-.8u#, oct"324" kern-.8u#,
- oct"334" kern-.8u#,
- "w" kern-1.2u#, oct"260" kern-1.2u#, oct"264" kern-1.2u#,
- oct"270" kern-1.2u#, oct"274" kern-1.2u#, oct"300" kern-1.2u#,
- oct"304" kern-1.2u#, oct"372" kern-1.2u#,
- else:
- "f" kern -.5u#,
- "a" kern-.5u#, oct"200" kern-.5u#, oct"204" kern-.5u#,
- oct"210" kern-.5u#, oct"214" kern-.5u#, oct"220" kern-.5u#,
- oct"224" kern-.5u#, oct"370" kern-.5u#,
- "w" kern-.5u#, oct"260" kern-.5u#, oct"264" kern-.5u#,
- oct"270" kern-.5u#, oct"274" kern-.5u#, oct"300" kern-.5u#,
- oct"304" kern-.5u#, oct"372" kern-.5u#,
- fi
- "e" kern-.5u#, oct"340" kern-.5u#, oct"350" kern-.5u#,
- "o" kern-1.5u#, oct"344" kern-1.5u#, oct"354" kern-1.5u#;
-
-
-ligtable "y": "g" kern-.7u#,
- "q" if cbleipzig:kern-.1u# else:kern-.7u# fi,
- if cbleipzig: sampi kern-3u#, fi
- "u" kern-u#, oct"314" kern-u#, oct"324" kern-u#,
- oct"334" kern-u#;
-
-if cbleipzig:
-ligtable oct"006": % stigma
- oct"007": % varstigma
- oct"022": % coppa
- sampi: sampi kern-3u#;
-ligtable oct"023": % varcoppa
- sampi kern-4u#;
-fi
-
-%
-% oct"014"=A" is the same glyph as A, but is in a different position
-% oct"015" is a version of Udiaer preshifted by the amount AUkern to the left
-%
-ligtable oct"014": "U" |=: oct"015", % (A")+(U)-> (A")+(shifted Udiaer)
- "I" |=: Idiaer, % (A")+(I)-> (A")+(Idiaer)
- "~" |=: oct"040", % (A")+(')-> (A")+("~)
- "`" |=: oct"044", % (A")+(')-> (A")+("`)
- "'" |=: oct"043"; % (A")+(')-> (A")+("')
-ligtable "A": "|"=: oct"011",
- diaer =: oct"014", % (A)+(") -> (A")
- "U" kern-2.5u#, Udiaer kern-AUkern#,
- "J" kern-1.5u#, "O" kern-1.5u#, "T" kern-1.5u#, "F" kern-1.5u#, "Y" kern-2.2u#,
- "n" if cbleipzig: kern-1.75u# else: kern-.25u# fi;
-ligtable "H": "|"=: oct"012";
-ligtable "O": "A" kern-1.5u#, "S" kern-u#;
-ligtable "U": Udiaer: oct"015": "A" kern-2.5u#, "D" kern-2.5u#, "L" kern-2.5u#;
-ligtable "W": "|"=: oct"013";
-
-ligtable "G": "A" kern -2.4u#, "D" kern -2u#, "L" kern -2.2u#;
-ligtable "D": "U" kern-2.5u#, "O" kern-.6u#;
-ligtable "J": "A" kern-1.5u#, "U" kern-1.5u#;
-ligtable "K": "O" kern-1.5u#;
-ligtable "L": "U" kern-1.8u#, "O" kern-.6u#;
-ligtable "N": "A" kern -1.5u#;
-ligtable "R": "A" kern-3u#;
-ligtable "S": "A" kern-.5u#;
-ligtable "T": "A" kern-1.5u#;
-ligtable "F": "A" kern-1.5u#;
-ligtable "Y": "A" kern-2.2u#;
-
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbligrm.mf b/Master/texmf-dist/fonts/source/public/cb/cbligrm.mf
deleted file mode 100644
index 5c90e24e495..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbligrm.mf
+++ /dev/null
@@ -1,491 +0,0 @@
-% Copyright (C) 1998, 2000 Claudio Beccari v.2.0e (2000/08/03)
-% Ligature and kerning table: CB romanlike greek
-%
-% The starting point was cbligit where suitable corrections were made
-
-diaer=oct"042"; % diaeresis (double quote key)
-Idiaer=oct"333"; % Iota with diaeresis
-Udiaer=oct"337"; % Upsilon with diaeresis
-AUkern#:=2.5u#; % check definition in cbupper.mf
-%
-ligtable "-": "-" =: oct"000"; % en-dash
-ligtable oct"000": "-" =: oct"177"; % em-dash
-ligtable "(": "(" =: oct"173"; % open quotes
-ligtable ")": ")" =: oct"175"; % close quotes
-
-ligtable oct"175": "," kern -3u#, "." kern -3u#, ";" kern -3u#, ":" kern -3u#; % close
- % quotes and punctuation marks, except ? and !
-
-ligtable "<": % rough breathing
- "~" =: oct"100", "'" =: oct"126", "`" =: oct"103",
- "a" =: oct"201", "e" =: oct"341", "h" =: oct"231", "r" =: oct"373",
- "o" =: oct"345", "w" =: oct"261", "i" =: oct"311", "u" =: oct"315",
- "A" kern-3u#, "O" kern-u#, "W" kern-.5u#;
-
-ligtable ">": % smooth breathing
- "~" =: oct"134", "'" =: oct"136", "`" =: oct"137",
- "a" =: oct"202", "e" =: oct"342", "h" =: oct"232", "r" =: oct"374",
- "o" =: oct"346", "w" =: oct"262", "i" =: oct"312", "u" =: oct"316",
- "A" kern-2.5u#, "O" kern-u#, "W" kern-.5u#;
-
-ligtable diaer: % diaeresis
- "~" =: oct"040", "'" =: oct"043", "`" =: oct"044",
- oct"375" =:| oct"035", % diaeresis at end of word becomes apostrophe
- "i" =: oct"360", "u" =: oct"364",
- "I" =: oct"333", "U" =: oct"337";
-
-ligtable oct"044": % diaeresis and grave
- "i" =: oct"361", "u" =: oct"365";
-
-ligtable oct"043": % diaeresis and acute
- "i" =: oct"362", "u" =: oct"366";
-
-ligtable oct"040": % diaeresis and circumflex
- "i" =: oct"363", "u" =: oct"367";
-
-ligtable "`": % grave
- diaer =: oct"044", "`" =: oct"034", "<"=: oct"103", ">"=: oct"137",
- "a" =: oct"200", "h" =: oct"230", "w" =: oct"260",
- "e" =: oct"340", "o" =: oct"344", "i" =: oct"310", "u" =: oct"314",
- "A" kern-2u#, "O" kern-u#, "W" kern-.5u#;
-
-ligtable "'": % acute
- diaer =: oct"043", "'" =: oct"035", "<"=: oct"126", ">"=: oct"136",
- "a" =: oct"210", "h" =: oct"240", "w" =: oct"270",
- "e" =: oct"350", "o" =: oct"354", "i" =: oct"320", "u" =: oct"324",
- "A" kern-2u#, "O" kern-u#, "W" kern-.5u#;
-
-ligtable oct"126": % rough breathing and acute
- "a" =: oct"211", "h" =: oct"241", "w" =: oct"271",
- "e" =: oct"351", "o" =: oct"355", "i" =: oct"321", "u" =: oct"325",
- "A" kern-1.5u#, "O" kern-.5u#;
-
-ligtable oct"136": % smooth breathing and acute
- "a" =: oct"212", "h" =: oct"242", "w" =: oct"272",
- "e" =: oct"352", "o" =: oct"356", "i" =: oct"322", "u" =: oct"326",
- "A" kern-1.5u#, "O" kern-.5u#;
-
-ligtable oct"137": % smooth breathing and grave
- "a" =: oct"213", "h" =: oct"253", "w" =: oct"273",
- "e" =: oct"353", "o" =: oct"357", "i" =: oct"323", "u" =: oct"327",
- "A" kern-1.5u#, "O" kern-.5u#;
-
-ligtable oct"103": % rough breathing and grave
- "a" =: oct"203", "h" =: oct"243", "w" =: oct"263",
- "e" =: oct"343", "o" =: oct"347", "i" =: oct"313", "u" =: oct"317",
- "A" kern-1.5u#, "O" kern-.5u#;
-ligtable "~": % circumflex
- diaer =: oct"040", "<"=: oct"100", ">"=: oct"134",
- "a" =: oct"220", "h" =: oct"250", "w" =: oct"300",
- "i" =: oct"330", "u" =: oct"334","A" kern-2u#;
-
-ligtable oct"100": % rough breathing and circumflex
- "a" =: oct"221", "h" =: oct"251", "w" =: oct"301",
- "i" =: oct"331", "u" =: oct"335", "A" kern-2u#;
-
-ligtable oct"134": % smooth breathing and circumflex
- "a" =: oct"222", "h" =: oct"252", "w" =: oct"302",
- "i" =: oct"332", "u" =: oct"336","A" kern-2u#;
- % iota subscripts
-ligtable "a": "|" =: oct"370",
- oct"370":
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "n" kern -.8u#, "t" kern -.8u#, "q" kern -.5u#,
- "y" kern -.5u#, "m" kern -.5u#, "g" kern -.5u#;
-ligtable oct"200": "|" =: oct"204",
- oct"204":
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "n" kern -.8u#, "t" kern -.8u#, "q" kern -.5u#,
- "y" kern -.5u#, "m" kern -.5u#, "g" kern -.5u#;
-ligtable oct"201": "|" =: oct"205",
- oct"205":
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "n" kern -.8u#, "t" kern -.8u#, "q" kern -.5u#,
- "y" kern -.5u#, "m" kern -.5u#, "g" kern -.5u#;
-ligtable oct"202": "|" =: oct"206",
- oct"206":
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "n" kern -.8u#, "t" kern -.8u#, "q" kern -.5u#,
- "y" kern -.5u#, "m" kern -.5u#, "g" kern -.5u#;
-ligtable oct"203": "|" =: oct"207",
- oct"207":
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "n" kern -.8u#, "t" kern -.8u#, "q" kern -.5u#,
- "y" kern -.5u#, "m" kern -.5u#, "g" kern -.5u#;
-ligtable oct"210": "|" =: oct"214",
- oct"214":
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "n" kern -.8u#, "t" kern -.8u#, "q" kern -.5u#,
- "y" kern -.5u#, "m" kern -.5u#, "g" kern -.5u#;
-ligtable oct"211": "|" =: oct"215",
- oct"215":
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "n" kern -.8u#, "t" kern -.8u#, "q" kern -.5u#,
- "y" kern -.5u#, "m" kern -.5u#, "g" kern -.5u#;
-ligtable oct"212": "|" =: oct"216",
- oct"216":
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "n" kern -.8u#, "t" kern -.8u#, "q" kern -.5u#,
- "y" kern -.5u#, "m" kern -.5u#, "g" kern -.5u#;
-ligtable oct"213": "|" =: oct"217",
- oct"217":
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "n" kern -.8u#, "t" kern -.8u#, "q" kern -.5u#,
- "y" kern -.5u#, "m" kern -.5u#, "g" kern -.5u#;
-ligtable oct"220": "|" =: oct"224",
- oct"224":
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "n" kern -.8u#, "t" kern -.8u#, "q" kern -.5u#,
- "y" kern -.5u#, "m" kern -.5u#, "g" kern -.5u#;
-ligtable oct"221": "|" =: oct"225",
- oct"225":
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "n" kern -.8u#, "t" kern -.8u#, "q" kern -.5u#,
- "y" kern -.5u#, "m" kern -.5u#, "g" kern -.5u#;
-ligtable oct"222": "|" =: oct"226",
- oct"226":
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "n" kern -.8u#, "t" kern -.8u#, "q" kern -.5u#,
- "y" kern -.5u#, "m" kern -.5u#, "g" kern -.5u#;
-
-ligtable "h": "|" =: oct"371",
- oct"371":
- "g" kern-u#, "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"230": "|" =: oct"234",
- oct"234":
- "g" kern-u#, "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"231": "|" =: oct"235",
- oct"235":
- "g" kern-u#, "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"232": "|" =: oct"236",
- oct"236":
- "g" kern-u#, "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"240": "|" =: oct"244",
- oct"244":
- "g" kern-u#, "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"241": "|" =: oct"245",
- oct"245":
- "g" kern-u#, "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"242": "|" =: oct"246",
- oct"246":
- "g" kern-u#, "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"243": "|" =: oct"247",
- oct"247":
- "g" kern-u#, "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"250": "|" =: oct"254",
- oct"254":
- "g" kern-u#, "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"251": "|" =: oct"255",
- oct"255":
- "g" kern-u#, "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"252": "|" =: oct"256",
- oct"256":
- "g" kern-u#, "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable oct"253": "|" =: oct"257",
- oct"257":
- "g" kern-u#, "n" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-
-ligtable "w": "|" =: oct"372",
- oct"372": "x" kern .5u#,
- "g" kern-u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"260": "|" =: oct"264",
- oct"264": "x" kern .5u#,
- "g" kern-u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"261": "|" =: oct"265",
- oct"265": "x" kern .5u#,
- "g" kern-u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"262": "|" =: oct"266",
- oct"266": "x" kern .5u#,
- "g" kern-u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"263": "|" =: oct"267",
- oct"267": "x" kern .5u#,
- "g" kern-u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"270": "|" =: oct"274",
- oct"274": "x" kern .5u#,
- "g" kern-u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"271": "|" =: oct"275",
- oct"275": "x" kern .5u#,
- "g" kern-u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"272": "|" =: oct"276",
- oct"276": "x" kern .5u#,
- "g" kern-u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"273": "|" =: oct"277",
- oct"277": "x" kern .5u#,
- "g" kern-u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"300": "|" =: oct"304",
- oct"304": "x" kern .5u#,
- "g" kern-u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"301": "|" =: oct"305",
- oct"305": "x" kern .5u#,
- "g" kern-u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-ligtable oct"302": "|" =: oct"306",
- oct"306": "x" kern .5u#,
- "g" kern-u#, "n" kern-.5u#, "m" kern -.5u#, "q" kern -u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-
- % sigma ligatures
- % left sigma is replaced with final sigma, while right character is preserved
-
-ligtable "s":"." =:| "c", "," =:| "c", ";" =:| "c",
- ":" =:| "c", "?" =:| "c", "!" =:| "c",
- ")" =:| "c", "/" =:| "c", "]" =:| "c",
- oct"375" =:| "c", oct"052" =:| "c", oct"035" =:| "c",
- "a" kern-.8u#, oct"200" kern-.8u#, oct"204" kern-.8u#,
- oct"210" kern-.8u#, oct"214" kern-.8u#, oct"220" kern-.8u#,
- oct"224" kern-.8u#, oct"370" kern-.8u#,
- "w" kern-.5u#, oct"260" kern-.5u#, oct"264" kern-.5u#,
- oct"270" kern-.5u#, oct"274" kern-.5u#, oct"300" kern-.5u#,
- oct"304" kern-.5u#, oct"372" kern-.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#,
- "e" kern-.5u#, oct"340" kern-.5u#, oct"350" kern-.5u#,
- "r" kern-.5u#, oct"373" kern-.5u#, oct"374" kern-.5u#;
-
-ligtable "v": "v"=: "v", "A"=: "A", "B"=: "B", "G"=: "G", "D"=: "D",% void character
- "E"=: "E", "Z"=: "Z", "H"=: "H", "J"=: "J", "I"=: "I",
- "K"=: "K", "L"=: "L", "M"=: "M", "N"=: "N", "X"=: "X",
- "O"=: "O", "P"=: "P", "R"=: "R", "S"=: "S", "T"=: "T",
- "U"=: "U", "F"=: "F", "Q"=: "Q", "Y"=: "Y", "W"=: "W";.
-
- % kernings
-
-ligtable "i": oct"310": oct"311": oct"312": oct"320": oct"321": oct"322":
- oct"330": oct"331": oct"332": oct"360": oct"361": oct"362": oct"363":
- "t" kern-.5u#, "n" kern-.3u#, "c" kern-.5u#, "s" kern-.5u#,
- "h" kern-.3u#, "g" kern-.5u#,
- "j" kern-.3u#, "q" kern-.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"345" kern-.5u#,
- oct"346" kern-.5u#, oct"354" kern-.5u#, oct"355" kern-.5u#,
- oct"356" kern-.5u#;
-
-ligtable "e": oct"340": oct"341": oct"342": oct"343": oct"350":
- oct"351": oct"352": oct"353":
- "a" kern-.5u#, oct"200" kern-.5u#, oct"204" kern-.5u#,
- oct"210" kern-.5u#, oct"214" kern-.5u#, oct"220" kern-.5u#,
- oct"224" kern-.5u#, oct"370" kern-.5u#,
- "d" kern-.5u#, "q" kern-.5u#, "s" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable "o": oct"344": oct"345": oct"346": oct"347":
- oct"354": oct"355": oct"356": oct"357":
- "l" kern-.3u#, "g" kern-.3u#, "n" kern-.3u#, "t" kern-.3u#,
- "q" kern-.3u#, "m" kern-.3u#,
- "u" kern-.3u#, oct"314" kern-.3u#, oct"324" kern-.3u#,
- oct"334" kern-.3u#;
-
-ligtable "u": oct"314": oct"315": oct"316": oct"317": oct"324":
- oct"325": oct"326": oct"327": oct"334": oct"335":
- oct"336": oct"364": oct"365": oct"366": oct"367":
- "g" kern-.5u#,
- "m" kern-.5u#,
- "n" kern-.5u#, "q" kern-.5u#;
-
-ligtable "z":
- "g" kern-1.5u#, "d" kern-.5u#, "j" kern-.5u#, "m" kern-.5u#, "n" kern-.5u#,
- "p" kern-5u#, "s" kern-5u#, "t" kern-1u#, "f" kern-5u#,
- "q" kern-1.5u#,"y" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "a" kern-u#, oct"200" kern-u#, oct"204" kern-u#,
- oct"210" kern-u#, oct"214" kern-u#, oct"220" kern-u#,
- oct"224" kern-u#, oct"370" kern-u#,
- "w" kern-.5u#, oct"260" kern-.5u#, oct"264" kern-.5u#,
- oct"270" kern-.5u#, oct"274" kern-.5u#, oct"300" kern-.5u#,
- oct"304" kern-.5u#, oct"372" kern-.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#,
- "e" kern-.5u#, oct"340" kern-.5u#, oct"350" kern-.5u#;
-
-ligtable "t": "q" kern -.5u#,
- "a" kern-.5u#, oct"200" kern-.5u#, oct"204" kern-.5u#,
- oct"210" kern-.5u#, oct"214" kern-.5u#, oct"220" kern-.5u#,
- oct"224" kern-.5u#, oct"370" kern-.5u#,
- "w" kern-.5u#, oct"260" kern-.5u#, oct"264" kern-.5u#,
- oct"270" kern-.5u#, oct"274" kern-.5u#, oct"300" kern-.5u#,
- oct"304" kern-.5u#, oct"372" kern-.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#,
- "e" kern-.3u#, oct"340" kern-.3u#, oct"350" kern-.3u#;
-
-
-
-ligtable "l": "g" kern-2u#, "m" kern-.5u#, "n" kern-u#, "s" kern-.5u#,
- "t" kern-u#, "q" kern-2u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "a" kern-.5u#, oct"200" kern-.5u#, oct"204" kern-.5u#,
- oct"210" kern-.5u#, oct"214" kern-.5u#, oct"220" kern-.5u#,
- oct"224" kern-.5u#, oct"370" kern-.5u#,
- "e" kern-.5u#, oct"340" kern-.5u#, oct"350" kern-.5u#;
-
-ligtable "m":
- "g" kern-.5u#, "n" kern-.5u#, "s" kern-.5u#,
- "f" kern-.5u#, "q" kern-5u#, "z" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "a" kern-.5u#, oct"200" kern-.5u#, oct"204" kern-.5u#,
- oct"210" kern-.5u#, oct"214" kern-.5u#, oct"220" kern-.5u#,
- oct"224" kern-.5u#, oct"370" kern-.5u#,
- "w" kern-.5u#, oct"260" kern-.5u#, oct"264" kern-.5u#,
- oct"270" kern-.5u#, oct"274" kern-.5u#, oct"300" kern-.5u#,
- oct"304" kern-.5u#, oct"372" kern-.5u#,
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#;
-
-ligtable "b": "q" kern -.5u#;
-
-ligtable "d": "m" kern-.5u#, "n" kern-.5u#, "g" kern-5u#,
- "q" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "a" kern-.5u#, oct"200" kern-.5u#, oct"204" kern-.5u#,
- oct"210" kern-.5u#, oct"214" kern-.5u#, oct"220" kern-.5u#,
- oct"224" kern-.5u#, oct"370" kern-.5u#;
-
-ligtable "n": "r" kern-.5u#, "x" kern-.7u#, "q" kern-.5u#,
- "a" kern-.5u#, oct"200" kern-.5u#, oct"204" kern-.5u#,
- oct"210" kern-.5u#, oct"214" kern-.5u#, oct"220" kern-.5u#,
- oct"224" kern-.5u#, oct"370" kern-.5u#,
- "w" kern-u#, oct"260" kern-u#, oct"264" kern-u#,
- oct"270" kern-u#, oct"274" kern-u#, oct"300" kern-u#,
- oct"304" kern-u#, oct"372" kern-u#,
- "o" kern-u#, oct"344" kern-u#, oct"354" kern-u#,
- "e" kern-.5u#, oct"340" kern-.5u#, oct"350" kern-.5u#;
-
-ligtable "x": "g" kern-.3u#,"s" kern-.5u#, "t" kern-.5u#, "f" kern-.7u#,
- "q" kern-.5u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#,
- "a" kern-u#, oct"200" kern-u#, oct"204" kern-u#,
- oct"210" kern-u#, oct"214" kern-u#, oct"220" kern-u#,
- oct"224" kern-u#, oct"370" kern-u#,
- "o" kern-u#, oct"344" kern-u#, oct"354" kern-u#,
- "e" kern-u#, oct"340" kern-u#, oct"350" kern-u#;
-
-ligtable "p":
- "o" kern-.5u#, oct"344" kern-.5u#, oct"354" kern-.5u#;
-
-ligtable "r": oct"373": oct"374":
- "g" kern -.5u#, "z" kern .5u#, "y" kern .3u#, "q" kern-.7u#,
- "s" kern .5u#,
- "o" kern .5u#, oct"344" kern .5u#, oct"354" kern .5u#;
-
-ligtable "f": "g" kern -u#, "m" kern -.7u#, "n" kern -.7u#, "t" kern -.5u#,
- "h" kern-.5u#, oct"371" kern-.5u#, oct"230" kern-.5u#,
- oct"234" kern-.5u#, oct"240" kern-.5u#, oct"244" kern-.5u#,
- oct"250" kern-u#, oct"254" kern-u#,
- "u" kern-.5u#, oct"314" kern-.5u#, oct"324" kern-.5u#,
- oct"334" kern-.5u#;
-
-ligtable "q": "s" kern -.7u#, "y" kern .3u#,
- "a" kern-.5u#, oct"200" kern-.5u#, oct"204" kern-.5u#,
- oct"210" kern-.5u#, oct"214" kern-.5u#, oct"220" kern-.5u#,
- oct"224" kern-.5u#, oct"370" kern-.5u#,
- "w" kern-.5u#, oct"260" kern-.5u#, oct"264" kern-.5u#,
- oct"270" kern-.5u#, oct"274" kern-.5u#, oct"300" kern-.5u#,
- oct"304" kern-.5u#, oct"372" kern-.5u#,
- "e" kern-.5u#, oct"340" kern-.5u#, oct"350" kern-.5u#;
-
-ligtable "y": "g" kern-.7u#, "q" kern-.3u#;
-
-
-%
-% oct"014"=A" is the same glyph as A, but is in a different position
-% oct"015" is a version of Udiaer preshifted by the amount AUkern to the left
-%
-ligtable oct"014": "U" |=: oct"015", % (A")+(U)-> (A")+(shifted Udiaer)
- "I" |=: Idiaer, % (A")+(I)-> (A")+(Idiaer)
- "~" |=: oct"040", % (A")+(')-> (A")+("~)
- "`" |=: oct"044", % (A")+(')-> (A")+("`)
- "'" |=: oct"043"; % (A")+(')-> (A")+("')
-ligtable "A": "|"=: oct"011",
- diaer =: oct"014", % (A)+(") -> (A")
- "U" kern-2.5u#, Udiaer kern-AUkern#,
- "J" kern-1.5u#, "O" kern-1.5u#, "T" kern-1.5u#, "F" kern-1.5u#, "Y" kern-2.2u#;
-ligtable "H": "|"=: oct"012";
-ligtable "O": "A" kern-1.5u#, "S" kern-u#;
-ligtable "U": Udiaer: oct"015": "A" kern-2.5u#, "D" kern-2.5u#, "L" kern-2.5u#;
-ligtable "W": "|"=: oct"013";
-
-ligtable "G": "A" kern -2.4u#, "D" kern -2u#, "L" kern -2.2u#;
-ligtable "D": "U" kern-2.5u#, "O" kern-.6u#;
-ligtable "J": "A" kern-1.5u#;
-ligtable "K": "O" kern-1.5u#;
-ligtable "L": "U" kern-1.8u#, "O" kern-.6u#;
-ligtable "N": "A" kern -1.5u#;
-ligtable "R": "A" kern-3u#;
-ligtable "S": "A" kern-.5u#;
-ligtable "T": "A" kern-1.5u#;
-ligtable "F": "A" kern-1.5u#;
-ligtable "Y": "A" kern-2.2u#;
-
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbligsc.mf b/Master/texmf-dist/fonts/source/public/cb/cbligsc.mf
deleted file mode 100644
index 4f92157ca5e..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbligsc.mf
+++ /dev/null
@@ -1,176 +0,0 @@
-% Copyright (C) 1997, 1999, 2000 Claudio Beccari v.2.0a 2000/02/13
-% Ligature and kerning table for caps-and-small-caps Greek font
-% (CB 1997/05/26); accent-spirit ligatures added 1997/11/03
-% (CB 2000/01/29); accent-spirit ligatures completely modified
-% (CB 2000/02/13); added kerning specials between A,a and u,"u,U,"U
-% No diacritics except for diaeresis and iota adscript
-diaer=oct"042"; % double quote
-idiaer=oct"360"; % iota with diaeresis
-idiaerac=oct"362"; % iota with diaeresis and acute
-udiaer=oct"364"; % upsilon with diaeresis
-udiaerac=oct"366"; % upsilon with diaeresis and acute
-Idiaer=oct"333"; % Iota with diaeresis
-Udiaer=oct"337"; % Upsilon with diaeresis
-AUkern#:=2.5u#; % check definition in cbupper.mf
-aukern#:=1.5u#; % check definition in cblower.mf
-%
-ligtable "-": "-" =: oct"000"; % en-dash
-ligtable oct"000": "-" =: oct"177"; % em-dash
-ligtable "(": "(" =: oct"173"; % open quotes
-ligtable ")": ")" =: oct"175"; % close quotes
-ligtable "<":
- "~" =: "<", "'" =: "<", "`" =: "<",
- "a" =: "a", "e" =: "e", "h" =: "h", "r" =: "r",
- "o" =: "o", "w" =: "w", "i" =: "i", "u" =: "u",
- "A" =:"A", "E" =:"E", "H" =:"H", "I" =:"I", "O" =:"O", "U" =:"U", "W" =:"W";
-ligtable ">":
- "~" =: ">", "'" =: ">", "`" =: ">",
- "a" =: "a", "e" =: "e", "h" =: "h", "r" =: "r",
- "o" =: "o", "w" =: "w", "i" =: "i", "u" =: "u",
- "A" =:"A", "E" =:"E", "H" =:"H", "I" =:"I", "O" =:"O", "U" =:"U", "W" =:"W";
-ligtable diaer: "~" =: diaer, "'" =: oct"043", "`" =: diaer,
- oct"375" =:| oct"035", % diaeresis at end of word becomes apostrophe
- "i" =: idiaer, "u" =: udiaer, "I" =:Idiaer, "U" =: Udiaer;
-ligtable oct"044": % diaeresis and grave
- "i" =: idiaer, "u" =: udiaer;
-ligtable oct"043": % diaeresis and acute
- "i" =: idiaerac, "u" =: udiaerac;
-ligtable oct"040": % diaeresis and circumflex
- "i" =: idiaer, "u" =: udiaer;
-ligtable "`":
- diaer =: diaer, "`" =: oct"034", "<"=: "<", ">"=: ">",
- "a" =: "a", "h" =: "h", "w" =: "w",
- "e" =: "e", "o" =: "o", "i" =: "i", "u" =: "u",
- "A" =:"A", "E" =:"E", "H" =:"H", "I" =:"I", "O" =:"O", "U" =:"U", "W" =:"W";
-ligtable "'": diaer =: oct"043", "'" =: oct"035", "<"=: "<", ">"=: ">",
- "a" =: "a", "h" =: "h", "w" =: "w",
- "e" =: "e", "o" =: "o", "i" =: "i", "u" =: "u",
- "A" =:"A", "E" =:"E", "H" =:"H", "I" =:"I", "O" =:"O", "U" =:"U", "W" =:"W";
-ligtable oct"126": % rough breathing and acute
- "a" =: "a", "h" =: "h", "w" =: "w",
- "e" =: "e", "o" =: "o", "i" =: "i", "u" =: "u",
- "A" =:"A", "E" =:"E", "H" =:"H", "I" =:"I", "O" =:"O", "U" =:"U", "W" =:"W";
-ligtable oct"136": % smooth breathing and acute
- "a" =: "a", "h" =: "h", "w" =: "w",
- "e" =: "e", "o" =: "o", "i" =: "i", "u" =: "u",
- "A" =:"A", "E" =:"E", "H" =:"H", "I" =:"I", "O" =:"O", "U" =:"U", "W" =:"W";
-ligtable oct"137": % smooth breathing and grave
- "a" =: "a", "h" =: "h", "w" =: "w",
- "e" =: "e", "o" =: "o", "i" =: "i", "u" =: "u",
- "A" =:"A", "E" =:"E", "H" =:"H", "I" =:"I", "O" =:"O", "U" =:"U", "W" =:"W";
-ligtable oct"103": % rough breathing and grave
- "a" =: "a", "h" =: "h", "w" =: "w",
- "e" =: "e", "o" =: "o", "i" =: "i", "u" =: "u",
- "A" =:"A", "E" =:"E", "H" =:"H", "I" =:"I", "O" =:"O", "U" =:"U", "W" =:"W";
-ligtable "~": diaer =: diaer, "<"=: "<", ">"=: ">",
- "a" =: "a", "h" =: "h", "w" =: "w",
- "i" =: "i", "u" =: "u",
- "A" =:"A", "H" =:"H", "I" =:"I", "U" =:"U", "W" =:"W";
-ligtable oct"100": % rough breathing and circumflex
- "a" =: "a", "h" =: "h", "w" =: "w",
- "i" =: "i", "u" =: "u",
- "A" =:"A", "H" =:"H", "I" =:"I", "U" =:"U", "W" =:"W";
-ligtable oct"134": % smooth breathing and circumflex
- "a" =: "a", "h" =: "h", "w" =: "w",
- "i" =: "i", "u" =: "u",
- "A" =:"A", "H" =:"H", "I" =:"I", "U" =:"U", "W" =:"W";
-
-% iota subscript and other ligatures and kernings
-% oct"016"=a" is identical to the glyph a, but is in a different position
-% a" is used for the different kern-ligarures with "i or "u
-
-ligtable oct"016": "'" =: oct"016", % (a")+(') -> (a")
- "`" =: oct"016", % (a")+(`) -> (a")
- "~" =: oct"016", % (a")+(~) -> (a")
- "u" |=: oct"017", % (a")+(u) -> (a")+(shifted udiaer)
- "i" |=: idiaer; % (a")+(i) -> (a")+(idiaer)
-ligtable "a": "|" =: oct"370",
- diaer =: oct"016", % (a)+(") -> (a")
- "u" kern-1.5u#, udiaer kern-aukern#, udiaerac kern-aukern#, "j" kern-u#,
- "o" kern-u#, "t" kern-u#, "f" kern-u#, "y" kern-1.5u#,
- oct"035" kern-2u#, "'"=:"a", "`"=:"a", "<"=:"a", ">"=:"a", "~"=:"a";
-ligtable "h": "|" =: oct"371", "'"=:"h", "`"=:"h", "<"=:"h", ">"=:"h", "~"=:"h";
-ligtable "w": "|" =: oct"372", "'"=:"w", "`"=:"w", "<"=:"w", ">"=:"w", "~"=:"w";
-ligtable "e": "'"=:"e", "`"=:"e", "<"=:"e", ">"=:"e", "~"=:"e";
-ligtable "i": "'"=:"i", "`"=:"i", "<"=:"i", ">"=:"i", "~"=:"i";
-ligtable "o": "'"=:"o", "`"=:"o", "<"=:"o", ">"=:"o", "~"=:"o",
- "a" kern-u#, "s" kern-.5u#, "c" kern-.5u#;
-ligtable "u": udiaer: udiaerac: oct"017": "a" kern-aukern#, "d" kern-1.5u#, "l" kern-1.5u#,
- "'"=:"u", "`"=:"u", "<"=:"u", ">"=:"u", "~"=:"u";
-%ligtable udiaer: "a" kern-aukern#, "d" kern-1.5u#, "l" kern-1.5u#;
-%ligtable udiaerac: "a" kern-aukern#, "d" kern-1.5u#, "l" kern-1.5u#;
-ligtable "b": "'"=:"b", "`"=:"b", "<"=:"b", ">"=:"b", "~"=:"b";
-ligtable "g": "a" kern -2u#, "d" kern -1.5u#, "l" kern -1.8u#,
- "'"=:"g", "`"=:"g", "<"=:"g", ">"=:"g", "~"=:"g";
-ligtable "d": "u" kern-1.5u#, "o" kern-.3u#,
- oct"035" kern-2u#, "'"=:"d", "`"=:"d", "<"=:"d", ">"=:"d", "~"=:"d";
-ligtable "z": "'"=:"z", "`"=:"z", "<"=:"z", ">"=:"z", "~"=:"z";
-ligtable "j": "a" kern-u#, "'"=:"j", "`"=:"j", "<"=:"j", ">"=:"j", "~"=:"j";
-ligtable "k": "o" kern-u#, "'"=:"k", "`"=:"k", "<"=:"k", ">"=:"k", "~"=:"k";
-ligtable "l": "u" kern -1.5u#, "o" kern-.3u#,
- oct"035" kern-2u#, "'"=:"l", "`"=:"l", "<"=:"l", ">"=:"l", "~"=:"l";
-ligtable "m": "'"=:"m", "`"=:"m", "<"=:"m", ">"=:"m", "~"=:"m";
-ligtable "n": "a" kern-1.5u#, "'"=:"n", "`"=:"n", "<"=:"n", ">"=:"n", "~"=:"n";
-ligtable "x": "`"=:"x", "<"=:"x", ">"=:"x", "~"=:"x";
-ligtable "p": "'"=:"p", "`"=:"p", "<"=:"p", ">"=:"p", "~"=:"p";
-ligtable "r": "a" kern-2u#, "'"=:"r", "`"=:"r", "<"=:"r", ">"=:"r", "~"=:"r";
-ligtable "s": "a" kern-.35u#, "." =:| "c", "," =:| "c", ";" =:| "c", ":" =:| "c",
- "?" =:| "c", "!" =:| "c", ")" =:| "c", "/" =:| "c", "]" =:| "c",
- oct"375" =:| "c", "'"=:"s", "`"=:"s", "<"=:"s", ">"=:"s", "~"=:"s";
-ligtable "c": "a" kern-.35u#;
-ligtable "t": "a" kern-u#, "'"=:"t", "`"=:"t", "<"=:"t", ">"=:"t", "~"=:"t";
-ligtable "f": "a" kern-u#, "'"=:"f", "`"=:"f", "<"=:"f", ">"=:"f", "~"=:"f";
-ligtable "q": "'"=:"q", "`"=:"q", "<"=:"q", ">"=:"q", "~"=:"q";
-ligtable "y": "a" kern-1.5u#, "'"=:"y", "`"=:"y", "<"=:"y", ">"=:"y", "~"=:"y";
-
-%
-% oct"014"=A" is the same glyph as A, but is in a different position
-% oct"015" is a version of Udiaer preshifted by the amount AUkern to the left
-%
-ligtable oct"014": "U" |=: oct"015", % (A")+(U)-> (A")+(shifted Udiaer)
- "I" |=: Idiaer, % (A")+(I)-> (A")+(Idiaer)
- "'" =: oct"014", % (A")+(')-> (A")
- "i" |=: idiaer, % (A")+(i}-> (A")+(idiaer)
- "u" |=: oct"017"; % (A")+(u)-> (A")+(shifted udiaer)
-ligtable "A": "|"=: oct"011",
- diaer =: oct"014", % (A)+(") -> (A")
- "U" kern-AUkern#, Udiaer kern-AUkern#,
- "u" kern-aukern#, udiaer kern-aukern#, udiaerac kern-aukern#, "J" kern-1.5u#, "j" kern -u#,
- "O" kern-1.5u#, "o" kern -u#, "T" kern-1.5u#, "t" kern-1.1u#,
- "F" kern-1.5u#, "f" kern-1.1u#, "Y" kern-2.2u#, "y" kern-1.5u#,
- "'"=:"A", "`"=:"A", "<"=:"A", ">"=:"A", "~"=:"A";
-ligtable "H": "|"=: oct"012", "'"=:"H", "`"=:"H", "<"=:"H", ">"=:"H", "~"=:"H";
-ligtable "E": "'"=:"E", "`"=:"E", "<"=:"E", ">"=:"E", "~"=:"E";
-ligtable "I": "'"=:"I", "`"=:"I", "<"=:"I", ">"=:"I", "~"=:"I";
-ligtable "O": "'"=:"O", "`"=:"O", "<"=:"O", ">"=:"O", "~"=:"O",
- "A" kern-1.5u#, "a" kern-u#, "S" kern-u#;
-ligtable "U": Udiaer: oct"015": "A" kern-AUkern#, "D" kern-2.5u#, "L" kern-2.5u#,
- "a" kern-1.5u#, "d" kern-1.5u#, "l" kern-1.5u#,
- "'"=:"U", "`"=:"U", "<"=:"U", ">"=:"U", "~"=:"U";
-%ligtable Udiaer: "A" kern-AUkern#, "D" kern-2.5u#, "L" kern-2.5u#;
-ligtable "W": "|"=: oct"013", "'"=:"W", "`"=:"W", "<"=:"W", ">"=:"W", "~"=:"W";
-
-ligtable "B": "'"=:"B", "`"=:"B", "<"=:"B", ">"=:"B", "~"=:"B";
-ligtable "G": "A" kern -2.4u#, "D" kern -2u#, "L" kern -2.2u#,
- "a" kern -2.5u#, "d" kern -1.9u#, "l" kern -2.2u#,
- "'"=:"G", "`"=:"G", "<"=:"G", ">"=:"G", "~"=:"G";
-ligtable "D": "U" kern-2.5u#, "u" kern-1.5u#, "O" kern-.6u#, "o" kern-.4u#,
- "'"=:"D", "`"=:"D", "<"=:"D", ">"=:"D", "~"=:"D";
-ligtable "Z": "'"=:"Z", "`"=:"Z", "<"=:"Z", ">"=:"Z", "~"=:"Z";
-ligtable "J": "A" kern-1.5u#, "a" kern-u#, "'"=:"J", "`"=:"J", "<"=:"J", ">"=:"J", "~"=:"J";
-ligtable "K": "O" kern-1.5u#, "o" kern-.5u#, "'"=:"K", "`"=:"K", "<"=:"K", ">"=:"K", "~"=:"K";
-ligtable "L": "U" kern-1.8u#, "u" kern-1.5u#, "O" kern-.6u#, "o" kern-.4u#,
- "'"=:"L", "`"=:"L", "<"=:"L", ">"=:"L", "~"=:"L";
-ligtable "M": "'"=:"M", "`"=:"M", "<"=:"M", ">"=:"M", "~"=:"M";
-ligtable "N": "A" kern -1.5u#, "a" kern-.8u#, "'"=:"N", "`"=:"N", "<"=:"N", ">"=:"N", "~"=:"N";
-ligtable "X": "'"=:"X", "`"=:"X", "<"=:"X", ">"=:"X", "~"=:"X";
-ligtable "P": "'"=:"P", "`"=:"P", "<"=:"P", ">"=:"P", "~"=:"P";
-ligtable "R": "A" kern-3u#, "a" kern-2.5u#, "'"=:"R", "`"=:"R", "<"=:"R", ">"=:"R", "~"=:"R";
-ligtable "S": "A" kern-.5u#, "a" kern-.35u#, "'"=:"S", "`"=:"S", "<"=:"S", ">"=:"S", "~"=:"S";
-ligtable "T": "A" kern-1.5u#, "a" kern-1.1u#, "'"=:"T", "`"=:"T", "<"=:"T", ">"=:"T", "~"=:"T";
-ligtable "F": "A" kern-1.5u#, "a" kern-1.1u#, "'"=:"F", "`"=:"F", "<"=:"F", ">"=:"F", "~"=:"F";
-ligtable "Q": "'"=:"Q", "`"=:"Q", "<"=:"Q", ">"=:"Q", "~"=:"Q";
-ligtable "Y": "A" kern-2.2u#, "a" kern-1.5u#, "'"=:"Y", "`"=:"Y", "<"=:"Y", ">"=:"Y", "~"=:"Y";
-
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbligtt.mf b/Master/texmf-dist/fonts/source/public/cb/cbligtt.mf
deleted file mode 100644
index bc7dc8a0de0..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbligtt.mf
+++ /dev/null
@@ -1,120 +0,0 @@
-% Copyright (C) 1997, 1998, 1999 Claudio Beccari
-% v.2.0d 1999/11/07
-% Ligature for monospaced fonts; accent-spirit ligatures added 1997/11/03
-% Thanks to Andreas Schwab for spotting some bugs and suggesting
-% the corrections
-% Ligatures with void char corrected 1999/04/07
-% Ligatures with iota adscript added 1999/10/25
-%
-diaer=oct"042"; % double quote
-ligtable "-": "-" =: oct"000"; % en-dash
-ligtable oct"000": "-" =: oct"177"; % em-dash
-ligtable "(": "(" =: oct"173"; % open quotes
-ligtable ")": ")" =: oct"175"; % close quotes
-ligtable "<":
- "~" =: oct"100", "'" =: oct"126", "`" =: oct"103",
- "a" =: oct"201", "e" =: oct"341", "h" =: oct"231", "r" =: oct"373",
- "o" =: oct"345", "w" =: oct"261", "i" =: oct"311", "u" =: oct"315";
-ligtable ">":
- "~" =: oct"134", "'" =: oct"136", "`" =: oct"137",
- "a" =: oct"202", "e" =: oct"342", "h" =: oct"232", "r" =: oct"374",
- "o" =: oct"346", "w" =: oct"262", "i" =: oct"312", "u" =: oct"316";
-ligtable diaer: "~" =: oct"040", "'" =: oct"043", "`" =: oct"044",
- oct"375" =:| oct"035", % diaeresis at end of word becomes apostrophe
- "i" =: oct"360", "u" =: oct"364",
- "I" =: oct"333", "U" =: oct"337";
-ligtable oct"044": % diaeresis and grave
- "i" =: oct"361", "u" =: oct"365";
-ligtable oct"043": % diaeresis and acute
- "i" =: oct"362", "u" =: oct"366";
-ligtable oct"040": % diaeresis and circumflex
- "i" =: oct"363", "u" =: oct"367";
-ligtable "`":
- diaer =: oct"044", "`" =: oct"034", "<"=: oct"103", ">"=: oct"137",
- "a" =: oct"200", "h" =: oct"230", "w" =: oct"260",
- "e" =: oct"340", "o" =: oct"344", "i" =: oct"310", "u" =: oct"314";
-ligtable "'": diaer =: oct"043", "'" =: oct"035", "<"=: oct"126", ">"=: oct"136",
- "a" =: oct"210", "h" =: oct"240", "w" =: oct"270",
- "e" =: oct"350", "o" =: oct"354", "i" =: oct"320", "u" =: oct"324";
-ligtable oct"126": % rough breathing and acute
- "a" =: oct"211", "h" =: oct"241", "w" =: oct"271",
- "e" =: oct"351", "o" =: oct"355", "i" =: oct"321", "u" =: oct"325";
-ligtable oct"136": % smooth breathing and acute
- "a" =: oct"212", "h" =: oct"242", "w" =: oct"272",
- "e" =: oct"352", "o" =: oct"356", "i" =: oct"322", "u" =: oct"326";
-ligtable "~": diaer =: oct"040", "<"=: oct"100", ">"=: oct"134",
- "a" =: oct"220", "h" =: oct"250", "w" =: oct"300",
- "i" =: oct"330", "u" =: oct"334";
-ligtable oct"137": % smooth breathing and grave
- "a" =: oct"213", "h" =: oct"253", "w" =: oct"273",
- "e" =: oct"353", "o" =: oct"357", "i" =: oct"323", "u" =: oct"327",
- "A" kern-1.5u#, "O" kern-.5u#;
-ligtable oct"103": % rough breathing and grave
- "a" =: oct"203", "h" =: oct"243", "w" =: oct"263",
- "e" =: oct"343", "o" =: oct"347", "i" =: oct"313", "u" =: oct"317",
- "A" kern-1.5u#, "O" kern-.5u#;
-ligtable oct"100": % rough breathing and circumflex
- "a" =: oct"221", "h" =: oct"251", "w" =: oct"301",
- "i" =: oct"331", "u" =: oct"335";
-ligtable oct"134": % smooth breathing and circumflex
- "a" =: oct"222", "h" =: oct"252", "w" =: oct"302",
- "i" =: oct"332", "u" =: oct"336";
- % iota subscripts
-ligtable "a": "|" =: oct"370";
-ligtable "h": "|" =: oct"371";
-ligtable "w": "|" =: oct"372";
-ligtable oct"200": "|" =: oct"204";
-ligtable oct"201": "|" =: oct"205";
-ligtable oct"202": "|" =: oct"206";
-ligtable oct"203": "|" =: oct"207";
-ligtable oct"210": "|" =: oct"214";
-ligtable oct"211": "|" =: oct"215";
-ligtable oct"212": "|" =: oct"216";
-ligtable oct"213": "|" =: oct"217";
-ligtable oct"220": "|" =: oct"224";
-ligtable oct"221": "|" =: oct"225";
-ligtable oct"222": "|" =: oct"226";
-ligtable oct"230": "|" =: oct"234";
-ligtable oct"231": "|" =: oct"235";
-ligtable oct"232": "|" =: oct"236";
-ligtable oct"240": "|" =: oct"244";
-ligtable oct"241": "|" =: oct"245";
-ligtable oct"242": "|" =: oct"246";
-ligtable oct"243": "|" =: oct"247";
-ligtable oct"250": "|" =: oct"254";
-ligtable oct"251": "|" =: oct"255";
-ligtable oct"252": "|" =: oct"256";
-ligtable oct"253": "|" =: oct"257";
-ligtable oct"260": "|" =: oct"264";
-ligtable oct"261": "|" =: oct"265";
-ligtable oct"262": "|" =: oct"266";
-ligtable oct"263": "|" =: oct"267";
-ligtable oct"270": "|" =: oct"274";
-ligtable oct"271": "|" =: oct"275";
-ligtable oct"272": "|" =: oct"276";
-ligtable oct"273": "|" =: oct"277";
-ligtable oct"300": "|" =: oct"304";
-ligtable oct"301": "|" =: oct"305";
-ligtable oct"302": "|" =: oct"306";
-
-
- % sigma ligatures
- % left sigma is replaced with final sigma, while right character is preserved
-
-ligtable "s":"." =:| "c", "," =:| "c", ";" =:| "c",
- ":" =:| "c", "?" =:| "c", "!" =:| "c",
- ")" =:| "c", "/" =:| "c", "]" =:| "c",
- oct"375" =:| "c", oct"052" =:| "c", oct"035" =:| "c";
-
-ligtable "v": "v"=: "v", "A"=: "A", "B"=: "B", "G"=: "G", "D"=: "D",
- "E"=: "E", "Z"=: "Z", "H"=: "H", "J"=: "J", "I"=: "I",
- "K"=: "K", "L"=: "L", "M"=: "M", "N"=: "N", "X"=: "X",
- "O"=: "O", "P"=: "P", "R"=: "R", "S"=: "S", "T"=: "T",
- "U"=: "U", "F"=: "F", "Q"=: "Q", "Y"=: "Y", "W"=: "W";
-
-ligtable "A": "|"=: oct"011";
-ligtable "H": "|"=: oct"012";
-ligtable "W": "|"=: oct"013";
-
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/cblower.mf b/Master/texmf-dist/fonts/source/public/cb/cblower.mf
deleted file mode 100644
index f13e8a437cc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cblower.mf
+++ /dev/null
@@ -1,4581 +0,0 @@
-% grlower.mf v.2.3k 2002/11/16
-% Copyright (C) 1997 --- 2002 Claudio Beccari
-% Corrected many glyphs in view of better ligatures in AllCaps
-% and CapsAndSmallCaps 2000/01/19
-% Added dummy glyphs for the ligatures A"U, A"u, a"u 2000/02/13
-% Added Leipzig Greek 2000/06/21; corrected 2000/08/03; corrected 2000/11/23; corrected 2001/01/28
-% Added CB roman 2000/07/20
-% Modified Leipzig theta with the open shape 2001/03/25
-% Added "roman" and cursive shwa 2001/07/29
-% Introduced SansSerif boolean and modified the sans serif font 2001/08/01, 2002/04/14
-% Corrected SS medial sigma that came out bad at small design sizes 2002/11/16
-%
-% Most of the following definitions come from Silvio Levy.
-% CB added the small caps variants and made some `corrections' in order to
-% work also with sans serif, bold, inclined, small caps,..., proportional
-% and monospaced, text and slides fonts.
-%
-% CB added also the cursive or italic variants; CB added also the "roman" variant,
-% a sort of greek script that strongly resembles roman latin characters with roman serifs
-% practically on every letter.
-%
-% Thanks to the sigma ligatures the layout of the accented letters are
-% different from Silvio's ones; the layout includes also the Greek numerals
-% (not included in this file; see cbdigits.mf)
-% lowercase and uppercase digamma, lower case iota and upsilon with diaeresis.
-%
-% The sigma ligatures are performed according to the new ligature commands
-% that were introduced in METAFONT (and in TeX) after 1988; they were not
-% available to Silvio; if they were, probably he'd had chosen the same
-% approach as I did.
-%
-% (1999/10/25) CB added the adscript iota for the small cap alpha, eta
-% and omega -- this was done on the explicit request of Apostolos Syropoulos
-% and his classicist friend Efthimios Maurogeorgiadis.
-
-% CB Leipzig Greek added on request and with great help of Dimitri Filippou; without
-% his constructive collaboration this font shape would have been very poor; thanks,
-% Dimitri, for the great help you gave me!
-
-
- currentbreadth:=0;
-
-
-% alpha
-
-def width = if small_caps: 11 elseif cbleipzig: 10 else: 9 fi u enddef;
-def height = if small_caps: sclc* fi x_height enddef;
-def dims = width#,height#,0 enddef;
-def ital = 0 enddef;
-def fit_params = 0,if SansSerif:1.2u# else:0 fi enddef;
-
-def gen_letter =
- if small_caps:
- 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=.8jut; x1l=w-x4r=l+letter_fit+outer_jut+.5u; y1=y4=0;
- 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 y0<h-notch_cut: y0:=h-notch_cut;
- fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r)
- --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1}
- ...{up}z0+.5left--cycle; % left and right diagonals
- else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)
- --diag_end(2l,1l,1,1,1r,0)--cycle; fi % 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 =5/12y0;
- y5r-y5l=y6r-y6l=cap_band;
- penstroke z5e--z6e; % bar line
- if serifs: numeric inner_jut; pickup tiny.nib;
- prime_points_inside(1,2); prime_points_inside(4,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
- dish_serif(1',2,a,1/2,outer_jut,b,.6,inner_jut)(dark); % left serif
- dish_serif(4',3,c,1/2,inner_jut,d,1/3,outer_jut); fi % right serif
- numeric pos_stem; %iota reference
- pos_stem=rt x4r if serifs or slitex: -.5slab + outer_jut fi +.5(tiny+.5[vair,stem])+u;
- else:
- if cursive:
- %adjust_fit(0,0);
- if slitex or monospace:pickup fine.nib; else: pickup pencircle; fi
- pos1(stem,0); top y1=x_height+oo; x1l=x5l;
- pos2(hair,-90); pos4(hair,90); x4=x2=.5[x3l,x5l];
- bot y2r=-oo; top y4r=x_height+oo; %bottom and top bulges
- pos3(vstem,-180); lft x3r=hround 3/4u; y3=.5[y2,y4]; %left bulge
- pos6(vstem,90); x5=.55[x2,x6]; y6l=y2r; x6=w-2u; %bottom right
- pos5(hair,0); y5=y3; pos8(.5[hair,stem],0); z8l=z5l;
- alpha_tail(6,7); %hook
- filldraw stroke z5e{down}..z2e{left}..z3e{up}..z4e{right}..{down}z5e;
- filldraw stroke z1e{down}..z8e...z6e{right}...{up}z7e;
- numeric x_baryctr; x_baryctr=.25[x4,x1]; %accent reference
- numeric pos_stem; %iota reference
- pos_stem=x5l;
- elseif cbleipzig:
- %adjust_fit(0,0);
- pickup pencircle;
- pos1(vstem,0); top y1=x_height+oo-.5vstem; x1l=x5l;
- pos2(hair,-90); pos4(fine,90); x4=x2=.5[x3l,x5l];
- bot y2r=-oo; top y4r=x_height+oo; %bottom and top bulges
- pos3(vstem,-180); lft x3r=hround 3/4u; y3=.5[y2,y4]; %left bulge
- pos6(vstem,90); x5=.55[x2,x6]; y6l=y2r; x6=w-2u; %bottom right
- pos5(hair,0); y5=y3;pos7(fine,0); z7l=z5l;
- pos8(.5[hair,stem],0); z8l=z5l;
- filldraw stroke z5e{down}..z2e{left}..z3e{up}..z4e{right}..{down}z7e;
- pos9(hair,135); rt x9l=w-lft x3r; bot y9l=min(2stem,bar_height/2);
- x10l=.5[x5l,x9l]; y10l=y6l=y10r-.9stem; x10r=.5[x8r,x9r]; z10=.5[z10l,z10r];
- filldraw double_circ_stroke z1e{down}..z8e...z10e{right}...{up}z9e;
- numeric x_baryctr; x_baryctr=.25[x4,x1]; %accent reference
- numeric pos_stem; %iota reference
- pos_stem=x5l;
- elseif cbroman:
- %adjust_fit(0,0);
- pos2(hair,90); pos3(stem,180); pos4(hair,-90); pos5(stem,0);
- pos10(hair,0); z10l=z7l;
- pos11(hair,0); z5l=.5[z11l,z10l];;
- x2=x4=.5[x3,x5]; h-top y2r= bot y4r=-oo; lft x3r=w-u-rt x5r= 3/4u; y3=y5=h/2;
- top y1r=top y2r; x1r=x5r; z1l=z1r+whatever*dir(45); x1l=x5l;
- pos7(stem,0); x7r=x5r;y7=h/4;
- pos8(.5[hair,stem],60); x8r=.5[x7r,x9r]; bot y8l= bot y4r;
- pos9(hair,135); rt x9l= w-u/2; y9r=y8r+hair;
- filldraw stroke z11e{up}...z2e{left}...{down}z3e...z4e{right}...z10e{up};
- filldraw circ_stroke z9e{down}...z8e{left}...z7e{up}---z1e;
- numeric x_baryctr; x_baryctr=.15[x4,x5]; %accent reference
- numeric pos_stem; %iota reference
- pos_stem=x5l;
- else:
- %adjust_fit(fit_params);
- pickup fine.nib;
- pos1(stem,0); top y1=x_height+oo; rt x1r=hround(w-.5u); %top right
- pos2(vstem,-90); pos4(vstem,-270); x4=x2=.5w-u;
- bot y2r=-oo; top y4r=x_height+oo; %bottom and top bulges
- pos3(hair,-180); lft x3r=hround .75u; y3=.5[y2,y4]; %left bulge
- pos6(vstem,90); x6=w-u; y6=y2; %bottom right
- numeric theta; theta=angle((x4-x6),2.5(y4-y6))-90;
- pos5(hair,theta); x5=.55[x4,x6]; y5=y3; %point of inflection
- alpha_tail(6,7); %hook
- filldraw stroke z1e{(x2-x1,2(y2-y1))}... %diagonal
- pulled_arc.e(2,3) & pulled_arc.e(3,4) %bowl
- ...z5e{(x6-x4,2.5(y6-y4))}...z6e{right}...{up}z7e; %diagonal and hook
- numeric x_baryctr; x_baryctr=.25[x4,x1]; %accent reference
- numeric pos_stem; pos_stem=x_baryctr; %iota reference
- fi
- fi
-enddef;
-
-
-
-cmchar "Lowercase alpha";
-beginchar("a",dims);
-adjust_fit(fit_params);
-this_letter; penlabels(1,2,3,4,5,6,7,8,9,10,11); endchar;% "Lowercase alpha"
-
-
-iff(not barebones):
-cmchar "Lowercase alpha with right diaeresis"; % for kerning purposes - see explanation
-beginchar(oct"016",dims); % after uppercase alpha in cbupper.mf
-adjust_fit(fit_params);
-this_letter; endchar;% "Lowercase alpha with right diaeresis"
-
-numeric aukern, aukern#; aukern:=1.5u; aukern#:=1.5u#; % for kerning between a and "u
-
-
-iff(not barebones):
-cmchar "Lowercase alpha with grave";
-beginchar(oct"200",width#,acc_ht#,0);
-adjust_fit(fit_params);
-this_letter; if not small_caps: grave(x_baryctr); fi endchar;% "Lowercase alpha with grave"
-
-iff(not barebones):
-cmchar "Lowercase alpha with rough breathing";
-beginchar(oct"201",width#,acc_ht#,0);
-adjust_fit(fit_params);
-this_letter; if not small_caps: spirit(x_baryctr)<; fi endchar;% "Lowercase alpha with rough breathing"
-
-iff(not barebones):
-cmchar "Lowercase alpha with smooth breathing";
-beginchar(oct"202",width#,acc_ht#,0);
-adjust_fit(fit_params);
-this_letter; if not small_caps: spirit(x_baryctr)>; fi endchar;% "Lowercase alpha with smooth breathing"
-
-iff(not barebones):
-cmchar "Lowercase alpha with grave and iota subscript";
-beginchar(oct"204",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+
- if serifs:.4jut#elseif not slitex: .5*(.5[vair#,stem#])fi
- +if monospace:1.8elseif slitex:1.5else:.5fi tiny#+1.3u#);
-gen_letter;
-else:
-adjust_fit(fit_params);
-this_letter; grave(x_baryctr);
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with rough breathing and iota subscript";
-beginchar(oct"205",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+
- if serifs:.4jut#elseif not slitex: .5*(.5[vair#,stem#])fi
- +if monospace:1.8elseif slitex:1.5else:.5fi tiny#+1.3u#);
-gen_letter;
-else:
-adjust_fit(fit_params);
-this_letter; spirit(x_baryctr)<;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with smooth breathing and iota subscript";
-beginchar(oct"206",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+
- if serifs:.4jut#elseif not slitex: .5*(.5[vair#,stem#])fi
- +if monospace:1.8elseif slitex:1.5else:.5fi tiny#+1.3u#);
-gen_letter;
-else:
-adjust_fit(fit_params);
-this_letter; spirit(x_baryctr)>;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with acute";
-beginchar(oct"210",width#,acc_ht#,0);
-adjust_fit(fit_params);
-this_letter; if not small_caps: acute(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with rough breathing and acute";
-beginchar(oct"211",width#,acc_ht#,0);
-adjust_fit(fit_params);
-this_letter; if not small_caps: spirit_acute(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with smooth breathing and acute";
-beginchar(oct"212",width#,acc_ht#,0);
-adjust_fit(fit_params);
-this_letter; if not small_caps: spirit_acute(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with rough breathing and grave";
-beginchar(oct"203",width#,acc_ht#,0);
-adjust_fit(fit_params);
-this_letter; if not small_caps: spirit_grave(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with smooth breathing and grave";
-beginchar(oct"213",width#,acc_ht#,0);
-adjust_fit(fit_params);
-this_letter; if not small_caps: spirit_grave(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with rough breathing and grave and iota subscript";
-beginchar(oct"207",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+
- if serifs:.4jut#elseif not slitex: .5*(.5[vair#,stem#])fi
- +if monospace:1.8elseif slitex:1.5else:.5fi tiny#+1.3u#);
-gen_letter;
-else:
-adjust_fit(fit_params);
-this_letter; spirit_grave(x_baryctr)<;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with smooth breathing and grave and iota subscript";
-beginchar(oct"217",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+
- if serifs:.4jut#elseif not slitex: .5*(.5[vair#,stem#])fi
- +if monospace:1.8elseif slitex:1.5else:.5fi tiny#+1.3u#);
-gen_letter;
-else:
-adjust_fit(fit_params);
-this_letter; spirit_grave(x_baryctr)>;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with acute and iota subscript";
-beginchar(oct"214",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+
- if serifs:.4jut#elseif not slitex: .5*(.5[vair#,stem#])fi
- +if monospace:1.8elseif slitex:1.5else:.5fi tiny#+1.3u#);
-gen_letter;
-else:
-adjust_fit(fit_params);
-this_letter; acute(x_baryctr);
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with rough breathing, acute and iota subscript";
-beginchar(oct"215",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+
- if serifs:.4jut#elseif not slitex: .5*(.5[vair#,stem#])fi
- +if monospace:1.8elseif slitex:1.5else:.5fi tiny#+1.3u#);
-gen_letter;
-else:
-adjust_fit(fit_params);
-this_letter; spirit_acute(x_baryctr)<;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with smooth breathing and acute and iota subscript";
-beginchar(oct"216",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+
- if serifs:.4jut#elseif not slitex: .5*(.5[vair#,stem#])fi
- +if monospace:1.8elseif slitex:1.5else:.5fi tiny#+1.3u#);
-gen_letter;
-else:
-adjust_fit(fit_params);
-this_letter; spirit_acute(x_baryctr)>;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with circumflex";
-beginchar(oct"220",width#,circ_ht#,0);
-adjust_fit(fit_params);
-this_letter; if not small_caps:
-squeeze:=false; circumflex(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with rough breathing and circumflex";
-beginchar(oct"221",width#,Circ_ht#,0);
-adjust_fit(fit_params);
-this_letter; if not small_caps:
-squeeze:=true; spirit_circumflex(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with smooth breathing and circumflex";
-beginchar(oct"222",width#,Circ_ht#,0);
-this_letter; if not small_caps: squeeze:=true; spirit_circumflex(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with circumflex and iota subscript";
-beginchar(oct"224",width#,if small_caps:height#else:circ_ht#fi,iota_dp#);
-if small_caps:
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+
- if serifs:.4jut#elseif not slitex: .5*(.5[vair#,stem#])fi
- +if monospace:1.8elseif slitex:1.5else:.5fi tiny#+1.3u#);
-gen_letter;
-else:
-adjust_fit(fit_params);
-this_letter; squeeze:=false; circumflex(x_baryctr);
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with rough breathing, circumflex and iota subscript";
-beginchar(oct"225",width#,if small_caps:height#else:Circ_ht#fi,iota_dp#);
-if small_caps:
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+
- if serifs:.4jut#elseif not slitex: .5*(.5[vair#,stem#])fi
- +if monospace:1.8elseif slitex:1.5else:.5fi tiny#+1.3u#);
-gen_letter;
-else:
-adjust_fit(fit_params);
-this_letter;squeeze:=true; spirit_circumflex(x_baryctr)<;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with smooth breathing, circumflex and iota subscript";
-beginchar(oct"226",width#,if small_caps:height#else:Circ_ht#fi,iota_dp#);
-if small_caps:
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+
- if serifs:.4jut#elseif not slitex: .5*(.5[vair#,stem#])fi
- +if monospace:1.8elseif slitex:1.5else:.5fi tiny#+1.3u#);
-gen_letter;
-else:
-adjust_fit(fit_params);
-this_letter; squeeze:=true; spirit_circumflex(x_baryctr)>;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase alpha with iota subscript";
-beginchar(oct"370",width#,height#,iota_dp#);
-if small_caps:
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+
- if serifs:.4jut#elseif not slitex: .5*(.5[vair#,stem#])fi
- +if monospace:1.8elseif slitex:1.5else:.5fi tiny#+1.3u#);
-gen_letter;
-else:
-adjust_fit(fit_params);
-this_letter;
-fi
-iota_sub(pos_stem); endchar;
-
-%picture pic.iota;
-picture savedpicture; currentbreadth:=0;
-
-
-def dims = if small_caps: 10u#, sclc*x_height#,0 % lowercase beta
- else: if cbleipzig: 8u#,asc_height#,desc_depth#
- elseif cbroman:8u#,asc_height#,0
- else:9u#,asc_height#,desc_depth#
- fi
- fi enddef;
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-def gen_letter=
- if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(serif_fit#-.5u#,-.5u#);
- numeric left_stem,right_curve,middle_weight;
- left_stem=stem-hround 2stem_corr; middle_weight=.6vair+.5;
- 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
- penpos3(.7cap_band,90); penpos4(.7cap_band,90);
- penpos6(middle_weight,-90); penpos7(middle_weight,-90);
- penpos8(middle_weight,90); penpos9(middle_weight,90);
- penpos5(right_curve-stem_corr,0); penpos10(right_curve,0);
- penpos11(cap_band,-90); penpos12(cap_band,-90);
- z3r=top z1; y4=y3; y5=.5[y4,y6]; y6=y7; y7l-y8l=vair;
- z12r=bot z2; y11=y12; y10=.5[y11,y9]; y8=y9; .5[y7l,y8l]=.52h;
- x4=x6; x9=x11=x4+.5u; x7=x8=x1; x9l:=x4+.25u;
- x5r=hround(w-1.5u); x10r=hround(w-u);
- if serifs: right_curve=curve-stem_corr; x4=.5[x1,w-1.5u];
- else: right_curve=curve-3stem_corr; x4=.5[x1,w-2.5u];
- x4l:=x4l-.5u; x9l:=x9l-.5u; fi
- x6l:=x6l-.5u; x11l:=x11l-.5u;
- fill stroke z3e..super_arc.e(4,5) & super_arc.e(5,6)..z7e; % upper lobe
- fill stroke z8e..super_arc.e(9,10) & super_arc.e(10,11)..z12e; % lower lobe
- if serifs: if not monospace:dish_serif(1,2,a,1/3,jut,b,1/3,.5jut) % upper serif
- else: serif(1,2,a,1/3,-jut) fi;
- dish_serif(2,1,c,1/3,jut,d,1/3,.5jut); fi % lower serif
- math_fit(0,.5ic#);
- else:
- italcorr .8*asc_height#*slant-.5u#;
- if (cursive or cbleipzig) and not SansSerif:
- if monospace or slitex: pickup fine.nib; fi
- numeric bstem; bstem=.7[hair,stem];
- pos1(bstem,0); lft x1l=3/4u; bot y1=-d if cbleipzig:+.5bstem fi;
- if cbleipzig:
- pos3(bstem,45); x3r=x1r; y3l=.55[bar_height,h];
- pos2(bstem,30);z2r=.7[z1r,z3r];
- else:
- pos2(bstem,0); x2r=x1r; y2=bar_height;
- pos3(bstem,-45); x3r=x1r; y3r=if serifs:if monospace:.3 else:.55fi
- else: if slitex:.4 else:.5fi fi[bar_height,h];
- fi
- pos5(hair,-90); x5=w/2; top y5l=h+oo;
- pos7((2*(h-y9)/h)*stem,180);
- x7l=w-7/5x1l;
- if cbleipzig: y7=.5[y9,y5]; else: y7=3/4h; fi
- pos8(hair,90); x8=x5; y8=y9;
- pos9(max(hair,9/10bstem),90);
- x9-.5bstem=rt x1r+.15u;
- if cbleipzig: top y9r=x_height; else: y9=1/2h; fi
- if cbleipzig:
- filldraw circ_stroke z1e{up}..z2e..z3e..{right}z5e..{down}z7e..{left}z8e;
- else:
- filldraw stroke z1e{up}..z2e..z3e..{right}z5e..{down}z7e..{left}z8e;
- fi
- filldraw circ_stroke z9e..if not cbleipzig:{right}fi z8e;
- pos12(stem,0); x12r=w-x1l; if cbleipzig: y12=.5[y14,y9];else:y12=1/4h;fi
- pos14(fine+eps,-90); x14=x5; bot y14r=-oo;
- pos15(bstem,-135); x15l=x1r; if cbleipzig: y15= bstem;else:y15=x_height-y9;fi
- filldraw stroke z8e{right}..{down}z12e..{left}z14e..z15e;
- numeric bstem;
- elseif cbroman:
- numeric bstem,slope; bstem=.7[hair,stem];
- pos1(bstem,180); z1=z2;
- pos2(bstem,0); lft x2l=3/4u; y2=.6[bar_height,x_height];
- pos3(bstem,-30); x3r=x2r; y3r=.55[bar_height,h];
- pos5(hair,-90); x5=.5[x3r,x7r]; top y5l=h+oo;
- pos7(bstem,180); z7-(w,0)=whatever*((w/2+u,h)-(w,0)); y7=.45[x_height,h];
- pos9(hair,135); z9r=z2l;
- slope=angle((w,x_height)-z2);
- filldraw stroke z9e{dir(slope)}..z7e{up}...z5e{left}...z3e---{down}z2e;
- path cbp; cbp=z9{dir(slope)}..{up}z7;
- pair za,zb; za=point .5 of cbp; zb=direction .5 of cbp;
- pos8(hair,angle(zb)); z8=za;
- pos12(stem,0); x12r=w-x2l; y12=.5[y8l,y14r];
- pos14(hair,-90); x14=.5[x1l,x12l]; bot y14r=-oo;
- filldraw stroke z1e{down}...{right}z14e...{up}z12e...{dir(180-slope)}z8e;
- numeric bstem,slope; pair za,zb; path cbp;
- elseif SansSerif:
- pickup fine.nib;
- numeric thin_stem,beta_hair;
- beta_hair=.65hair;
- thin_stem=.3[beta_hair,stem]; %for upper bowl
- pos1(stem,180); y1-stem=-d-o; %bottom left
- pos2(stem,180); y2=.9bar_height; %self-intersection (cf. z15)
- x1=x2; lft x1r=hround(.75u); %i.e., lft x2r = .75u
- pos3(stem,180);
- x3r=x2r; y3r=.3[y10,y5]=.9y7r; %beginning of curve
- x7r=x12r-.9u;
- pos7(stem,0);
- top y5r=h+oo; bot y14r=-oo;
- x5r=.5[x3r,x7r]; x14r=w/2; %top and bottom bulges
- pos5(.1 [beta_hair,hair],90);
- y10=y9=.56[y14,y5]; x9r=x10r; %top and bottom of cusp
- pos10(beta_hair,90); pos9(beta_hair,-90);
- rt x12r=hround(w-.75u); %lower right bulge
- y12r=y10/2;
- pos12(stem,0);
- x9r=hround(x5r-.5u-.5thin_stem);
- pos14(thin_stem,-90);
- z15l=z2l;
- pos15(.5hair,180);
- filldraw stroke z1e--z2e--z3e{up}..tension(.8)..z5e{right}..tension(.8)
- ..z7e{down}...{left}z9e;
- filldraw stroke z10e{right}..tension(.8)..z12e{down}..{left}z14e..{up}z15e;
- else:
- pickup fine.nib;
- numeric thin_stem; thin_stem=.6[hair,stem]; %for upper bowl
- numeric tilt; tilt=min(2*otilt,.5); %for both bowls
- pos1(stem,180); y1-.5stem=-d-o; %bottom left
- pos2(hair,180); y2=.5bar_height; %self-intersection (cf. z15)
- x1=x2; lft x1r=hround(.75u+.5(hair-stem)); %i.e., lft x2r ~ .75u
- x3r=x2r; %beginning of curve
- top y5r=h+oo; bot y14r=-oo; x5r=x14r; %top and bottom bulges
- if monospace or slitex:
- top y10r=x_height; z9=z10;
- pos9(stem,-90); pos10(stem,90);
- else:
- top y10r=vstem+bot y9r=x_height; x9r=x10r; %top and bottom of cusp
- fi
- rt x12r=hround(w-.75u); %lower right bulge
- x5r=.5[lft x2r,rt x12r]; x9r-.5vstem=hround(x5r-.5u-.5vstem);
- % we want to simulate the following relations, to make slopes consistent
- % (where z7 is the upper right bulge):
- % z5r-z3r=whatever*(z9r-z7r)=whatever*(z14r-z12r);
- % z7r-z5r=whatever*(z12r-z10r)=whatever*(z5r-z3r) yscaled -1;
- numeric slope;
- slope=((y10r-y12r)+(y12r-y14r))/((x12r-x10r)+(x12r-x14r));
- z7'r=z9r+whatever*(1,slope); z7'r=z5r+whatever*(1,-slope);
- y7r=y7'r; rt x7r=hround rt x7'r;
- z12r=z14r+whatever*(1,slope); z3r=z5r+whatever*(1,slope);
- if monospace or slitex:
- pos7(stem,0); pos5(stem,90); pos3(stem,180); %top and left
- filldraw circ_stroke z1e--z2e..z3e{up}..{right}z5e...{down}z7e;
- else:
- filldraw double_circ_stroke gr_arc.e(7,6,5)(hair,thin_stem,tilt)..
- gr_arc.e(5,4,3)(hair,thin_stem,tilt)..{down}z2e..z1e;
- fi
- z2=z15; pos15(hair,slope-90); %intersection pt
- numeric slope;
- slope=angle((z14r-z15)yscaled 2);
- filldraw stroke z15e{dir slope}...gr_arc.e(14,13,12)(hair,stem,tilt); %bottom
- if not (monospace or slitex):
- forsuffixes e=r,l:
- path curv[]e; numeric S[]e;
- curv1e=reverse gr_arc.e(9,8,7)(hair,thin_stem,tilt); %cusp bottom
- curv2e=gr_arc.e(12,11,10)(hair,stem,tilt); endfor %cusp top
- (S1r,S2r)=curv1r intersectiontimes curv2r;
- (whatever,S2l)=curv1r intersectiontimes curv2l;
- (S1l,whatever)=curv1l intersectiontimes curv2r;
- if S1l=-1 : S1l:=2; fi
- if S2l=-1 : S2l:=2; fi
- filldraw stroke subpath(0,S1e+eps) of curv1e; %fill in cusp
- filldraw stroke subpath(0,S2e+eps) of curv2e;
- filldraw subpath (S1r+eps,2) of curv1r...subpath(2,S2r+eps) of curv2r..cycle;
- else:
- if slitex:
- filldraw double_circ_stroke z12e{up}...{left}z10e;
- else:
- filldraw stroke z12e{up}...{left}z10e;
- fi
- filldraw stroke z9e{right}...{up}z7e;
- fi
- fi
- fi
-enddef;
-
-cmchar "Lowercase beta";
-beginchar("b",dims);
-this_letter; penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;% "Lowercase beta"
-
-picture savedpicture; currentbreadth:=0;
-
-
-
-def dims = if small_caps: 8.5u#, sclc*x_height#,0 % gamma
- else:
- if cbleipzig:8.5%
- elseif cbroman:9%
- else:10%
- fi
- u#,x_height#,desc_depth# fi enddef;
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-
-
-def gen_letter=
- if small_caps: sc_beak_jut:=.7beak_jut; sc_beak:=.7beak; sc_jut:=.9jut;
- italcorr height#*slant-beak_jut#-.25u#;
- h:=vround(h-stem_corr);
- pickup tiny.nib; pos1(stem,0); pos2(stem,0);
- lft x1l=lft x2l=hround 1.5u+sc_beak_jut; 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-if serifs:.75fi u); y4=good.y(y3l-sc_beak)-eps;
- arm(3,4,e,beak_darkness,sc_beak_jut); % arm and beak
- if serifs: dish_serif(1,2,a,1/3,sc_jut,b,1/3,.5sc_jut); % upper serif
- dish_serif(2,1,c,1/3,sc_jut,d,1/3,1.25sc_jut); fi % lower serif
- math_fit(0,ic#-2.5u#);
- else:
- if cursive and serifs and not monospace:
- adjust_fit(.5stem#,0);
- pos1(hair,90); pos2(stem,45);
- lft x1r=0; top y1=bot y2l; top y2r= h+oo; x2l-x1r=5/4u;
- pos3(stem,0); x3l=x2r+2/3u; y3=3/4h;
- pos4(hair,0); y4=-o; x4=w/2;
- filldraw stroke z1e..z2e..z3e..{down}z4e;
- pos7(hair,-45); z7=z4;
- pos5(stem,0); bot y5-.5stem=-d-oo; z4-z5=whatever*dir(70);
- filldraw z4r{down}..z5r...z5l{up}...{dir(45)}z7l--cycle;
- numeric tilt; tilt=20;
- pos6(stem,30); top y6=h+oo-.5stem; rt x6r=w-3/4u;
- filldraw circ_stroke z6e{dir(tilt-90)}..{dir(225)}z7e;
- numeric tilt;
- elseif cbleipzig:
- adjust_fit(.5u#,0);
- pos1(fine,150); lft x1r=0; top y1=bot y2l-u;
- top y2r= h+oo=y2l+stem; x2l=.5[x1l,x3l];x2r=.5[x1r,x3r]; z2=.5[z2l,z2r];
- pos3(.5[hair,stem],30); x3l=x1l+2.5u; y3=3/4h;
- pos4(.3[hair,stem],0); z4=(w,h)+whatever*(((w,h)-(0,-d))yscaled1.2); y4=o;
- filldraw circ_stroke z1e{up}...z2e{right}...z3e..{down}z4e;
- z5=z1 +whatever*(slant,-1); bot y5=-d;
- numeric slope,pend; slope= angle(z4-z5); pend=slope-90;
- pos5(.1[hair,stem],pend);
- pos9(stem,pend); z9-z5=whatever*(z4-z5);y9=y5+.34stem*sind(slope);
- pos7(.3[hair,stem],pend-30); z7=z4;
- filldraw z4r{down}..z9r..z5r..z5l..z9l..{dir(pend+60)}z7l--cycle;
- pos6(stem,0); top y6=h+oo-.5stem; rt x6r=w-3/4u;
- pos8(.4[hair,stem],-15); y8=.7[y4,y6]; x8r=x6r;
- filldraw circ_stroke z6e..z8e...{-dir(pend+60)}z7e;
- elseif SansSerif:
- pickup fine.nib; superness__:=superness;
- begingroup
- save t; t:=superness__;
- superness:=.95t;
- pos2(curve,90); top y2r=h+oo; %top of left branch
- pos1(hair,180); bot y1=top y2r-4/3curve; %tip of hook
- lft x1r=hround .5u; x2-x1=y2-y1; %central arc is round
- pos5(curve,-270); top y5r=h+oo; x5=hround(w-.75u); %right branch
- pos5'(curve,0); z5'=z5;
- filldraw stroke z1e{up}...z2e{right};
- x3-x4=abs(if (not monospace): 1.2stem-vair else: 0 fi);
- pos3(hair,0); pos4(hair,-180);
- y4=y3; .5[x3,x4]=.5w;
- y3-.5stem=vround(-.8d);
- drawloop(2,3,4,5); %hook and cusp
- endgroup;
- superness:=superness__;
- elseif cbroman:
- pickup tiny.nib;
- pos1(stem,0);top y1=h; lft x1l=jut;
- pos2(stem,0);y2=0; x2=w/2;
- pos3(stem,0); bot y3=-d; x3=x2;
- pos4(hair,0);z4r=z2r;
- pos5(hair,0);y5=y1; rt x5r=w-jut;
- filldraw stroke z1e--z2e--z3e;
- filldraw stroke z4e--z5e;
- dish_serif(3,2,a,1/3,.8jut,b,1/3,.8jut);
- serif(1,2,c,1/3,-.8jut);
- dish_serif(5,4,f,1/4,.8jut,g,1/4,.8jut);
- else:
- pickup fine.nib; superness__:=superness;
- begingroup
- save t; t:=superness__;
- superness:=.95t;
- pos2(curve,90); top y2r=h+oo; %top of left branch
- pos1(hair,180); bot y1=top y2r-4/3curve; %tip of hook
- lft x1r=hround .5u; x2-x1=y2-y1; %central arc is round
- pos5(curve,-270); top y5r=h+oo; x5+.5curve=hround(w-.75u); %right branch
- pos5'(curve,0); z5'=z5;
- filldraw stroke z1e{up}...z2e{right};
- if serifs and (not monospace):
- rt x3r-lft x4r= stem; %bottom of cusp
- else:
- x3-x4=abs(if (not monospace): 1.2stem-vair else: 0 fi);
- fi
- pos3(hair,0); pos4(hair,-180);
- y4=y3; .5[x3,x4]=.5w;
- if monowidth:
- y3=0 else: y3-.5stem=vround(-.8d)
- fi;
- drawloop(2,3,4,5); %hook and cusp
- filldraw z5l{right}...z5'r{up}...z5r{left}--cycle; %right branch
- if monowidth: %complete stem
- x3'=x3r; x4'=x4r; y3'=y4'; y3'-.5stem=vround(-.8d);
- filldraw z3r--z3'{down}...{up}z4'--z4r--cycle;
- fi
- endgroup;
- superness:=superness__;
- fi
- fi
-enddef;
-
-
-cmchar "Lowercase gamma";
-beginchar("g",dims);
-if small_caps: adjust_fit(.7serif_fit#,0)
- elseif cbroman: adjust_fit(serif_fit#,serif_fit#)
- else: adjust_fit(0,0)fi;
-this_letter; penlabels(1,2,3,3',4,4',5,6,7,8,9); endchar;% "Lowercase gamma"
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-def dims = if small_caps: 11u#, sclc*x_height#,0 % delta
- elseif cbleipzig:
- 8.4 u#,asc_height#,0
- else: 8.5u#,asc_height#,0
- fi enddef;
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-
-def gen_letter =
- if small_caps:
- numeric left_stem,alpha;
- left_stem=hair if hefty: -3stem_corr fi;
- x1l=w-x4r=.75u; y1=y4=0;
- 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*stem,0); penpos4(alpha*stem,0);
- fill diag_end(2l,1l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)--cycle; % triangle
- z0=whatever[z1r,z2r]=whatever[z3l,z4l];
- y5=y6=vstem; z5=whatever[z1r,z2r]; z6=whatever[z3l,z4l];
- if y0<h-notch_cut: y0:=h-notch_cut;
- unfill z0+.5right{down}...{z4-z3}z6--z5{z2-z1}
- ...{up}z0+.5left--cycle; % counter
- else: unfill z0--z5--z6--cycle; fi % counter
- elseif cbleipzig: % cbleipzig
- pos1(hair,-90);
- pos2(stem,0); lft x2l=3/4u; y2=y1/2;
- pos3(.2[fine,stem],90); bot y3l=-oo; x3=x1;
- pos4(stem,180); y4=y2; x4l=w-x2l;
- pair zd,ze,zf; zd=(-w,h-x_height);
- pos5(stem-fine/2,angle(zd)+90);
- z5r=z1; x5r=w/2; y1l=x_height+oo;
- x6l-x6r=.6[hair,stem]; x6l=.2[x2r,x8l];
- y6l=.7[y5l,y8l]; y6r=.8[y5r,y8r];z6=.5[z6r,z6l];
- compl_slant_angle=angle((1,slant));
- pos8(hair,90); y8r=h+oo; z8=z5+whatever*dir(90+compl_slant_angle);
- pos9(.2[hair,stem],-compl_slant_angle);
- y9l=y5l+2stem/3;z9l=z5l+whatever*dir(80);
- path cbp; cbp=z4r{up}...z1r{left};
- zf=point .7 of cbp; ze=direction .7 of cbp;
- pos0(stem-fine/2,.5[angle(ze)+90,270]); z0r=zf;
- path cbp; cbp= z4l..z0l..z6l{dir(80)};pair zf; zf=direction1.6of cbp;
- pos7(.9length(z6r-z6l),angle(zf)+90); z7l=point1.6of cbp;
- filldraw double_circ_stroke z4e{up}..z1e{left}..z2e..z3e..z4e..z0e..z7e..%
- z6e{dir(80)}...{right}z8e..{dir(-compl_slant_angle-90)}z9e;
- unfill z1r..z2r...z3r..z4r...cycle;
- numeric compl_slant_angle;
- elseif cbroman: % cbroman
- pos1(hair,90); pos2(stem,180); pos3(hair,-90); pos4(stem,0);
- y1r=x_height+oo; y3r=-oo; y2=y4=x_height/2; x1=x3=w/2; x2r=w-x4r=u/2; z5r=z1r; z5l=z1l;
- filldraw stroke z1e{left}...z2e...z3e...z4e...{left}z5e;
- pos6(1.414hair,45); pos7(stem,0); pos8(hair,-90); pos9(hair,-180);
- z6=z1; x7l=u; y7=.5[x_height,h]; x8=x1;y8l=h+oo;
- x9r=x4l; y9=y7;
- filldraw stroke z6e{left}..{up}z7e...{right}z8e...{down}z9e;
- pos10(stem,0);pos11(stem,90);z10=z11; z10r=z9l;
- dot(10,11);
- elseif monospace or slitex or SansSerif: % sanserif, typewriter, slides
- pickup fine.nib;
- top y1r=vround(if not monowidth:.95 fi x_height+oo); x1r=.5w; %top of loop
- x5r=.5w; bot y5r=-oo; %bottom of ditto
- lft x3r=w-rt x7r=hround(.75u); y3r=y7r=.5[y1r,y5r]; %left and right bulge
- filldraw stroke gr_arc.e(1,2,3)(vair,stem,.5otilt) %four quadrants of loop
- & gr_arc.e(3,4,5)(vair,stem,.5otilt) & gr_arc.e(5,6,7)(vair,stem,.5otilt)
- & gr_arc.e(7,12,1)(vair,stem,.5otilt);
- path cbp;
- cbp= z7r...z12r...z1r; % external path of first quadrant
- z8r=point if slitex:.90elseif monospace:.84else:.76fi of cbp; % find attachment point
- z.a= direction if slitex:.90elseif monospace:.84else:.76fi of cbp; % tangent direction at attachment
- numeric axis; axis=angle(z.a)-90; % normal to tangent
- numeric thin_stem, raggio; thin_stem=top y1r - bot y1l; % thickness of arc
- raggio=.5stem+thin_stem; % radius of arc
- pos8(thin_stem,axis);
- pos9(thin_stem,axis);
- pos10(thin_stem,angle(z8l-z8r));
- pos11(thin_stem,axis-180);
- z10=z8+whatever*(z8l-z8r); % Start and end of delta arc are alligned along z8 direction
- top y11l=if gensize<6: h-o else:min(h-o,x_height+3.3stem) fi;% top of delta arc
- z0=.5[z8r,z10r]+whatever*dir(axis+90)=.5[z9r,z11r]; % center of delta arc defines median line
- z9r-z8r=whatever*dir(axis+90)=z11r-z10r; % allignment of straight parts of the delta arc
- x0=lft x3r+.5u+raggio; % center of delta arc
- filldraw stroke z8e..z9e{dir(axis+90)}..{dir(axis-90)}z11e..z10e;% delta arc
- else: % regular, outline and cursive
- pos1(hair,-90); y1l=x_height+o; x1=w/2;
- pos2(stem,0); lft x2l=3/4u; y2=y1/2;
- pos3(hair,90); bot y3l=-oo; x3=x1;
- pos4(stem,180); y4=y2; x4l=w-x2l;
- pair zd,ze; zd=(-w,h-x_height);
- ze=zd rotated -90;
- pos5(stem,180); z5=z1;
- pos6(hair,angle(zd));
- z6-(w,x_height)=whatever*zd; x6r=.1[x2l,x1];
- pos7(.5[hair,stem],90);
- x7= x4; y7=.6[y5,y6];
- filldraw stroke z1e{left}..z2e..z3e..z4e..z5e...z6e{ze}...{-zd}z7e;
- fi
-enddef;
-
-
-cmchar "Lowercase delta";
-beginchar("d",dims);
-this_letter; penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12); endchar;% "Lowercase delta"
-
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-def width = if small_caps: 9 else: % epsilon
- if cbleipzig:7%
- elseif cbroman:7
- else:7.75
- fi
- fi u enddef; % epsilon
-def height = if small_caps: sclc* fi x_height enddef;
-def dims = width#,height#,0 enddef;
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-def gen_letter =
- if small_caps:
- sc_beak#:=.7beak#; sc_beak_jut#:=.7beak_jut#;
- define_pixels(sc_beak,sc_beak_jut);
- adjust_fit(.7serif_fit#,0);
- italcorr slant*height#-sc_beak_jut#-.5u#;
- h:=vround(h-stem_corr);
- pickup tiny.nib; pos1(stem,0); pos2(stem,0);
- lft x1l=lft x2l=hround max(1.5u,2.5u-.5stem); 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-sc_beak)-eps;
- arm(3,4,e,beak_darkness,sc_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(.5[x3r,x4r+sc_beak_jut]);
- y6=good.y(y5l+.6*sc_beak)+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/6sc_beak)+eps;
- arm(8,9,h,beak_darkness,1.5sc_beak_jut); % lower arm and beak
- if serifs: dish_serif(1,2,a,1/3,jut,b,1/3,.5jut); % upper serif
- dish_serif(2,1,c,1/3,jut,d,1/3,.5jut); fi % lower serif
- math_fit(0,.5ic#);
- else:
- adjust_fit(fit_params);
- if cursive and not SansSerif:
- if slitex or monospace: pickup fine.nib; fi
- pos1(hair,90); pos2(stem,180); pos3(hair,270);
- lft x2r=3/4u; rt x1=rt x3=w-u;
- h-top y1r=bot y3r=-oo; y2=bar_height;
- filldraw stroke z1e{left}..z2e..{right}z3e;
- numeric ehair; ehair=.3[hair,stem];
- pos4(ehair,90); pos5(hair,90);
- x4=x2; x5=x1-min(hair,u); y4=y5=y2;
- filldraw stroke z4e..z5e;
- numeric x_baryctr; x_baryctr=w/2;
- elseif cbleipzig:
- pos1(.5[hair,stem],30); z1=whatever*(w,.9h); x1r=hround(w-.7u);
- pos7(.5[fine,hair],90); y7r=h+oo;x7=w/2;
- pos2(stem,180);x2r=.5u; y2=.5[bar_height,h];
- pos4(.7[hair,vstem],-90);y4=bar_height;
- pos5(stem,0);x5l=x2r; y5=.5bar_height;
- pos6(hair,135); x6l+x5l=w; y6r=y5;
- pos8(hair,90);x8=x7; y8l=-oo; x4l=x1l-.7stem;
- pos9(hair,-90); x9=.9[x2l,x7]; y9=y4;
- pair za,zb; zb=(z4l-z9l)yscaled1.2;za=zb yscaled-1;
- filldraw z4l{left}...{-zb}z9l--z9r{za}...{right}z4r..cycle;
- filldraw circ_stroke z1e..{left}z7e..z2e{down}..{za}z9e;
- filldraw circ_stroke z6e{(z8-z6)yscaled 4}..z8e{left}..{up}z5e..{zb}z9e;
- numeric x_baryctr; x_baryctr=x7; %accent reference
- elseif cbroman:
- pos1(hair,0); x1r=w-u; y1=y3;
- pos2(hair,90); x2=w/2; top y2r=h+oo;
- pos3(stem,180); x3r=u; y3=.5[y4,h];
- pos4(hair,-90); y4=bar_height; z4=whatever*z1r;
- pos5(hair,90); z5=z4;
- pos6(stem,180);x6r=u/2; y6=y4/2;
- pos7(hair,-90); x7=x2; bot y7r=-oo;
- pos8(hair,-30);x8r=w-u/2; y8=y6;
- pos9(stem,0);pos10(stem,90); z9=z10; z9r=z1r;
- dot(9,10);
- filldraw circ_stroke z4e{left}...z3e...{right}z2e...{down}z1e;
- filldraw stroke z5e{left}...z6e...{right}z7e..{dir(60)}z8e;
- numeric x_baryctr; x_baryctr=x2; %accent reference
- elseif SansSerif:
- pickup fine.nib;
- numeric estem,evair;
- estem=if gensize<6:.7fi stem;
- evair=if gensize<6:max(.7vair,crisp.breadth+eps) else:vair fi;
- pos2(estem,90); x2=.5w; top y2r=x_height+oo; %top point
- pos7(estem,-90); x2=x7; bot y7r=-oo; %bottom point
- pos1(estem,45);x2=.5[x3r,x1r]; y1r=y2l; %upper tip
- pos3(estem,170); lft x3r=hround u; y3l=.5[y4l,y2l]; %top left bulge
- pos6(estem,-170); x6r=hround .75u; .5[y6l,y3l]=bar_height; %bottom left bulge
- pos4(evair,-90); y4=bar_height; x4=.35[x2,x1];
- pos5(evair,90);z5=z4;
- pos8(estem,-45);x8l=.5[x1,x1l];y8r=y7l;
- filldraw stroke z1e{dir 135}..{left}z2e..{down}z3e..{right}z4e;
- filldraw stroke z5e{left}..{down}z6e..{right}z7e..{dir 45}z8e;
- numeric x_baryctr; x_baryctr=x2; %accent reference
- else:
- pickup fine.nib;
- pos2(vstem,90); x2=.5w; top y2r=x_height+o; %top point
- pos7(vstem,-90); x2=x7; bot y7r=-o; %bottom point
- rt x1r=hround(w-.75u); bot y1l=.3[bot y2l,bar_height]; %top end
- z1'=(x1r,y1l+.5(flare-currentbreadth)); %approximation to z1
- numeric slope; slope=angle((z2-z1')yscaled 2); pos1(flare,slope-90);
- bar_height=.5[y1,y8]; x8=x1; pos8(flare,slope+90); %bottom end
- pos3(vstem,120); lft x3r=hround .75u; y3=.5[y4r,y2r]; %top left bulge
- pos6(vstem,-120); x6=x3; .5[y6,y3]=bar_height; %bottom left bulge
- y6:=y6r;y3:=y3r; %for the benefit of pulled_arc
- y5-y4=abs(curve-min(hair,vair));
- y5+y4=2bar_height; x5=x4=x2; %loop
- pos4(vair,-90); pos5(vair,90);
- filldraw stroke z1e{dir slope}...pulled_arc.e(2,3); %top
- drawloop(3,4,5,6); %loop and bottom
- forsuffixes e=l,r:
- path foo.e; foo.e= z8e...pulled_arc.e(7,6);
- if angle(direction 0 of foo.e) > angle(z8r-z8l):
- foo.e:= z8e{z8r-z8l}...pulled_arc.e(7,6); fi
- endfor;
- filldraw stroke foo.e;
- numeric x_baryctr; x_baryctr=x2; %accent reference
- fi
- fi
-enddef;
-
-cmchar "Lowercase epsilon";
-beginchar("e",dims);
-this_letter; penlabels(1,2,3,4,5,6,7,8,9); endchar;% "Lowercase epsilon"
-
-
-iff(not barebones):
-cmchar "Lowercase epsilon with grave";
-beginchar(oct"340",width#,acc_ht#,0); this_letter;
-if not small_caps: grave(x_baryctr); fi
-endchar;
-
-
-iff(not barebones):
-cmchar "Lowercase epsilon with rough breathing";
-beginchar(oct"341",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit(x_baryctr)<; fi endchar;
-
-
-iff(not barebones):
-cmchar "Lowercase epsilon with smooth breathing";
-beginchar(oct"342",width#,acc_ht#,0);
-this_letter;
-if not small_caps:
- if SansSerif:
- spirit(x_baryctr)>;
- else:
- spirit(x_baryctr-u)>;
- fi
-fi
-endchar;
-
-iff(not barebones):
-cmchar "Lowercase epsilon with acute";
-beginchar(oct"350",width#,acc_ht#,0);
-this_letter; if not small_caps: acute(x_baryctr); fi endchar;
-
-
-iff(not barebones):
-cmchar "Lowercase epsilon with rough breathing and acute";
-beginchar(oct"351",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit_acute(x_baryctr)<; fi endchar;
-
-
-iff(not barebones):
-cmchar "Lowercase epsilon with smooth breathing and acute";
-beginchar(oct"352",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit_acute(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase epsilon with rough breathing and grave";
-beginchar(oct"343",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit_grave(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase epsilon with smooth breathing and grave";
-beginchar(oct"353",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit_grave(x_baryctr)>; fi endchar;
-
-picture savedpicture; currentbreadth:=0;
-
-
-
-def dims = if small_caps: % zeta
- 9u#,sclc*x_height#,0
- else:
- if cbleipzig:7.5else:
- 8.5fi
- u#,asc_height#,desc_depth#
- fi enddef;
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-
-def gen_letter=
- if small_caps:
- italcorr height#*slant-.5u#;
- adjust_fit(0,0);
- numeric arm_thickness[],z_stem;
- if hefty: arm_thickness1=Vround(slab-vair_corr); arm_thickness2=slab;
- z_stem=.8[vair,stem];
- else: arm_thickness1=slab; arm_thickness2=vround(slab+vair_corr);
- z_stem=.9[vair,stem]; fi
- pickup tiny.nib; x3l=x4l=w-x1r=w-x2r; lft x3l=hround u/2;
- top y1=h; y2=min(y1,h-2/3arm_thickness1);
- bot y4=0; y3=max(y4,2/3arm_thickness2);
- numeric alpha; alpha=diag_ratio(1,z_stem-tiny,y2-y3,x2r-x3l);
- 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 1.25u; y6=good.y(y5l-beak)-eps;
- arm(5,6,a,beak_darkness**.8,-.4beak_jut); % upper arm and beak
- pos7(arm_thickness2,-90); pos8(hair,0);
- bot y7r=0; x7=x4; rt x8r=hround(w-.9u); y8=good.y(y7l+1.2beak)+eps;
- arm(7,8,b,beak_darkness**.9,.6beak_jut); % lower arm and beak
- math_fit(0,.5ic#);
- else:
- if cursive and serifs and not monospace:
- pos4(stem,-180); y4=.8bar_height; lft x4r=hround(.75u); %left bulge
- pos6(hair,-180); rt x6l=hround(w-.75u); y6=-.5stem; %bottom right
- y3+.5stem=h+o; x3+.5stem=hround(rt x6l-.25u); %top right
- numeric slope; slope=angle((z3-z4)xscaled 2);
- pos3(.5[hair,stem],slope+90);
- pos5(stem,-135); bot y5r=0; x5=.5w; %inflection pt
- pos7(vstem,-270); y6=.5[y7r,y5r]; x7-.5vstem=hround x5;
- filldraw double_circ_stroke %bowl and tail
- z7e{right}...z6e{up}...z5e{left}...z4e{up}...z3e{dir slope};
- pos2(hair,slope+90); z2r=z3r; %where handle attaches
- pos0(hair,0); y0=h; x0=x1r;
- pos1(stem,0); lft x1l=hround(lft x4r+.25u); y1+.5stem=h; %end of handle
- filldraw stroke z0e..z1e{down}...z2e{dir slope};
- elseif cbleipzig:
- numeric tilt; tilt=10;
- pos1(hair,90);y1r=h; x1l=.6[x2l,x3l];
- y2r=.5[y3r,y1r];y2l=.5[y3l,y1l];x2r=.75[x3,x5r]=x2l-.5[hair,stem];
- pos3(hair,-90-tilt);x3=w/2; y3l=.5[x_height,h];
- pos4(hair,90+tilt); z3=z4;
- pos5(hair,180); x5r=hround(.5u); y5=bar_height;
- pos6(stem,-90); y6r=0;x6=2w/5;
- pos7(stem,90); y7=y3; x7=w-x5r-stem; z8=z7+(.5stem,0);
- pos9(stem,-90); y9=y6; x9=2w/3;
- x10l=w-x5r=x10r+.5[hair,stem];
- y10l=.5[y9l,y11l];y10r=.5[y9r,y11r];z10=.5[z10r,z10l];y10=-.25desc_depth;
- pos11(hair,90);x11=x6;
- filldraw circ_stroke z1e{left}...z2e..{dir(-tilt)}z3e; % hook
- filldraw stroke z4e{dir(180+tilt)}...z5e{down}..{right}z6e; % left bulge
- filldraw z3r{dir(-tilt)}...z7l..z8..z7r...{dir(180+tilt)}z4r..cycle; % top right
- filldraw circ_stroke z11e{right}..z10e{up}..z9e{left}--z6e; % bottom
- elseif cbroman:
- pos10(hair,90);x10r=x2r; y10r=y11r=h;
- pos11(hair,90);x11=w-u/2;
- pos1(hair,angle(z11)-90); z1r=z11l;
- pos2(stem,0); x2l=u/2; y2=.7bar_height;
- pos3(stem,90); y3l=y4l=0; z3=z2+whatever*dir(-45);
- pos4(stem,90);x4=w-x3;
- pos5(.5[hair,stem],30); x5r=x11; y5l=.5[y4l,y6l];
- pos6(hair,-90);x6=w/2; y6r=-(.5[y2r,d]);
- filldraw stroke z10e--z11e;
- filldraw circ_stroke z6e{(z5-z6)xscaled3}...z5e{up}...z4e---z3e{left}...%
- z2e{up}...{(z1-z2)xscaled1.5}z1e;
- else:
- pickup fine.nib;
- pos4(hair,-180); y4=bar_height; lft x4r=hround(.75u); %left bulge
- pos6(hair,-180); rt x6l=hround(w-.75u); y6=-.5stem; %bottom right
- y3+.5stem=h+o;
- if SansSerif:
- x3+.35stem=x6l;
- else: %top right
- x3+.5stem=hround(rt x6l-.25u);
- fi
- numeric slope; slope=angle((z3-z4)xscaled 2); pos3(stem,slope+90);
- pos5(stem,-90); bot y5r=0; x5=.5w; %inflection pt
- pos7(vstem,-270); y6=.5[y7r,y5r];
- if SansSerif: %bowl and tail
- x7=hround x5;
- filldraw stroke
- z3e{dir(180+slope)}...z4e{down}...z5e{right}...z6e{down}...{left}z7e;
- % z7e{right}...z6e{up}...z5e{left}...z4e{up}...z3e{dir slope};
- else:
- x7-.5vstem=hround x5;
- filldraw double_circ_stroke
- z7e{right}...z6e{up}...z5e{left}...z4e{up}...z3e{dir slope};
- fi
- pos2(hair,slope+90); z2r=z3r; %where handle attaches
- pos1(curve,0); lft x1l=hround(lft x4r+.25u); %end of handle
- if SansSerif: y1=y3r; else: y1+.5curve=h+o; fi
- if SansSerif:
- filldraw stroke z1e{down}...z2e{dir slope};
- else:
- filldraw circ_stroke z1e{down}...z2e{dir slope};
- fi
- fi
- fi
-enddef;
-
-
-cmchar "Lowercase zeta";
-beginchar("z",dims);
-this_letter; penlabels(0,1,2,3,4,5,6,7,8,9,10,11); endchar;% "Lowercase zeta"
-
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-def width = if small_caps: if serifs: 11 else: 9 fi % eta
- elseif cursive and serifs and not monospace: 9.5
- elseif cbleipzig: 8.8
- else: 8.5
- fi u enddef;
-def dims = width#,if small_caps:sclc* fi x_height#,%
- desc_depth# enddef;
-def ital = 0 enddef;
-def fit_params = if small_caps: 0 else: if straight or SansSerif: .75 else: .5 fi u# fi,0 enddef;
-
-def gen_letter =
- if small_caps:
- pickup tiny.nib; pos1(stem,0); pos2(stem,0);
- pos3(stem,0); pos4(stem,0);
- lft x1l=lft x2l=hround (.5u+jut); 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+jut+.5u+1<=lft x3l-jut: inner_jut=jut;
- else: rt x1r+inner_jut+.5u+1=lft x3l-inner_jut; fi
- dish_serif(1,2,a,1/3,jut,b,1/3,inner_jut); % upper left serif
- dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); % lower left serif
- dish_serif(3,4,e,1/3,inner_jut,f,1/3,jut); % upper left serif
- dish_serif(4,3,g,1/3,inner_jut,h,1/3,jut); fi % lower left serif
- math_fit(0,.5ic#);
- numeric pos_stem;
- pos_stem=rt x4r if serifs or slitex:+jut+if slitex:.7else:.9fi u fi + if slitex:1.2*fi.5[vair,stem]+.1u;
- else:
- if cursive and serifs and not monospace:
- numeric cstem; cstem=stem;
- pos1(hair,90); pos2(cstem,45); pos3(cstem,0);
- x1=0; y1=y2l; y2r=x_height+oo; x2=.5[x1,x3]; y3=3/4y2r; x3l=x1+stem;
- pos4(stem,0); x4r=x3r; y4=0;
- filldraw stroke z1e..{right}z2e..{down}z3e..z4e;
- pos5(hair,135); z5l=z3r;
- pos6(stem,45); pos7(cstem,0); pos8(stem,0);
- x7r=x8r=w-u; y7=3/5y2r;
- y8=-d;
- x6l=.5[x5l,x7l]; y6r=y2r;
- filldraw stroke z5e..{right}z6e..{down}z7e..z8e;
- numeric x_baryctr; x_baryctr=.4[x3,x7]; %accent reference
- numeric pos_stem; pos_stem=x4; %iota reference
- elseif cbleipzig:
- numeric cstem; cstem=.6[hair,stem];
- pos1(.2[hair,stem],160);
- x1r=0; y1=3/4y2r;
- top y2r=h+oo=top y2l+.2[hair,stem]; x2l=.5[x1l,x5l]; x2r=.5[x1r,x5r]; z2=.5[z2l,z2r];
- pos5(stem,0); y5l=stem/2-oo/2; x5l=x1l+min(1.3stem,2u);
- pos4(stem,0);x4=x5;y4=.5[bar_height,y1l];
- filldraw double_circ_stroke z1e{(z2-z1)yscaled4}...z2e...{down}z4e--z5e;
- pos3(hair,180);
- z3l=.2[z4r,z5r];
- pos6(.1[hair,stem],90); pos7(cstem,0); pos8(stem,0);
- x7r=w-.75u; y7=.5y2r; x7l=x8l;
- y8=-d +stem/2;
- x6l=.77[x5l,x7l]; y6r=vround(h+oo);
- filldraw circ_stroke z8e..{up}z7e...{left}z6e..tension1.1..{down}z3e;
- numeric x_baryctr; x_baryctr=.5[x1,x7]; %accent reference
- numeric pos_stem; pos_stem=x5; %iota reference
- numeric cstem;
- elseif cbroman:
- pickup tiny.nib;
- pos1(stem,0);x1l=.9jut; bot y1=0;
- pos2(stem,0);x2l=x1l; top y2=h;
- pos3(hair,135);rt x3l=rt x1r; y3l=2h/3;
- pos4(.5[hair,stem],90); x4=.5[rt x3l,rt x5l]; top y4r=h+oo;
- pos5(stem,0); x5r=x6r; y5= bot y4l-(lft x5l-rt x3l)/2;
- pos6(stem,0); rt x6r=w-lft x1l;bot y6=-d;
- filldraw stroke z1e--z2e;
- filldraw stroke z3e{(z4-z3)yscaled 4}...{right}z4e...{down}z5e---z6e;
- serif(2,1,a,1/3,-.8jut);
- dish_serif(1,2,c,1/3,.8jut,d,1/3,.8jut);
- dish_serif(6,5,f,1/3,.8jut,g,1/3,.8jut);
- numeric x_baryctr; x_baryctr=x4; %accent reference
- numeric pos_stem; pos_stem=x1; %iota reference
- elseif SansSerif:
- pickup fine.nib;
- numeric hstem,hhair,hvstem;
- if gensize<6:
- hstem=.75stem;hhair=.75hair;hvstem=.75vstem;
- else:
- hstem=stem;hhair=hair;hvstem=vstem;
- fi
- y1r=-d; rt x1r= rt x2r; pos1(hstem,0); %bottom right
- rt x2r=hround(w-.75u); y2r=.6x_height; pos2(hhair,0); %right bulge
- y5=0; pos5(hstem,-180); %bottom left
- top y4r=x_height+o; x4r=.5[rt x2r,lft x3r]; %top of arch
- bot y4l=y4r-hstem; x4l=.5[lft x2l,rt x3l]; z4=.5[z4l,z4r];
- pos6(hstem,180); y6=y2; x6=x5; x6r=x8r+.75u; %where handle attaches
- pos3(.5hstem,180); z3l=z6l;
- pos8(hvstem,0); lft x8l=-.25u; y8=y7r-.5hvstem; %end of handle
- pos7(hvstem,-90); top y7l=x_height+o; x7=.5[x8r,x6r]; %top of handle
- z2'l=z2'r=up;
- filldraw stroke z1e{up}--z2e{up}...z4e{left}...{down}z3e; %right leg
- filldraw stroke z8e{up}..z7e{right}...z6e{down}--z5e; %left leg with handle
- numeric x_baryctr; x_baryctr=.1[x4,x7]; %accent reference
- numeric pos_stem; pos_stem=x5; %iota reference
- else:
- pickup fine.nib;
- y1r-.5stem=-d-o; pos1(stem,0); %bottom right
- rt x2r=hround(w-.75u); y2r=.5x_height; pos2(hair,0); %right bulge
- lft x5r=hround(1.5u); y5-.5stem=-o; pos5(stem,-180); %bottom left
- top y4r=x_height+o; x4r=.5[lft x2l,rt x5l]; %top of arch
- pos6(hair,180); y6=y2; %where handle attaches
- if straight:
- x1=x2; x5=x6; pos4(stem,90); %yawn...
- filldraw double_circ_stroke z1e--pulled_arc.e(2,4)&pulled_arc.e(4,6)--z5e;
- else:
- if serifs: %%<< aggiunto questo if
- rt x1r=hround (rt x2r-.25);
- else:
- rt x1r= rt x2r-u;
- fi
- z2'l=z2'r=up; %%<< e mossa questa assegn.
- filldraw circ_stroke z1e{up}...gr_arc.e(2,3,4)(hair,stem,.8); %right leg
- filldraw circ_stroke z5e{(z4-z5) yscaled 3}...z4e{-z4'e}; %left leg
- z9=((0,y6)--(w,y6)) intersectionpoint (z5r{(z4-z5) yscaled 3}...z4r{-z4'r});
- x6r=x9;
- fi
- pos8(vstem,0); rt x8r=hround(lft x6r-.75u); %end of handle
- pos7(vstem,-90); top y7l=x_height+o; z8r=z7r; %top of handle
- filldraw circ_stroke z8e{up}...z7e{right}...z6e{down};
- numeric x_baryctr; x_baryctr=.1[x4,x7]; %accent reference
- numeric pos_stem; pos_stem=x5; %iota reference
- fi
- fi
-enddef;
-
-
-
-cmchar "Lowercase eta";
-beginchar("h",dims);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if serifs: adjust_fit(.7serif_fit#,.7serif_fit#); fi
-fi
-this_letter; penlabels(1,2,3,4,5,6,7,8); endchar;% "Lowercase eta"
-
-
-
-
-
-
-iff(not barebones):
-cmchar "Lowercase eta with grave";
-beginchar(oct"230",width#,acc_ht#,desc_depth#);
-this_letter; if not small_caps: grave(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with rough breathing";
-beginchar(oct"231",width#,acc_ht#,desc_depth#);
-this_letter; if not small_caps: spirit(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with smooth breathing";
-beginchar(oct"232",width#,acc_ht#,desc_depth#);
-this_letter; if not small_caps: spirit(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with grave and iota subscript";
-beginchar(oct"234",width#,if small_caps:height#else:acc_ht#fi,desc_depth#);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if slitex:
- adjust_fit(0,.5[vair#,stem#]+.7(.5[vair#,stem#])+.3tiny#+u#);
- elseif serifs:
- adjust_fit(.7serif_fit#,serif_fit#+.5[vair#,stem#]+.7(jut#+u#)if monospace:+tiny# fi+.5u#);
- else:
- adjust_fit(0,+.5[vair#,stem#]+.7u#);
- fi
- gen_letter;
-else:
- this_letter; grave(x_baryctr);
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with rough breathing and iota subscript";
-beginchar(oct"235",width#,if small_caps:height#else:acc_ht#fi,desc_depth#);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if slitex:
- adjust_fit(0,.5[vair#,stem#]+.7(.5[vair#,stem#])+.3tiny#+u#);
- elseif serifs:
- adjust_fit(.7serif_fit#,serif_fit#+.5[vair#,stem#]+.7(jut#+u#)if monospace:+tiny# fi+.5u#);
- else:
- adjust_fit(0,+.5[vair#,stem#]+.7u#);
- fi
-gen_letter;
-else:
-this_letter; spirit(x_baryctr)<;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with smooth breathing and iota subscript";
-beginchar(oct"236",width#,if small_caps:height#else:acc_ht#fi,desc_depth#);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if slitex:
- adjust_fit(0,.5[vair#,stem#]+.7(.5[vair#,stem#])+.3tiny#+u#);
- elseif serifs:
- adjust_fit(.7serif_fit#,serif_fit#+.5[vair#,stem#]+.7(jut#+u#)if monospace:+tiny# fi+.5u#);
- else:
- adjust_fit(0,+.5[vair#,stem#]+.7u#);
- fi
-gen_letter;
-else:
-this_letter; spirit(x_baryctr)>;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with acute";
-beginchar(oct"240",width#,acc_ht#,desc_depth#);
-this_letter; if not small_caps: acute(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with rough breathing and acute";
-beginchar(oct"241",width#,acc_ht#,desc_depth#);
-this_letter; if not small_caps: spirit_acute(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with smooth breathing and acute";
-beginchar(oct"242",width#,acc_ht#,desc_depth#);
-this_letter; if not small_caps: spirit_acute(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with acute and iota subscript";
-beginchar(oct"244",width#,if small_caps:height#else:acc_ht#fi,desc_depth#);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if slitex:
- adjust_fit(0,.5[vair#,stem#]+.7(.5[vair#,stem#])+.3tiny#+u#);
- elseif serifs:
- adjust_fit(.7serif_fit#,serif_fit#+.5[vair#,stem#]+.7(jut#+u#)if monospace:+tiny# fi+.5u#);
- else:
- adjust_fit(0,+.5[vair#,stem#]+.7u#);
- fi
-gen_letter;
-else:
-this_letter; acute(x_baryctr);
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with rough breathing and grave";
-beginchar(oct"243",width#,acc_ht#,desc_depth#);
-this_letter; if not small_caps: spirit_grave(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with smooth breathing and grave";
-beginchar(oct"253",width#,acc_ht#,desc_depth#);
-this_letter; if not small_caps: spirit_grave(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with rough breathing and grave and iota subscript";
-beginchar(oct"247",width#,if small_caps:height#else:acc_ht#fi,desc_depth#);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if slitex:
- adjust_fit(0,.5[vair#,stem#]+.7(.5[vair#,stem#])+.3tiny#);% +u#
- elseif serifs:
- adjust_fit(.7serif_fit#,serif_fit#+.5[vair#,stem#]+.7(jut#+u#)if monospace:+tiny# fi+.5u#);
- else:
- adjust_fit(0,+.5[vair#,stem#]+.7u#);
- fi
-gen_letter;
-else:
-this_letter; spirit_grave(x_baryctr)<;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with smooth breathing and grave and iota subscript";
-beginchar(oct"257",width#,if small_caps:height#else:acc_ht#fi,desc_depth#);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if slitex:
- adjust_fit(0,.5[vair#,stem#]+.7(.5[vair#,stem#])+.3tiny#+u#);
- elseif serifs:
- adjust_fit(.7serif_fit#,serif_fit#+.5[vair#,stem#]+.7(jut#+u#)if monospace:+tiny# fi+.5u#);
- else:
- adjust_fit(0,+.5[vair#,stem#]+.7u#);
- fi
-gen_letter;
-else:
-this_letter; spirit_grave(x_baryctr)>;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with rough breathing, acute and iota subscript";
-beginchar(oct"245",width#,if small_caps:height#else:acc_ht#fi,desc_depth#);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if slitex:
- adjust_fit(0,.5[vair#,stem#]+.7(.5[vair#,stem#])+.3tiny#+u#);
- elseif serifs:
- adjust_fit(.7serif_fit#,serif_fit#+.5[vair#,stem#]+.7(jut#+u#)if monospace:+tiny# fi+.5u#);
- else:
- adjust_fit(0,+.5[vair#,stem#]+.7u#);
- fi
-gen_letter;
-else:
-this_letter; spirit_acute(x_baryctr)<;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with smooth breathing and acute and iota subscript";
-beginchar(oct"246",width#,if small_caps:height#else:acc_ht#fi,desc_depth#);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if slitex:
- adjust_fit(0,.5[vair#,stem#]+.7(.5[vair#,stem#])+.3tiny#+u#);
- elseif serifs:
- adjust_fit(.7serif_fit#,serif_fit#+.5[vair#,stem#]+.7(jut#+u#)if monospace:+tiny# fi+.5u#);
- else:
- adjust_fit(0,+.5[vair#,stem#]+.7u#);
- fi
-gen_letter;
-else:
-this_letter; spirit_acute(x_baryctr)>;
-fi
-iota_sub(pos_stem);
-endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with circumflex";
-beginchar(oct"250",width#,if small_caps:height#else:circ_ht#fi,desc_depth#);
-this_letter; if not small_caps:
-squeeze:=false; circumflex(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with rough breathing and circumflex";
-beginchar(oct"251",width#,Circ_ht#,desc_depth#);
-this_letter; if not small_caps:
-squeeze:=true; spirit_circumflex(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with smooth breathing and circumflex";
-beginchar(oct"252",width#,Circ_ht#,desc_depth#);
-this_letter; if not small_caps:
-squeeze:=true; spirit_circumflex(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with circumflex and iota subscript";
-beginchar(oct"254",width#,if small_caps:height#else:circ_ht#fi,desc_depth#);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if slitex:
- adjust_fit(0,.5[vair#,stem#]+.7(.5[vair#,stem#])+.3tiny#+u#);
- elseif serifs:
- adjust_fit(.7serif_fit#,serif_fit#+.5[vair#,stem#]+.7(jut#+u#)if monospace:+tiny# fi+.5u#);
- else:
- adjust_fit(0,+.5[vair#,stem#]+.7u#);
- fi
-gen_letter;
-else:
-this_letter; squeeze:=false; circumflex(x_baryctr);
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with rough breathing, circumflex and iota subscript";
-beginchar(oct"255",width#,if small_caps:height#else:Circ_ht#fi,desc_depth#);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if slitex:
- adjust_fit(0,.5[vair#,stem#]+.7(.5[vair#,stem#])+.3tiny#+u#);
- elseif serifs:
- adjust_fit(.7serif_fit#,serif_fit#+.5[vair#,stem#]+.7(jut#+u#)if monospace:+tiny# fi+.5u#);
- else:
- adjust_fit(0,+.5[vair#,stem#]+.7u#);
- fi
-gen_letter;
-else:
-this_letter; squeeze:=true; spirit_circumflex(x_baryctr)<;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with smooth breathing, circumflex and iota subscript";
-beginchar(oct"256",width#,if small_caps:height#else:Circ_ht#fi,desc_depth#);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if slitex:
- adjust_fit(0,.5[vair#,stem#]+.7(.5[vair#,stem#])+.3tiny#+u#);
- elseif serifs:
- adjust_fit(.7serif_fit#,serif_fit#+.5[vair#,stem#]+.7(jut#+u#)if monospace:+tiny# fi+.5u#);
- else:
- adjust_fit(0,+.5[vair#,stem#]+.7u#);
- fi
-gen_letter;
-else:
-this_letter; squeeze:=true; spirit_circumflex(x_baryctr)>;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase eta with iota subscript";
-beginchar(oct"371",width#,height#,desc_depth#);
-if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- if slitex:
- adjust_fit(0,.5[vair#,stem#]+.7(.5[vair#,stem#])+.3tiny#+u#);
- elseif serifs:
- adjust_fit(.7serif_fit#,serif_fit#+.5[vair#,stem#]+.7(jut#+u#)if monospace:+tiny# fi+.5u#);
- else:
- adjust_fit(0,+.5[vair#,stem#]+.7u#);
- fi
-gen_letter;
-else:
-this_letter;
-fi
-iota_sub(pos_stem); endchar;
-
-%picture pic.iota;
-picture savedpicture; currentbreadth:=0;
-
-
-if monospace: % theta
-def dims = 8.5u#,asc_height#,0 enddef;
-else:
-def dims = if cbroman:8
- elseif cbleipzig:8
- else:9
- fi
- u#,if small_caps: sclc*x_height# else: asc_height# fi,0 enddef;
-fi
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-
-def gen_letter=
-if small_caps:
- italcorr .7*height#*slant-.5u#;
- adjust_fit(0,0);
- numeric light_curve; light_curve=hround(curve-2stem_corr);
- penpos1(vair,90); penpos3(vround(vair+.5vair_corr),-90);
- penpos2(light_curve,180); penpos4(light_curve,0);
- if monospace: x2r=hround 1.5u;
- interim superness:=sqrt superness; % make |"O"|, not |"0"|
- else: x2r=hround (u/2); fi
- x4r=w-x2r; x1=x3=.5w; y1r=h+o; y2=y4=.5h-vair_corr; y3r=-o;
- 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
- pickup crisp.nib; pos5(vstem,90); pos6(vstem,90);
- lft x5=w-rt x6=hround(x2l+u)+1; y5=y6=.5[y1l,y3l];
- filldraw stroke z5e--z6e; % bar
- if serifs: pos7(hair,0); pos8(hair,0); pos9(hair,0); pos10(hair,0);
- x7l=x8l=x5; x9r=x10r=x6;
- y7-y5r=y9-y6r=y5l-y8=y6l-y10=vround .05h;
- filldraw stroke z7e--z8e; % left serif
- filldraw stroke z9e--z10e; fi % right serif
- math_fit(-.3*height#*slant-.5u#,ic#-.5u#);
-else:
- if (monospace or monotoniko or SansSerif):
- pickup fine.nib;
- lft x4r=w-rt x8r=hround .75u; y4r=y8r=.5h; %left and right bulges
- x2r=x6r=.5w; top y2r=h+oo; bot y6r=-oo; %top and bottom
- pos4(stem,180); pos8(stem,0); pos2(stem,90); pos6(stem,-90);
- filldraw stroke z6e{right}...z8e{up}...z2e{left}...z4e{down}...{right}z6e;
- pos4`(bar,90); pos8`(bar,90); x4`=x4; x8`=x8; y4`=y8`=.05[y4,y2];
- filldraw stroke z4`e--z8`e; %bar
- else:
- if cursive:
- if slitex: pickup fine.nib; fi
- pos0(hair,90); pos1(stem,45); pos2(stem,0);
- lft x0=0; y0=y1l; x2l=stem; y2l=3/4x_height;
- x1l=.5[x0,x2l];top y1r=x_height+oo;
- pos3(stem,0); pos4(hair,90); pos5(stem,180);
- x3=x2; y3=bar_height; x4=w/2=.5[x1l,x5l]; bot y4l=-oo; y5=y3;
- pos6(stem,180); pos7(if not serifs: .7 fi hair,270);
- pos8(stem,if (slitex or not serifs):-25 else:0 fi); pos9(hair,90);
- x6=x5; h-y6=y5; x7=x4; top y7l=h+oo;
- if slitex: x8l=x3r else: if serifs: x8=x3 else: x8=x3r fi fi;
- y8=.5[y7l,y1r]; rt x9=w;
- if (slitex or not serifs): y9r=y1l else: y9l=y1r fi;
- filldraw stroke z0e..{right}z1e..{down}z2e..{down}z3e
- ..{right}z4e..{up}z5e..{up}z6e..{left}z7e..{down}z8e..{right}z9e;
- elseif cbleipzig:
- adjust_fit(.5u#,.75u#); italcorr .9*height#*slant-.5u#;
- pos0(hair,160);
- pos2(stem,0);
- lft x0r=0; y0l=.7[y1l,y2l]; x2l=stem; y2l=3/4x_height;
- x1l=.5[x0l,x2l];x1r=.5[x0r,x2r];
- top y1r=x_height=y1l+.5stem; z1=.5[z1l,z1r];
- pos3(stem,0); x3=x2; y3=.8bar_height;
- pos6(stem,180);x6=x5;y6=y3;
- x4l=.5[x3l,x6l];bot y4l=-oo=y4r-hair;x4r=.5[x3r,x6r];z4=.5[z4r,z4l];
- pos5(stem,180);
- w/2=.5[x1l,x5l]; y5=h/2;
- top y7l=h+oo=bot y7r+.7hair;x7l=.5[x8l,x5l];x7r=.5[x8r,x5r];z7=.5[z7r,z7l];
- pos8(.6[stem,hair],0); pos9(hair,25);
- x8l=x1r;
- y8=.45[y7l,y1r]; rt x9r=w; y9r=.5[y11,y5];
- pos11(hair,90); x11=.7[x1,x5];y11=x_height;
- pos10(.1[hair,stem],0); x10l=x9; y10=.9[y6,y5];%y9-.5stem;
- filldraw double_circ_stroke z0e{up}...z1e..{down}z2e..{down}z3e
- ..{right}z4e..{up}z6e--z5e{up}...{left}z7e..{down}z8e..z11e..z9e...{(slant,-1)}z10e;
- elseif cbroman:
- pos1(hair,90); x1=w/2; top y1r=h+oo;
- pos2(stem,180);x2r=u/2; y2=h/2;
- pos3(hair,-90);x3=x1; bot y3r=-oo;
- pos4(stem,0);x4r=w-x2r; y4=y2;
- z5r=z1r;z5l=z1l;
- filldraw stroke z1e{left}...z2e...z3e...z4e...{left}z5e;
- pos6(.3[hair,stem],90); z6=z2;
- pos7(.3[hair,stem],90); z7=z4;
- filldraw stroke z6e--z7e;
- else:
- adjust_fit(if SansSerif:1.3else:.5fi u#,.75u#);
- pickup fine.nib;
- numeric light_curve; light_curve=hround .5[stem,curve];
- x0=0; x2-.5stem=hround(2.5u-.5stem); hook_in(0,1,2); % opening hook
- pos2'(stem,-180); z2'=z2; pos3(stem,-180); pos4(vair,-90);
- pos5(light_curve,0); pos6(vair,90); pos7(hair,180); pos8(vair,270);
- x3=x2; x4=x6=.5[x3,x5]; rt x5r=hround(w-1.5u+.5light_curve);
- lft x7r=hround(3.25u-.5hair); x8+.5vair=hround(w+.5vair-epsilon);
- y3=.4x_height; bot y4r=-oo; y5=.5[y4,y6]; top y6r=h+oo;
- y7=.5[x_height,h]; y8=.5[bar_height,x_height];
- filldraw stroke z2'e..{{interim superness:=hein_super; super_arc.e(3,4)}}
- & pulled_arc.e(4,5) & pulled_arc.e(5,6)
- ...{down}z7e...{4(x8-x7),y8-y7}z8e; % bowl and loop
- math_fit(-2/3x_height#*slant+.5hair#+.5u#,ic#);
- fi
- fi
-fi
-enddef;
-
-cmchar "Lowercase theta";
-beginchar("j",dims);
-this_letter; penlabels(0,a,1,2,3,4,4`,5,6,7,8,8`,9,10,11);
-endchar;% "Lowercase theta"
-
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-% lowercase iota
-
-def width = if slitex and (not monospace): 6.3u
- else: 4.5u fi enddef;
-def dims = width#,if small_caps:sclc*fi x_height#,0 enddef;
-def ital = 0 enddef;
-def fit_params = if small_caps:
- serif_fit#,serif_fit#
- elseif SansSerif:
- 0,.25u#
- else:
- 0,0
- fi enddef; %
-
-def gen_letter=
-italcorr height#*slant-.25u#;
- if small_caps:
- pickup tiny.nib; pos1(stem,0); pos2(stem,0);
- lft x1l=lft x2l=hround(.5w-.5stem); top y1=h; bot y2=0;
- filldraw stroke z1e--z2e; % stem
- if serifs:
- dish_serif(1,2,a,1/3,1.05jut,b,1/3,1.05jut); % upper serif
- dish_serif(2,1,c,1/3,1.05jut,d,1/3,1.05jut); % lower serif
- else:
- if slitex:
- dish_serif(1,2,a,1/3,.71u,b,1/3,.71u); % upper serif
- dish_serif(2,1,c,1/3,.71u,d,1/3,.71u); % lower serif
- fi
- fi
- math_fit(0,.5ic#);
- numeric x_baryctr; x_baryctr=x1;
- else:
- if cursive and serifs and not monospace:
- numeric angolo; angolo=angle((hair,stem));
- pos1(hair,90); pos2(stem,angolo); pos3(stem,0);
- x1=0; x2=x3l; x3=w/2;
- y1=y2l; y2r=h+oo; y3=2/3h;
- pos4(stem,0); x4=x3; y4=y3/2;
- pos5(stem,angolo); x5=x4r; bot y5l=-oo;
- pos6(hair,90); x6l=w; y6=y5r;
- filldraw z1l...z2l..{down}z3l..{down}z4l..{right}z5l..z6l--%<>
- z6r...z5r..z4r{up}..{up}z3r..{left}z2r..z1r--cycle;
- numeric angolo;
- numeric x_baryctr; x_baryctr=x3;
- elseif cbleipzig:
- pos1(stem,0); x1l=hround .75u; y1=h;
- pos2(.3[stem,hair],0); x2l=x1l; y2=h/4;
- x3r=.5[x2r,x4r]; x3l=.5[x2l,x4l];bot y3l=-oo=y3r-.4[hair,stem];z3=.5[z3r,z3l];
- pos4(hair,180); x4=w-x1l; y4r=min(2stem,bar_height/2);
- filldraw circ_stroke z4e{(z3-z4)yscaled3}..{left}z3e..z2e---z1e;
- numeric x_baryctr; x_baryctr=.1[x1,x3];
- elseif cbroman:
- pickup tiny.nib;
- pos1(stem,0); x1=w/2; top y1=h;
- pos2(stem,0); x2=x1; bot y2=0;
- filldraw stroke z1e--z2e;
- dish_serif(2,1,c,1/3,.8jut,d,1/3,.8jut);
- serif(1,2,a,1/3,-.8jut);
- numeric x_baryctr; x_baryctr=x1;
- elseif SansSerif:
- pickup fine.nib;
- pos1(stem,0); x1l=hround .75u; y1=h;
- pos2(.3[stem,hair],0); x2l=x1l; y2=h/4;
- x3r=.5[x2r,x4r]; x3l=.5[x2l,x4l];bot y3l=-oo=y3r-.8(.4[hair,stem]);z3=.5[z3r,z3l];
- pos4(.7hair,180); x4=w-x1l; y4r=min(2stem,bar_height/2);
- filldraw stroke z4e{down}..{left}z3e..z2e---z1e;
- numeric x_baryctr; x_baryctr=.1[x1,x3];
- else:
- pickup fine.nib;
- pos1(flare,180); lft x1r=hround u; top y1=x_height+oo; %top
- numeric neck; neck=min(flare,.2[hair,stem]);
- pos2(neck,180); %neck
- .2[lft x2r,rt x2l]=.2[lft x1r,rt x1l];
- if monowidth:
- pos3(curve,-90); bot y3r=-oo; %bottom
- y2r=2[bot y3r,top y3l];
- lft x4l-rt x2l=u;
- y4r+.5neck=vround y2r; x3=.5[x2,x4]; pos4(neck,0); %tip of hook
- filldraw stroke z4e{down}...z3e...z2e---z1e;
- elseif slitex:
- pos3(curve,-90); bot y3r=-oo; %bottom
- y2r=2/3math_axis;
- x2+x4=w;
- y4r=vround y2r; x3=.5[x2,x4]; pos4(neck,0); %tip of hook
- filldraw stroke z4e{down}...z3e...z2e---z1e;
- else:
- bot y3r=-oo; top y3l=curve; %bottom
- x3r=.5[x2r,x4r]; z3=.5[z3r,z3l];
- y2r=1.5[bot y3r,top y3l];
- z4l=z4r=z4; top y4r=y2r; x4r=w-x2r; x3l=.5[x2l,x4l];
- path p.r, p.l;
- forsuffixes e=r,l: p.e=z1e---z2e...z3e...z4e; endfor
- rt x3.5r=hround(rt xpart directionpoint up of p.r);
- z4'r=direction 3 of p.r; z3'r=direction 2 of p.r;
- forever: %avoid bad vertical tangent between 2l and 3l
- a_:=directiontime down of p.l;
- exitif a_<0; % exit if vert. tang. does not exist
- x2.5l:= rt xpart point a_ of p.l;
- exitif abs(hround(x2.5l)-x2.5l)<.05;
- x2l:=x2l+hround(x2.5l)-x2.5l; p.l:=(z1l---z2l...z3l...z4l);
- endfor
- p.r:=z1r---z2r...club.r(3,3.5,4);
- %avoid bad vertical tangent between 3r and 4r
- filldraw stroke p.e;
- fi
- if monospace: currentpicture:=currentpicture shifted (.5w-x3,0); fi
- numeric x_baryctr; x_baryctr=x1 if monospace:+.5w-x3 fi;
- fi
- fi
-enddef;
-
-
-cmchar "Lowercase iota";
-beginchar("i",dims);
-adjust_fit(fit_params);
-this_letter; penlabels(1,2,3,4,5,6); endchar;% "Lowercase iota"
-
-
-
-iff(not barebones):
-cmchar "Lowercase iota with grave";
-beginchar(oct"310",width#,acc_ht#,0);
-this_letter; if (not small_caps): grave(x_baryctr); fi endchar;
-
-
-iff(not barebones):
-cmchar "Lowercase iota with rough breathing";
-beginchar(oct"311",width#,acc_ht#,0);
-this_letter; if (not small_caps):
-spirit(x_baryctr if serifs: +.25u fi)<;fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with smooth breathing";
-beginchar(oct"312",width#,acc_ht#,0);
-this_letter; if (not small_caps):
-spirit(x_baryctr if serifs: -.25u fi)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with acute";
-beginchar(oct"320",width#,acc_ht#,0);
-this_letter; if (not small_caps): acute(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with rough breathing and acute";
-beginchar(oct"321",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit_acute(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with smooth breathing and acute";
-beginchar(oct"322",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit_acute(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with rough breathing and grave";
-beginchar(oct"313",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit_grave(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with smooth breathing and grave";
-beginchar(oct"323",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit_grave(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with circumflex";
-beginchar(oct"330",width#,circ_ht#,0);
-this_letter; if (not small_caps):
-squeeze:=false; circumflex(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with rough breathing and circumflex";
-beginchar(oct"331",width#,Circ_ht#,0);
-this_letter; if (not small_caps):
-squeeze:=true; spirit_circumflex(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with smooth breathing and circumflex";
-beginchar(oct"332",width#,Circ_ht#,0);
-this_letter; if (not small_caps):
-squeeze:=true; spirit_circumflex(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with diaeresis";
-beginchar(oct"360",width#,circ_ht#,0);
-this_letter; diaeresis(x_baryctr); endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with diaeresis and grave";
-beginchar(oct"361",width#,acc_ht#,0);
-this_letter;
-if (not small_caps):
- diaeresis_grave(x_baryctr);
-else:
- diaeresis(x_baryctr);
-fi
-endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with diaeresis and acute";
-beginchar(oct"362",width#,acc_ht#,0);
-this_letter;
-if (not small_caps):
- diaeresis_acute(x_baryctr);
-else:
- diaeresis(x_baryctr);
-fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase iota with diaeresis and circumflex";
-beginchar(oct"363",width#,Circ_ht#,0);
-this_letter;
-if (not small_caps):
- squeeze:=true;
- diaeresis_circumflex(x_baryctr);
-else:
- diaeresis(x_baryctr);
-fi endchar;
-
-picture savedpicture; currentbreadth:=0;
-
-
-
-def dims = if small_caps: % kappa
- 11u#,sclc*x_height#,0
- elseif monotoniko:
- 8.5u#,x_height#,0
- %elseif cbleipzig:
- %8.3u#,x_height#,0
- elseif cbroman:
- 8.7u#,x_height#,0
- elseif SansSerif:
- 8.7u#,x_height#,0
- else:
- 9.5u#,x_height#,0
- fi enddef;
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-def gen_letter=
- if small_caps: % maiuscoletto
- italcorr height#*slant-.5u#;
- adjust_fit(.7serif_fit#,.7serif_fit#);
- numeric right_jut,stem[],alpha[];
- if serifs: right_jut=.6jut;
- else: right_jut=.4tiny; fi
- pickup tiny.nib; pos1(fudged.stem,0); pos2(fudged.stem,0); % old: cap_stem
- lft x1l=lft x2l=hround (max(2u,3u-.5fudged.stem)-.5u); top y1=h; bot y2=0;% idem
- filldraw stroke z1e--z2e; % stem
- stem2=max(tiny.breadth,fudged.stem-3stem_corr);% idem
- stem1=max(tiny.breadth,fudged.hair if hefty:-3stem_corr fi);
- top y3=h; rt x3r=hround(r-letter_fit-u-right_jut);
- bot y6=0; rt x6r=hround(r-letter_fit-.75u-right_jut);
- x4=x1; y4=1/3h;
- alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4);
- penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90);
- alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1);
- penpos6(alpha2*(stem2-tiny),0);
- forsuffixes $=l,r: y3'$=h; y6'$=0; z4$=z3'$+whatever*(z3-z4);
- z5$=z6'$+whatever*(z1-z6)=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 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
- fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle; % lower diagonal
- if serifs: numeric inner_jut;
- if rt x2r+jut+.5u+1<=lft x6l-jut: inner_jut=jut;
- else: rt x2r+jut+.5u+1=lft x6l-inner_jut; fi
- dish_serif(1,2,a,1/3,jut,b,1/3,jut); % upper stem serif
- dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower stem serif
- dish_serif(3,4,e,2/3,1.2jut,f,1/2,right_jut)(dark); % upper diagonal serif
- dish_serif(6,5,g,1/2,inner_jut,h,1/3,right_jut)(dark); % lower diagonal serif
- fi
- math_fit(0,.5ic#);
- else: % minuscolo
- adjust_fit(0,0);
- if cursive and not SansSerif: % corsivo minuscolo escluso sans
- if serifs and not monospace:% corsivo minuscolo normale
- pos0(hair,90); pos1(stem,45); pos2(stem,0); pos3(1.2stem,0);
- top y1r=h+oo; y3=0; y2l=5/6y1;
- x1=x2l; x2r=x3r; lft x0=.5u; y0=y1l; x3l=min(x0+.8stem,1.5u);
- filldraw stroke z0e{(z1r-z0l) yscaled 2}..{right}z1e..{z3-z2}z2e--z3e; % left bar
- s_a:=85; s_c:=12;
- pos4(vair,180); pos5(stem,90); pos8(hair,80);
- x4l=x3r; bot y4=y3; rt x8r=w-x0; x5=.2[x8l,x1r];
- top y5r=h; top y8r=.8*(top y5r);
- filldraw stroke z8e...z5e{left}...{-dir s_a}z4e; % ascending stroke
- s_b:=60; path gamba; gamba=z4{dir s_a}...{right}z5;
- pos6(stem,s_b); pos7(.3stem,45); pos9(.5hair,70);
- z6=directionpoint (dir s_b) of gamba; path gamba;
- bot y7l=0; x7r=x9l-.3stem; rt x9r=w-x0; y9l=y7r;
- pos10(stem,-15); y10r=y9; x10r=x7r-.3stem;
- z11-z6=whatever*(z10l-z6); y11=0; z12=.5[z11,z7l]; z13=.5[z11,z10l];
- filldraw z9r{(z7l-z9r) yscaled 2}..z7r{left}...z10r--z6r--z6l--z10l
- ..controls z13 and z12..z7l{right}..{z9r-z9l}z9l--cycle; % descending stroke
- else: % corsivo minuscolo monospace e slides
- if monospace or slitex: % corsivo minuscolo monospace e slides
- pickup fine.nib;
- else: % corsivo minuscolo sans; ramo morto
- pickup pencircle;
- fi
- pos1(1.2stem,180); pos2(stem,180); pos3(1.2stem,180);
- top y1 = h = 2y2; bot y3=0;
- lft x2r=u; x1l=x2l=x3l;
- filldraw stroke z1e..z2e..z3e; % left bar
- s_a:=90; s_c:=12;
- pos4(vair,180); pos5(stem,90-s_c);
- x4l=x3l; bot y4=bot y3; rt x5=w-x3r+o; top y5r=h;
- filldraw stroke z5e{dir(180-s_c)}...{-dir s_a}z4e; % ascending stroke
- s_b:=60; path gamba; gamba=z4{dir s_a}...{dir-s_c}z5;
- pos6(if not monospace: 0.7fi stem,s_b); pos7(.5[vair,stem],90);
- z6=directionpoint (dir s_b) of gamba; path gamba;
- bot y7l=0; rt x7=w-x3r;
- x10=.7[x4,x7l]; y10=0;
- filldraw stroke z7e{left}...{z6-z10}z6e; % descending stroke
- fi
- elseif cbleipzig:
- pickup fine.nib;
- numeric barangle; barangle=22;
- pos1(hair,135); lft x1r=u/2; top y1r+hair= bot y2l;
- pos2(stem,80); top y2r=h+oo; x2l=.22w=.5[x1l,x3l];
- pos3(.4[hair,stem],0); y3=2h/3;
- pos4(stem,0);bot y4=-oo; z4l=z1l + whatever*(slant,-2);
- filldraw circ_stroke z1e{(z2l-z1l)yscaled 4}...z2e{right}...z3e{down}..z4e;
- z5r=z4l; z5l=z4r;
- pos6(.4[hair,stem],135); z6=(w/2,h/2)-whatever*dir(barangle); rt x6l= rt x3r;
- pos7(.4[hair,stem],135); (w/2,h/2)=.5[z6,z7];
- filldraw stroke z5e{up}...z6e...z7e;
- pos8(stem,135); top y8r=h+oo; z8l=z12+whatever*(-slant,2);
- pos9(.4[hair,stem],180); z9r=z7r;
- pos10(.4[hair,stem],180); x10r=x9r; y10=h/3;
- bot y11r=-oo=top y11l-stem; x11l=.5[x10l,x12l]; x11r=.5[x10r,x12r];
- pos12(stem/2,-60); x12r= w-lft x1r; y12l=y11l+stem;
- pair za; path cbp; cbp= z8r{(z9r-z8r)xscaled2}...z9r; za=direction 1 of cbp;
- filldraw z6l{dir(barangle)}..z8l{(z8l-z6l)yscaled3}...z8r{(z9r-z8r)xscaled2}...z9r--cycle;
- filldraw circ_stroke z12e{down}...z11e{left}...z10e...{-za}z9e;
- pair za; path cbp;
- elseif cbroman:
- pickup tiny.nib;
- pos1(stem,0); lft x1l=1.1jut; top y1=h;
- pos2(stem,0);x2l=x1l; bot y2=0;
- pos3(hair,0); rt x3r=rt x1r; y3=h/3;
- pos4(hair,0); rt x4r=w- lft x1l; top y4=top y1;
- pos5(stem,angle(z4-z3)); z5=.4[z3,z4];
- pos6(stem,0); rt x6r=rt x4r; bot y6=0;
- filldraw stroke z1e--z2e;
- filldraw stroke z3e--z4e;
- filldraw stroke z6e--z5e;
- dish_serif(2,1,a,1/3,.8jut,b,1/3,.8jut);
- serif(1,2,c,1/3,-.8jut);
- dish_serif(4,3,f,1/3,.7jut,g,1/3,.7jut);
- dish_serif(6,5,i,1/3,.6jut,j,1/3,.8jut);
- elseif SansSerif:
- pickup fine.nib;
- pos1(1stem,180); pos2(stem,180); pos3(stem,180);
- y1=h;y2=.35h; y3=0;
- lft x2r=u; x1l=x2l=x3l;
- filldraw stroke z1e--z3e; % left bar
- s_a:=90; s_c=12;
- pos4(.9stem,135); pos5(1.414*.9*stem,180);
- z4l=z2l; top y5r=h; z5=z4+whatever*dir(45);
- pos8(.9stem,90);z5l=z8r;
- pos9(.9stem,135); z9=.75[z4,.25[z5,z5l]];
- filldraw stroke z4e--z9e{z9-z4}..{right}z8e;% ascending stroke
- pos6(stem,45); pos7(1.414*stem,0);
- z6=.20[z4,z5]; y7=0; z7=z6+whatever*dir(-45);
- filldraw stroke z7e--z6e; % descending stroke
- elseif slitex or monospace: % minuscolo regolare slides e typewriter
- pos1(1.2stem,180); pos2(stem,180); pos3(1.2stem,180);
- y1+(1.2stem)/2=h+o=2y2; y3-(1.2stem)/2=-o;
- lft x2r=u; x1l=x2l=x3l;
- filldraw double_circ_stroke z1e..z2e..z3e; % left bar
- s_a:=90; s_c=12;
- pos4(vair,180); pos5(stem,90-s_c);
- x4l=x3l; bot y4=y3; x5+.5stem=w-x2r+o; top y5r=h;
- filldraw circ_stroke z5e{dir(180-s_c)}...{-dir s_a}z4e; % ascending stroke
- s_b:=70; path gamba; gamba=z4{dir s_a}...{dir-s_c}z5;
- pos6(.7stem,s_b); pos7(.5[vair,stem],90);
- z6=directionpoint (dir s_b) of gamba; path gamba;
- bot y7l=0; rt x7+.5*(.5[vair,stem])=w-x3r;
- filldraw circ_stroke z7e{left}..{dir(s_b+90)}z6e; % descending stroke
- else: % minuscolo regolare
- %% versione Didot
- pickup fine.nib;
- x1-.5stem=hround .75u; y1-.5stem=-o; %lower left
- z1+z3=(w,h); z2=.5[z1,z3]; %upper right and middle
- z1'=(z3-z1) if monowidth: xscaled 1/2 fi; %slope at 1 and 3
- pos1(stem,angle z1'+90); pos2(.6[hair,stem],angle z1'+90);
- pos3(stem,angle z1'+90);
- filldraw double_circ_stroke z1e{z1'}..z2e..{z1'}z3e; %diagonal stroke
- z4=if monowidth: z1 else: 1/4[z1,z3] fi; z4+z7=z3+z1; %handle attachments
- z4'=if monowidth: z1' else: (z3-z1) xscaled .25 fi; %slope at 4 and 7
- pos4(hair,angle z4'-90); pos7(hair,angle z4'+90);
- pos5(vstem,90); top y5r=h+o; pos6(vstem,180); z6l=z5l;
- lft x6r=hround(x1-.5stem-.25u);
- filldraw circ_stroke z6e{up}...z5e{right}...z4e{-z4'}; %left handle
- pos8(.5[vstem,stem],-90); bot y8r=-o; rt x9r=hround(x3+.5stem+.25u);
- pos9(.5[vstem,stem],0); z9l=z8l;
- filldraw circ_stroke z9e{down}...z8e{left}...z7e{z4'}; %right handle
- fi
- fi
-enddef;
-
-
-cmchar "Lowercase kappa";
-beginchar("k",dims);
-this_letter; penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12); endchar;% "Lowercase kappa"
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-
-
-def dims = if small_caps: % lambda
- 10u#,sclc*x_height#,0
- elseif cbleipzig:
- 8.6u#,asc_height#,0
- elseif cbroman:
- 8.5u#,asc_height#,0
- else:
- 9.5u#,asc_height#,0
- fi enddef;
-def ital = 0 enddef;
-def fit_params = if cbroman:
- 0,0
- elseif small_caps:
- serif_fit#,serif_fit#
- else:
- -.25u#,-.25u#
- fi enddef;
-def krn = -.75u# enddef;
-
-
-def gen_letter=
- if small_caps:
- adjust_fit(fit_params);
- numeric left_stem,outer_jut,alpha;
- left_stem=hair if hefty: -3stem_corr fi;
- outer_jut=.7jut; x1l=w-x4r=l+letter_fit+outer_jut+.5u; y1=y4=0;
- 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*stem,0); penpos4(alpha*stem,0);
- z0=whatever[z1r,z2r]=whatever[z3l,z4l];
- if y0<h-notch_cut: y0:=h-notch_cut;
- fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r)
- --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1}
- ...{up}z0+.5left--cycle; % left and right diagonals
- else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)
- --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals
- if serifs: numeric inner_jut; pickup tiny.nib;
- prime_points_inside(1,2); prime_points_inside(4,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
- dish_serif(1',2,a,1/2,outer_jut,b,.6,inner_jut)(dark); % left serif
- dish_serif(4',3,c,1/2,inner_jut,d,1/3,outer_jut); fi % right serif
- else:
- if cursive and serifs and not monospace:
- adjust_fit(0,0);
- pos1(hair,0); pos2(stem,0); pos3(stem,45); pos4(hair,90);
- x1l=0; y1=h; x4=w; y4l=hair;
- z2-z4=whatever*(z1l-z4l); y2=x_height;
- x3r=x4l-stem/2-blacker; y3l=-oo;
- filldraw stroke z1e..z2e...z3e{right};
- filldraw z3l{right}..{1,1}z4l--z4r{-1,-1}...{left}z3r--cycle;
- pos5(hair,0); z5l=z2l;
- pos6(stem,0); x6l=x1l; y6=0;
- filldraw stroke z6e{dir(80)}..z5e;
- elseif cbleipzig:
- numeric compl_slant_angle,prop,lstem;
- compl_slant_angle=angle((1,slant));
- prop=.4;
- lstem=.15[hair,stem];
- pos0(1.1hair,150);y0+y4=h; lft x0r=(stem+u)/2;
- top y1r-bot y1l=stem; top y1r=h+oo; x1r=prop[x0r,x2r]; x1l=prop[x0l,x2l];z1=.5[z1r,z1l];
- pos2(lstem,compl_slant_angle);y2=.3[x_height,h]; x2=w/2;
- pos7(lstem,compl_slant_angle);y7+y2=h; z7-z2=whatever*dir(compl_slant_angle-90);
- top y3r - bot y3l=stem; bot y3l=-oo; x3l=prop[x4l,x7l]; x3r=prop[x4r,x7r];
- pos4(1.1hair,150);rt x4l=w-u/2; y4=min(1.5stem,.4bar_height);
- z2'= dir(compl_slant_angle-90);
- z1'=((z1-z0)yscaled3);
- filldraw double_circ_stroke z0e{z1'}...{right}z1e...%
- {z2'}z2e...{z2'}z7e...{right}z3e..{z1'}z4e;
- path cbp,cbh; cbp=z1l{right}...{z2'}z2l...{z2'}z7l...{right}z3l;
- cbh=(0,x_height)--(w,x_height);
- z5l=(cbh)intersectionpoint(cbp);
- pos6(stem,0); bot y6=0; lft x6l=u/2;
- z5'=(z7l-z2l);
- numeric lstem;
- lstem=stem/(sind(angle(z5l-z6l)));
- lstem:=lstem/(sind(angle(z5l-z6l)-angle(z5')-angle((1,slant))));
- pos5(lstem,angle(z5'));
- filldraw stroke z6e---z5e;
- elseif cbroman:
- pickup tiny.nib;
- pos1(hair,0); lft x1l=jut; bot y1=0;
- pos2(hair,0); x2=w/2; y2=x_height+stem/2;
- pos3(stem,0); rt x3r=w-lft x1l; bot y3=0;
- pos4(stem,0); z4=z3+whatever*(z2-z3); top y4=h;
- filldraw stroke z1e--z2e;
- filldraw stroke z3e--z4e;
- dish_serif(1,2,a,1/3,.7jut,b,1/3,.7jut);
- serif(4,3,c,1/3,-.8jut);
- dish_serif(3,4,f,1/3,.8jut,g,1/3,.8jut);
- elseif SansSerif:
- pickup fine.nib;
- x1r=hround .75u; y1r=h-.5stem; %top left
- x0r=x1r+stem;y0r=h;
- z1'=(z0r-z1r)yscaled 2; pos1(stem,100); %direction at z1
- x3r+x1r=w; bot y3r=0; %bottom right
- z2'=(z3r-z1r)yscaled 1.7; %direction at z2
- y2r=x_height; z2r=z3r+whatever*z2'; %attachment
- pos2(hair,angle z2'+90);
- pos3(stem/sind(abs(angle z2')),0);
- numeric t; t=(x0r-x1r)/(x2r-x1r);%pos0(stem,90);
- x0l=t[x1l,x2l]; y0l=y0r-stem; z0=.5[z0r,z0l];
- filldraw stroke z1e{z1'}...{right}z0e...{z2'}z2e--z3e; %diagonal
- lft x4l=hround.75u; bot y4l=0; %bottom left
- numeric stem'; stem'=stem-currentbreadth; numeric slope; %from z4 to z4
- slope=angle(z2-z4l)+angle(length(z2-z4l)+-+.5stem',.5stem');
- x4r=x4l+(stem'/sind slope); y4r=y4l; z4=.5[z4r,z4l];
- path p; p=z1{right}...{z2'}z2--z3;
- forsuffixes e=r,l: z5e=(z4e--(z4e+2(z2-z4))) intersectionpoint p; endfor
- filldraw stroke z4e--z5e;
- else:
- pickup fine.nib;
- x1-.5stem=hround .75u; y1+.5stem=h; %top left
- z1'=(1,.2); pos1(stem,angle z1'+90); %direction at z1
- x3+x1=w; y3-.5stem=-oo; pos3(stem,-angle z1'+90); %bottom right
- y2=x_height; x2=.5[x1,x3]; %attachment
- z2'=(z3-z1)yscaled 2; pos2(hair,angle z2'+90); %direction at z4
- filldraw double_circ_stroke z1e{z1'}...
- z2e{(z3-z1)yscaled 2}...{z1' yscaled -1}z3e; %diagonal
- lft x4l=hround.75u; bot y4l=0; %bottom left
- numeric stem'; stem'=stem-currentbreadth; numeric slope; %from z4 to z4
- slope=angle(z2-z4l)+angle(length(z2-z4l)+-+.5stem',.5stem');
- x4r=x4l+(stem'/sind slope); y4r=y4l; z4=.5[z4r,z4l];
- path p; p=z1{z1'}...z2{(z3-z1)yscaled 2}...{z1' yscaled -1}z3;
- forsuffixes e=r,l: z5e=(z4e--(z4e+2(z2-z4))) intersectionpoint p; endfor
- filldraw stroke z4e{(z2-z4)if not monowidth: xscaled 1.2 fi}..z5e;
- fi
- fi
-enddef;
-
-cmchar "Lowercase lambda";
-beginchar("l",dims);
-this_letter; penlabels(0,1,2,3,4,5,6,7); endchar;% "Lowercase lambda"
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-def dims = if small_caps: % lowercase mu
- 12u#,sclc*x_height#,0
- elseif cursive:
- 9u#,x_height#,desc_depth#
- elseif cbleipzig:
- 9u#,x_height#,desc_depth#% width=8.7u# ?
- elseif cbroman:
- 9u#,x_height#,desc_depth#
- elseif SansSerif:
- 10u#,x_height#,desc_depth#
- else:
- 8u#,x_height#,desc_depth#
- fi enddef;
-def ital = 0 enddef;
-def fit_params = if small_caps:
- .7serif_fit#,.7serif_fit#
- elseif cursive:
- .5stem#,.5stem#
- elseif cbleipzig:
- 0,0
- elseif cbroman:
- 0,.5u#
- elseif SansSerif:
- 0,0
- else:
- 0,.5stem#
- fi enddef;
-
-def gen_letter=
- if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- adjust_fit(fit_params);
- numeric stem[]; % thicknesses of the four strokes
- stem1=hround(fudged.hair+stem_corr);
- stem2=hround(fudged.stem-4stem_corr);
- stem3=hround(fudged.hair-stem_corr);
- stem4=hround(fudged.stem-3stem_corr);
- if stem4<stem1: stem4:=stem1; fi
- pickup tiny.nib; pos1(stem1,0); pos2(stem1,0);
- pos3(stem4,0); pos4(stem4,0);
- x1=x2; x3=x4; x1l=w-x3r; rt x3r=hround (min(w-2u,w-3u+.5stem4)+.5u);
- 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: o fi;
- numeric upper_notch,lower_notch;
- upper_notch=h-notch_cut; lower_notch=y6+notch_cut;
- 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'<upper_notch: {right}(x1'+1,upper_notch){down}... fi
- {z6-z5}diag_in(5l,6l,1,6r)..diag_out(7l,1,7r,8r){z8-z7}
- if y3'<upper_notch: ...{up}(x3'-1,upper_notch){right} fi
- ..z8r--diag_out(8r,1,8l,7l){z7-z8}
- if y0<=lower_notch: ..{z7-z8}z0{z5-z6}..
- else: ...{down}(x0+.5,lower_notch)--(x0-.5,lower_notch){up}... fi
- {z5-z6}diag_in(6r,5r,1,5l)--cycle; % diagonals
- else: y6=0; z0=whatever[z5r,z6r]=whatever[z7l,z8l];
- fill z5l..{z6-z5}diag_in(5l,6l,1,6r)..diag_out(7l,1,7r,8r){z8-z7}
- ..z8r--diag_out(8r,1,8l,7l){z7-z8}..{z7-z8}z0{z5-z6}
- ..{z5-z6}diag_in(6r,5r,1,5l)--cycle; fi % diagonals
- if serifs: serif(1,2,a,1/3,-jut); % upper left serif
- dish_serif(2,1,b,1/2,jut,c,1/2,jut)(dark); % lower left serif
- serif(3,4,d,1/3,jut); % upper right serif
- dish_serif(4,3,e,1/3,jut,f,1/3,jut); fi % lower right serif
- math_fit(0,max(.5ic#-.5u#,0));
- else:
- if cursive and serifs and not monospace:
- adjust_fit(fit_params);
- pos1(hair,90); pos2(stem,45); pos3(stem,0); pos4(stem,0); %left stroke
- lft x1=0; y1=y2l; top y2r=h; x2l=5/4u; x2=x3l=x4l;
- bot y4 =-d; y3=3/4h;
- filldraw stroke z1e..z2e..z3e--z4e;
- pos5(stem,0); pos6(stem,0); pos7(stem,45); pos8(hair,90); %right stroke
- rt x8=w; y8=y7r; bot y7l=0; x7r=w-x2l; x7=x6r=x5r;
- top y5=h; y6=1/4h;
- filldraw stroke z8e..z7e..z6e--z5e;
- pos9(vair,90); pos10(hair,0); pos11(.4[vair,stem],180); % bowl
- x9=.5[x10r,x11r]; bot y9l=0;
- x10r=x3r; x11r=x6l; y10=y11=4/10h;
- filldraw stroke z10e{down}...z9e...{up}z11e;
- elseif cbleipzig:
- adjust_fit(fit_params);
- pos3(stem,0); pos4(stem,0); %left stroke
- x3l=x4l=.75u; y4 =(x6l-x3r)/2+.5[hair,stem]; top y3=h;
- pos1(hair,90); x1r=.5[x3r,x6l]; bot y1l=-oo;
- pos2(hair,180); x2r=x6l; y2r=y9l;
- pos5(stem,0);
- pos6(stem,0);
- pos8(hair,135); %right stroke
- pos9(hair,0);z9r=z4r;pos13(hair,0);z13r=z3r;
- rt x8l=w-.5u; bot y7l=-oo=top y7r-.5[hair,stem]; x7r=.5[x6r,x8r]; x7l=.5[x6l,x8l];
- top y5=h; y6=y4; y8=min(2stem,bar_height/2); x6r=x5r=x8r-min(1.3stem,1.5u);
- pos10(stem-hair,0);z10l=z4l;
- pos11(cap_stem,0); x11l=x4l; y11=-d+cap_stem/2;
- pos12(.6[hair,stem],0); x12l=x4l; y12=.6[y10,y11];
- filldraw stroke z3e--z4e;
- filldraw stroke z9e{down}...z1e...{up}z2e;
- filldraw circ_stroke z8e{(z7r-z8r)xscaled.3}..z7e{left}..{up}z6e..z5e;
- filldraw circ_stroke z11e...z12e---z10e;
- elseif cbroman:
- adjust_fit(fit_params);
- pickup tiny.nib;
- pos1(stem,0); lft x1l=jut; bot y1=-d;
- pos2(stem,0); x2l=x1l; top y2=h;
- pos3(hair,30); x3r=x1r; y3r=1.5stem;
- pos4(hair,90);x4=w/2; bot y4l=-oo;
- pos5(hair,150); x4=.5[x3r,x5r]; y5r=y3r;
- pos6(stem,0); x6l=x5r; y6=y2;
- pos7(stem,0);x7l=x6l; y7l=y5r;
- x8l=.5[x7l,x9l]; bot y8l=-oo; x8r=.5[x7r,x9r];y8r=y8l+.1[hair,stem];
- pos9(hair,180); x9l=w; y9= min(y7,2u);
- filldraw stroke z1e--z2e;
- filldraw stroke z3e{down}...{right}z4e...{up}z5e;
- filldraw stroke z6e---z7e...{right}z8e...{up}z9e;
- serif(2,1,a,1/3,-.8jut);
- dish_serif(1,2,c,1/3,.8jut,d,1/3,.8jut);
- serif(6,7,f,1/3,-.8jut);
- elseif SansSerif:
- adjust_fit(fit_params);
- pickup fine.nib;
- pos6(stem,0); y6=h; %x6r=hround(w-1.5stem);
- pos7(stem,0); y7=1.6[y8l,y8r]; x7=x6;
- y8l=-oo; x8l=.5[x7l,x9l]; x8r=x7r+.4stem; y8r=.8stem; z8=.5[z8l,z8r];
- pos9(.7hair,180); x9=w-x1r;
- x8r=.5[x7r,x9r]; y9=y7;
- pos1(stem,180);x1r=.75u; y1=h;
- pos2(stem,180); x1=x2;y2=-d;
- pos3(.5stem,180);y3=y5=.8bar_height; x3l=x1l;
- pos4(stem,-90);y4r=-oo; x4=.5[x1l,x6l];
- pos5(.5stem,0);x5l=x6l;
- filldraw stroke z3e{down}..{right}z4e..{up}z5e;
- filldraw stroke z1e--z2e;
- filldraw stroke z9e...{left}z8e...{up}z7e--z6e;
- else:
- adjust_fit(fit_params);
- pickup fine.nib;
- y6+.5stem=h+o; pos6(stem,0); rt x6r=hround(w-vstem); %top right
- x5r=.5[x1,x6]; bot y5r=-oo; %bottom of bowl
- if straight:
- lft x1r=hround .75 u; y1+.5stem=h+o; pos1(stem,180); %top left
- x4=x1; x9=x6; y9=y4=.5x_height; pos4(stem,180); pos9(stem,0);
- pos5(vstem, 270);
- filldraw double_circ_stroke z1e..pulled_arc.e(4,5)&pulled_arc.e(5,9)..z6e;
- y8-.5stem=-d-oo; x8=x1; pos8(stem,180); %end of handle
- filldraw circ_stroke z8e..z4e;
- else:
- lft x2r=rt x2l-stem=hround .75u; %vertical tangents of left bulb
- top y1r=h+o; x1r=.5[x2r,x2l]; z1=z1l=z1r; z1'r=-z1'l=left; %top left
- y3r=.4[y1r,y5r];
- lft x3r=max(x1r-.5hair,lft x2r+eps); %middle left
- numeric tilt; tilt:=.6; path p.r, p.l;
- p.l=gr_arc.l(3,4,5)(hair,.4[hair,stem],tilt)...{up}z6l;
- p.r=subpath (2(1-tilt),2) of gr_arc.r(3,4,5)(fie,fo,fum)...{up}z6r;
- z3.5r=z4r; z3.5'r=z4'r; z3.5l=z3l; z3.5'l=z3'l; %a hybrid
- filldraw double_circ_stroke club.e(1,2,3.5) & p.e; %bowl
- x8=lft x2r+stem; y8-.5stem=-d-oo; %end of handle
- if serifs:
- pos8(stem,angle(z4'l xscaled 2)-90); z8'r=z8'l=z4'l xscaled 2;
- assign_z3'r(z3'l); %so club.r won't get confused
- lft x7r=rt x7l-max(.2[hair,stem],2)=lft x2r; %vertical tangents of handle
- filldraw double_circ_stroke club.e(3,7,8); %handle
- else:
- x3r:=x3r-1;
- pos8(1.2vstem,angle(z4'l xscaled 2)-90); z8'=z4'l xscaled 2;
- fill z3l{down}...{z8'}z8l...z8r{-z8'}...{up}z3r--cycle;
- fi
- y9r=max(y4r+epsilon,-oo+2vstem); %where hook attaches
- x9r=xpart(((0,y9r)--(w,y9r)) intersectionpoint p.r); pos9(hair,0);
- fi
- pos10(vstem,90); y10l=y5r; x10-x9=vstem; %bottom of hook
- pos11(hair,180); top y11=bot y10l+4/3vstem; %tip of hook
- rt x11l=hround(x10+(y11-y10)+.5hair); %central arc is round
- filldraw stroke z9e{down}..z10e{right}..{up}z11e; %hook
- fi
- fi
-enddef;
-
-
-cmchar "Lowercase mu";
-beginchar("m",dims);
-this_letter; penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13); endchar;% "Lowercase mu"
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-def dims = if small_caps: % nu
- 9.5u#,sclc*x_height#,0
- elseif cbleipzig:
- 7u#,x_height#,0
- else:
- 8.5u#,x_height#,0
- fi enddef;
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-
-def gen_letter =
- if small_caps:
- adjust_fit(-.7serif_fit#,-.7serif_fit#);
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- 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);
- pickup tiny.nib; top y1=top y3=h; bot y2=bot y4=0;
- x1=x2; x3=x4; x1l=w-x3r;
- rt x3r=hround (min(w-2u,w-3u+.5fudged.stem)+.5u);
- filldraw stroke z1e--z2e; % left stem
- filldraw stroke z3e--z4e; % right stem
- if hefty: penpos5(fudged.stem,0); penpos6(fudged.stem,0);
- x5l=x1; x6r=x4; y5=h; y6=0;
- numeric upper_notch,lower_notch;
- upper_notch=h-notch_cut; lower_notch=notch_cut;
- x1'=rt x1r; z1'=whatever[z5l,z6l]; x4'=lft x4l; z4'=whatever[z5r,z6r];
- fill z5l..
- if y1'<upper_notch: {right}(x1'+1,upper_notch){down}... fi
- {z6-z5}diag_in(5l,6l,1,6r)--z6r..
- if y4'>lower_notch: {left}(x4'-1,lower_notch){up}... fi
- {z5-z6}diag_in(6r,5r,1,5l)--cycle; % diagonal
- else: penpos5(whatever,0); penpos6(whatever,90);
- z5l=z1l; z6l=z4l;
- z7=z6l+(max(eps,stem-3stem_corr-tiny),0) rotated (angle(z5l-z6l)-90);
- z5r=z7+whatever*(z5l-z6l); z6r=z7+whatever*(z5l-z6l);
- filldraw stroke z5e..z6e; fi % diagonal
- if serifs: if hefty: serif(1,2,a,1/3,-jut); % upper left serif
- else: serif(5,6,a,1/3,-jut); fi % upper left serif
- dish_serif(2,1,b,1/2,jut,c,1/2,jut)(dark); % lower left serif
- dish_serif(3,4,e,1/2,jut,f,1/2,jut)(dark); fi % upper right serif
- math_fit(0,max(.5ic#-.5u#,0));
- else:
- if cursive and serifs and not monospace:
- adjust_fit(.5stem#,0);
- pos1(hair,90); pos2(stem,45); pos3(stem,0); pos4(stem,45);
- lft x1l=0; x2l=5/4u; x2=x3l=x4l;
- y1= y2l; y2r=h; y3=3/4h; y4l=-o;
- filldraw stroke z1e..z2e..z3e--z4e;
- numeric nutop; nutop=if cbleipzig:.5else:1fi[hair,stem];
- pos5(hair,135); pos6(nutop,180);
- z5l=z4r; x6l=w-if cbleipzig:3u/4 else:x2l fi; y6+.5nutop=h+.5o;
- filldraw circ_stroke z6e{down}..{dir(225)}z5e;
- elseif cbleipzig:
- adjust_fit(.5u#,0);
- numeric compl_slant_angle; compl_slant_angle=angle(u,slant*u);
- pos1(hair,180);
- pos3(stem*cosd45,0);
- pos4(stem,45);
- lft x1r=0; x2l=.4[x1l,x3l];x2r=.4[x1r,x3r];
- y2r=h+oo=y2l+.5[hair,stem*cosd45];z2=.5[z2r,z2l];
- x3l=x1l+if stem<1.5u:1.6fi u; z4l=z1l+whatever*dir(compl_slant_angle-90);
- y1l= y3l; y3=3/4h; y4l=-o;
- z4'=dir(225)yscaled if stem>1.5u:8else:4fi;
- filldraw circ_stroke z1e{(z2-z1)yscaled3}...z2e{right}..z3e...{z4'}z4e;
- numeric nutop; nutop=.9[hair,stem];
- pos5(fine,135); pos6(nutop,180); pos7(.4[hair,stem],175);
- z5l=z4r; x6l=w-3u/4 ; y6+.5nutop=h+oo; y7=.6[y5,y6]; x7=x6;
- filldraw circ_stroke z6e{down}..z7e..{dir(225)}z5e;
- elseif cbroman:
- pickup tiny.nib;
- x0=w/2; bot y0=-oo;
- pos1(stem,0); lft x1l= jut; top y1= h;
- pos3(hair,0); rt x3r= w-jut; top y3=h;
- z4r=z2l=z0;
- z4l=z0+whatever*(z1l-z0)=z3l+whatever*(z3r-z0);
- z2r=z0+whatever*(z3r-z0)=z1r+whatever*(z1l-z0);
- z2 = .5[z2l,z2r]; z4=.5[z4l,z4r];
- filldraw stroke z1e--z2e; filldraw stroke z3e--z4e;
- serif(1,2,a,1/3,-.8jut);
- dish_serif(3,4,c,1/3,.8jut,d,1/3,.8jut);
- elseif SansSerif:
- adjust_fit(fit_params);
- pickup fine.nib;
- pos0(hair,0); pos3(hair,0);
- top y0=h; bot y3=0;
- x0l=0; x3=.5w;
- z2=.8[z3,z0]+(.75u,0);
- z2'=(z0-z3) rotated-90;
- pos2(hair,angle(z2'));
- z1'=z0l-z2;
- pos1(hair/(cosd(angle(z0-z2)-90)),0);z1l=z0l;
- pos4(hair,10); pos5(hair,0);
- y5=y1; x5r+.25u=w-.5u=x4r; y4r=.8[y3,y5];
- pos6(hair,angle((z4-z3)xscaled 1.25)-90); z6r=z3r;
- filldraw stroke z3e--z2e{z2-z3}...{z1'}z1e;% left stroke
- filldraw stroke z6e{(z4-z3)xscaled 1.25}..{up}z4e--z5e;% right stroke
- else:
- adjust_fit(fit_params);
- pickup fine.nib;
- rt x4r=hround(w-.75u); lft x4l-rt x4r=hround -.2[hair,stem]; %vert tangents
- x5=lft x4l; y5 +.5hair -oo =h; z5'l=z5'r=(u,-.2h); %right tip
- pos5(hair,angle z5'l+90);
- pos3(whatever,-90); bot y3r=-oo; x3=.5w; z3'l=z3'r=z5'l xscaled -2; %bottom
- z3l+whatever*z3'l=z3r+(stem-currentbreadth)*(dir(angle z3'l-90)); %width=stem
- filldraw circ_stroke club.e(5,4,3);
- y1+.5stem-oo=h; x1-.5stem=hround.75u; %left tip
- z1'=(9u,-h); pos1(stem/abs((sind(angle z1'-90))),180);
- z2r=z3r; z2l=z2r+(hair-currentbreadth)*(dir(angle z1'+90));
- filldraw circ_stroke z1e{z1'}...{down}z2e;
- fi
- fi
-enddef;
-
-
-cmchar "Lowercase nu";
-beginchar("n",dims);
-this_letter; penlabels(1,2,3,4,5,6,7,8); endchar;% "Lowercase nu"
-
-
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-if small_caps: % xi
- def dims = 9.5u#,sclc*x_height#,desc_depth# enddef;
-else:
- def dims = if cbleipzig:7.5u#,asc_height#,desc_depth#else:
- 8.5u#,asc_height#,desc_depth#
- fi
- enddef;
-fi
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-
-
-def gen_letter=
- if small_caps:
- italcorr height#*slant-.35u#;
- adjust_fit(0,0);
- h:=vround(h-2stem_corr);
- numeric shaved_stem; shaved_stem=hround .9[vair,.85stem];
- pickup crisp.nib; pos1(shaved_stem,90); pos2(hair,0);
- top y1r=h; x1=.5w; rt x2r=hround(w-.5u-.3beak_jut); y2=good.y(y1l-4/9beak)-eps;
- arm(1,2,a,.4beak_darkness,.3beak_jut); % upper right arm and beak
- pos3(hair,180); x3=w-x2; y3=y2;
- arm(1,3,b,.4beak_darkness,-.3beak_jut); % upper left arm and beak
- pos4(shaved_stem,-90); pos5(hair,0);
- bot y4r=0; x4=.5w; rt x5r=hround(w-.4u-.3beak_jut); y5=good.y(y4l+.5beak)+eps;
- arm(4,5,c,.4beak_darkness,.3beak_jut); % lower right arm and beak
- pos6(hair,180); x6=w-x5; y6=y5;
- arm(4,6,d,.4beak_darkness,-.3beak_jut); % lower left arm and beak
- pos7(shaved_stem,90); pos8(shaved_stem,90);
- lft x7=w-rt x8=hround if serifs: 2.5 else: 2 fi\\ u;
- top y7r=top y8r=vround(.52h+.5shaved_stem);
- filldraw stroke z7e--z8e; % middle bar
- if serifs: numeric xjut;
- if bot y2>top y7r+.75jut:
- xjut=.5jut;
- else:
- bot y2=top y7r+1.5xjut;
- fi
- pos11(hair,0); pos12(hair,0); y11=y12;
- pos13(hair,0); pos14(hair,0); y13=y14;
- lft x11l=lft x13l=w-rt x12r=w-rt x14r=hround 2.5u;
- top y11-bot y13=shaved_stem+2xjut; .5[y11,y13]=y7;
- filldraw stroke z11e--z13e; filldraw stroke z12e--z14e; % middle serifs
- fi
- math_fit(0,.5ic#);
- else:
- if cursive and serifs and not monospace:
- pos7(stem,180);
- lft x7r=hround(.75u); y7=1/3x_height; %big bulge
- pos8(stem,-135); bot y8r=0; x8=.5w; z8'r=z8'l=left; %inflection pt
- pos9(hair,-180); rt x9l=hround(w-.75u); %bottom right
- y6+.5hair=x_height+o; x6+.5hair=hround(rt x9l-.5u); %middle right
- numeric slope; slope=angle(5(x6-x7),y6-y8); pos6(hair,slope+90);
- z6'r=z6'l=dir slope;
- pos10(.5[hair,stem],90); y10l=-d+oo; y9=.5[y10r,y8r]; x10=hround x8r;
- filldraw double_circ_stroke %bowl and tail
- z10e{right}..z9e{up}..{left}z8e..{up}z7e..{dir(slope)}z6e;
- pos5(hair,1.5slope-90); z5=z6; %attachment
- z4=.5[z3,z5]+whatever*dir slope; %small bulge
- pos4(stem,-180); lft x4r=hround(lft x7r+.5u);
- pos3(hair,slope+90); top y3r=h-o; rt x3r=hround(rt x9l-.5u); %top rt
- filldraw double_circ_stroke z3e{-dir slope}..z4e{down}...z5e{dir 1.5slope};
- pos2(hair,1.5slope+90); z2=z3; %where handle attaches
- pos1(stem,slope); lft x1l=hround(lft x7r+.5u); y1r+hair=h; %end of handle
- pos0(hair,0); x0=x1r; y0=h;
- filldraw circ_stroke z2e{-dir9/8slope}...z1e{up}...z0e;
- elseif cbleipzig:
- numeric tilt[];
- pos1(hair,90);y1r=h; x1l=.6[x2l,x3l];
- y2r=.5[y3r,y1r];y2l=.5[y3l,y1l];x2r=hround(.5u)=x2l-.5[hair,stem];
- pos3(hair,-90);x3=2w/5; y3l=.5[x_height,h];
- pos4(hair,90); z3=z4;
- pos5(hair,180); x5r=x16; y5=.5[y12,y7];
- pos6(stem,-90); y6r=0;x6=2w/5;
- pos7(.2[stem,hair],90); y7=y3=y8; x8=x7+.5stem; z8=(w-u/2,-d/4)+whatever*dir(98);
- tilt1=angle((z7r-z4r) yscaled .7);
- pos9(stem,-90); y9=y6; x9=2w/3;
- x10l=w-x16r=x10r+.5[hair,stem];
- y10l=.5[y9l,y11l];y10r=.5[y9r,y11r];z10=.5[z10r,z10l];y10=-.25desc_depth;
- pos11(hair,90);x11=x6;
- pos12(hair,-90); y14=y12; z12-.5[z6,z9]=whatever*(z3-.5[z6,z9]);
- pos13(hair,90); z13=z12;
- pos14(.2[stem,hair],90); y14=.55[y9l,y7l];
- pos16(hair,180); x16r=hround(.5u); y16=.5[y14,y6];
- z15=z14+(.5stem,0); z15=(w-u/2,-d/4)+whatever*dir(98);
- tilt2=angle((z14r-z13r) yscaled .7);
- filldraw circ_stroke z1e{left}...z2e...{dir(-tilt1)}z3e; % hook
- filldraw stroke z4e{dir(180+tilt1)}..z5e{down}..{dir(-tilt2)}z12e; % top bulge
- filldraw z3r{dir(-tilt1)}...z7l..z8..z7r...{dir(180+tilt1)}z4r..cycle; % top right
- filldraw z12r{dir(-tilt2)}...z14l..z15..z14r...{dir(180+tilt2)}z13r..cycle; % middle right
- filldraw stroke z13e{dir(180+tilt2)}..z16e{down}..{right}z6e; % bottom bulge
- filldraw circ_stroke z11e{right}..{up}z10e..{left}z9e--z6e; % bottom
- elseif cbroman:
- pos11(hair,90);x11=x7r; y11r=h;
- pos12(hair,90);x12=.7w; y12=y11;
- pos9(.5[hair,stem],180); x9r=x11; y9=.5[x_height,h];
- pos8(hair,-90);x8=x12; y8l=x_height;
- pos7(.3[stem,hair],0); x7l=u/2; y7=bar_height;
- pos6(stem,90);y6l=0; x6=w/2;
- pos5(stem,90);y5l=y6l; x5=.5[x6,x4];
- pos3(hair,-90); x3=w/2; y3=-(.5[.7bar_height,d]);
- y4l=.5[y3l,y5l]; x4r=x4l+.3[hair,stem]=w-u/2; y4r=.5[y3r,y5r];z4=.5[z4r,z4l];
- filldraw double_circ_stroke z11e--z12e;
- filldraw circ_stroke z8e{left}...{up}z9e...{right}z12e;
- filldraw circ_stroke z3e{(z4-z3)xscaled 3}...{up}z4e...z5e---z6e..{up}z7e...{right}z8e;
- elseif SansSerif:
- pickup fine.nib;
- lft x7r=rt x7l- hair=hround(.75u); x7=.5[x7r,x7r]; %big bulge
- pos8(stem,-90); bot y8r=0; x8=.5w; z8'r=z8'l=left; %inflection pt
- pos9(hair,-180); rt x9l=hround(w-.75u); y9=-.5stem; %bottom right
- y6+.5stem=x_height+o; x6=hround(x9r); %middle right
- numeric slope; slope=angle(5(x6-x7),y6-y8); pos6(stem,90);
- z6'r=z6'l=right;
- pos10(vstem,-270);
- %y9=.5[y10r,y8r];
- bot y10l=max(2y9-top y8l,-desc_depth-oo);
- x10-.5vstem=hround x8;
- filldraw stroke z10e{right}...z9e{up}...club.e(8,7,6); %bowl and tail
- pos5(hair,-90); z5r=z6l; %attachment
- z4l=.4[z3l,z5l]+whatever*dir slope; %small bulge
- pos4(vair,-180+slope);
- lft x4r=hround(lft x7r+1.5u);
- y3+.5stem=h+o; x3+.5stem=hround(rt x9l-.25u); pos3(stem,slope+90); %top rt
- filldraw stroke z3e{-dir slope}..z4e{down rotated slope}...z5e{right};
- pos2(hair,slope+90); z2r=z3r; %where handle attaches
- pos1(curve,0); lft x1l=hround(lft x7r+.25u); y1r=y2r; %end of handle
- filldraw stroke z1e{down}...z2e{dir slope};
- else:
- pickup fine.nib;
- lft x7r=rt x7l- hair=hround(.75u); x7=.5[x7r,x7r]; %big bulge
- pos8(stem,-90); bot y8r=0; x8=.5w; z8'r=z8'l=left; %inflection pt
- pos9(hair,-180); rt x9l=hround(w-.75u); y9=-.5stem; %bottom right
- y6+.5stem=x_height+o; x6+.5stem=hround(rt x9l-1.5u); %middle right
- numeric slope; slope=angle(5(x6-x7),y6-y8); pos6(stem,slope+90);
- z6'r=z6'l=dir slope;
- pos10(vstem,-270); y9=.5[y10r,y8r]; x10-.5vstem=hround x8;
- filldraw double_circ_stroke %bowl and tail
- z10e{right}...z9e{up}...club.e(8,7,6);
- pos5(hair,slope-90); z5l=z6r; %attachment
- z4=.5[z3,z5]+whatever*dir slope; %small bulge
- if serifs: pos4(vair,-180); else: pos4(.5vair,-180); fi lft x4r=hround(lft x7r+1.5u);
- y3+.5stem=h+o; x3+.5stem=hround(rt x9l-.25u); pos3(stem,slope+90); %top rt
- filldraw circ_stroke z3e{-dir slope}..z4e{down}...z5e{dir slope};
- pos2(hair,slope+90); z2r=z3r; %where handle attaches
- pos1(curve,0); lft x1l=hround(lft x7r+.25u); y1+.5curve=h+o; %end of handle
- filldraw circ_stroke z1e{down}...z2e{dir slope};
- fi
- fi
-enddef;
-
-
-
-cmchar "Lowercase xi";
-beginchar("x",dims);
-this_letter; penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16); endchar;% "Lowercase xi"
-
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-
-if small_caps: % omicron
- def width = 10u enddef;
- def dims = width#,sclc*x_height#,0 enddef;
-else:
- def width = if cursive:8.5
- elseif cbleipzig or cbroman:8.5
- else:9.5
- fi u enddef;
- def dims = width#,x_height#,0 enddef;
-fi
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-def gen_letter =
- if small_caps:
- italcorr .7*height#*slant-.5u#;
- adjust_fit(0,0);
- penpos1(vair',90); penpos3(vround(vair+1.5vair_corr),-90);
- penpos2(curve,180); penpos4(curve,0);
- if monospace: x2r=hround 1.5u;
- interim superness:=sqrt superness; % make |"O"|, not |"0"|
- else: x2r=.5hround 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
- math_fit(-.3*height#*slant-.5u#,ic#-.5u#);
- else:
- if cursive or cbleipzig or cbroman or SansSerif:
- pos1(if cbleipzig:fine else:hair fi,90);
- pos2(stem,180);
- pos3(if cbleipzig:fine else:hair fi,270);
- pos4(stem,0);
- x1=x3=w/2; lft x2r=w- rt x4r=.75u;
- bot y3r = h-top y1r= -oo; y2=y4=h/2;
- filldraw stroke z1e{left}..z2e..z3e..z4e..{left}z1e;
- numeric x_baryctr; x_baryctr=x1;
- elseif monospace:
- spess:=max(hair,fine+eps);
- pos1(spess,90); pos2(spess,180); pos3(spess,270); pos4(spess,0);
- x1=x3=w/2; lft x2r=w- rt x4r=.75u;
- bot y3r = h-top y1r= -oo; y2=y4=h/2;
- filldraw stroke z1e{left}..z2e..z3e..z4e..{left}z1e;
- numeric x_baryctr; x_baryctr=x1;
- else:
- pickup fine.nib;
- lft x4r=hround .75u; x8r=w-x4r; y4r=y8r=.5x_height; %top and bottom
- top y2r=x_height+oo; bot y6r=-oo; x2r=x6r=.5w; %right and left
- filldraw stroke
- gr_arc.e(8,1,2)(vair,curve,otilt) & gr_arc.e(2,3,4)(vair,curve,otilt) &
- gr_arc.e(4,5,6)(vair,curve,otilt) & gr_arc.e(6,7,8)(vair,curve,otilt) ;
- numeric x_baryctr; x_baryctr=x2; %accent reference
- fi
- fi
-enddef;
-
-
-cmchar "Lowercase omicron";
-beginchar("o",dims);
-this_letter; penlabels(1,2,3,4,5,6,7,8); endchar;% "Lowercase omicron"
-
-
-
-
-iff(not barebones):
-cmchar "Lowercase omicron with grave";
-beginchar(oct"344",width#,acc_ht#,0);
-this_letter; if (not small_caps): grave(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omicron with rough breathing";
-beginchar(oct"345",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omicron with smooth breathing";
-beginchar(oct"346",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omicron with acute";
-beginchar(oct"354",width#,acc_ht#,0);
-this_letter; if (not small_caps): acute(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omicron with rough breathing and acute";
-beginchar(oct"355",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit_acute(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omicron with smooth breathing and acute";
-beginchar(oct"356",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit_acute(x_baryctr)>; fi endchar;
-iff(not barebones):
-
-iff(not barebones):
-cmchar "Lowercase omicron with rough breathing and grave";
-beginchar(oct"347",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit_grave(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omicron with smooth breathing and grave";
-beginchar(oct"357",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit_grave(x_baryctr)>; fi endchar;
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-def dims = if small_caps: % pi
- 10.5u#,sclc*x_height#,0
- else:
- if cbroman:
- 9
- elseif SansSerif:
- 10.5
- elseif cbleipzig:
- 10.5
- else:
- 9.5
- fi
- u#,x_height#,0
- fi enddef;
-def ital = 0 enddef;
-def fit_params = if cbroman or SansSerif:0else:-.25fi u#,0 enddef;
-
-
-def gen_letter =
- if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- adjust_fit(.7serif_fit#,.7serif_fit#); pickup tiny.nib;
- h:=vround(h-stem_corr);
- pos1(stem,0); pos2(stem,0); pos3(stem,0); pos4(stem,0);
- lft x1l=lft x2l=hround (max(2u,3u-.5stem)-u/2); 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; y5r=y6r=h;
- fill stroke z5e--z6e; % bar
- 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
- dish_serif(1,2,a,1/3,jut,b,1/3,eps); % upper left serif
- dish_serif(2,1,c,1/3,jut,d,1/3,inner_jut); % lower left serif
- dish_serif(3,4,e,1/3,eps,f,1/3,jut); % upper right serif
- dish_serif(4,3,g,1/3,inner_jut,h,1/3,jut); fi % lower right serif
- math_fit(0,.5ic#);
- else:
- if cursive:
- adjust_fit(fit_params);
- if monospace or slitex: pickup fine.nib; fi
- pi_bar; %bar
- pos4(.5[stem,hair],0); pos7(hair,0); y4=y7=y2; %attachments
- lft x4l-(x1-.5hair)=lft x7l-rt x4r=rt x3-rt x7r;
- pos5(.5[stem,hair],0); pos8(hair,0); y5=y8=.5x_height; x5=x4; x8=x7; %midstems
- z6=whatever[z4,z5];bot y6=0; pos6(.5[stem,hair],0);
- filldraw stroke z6e...z5e---z4e;
- x9=x7+1.5u; bot y9l=-oo; pos9(.8[hair,stem],90); alpha_tail(9,10); %right stem
- filldraw stroke z10e...z9e{left}...z8e---z7e;
- elseif cbleipzig:
- cblpi_bar; %bar
- pos7(stem,0); z7r=z3; %right stem
- pos8(stem,0);
- pos10(.5[hair,stem],110);
- x8=x7-u/5; y8=2bar_height/3;
- x9r=.5[x8r,x10r]; x9l=.5[x8l,x10l]; bot y9l=-oo=top y9r-.5[hair,stem];
- x10l=w-u/4; y10r=min(2stem,bar_height/2);
- filldraw circ_stroke z10e{(z9l-z10l) xscaled 0.2}...z9e{left}...z8e{up}...z7e; %right stem
-%
- pos4(.4[hair,stem],0); y4=y2; z4=z5+whatever*((z7-z8)yscaled3); %left stem
- pos5(.4[hair,stem],angle(z7-z8)-90); y5=2bar_height/3; x5l=x2+.1u;
- pos12(.5[hair,stem],-120);
- bot y6r=-oo=top y6l-.8[hair,stem];x6l=.5[x5l,x12l]; x6r=.5[x5r,x12r];
- z12r-z1l=whatever*(-.5*slant,1); y12l=.5[y6l,y5];
- filldraw circ_stroke z12e{(z6l-z12l)yscaled2}...{right}z6e...z5e{(z7-z8)}...z4e;
- elseif cbroman:
- pickup tiny.nib;
- pos1(stem,0);lft x1l=jut; top y1=h;
- pos2(stem,0); x2l=x1l; bot y2=0;
- pos3(stem,0); rt x3r=w-lft x1l; y3=y1;
- pos4(stem,0); x4r=x3r; y4=y2;
- pos5(hair,90);x5=x1; top y5r=top y1;
- pos6(hair,90);x6=x3; top y6r= top y1;
- filldraw stroke z5e--z6e;
- filldraw stroke z1e--z2e; filldraw stroke z3e--z4e;
- serif(1,2,a,1/3,-.8jut); serif(3,4,b,1/3,.8jut);
- dish_serif(2,1,c,1/3,.8jut,d,1/3,.8jut);
- dish_serif(4,3,e,1/3,.8jut,f,1/3,.8jut);
- elseif SansSerif:
- pickup fine.nib;
- pi_bar; %bar
- pos4(hair,0); pos7(hair,0); y4=y7=y2; %attachments
- x4l=x2;lft x7l-rt x4r=rt x3-rt x7r;
- pos5(hair,0); pos8(hair,0); y5=.5x_height; x5=x4; x8=x7;y8=1.6[y9l,y9r];
- x6=x4; bot y6=0 if currentbreadth>0: -oo fi; %left stem
- numeric slope; slope=angle((z5-z6)xscaled2); pos6(stem,slope-90);
- filldraw stroke z6e--z4e;
- y9r=.8stem; bot y9l=-oo; x9l=.5[x8l,x10l]; z9=.5[z9l,z9r];
- pos10(.7hair,180); x10l=w-x1;
- y10=y8; x9r=.5[x8r,x10r]; %right stem
- filldraw stroke z10e{down}..z9e{left}..{up}z8e--z7e;
- else:
- pickup fine.nib;
- pi_bar; %bar
- pos4(hair,0); pos7(hair,0); y4=y7=y2; %attachments
- lft x4l-(x1-.5hair)=lft x7l-rt x4r=rt x3-rt x7r;
- pos5(hair,0); pos8(hair,0); y5=y8=.5x_height; x5=x4; x8=x7; %midstems
- x6+.5stem=hround(rt x4r if not straight:-.25u fi); y6-.5stem=-oo; %left stem
- numeric slope; slope=angle((z5-z6)xscaled2); pos6(stem,slope-90);
- filldraw circ_stroke z6e...z5e---z4e;
- x9=x7+1.5u; bot y9l=-oo; pos9(stem,90); alpha_tail(9,10); %right stem
- filldraw stroke z10e...z9e{left}...z8e---z7e;
- fi
- fi
-enddef;
-
-
-cmchar "Lowercase pi";
-beginchar("p",dims);
-this_letter; penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;% "Lowercase pi"
-
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-
-if small_caps: % rho
- def width = 9u enddef;
- def height = sclc*x_height enddef;
- def depth = 0 enddef;
- def dims = width#,height#,depth# enddef;
-else:
- def width =8.5u enddef;
- def height = x_height enddef;
- def depth = desc_depth enddef;
- def dims = width#,height#,depth# enddef;
-fi
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-
-def gen_letter =
- if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(.7serif_fit#,0);
- pickup tiny.nib; penpos1(stem'-tiny,0); penpos2(stem-tiny,0);
- pos0(stem',0); pos0'(stem,0);
- lft x1l=hround (max(2u,3u-.5stem')-u/2); top y1=h; bot y2=0;
- x1l=x2l=x0l=x0'l; y0=y0'=y7;
- penpos3(cap_band,90); penpos4(cap_band,90);
- penpos5(curve if hefty:-3stem_corr fi,0);
- penpos6(.5[vair,cap_band],-90); penpos7(.5[vair,cap_band],-90);
- z3r=top z1; y4=y3; y5=.5[y4l,y6l]; y6=y7;
- x7=x2; y7l=vround .5h; x4=x6=.5w+.75u; x5r=hround(w-u/2);
- x4l:=x6l:=x4-.25curve;
- filldraw stroke z1e--z0e--z0'e--z2e; % stem
- fill stroke z3e..pulled_arc.e(4,5) & pulled_arc.e(5,6)..z7e; % lobe
- if serifs: dish_serif(1,0,a,1/3,jut,b,1/3,.5jut); % upper serif
- dish_serif(2,0',c,1/3,jut,d,1/3,jut); fi % lower serif
- math_fit(0,ic#-2.5u#);
- else:
- if (cursive or monospace) and not SansSerif:
- if slitex or monospace: pickup fine.nib;spess:=max(hair,fine+eps);else: spess:=hair; fi
- pos0(stem,0); pos1(stem,0); pos2(spess,-90); pos3(stem,180);
- pos4(spess,90); pos5(spess,0);
- lft x0l= lft x1l = w - rt x3l= 3/4u; x2=x4=w/2; rt x5r = rt x1r;
- bot y0=-d; y1=y3=y5=bar_height; h-top y2l=bot y4l=-oo;
- filldraw stroke z1e{up}..{right}z2e..z3e{down}..z4e{left}..{up}z5e;
- filldraw z1l--z0l--z0r--z5--cycle;
- elseif cbleipzig:
- spess:=fine;
- pos1(stem,0); pos2(spess,-90); pos3(stem,180);
- pos4(spess,90); pos5(hair,0);
- lft x1l = w - rt x3l= 3/4u; x2=x4=w/2; lft x5l = lft x1l;
- y1=y3=y5=bar_height; h-top y2l=bot y4l=-oo;
- filldraw stroke z1e{up}..{right}z2e..z3e{down}..z4e{left}..{up}z1e;
- pos0(.9[hair,stem],90); if stem<1.5u:top y0r=-stem-hair else:bot y0l=-d+.7hair fi; x0=.5[x1,x3];
- pos6(.9[hair,stem],90);y6=y0;x6=.5[x4,x3];
- pos7(fine,45); bot y7l=-d; x7r=x3l;
- filldraw double_circ_stroke z5e{down}...z0e---z6e..z7e;
- elseif cbroman:
- pickup tiny.nib;
- pos1(stem,180); rt x1l=w-u/2; y1=h/2;
- pos2(hair,-90); x2=.5[x1,x3]; top y2l=h+oo;
- pos3(stem,0); lft x3l=u; y3=y1; pos0(hair,0); z3r=z0r;
- pos4(hair,90); x4=x2; bot y4l=-oo;
- pos5(stem,0); x5=x3; bot y5=-d;
- filldraw stroke z5e---z3e{up}...{right}z2e...{down}z1e...{left}z4e...{up}z0e;
- dish_serif(5,3,a,1/3,.8jut,b,1/3,.8jut);
- elseif SansSerif:
- pickup fine.nib;
- lft x4r=hround .75u; x8r=w-x4r; y4r=y8r=.5h; %left and right
- pos4(hair,180); pos8(hair,0);
- top y2r=h+oo; bot y6r=-oo; x2r=x6r=.5w; %top and bottom
- pos2(.8hair,90); pos6(.8hair,-90);
- pos9(hair,180); bot y9=-d; x9r=x4r;
- filldraw stroke z9e--z4e{up}...{right}z2e...{down}z8e...{left}z6e...{up}z4e;
- else:
- pickup fine.nib;
- lft x4r=hround .75u; x8r=w-x4r; y4r=y8r=.5h; %left and right
- top y2r=h+oo; bot y6r=-oo; x2r=x6r=.5w; %top and bottom
- filldraw stroke
- gr_arc.e(4,5,6)(curve,vair,-otilt) & gr_arc.e(6,7,8)(curve,vair,-otilt) &
- gr_arc.e(8,1,2)(curve,vair,-otilt) & gr_arc.e(2,3,4)(curve,vair,-otilt);
- if straight:
- y9-.5stem=-d-oo; x9=x4; pos9(stem,180); %end of handle
- filldraw circ_stroke z9e..z4e;
- else:
- y9-.5stem=-d-oo; x9=lft x4r+stem; %end of handle
- if serifs:
- pos9(stem,angle((z9-z4)xscaled3)-90); z9'r=z9'l=(z9-z4)xscaled3;
- rt x10l=lft x10r+vair; %vertical tangents of handle
- x10r=x4r-epsilon; assign_z4'r((-2eps,-1)); %so club.r won't get confused
- filldraw double_circ_stroke club.e(4,10,9);
- else:
- pos9(1.2vstem,angle((z9-z4)xscaled3)-90); z9'=(z9-z4)xscaled3;
- filldraw z4r{down}...{z9'}z9r...z9l{-z9'}...{up}z4l--cycle;
- fi
- fi
- fi
- numeric x_baryctr; x_baryctr=x2; %breathing placement
- fi
-enddef;
-
-
-cmchar "Lowercase rho";
-beginchar("r",dims);
-adjust_fit(fit_params);
-this_letter; penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar;% "Lowercase rho"
-
-
-iff(not barebones):
-cmchar "Lowercase rho with rough breathing";
-beginchar(oct"373",width#,acc_ht#,depth#);
-this_letter; if (not small_caps): spirit(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase rho with smooth breathing";
-beginchar(oct"374",width#,acc_ht#,depth#);
-this_letter; if (not small_caps): spirit(x_baryctr)>; fi endchar;
-
-picture savedpicture; currentbreadth:=0;
-
-
-def dims=if small_caps: 8.5u#,sclc*x_height#,0% % final sigma
- elseif cbleipzig:
- 7.5u#,x_height#,desc_depth#
- else: 8u#,x_height#,desc_depth#%
- fi
-enddef;
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-def gen_letter =
- if small_caps: sc_beak_jut#:=.7beak_jut#; sc_beak#:=.7beak#;
- define_pixels(sc_beak_jut,sc_beak);
- italcorr height#*slant-sc_beak_jut#-.5u#;
- numeric bot_arm_thickness;
- bot_arm_thickness=Vround .25[slab,vstem];
- pickup tiny.nib; lft x1l=hround u/2; x1l=x2l=x4l;
- top y1=h; bot y2=h-slab; bot y4=0; x3l-x1l=4/11(w-u); y3=.5h;
- numeric alpha[]; alpha1=((x3l-x1l)++(y2-y3))/(y2-y3);
- penpos1(alpha1*(stem-tiny),0); penpos2(alpha1*(stem-tiny),0);
- penpos3(alpha1*(stem-tiny),0);
- alpha2=diag_ratio(1,hair-tiny,y3-y4,x3r-x4l);
- penpos4(alpha2*(hair-tiny),0);
- z0=whatever[z2l,z3l]=z4l+whatever*(z3r-z4r);
- filldraw z1l--z2l--z0--z4l--z4r--z3r--z2r--z1r--cycle; % diagonals
- pickup crisp.nib; pos5(slab,90); pos6(hair,0);
- top y5r=h; x5=x1; rt x6r=hround(w-x1l); y6=good.y(y5l-sc_beak)-eps;
- arm(5,6,a,beak_darkness,sc_beak_jut); % upper arm and beak
- pos7(bot_arm_thickness,-90); pos8(hair,0);
- bot y7r=0; z7l=whatever[z4,z3]; x7r:=x4; x8=x6;
- y8=good.y(y7l+sc_beak)+eps;
- arm(7,8,b,beak_darkness,sc_beak_jut); % lower arm and beak
- math_fit(0,.5ic#);
- else:
- if cursive and not SansSerif:
- if slitex or monospace: pickup fine.nib; fi
- pos1(stem,45); pos2(hair,90); pos3(stem,220); pos4(.8[hair,stem],220);
- pos6(min(hair,.5d),90);
- lft x3r=3/4u=w-rt x1r; x2=w/2; top y2r=h+oo; top y1r=h-if serifs:.7fi stem;
- y3=bar_height; if slitex:bot y4r else: y4 fi=0; rt x4l=rt x1l;
- bot y6l=-d; x6=3w/8;
- path gobba; gobba= z2l{left}..tension .75..{down}z3l; pair zA,zB;
- zB=point .5 of gobba; zA=direction .5 of gobba;
- pos0(hair,angle(zA)-if serifs:90else:60fi);z0l=zB;
- if monospace:
- path gobba; pair zA; gobba=z4r{down}..tension .8..{left}z6r;
- zA=direction .5 of gobba;
- pos5(hair,angle(zA)-90); z5r=point .5 of gobba;
- else:
- pos5(hair,180); y5=.5[y4r,y6]; rt x5l=rt x1r;
- fi
- path gobba; gobba=z1{dir110}...{left}z2..z0..z3..z4..{if monospace:zA else: down fi}z5;
- pair diag; diag=direction 3.5 of gobba;
- pos7(stem,angle(diag)-90); if monospace:z7l else: z7 fi=point 3.5 of gobba;
- path gobba; gobba=z5r{if monospace:zA else: down fi}..{left}z6r;
- pair zB; zB=direction .5 of gobba; pos8(min(hair,.5d),angle(zB)-90); z8r=point .5 of gobba;
- filldraw circ_stroke z1e{dir 110}...{left}z2e..z0e..z3e..z7e{diag}..z4e
- ..{if monospace:zA else:down fi}z5e..z8e{zB}..{left}z6e;
- path gobba; pair zA,zB,diag;
- elseif cbleipzig:
- pickup fine.nib; numeric slope;
- pos4(hair,-180); y4=.5h; lft x4r=hround .75u; %left bulge
- pos6(hair,-180); rt x6l=hround(w-.75u); %y6=-.5stem; %bottom right
- top z0r=(w/2,h+oo);pos0(.6[hair,stem],90);
- z3r=z0r+whatever*dir(-15);z9=z3r+.5stem*down;
- x3r+.5stem=rt x6l; pos3(stem,angle(z9-z0r)+90); %top right
- pos5(vstem,-90); bot y5r=0; x5=.5w; %inflection pt
- pos7(hair,90); y6=.5[y7r,y5r]; x7=hround x5;
- top y7r=-.5desc_depth;
- pair za; za=.5[z3,z5]; slope=angle((0,h)-za);
- z10=z4+whatever*right=z0+whatever*down;
- pos1(hair,slope); pos2(.4[hair,stem],360-slope);
- numeric tensione[]; tensione1=1;tensione2=.85;
- path cbp; cbp=z5{left}..tension tensione1..z4..tension tensione2..{right}z0;
- z1=point 1.5 of cbp;
- z2=point .5 of cbp;
- pos8(vstem,-90); y8=y5;x8=x5+u;
- filldraw double_circ_stroke %bowl and tail
- z7e{right}...z6e...z8e...z5e{left}..z2e..z4e..z1e...z0e{right}...z3e;
- path cbp; numeric tensione[];
- elseif cbroman:
- pos1(hair,0); z1=(w/2,h/2)+whatever*dir(45); y1=.5[bar_height,h];
- pos10(stem,0); z10r=z1r; pos11(stem,90); z10=z11;
- pos2(hair,90); x2=w/2;y2r=h+oo;
- pos3(hair,180);x3r=u/2; y3=.75bar_height;
- pos4(stem,-90); y4r=0; z4=z3+whatever*dir(-45);
- pos5(stem,-90);y5r=y4r; x5=.5[x6,x4];
- pos7(hair,90); y7l=-(.5[.7bar_height,d]); x7=x2;
- x6l=x6r+.3[hair,stem]=w-u/2; y6r=.5[y5r,y7r]; y6l=.5[y5l,y7l]; z6=.5[z6r,z6l];
- filldraw circ_stroke z7e{(z6-z7)xscaled 3}...z6e{up}...{left}z5e---z4e%
- ...{up}z3e...{right}z2e...{down}z1e;
- dot(10,11);
- elseif SansSerif:
- pickup fine.nib;
- pos4(hair,-180); y4=.5[y3,y5]; lft x4r=hround .75u; %left bulge
- pos6(hair,-180); rt x6l=hround(w-.75u); %bottom right
- top y3r=h; x3=rt x6l; pos3(stem,90); %top right
- pos5(vstem,-90); bot y5r=0; x5=.5w; %inflection pt
- pos7(vstem,-270); y6=.5[y7r,y5r]; x7=hround (x5+.5u);
- if y5r-u-vstem <-.5desc_depth: y7r=-u else:y7l=-.5desc_depth fi;
- filldraw stroke %bowl and tail
- z7e{right}...z6e...z5e{left}...z4e..tension.95..{right}z3e;
- else:
- pickup fine.nib;
- pos4(hair,-180); y4=.5h; lft x4r=hround .75u; %left bulge
- pos6(hair,-180); rt x6l=hround(w-.75u); %bottom right
- top y3r=h+oo; x3+.5stem=rt x6l; pos3(stem,90); %top right
- pos5(vstem,-90); bot y5r=0; x5=.5w; %inflection pt
- pos7(vstem,-270); y6=.5[y7r,y5r]; x7-.5vstem=hround x5;
- bot y7l=-if not slitex:.5fi desc_depth;
- filldraw double_circ_stroke %bowl and tail
- z7e{right}...z6e...z5e{left}...z4e...z3e{right};
- fi
- fi
-enddef;
-
-
-cmchar "Final lowercase sigma";
-beginchar("c",dims);
-adjust_fit(fit_params);
-this_letter; penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar;% "Final lowercase sigma"
-
-
-
-iff small_caps: % For small caps the glyph of medial sigma is the same as the final one
-beginchar("s",dims);
-adjust_fit(fit_params);
-this_letter; penlabels(1,2,3,4,5,6,7,8); endchar;
-
-picture savedpicture; currentbreadth:=0;
-
-% Initial and medial "sigma"
-def dim_sigma =
- if cbroman:9.5else:
- %elseif cbleipzig:8.5else:
- 9.5fi
- u#,x_height#,0 enddef;
-def ital_sigma = 0 enddef;
-def fit_params_sigma = 0,if cbleipzig:-.5u# elseif cbroman:0 else:.75u# fi enddef;
-
-def gen_mid_sigma =
- numeric spess;
- if (cursive or monospace) and not SansSerif:
- if slitex or monospace: pickup fine.nib;spess:=max(hair,fine+eps);else: spess:=hair; fi
- pos1(stem,75); pos2(spess,90); pos3(stem,180); pos4(spess,270);
- pos5(stem,0);
- rt x1r+.3stem=w; top y1r=h+oo;
- x2=x4=.5[x3,x5]; bot y4r = h -top y2r = -oo;
- y3=y5=bar_height; lft x3r=3/4u; w-3/2u=rt x5r;
- filldraw circ_stroke z1e{dir 200}..z2e{left}..z3e..z4e..z5e..{left}z2e;
- elseif cbleipzig:
- spess:=.1[fine,stem];
- pos0(hair,120);
- pos1(stem,150);
- pos2(.3[hair,stem],90);
- pos3(stem,180);
- pos4(spess,270);
- pos5(stem,0);
- top y0r=h+fine;.42[lft x3r,rt x0l]=x2;
- z1r=z2r+whatever*dir(-4); x1r=.3[x0r,x2r];
- .5[x2,x4]=.5[x3,x5]=w/2-.5u; x4-x2=.6u; bot y4r = h -top y2r = -oo;
- y3=y5=bar_height; lft x3r=hround(3/4u);
- filldraw circ_stroke z0e...z1e..z2e{left}..z3e..z4e..z5e..{left}z2e;
- elseif cbroman:
- spess:=hair;
- pos1(stem,75); pos2(spess,90); pos3(stem,180); pos4(spess,270);
- pos5(stem,0);
- rt x1r+lft x3r=w;
- top y1r=h+oo;
- x2=x4=.5[x3,x5]=w/2-.5u; bot y4r = h -top y2r = -oo;
- y3=y5=bar_height; lft x3r=hround(3/4u);
- filldraw circ_stroke z1e{dir 200}..z2e{left}..z3e..z4e..z5e..{left}z2e;
- elseif SansSerif:
- pickup fine.nib;
- lft x4r=hround .75u; rt x8r=w-lft x4r; %left and right bulge
- pos4(hair,180); pos8(hair,0);
- top y2r=h; bot y6r=-oo; x2r=x6r; %top and bottom
- pos2(hair,90); pos6(hair,-90);
- 2y4r=y2r+y6r=2y8r;
- (x8r-x6r)/(y8r-y6r)=-(x4r-x6r)/(y4r-y6r); %determine x6r
- y1r=y2r;rt x1=hround(rt x8r+u); pos1(stem,90); %tip
- filldraw stroke z1e--z2e{left}...{down}z4e...{right}z6e...{up}z8e...{left}z2e;
- else:
- pickup fine.nib;
- lft x4r=hround .75u; rt x8r=w-lft x4r; %left and right bulge
- top y2r=h; bot y6r=-oo; x2r=x6r; %top and bottom
- numeric fake; fake=y2r-(vstem-currentbreadth); %approx height of z2l
- 2y4r=y2r+y6r; if serifs: 2y8r=fake+y6r else: y8r=y4r fi;
- (x8r-x6r)/(y8r-y6r)=-(x4r-x6r)/(y4r-y6r); %determine x6r
- y1r=y2r;rt x1=hround(rt x8r+u); pos1(stem,90); %tip
- filldraw stroke z1e..gr_arc.e(2,3,4)(vstem,vstem,otilt)
- & gr_arc.e(4,5,6)(vair,vstem,otilt) %top stroke and left bowl
- & gr_arc.e(6,7,8)(vair,vstem,otilt); %bottom part of right bowl
- z9l=z2l; pos9(vair,90);
- filldraw stroke z8e{z8'e}..{z2'l}z9e; %top part of right bowl
- fi
-enddef;
-
-
-
-iff (not small_caps):
-cmchar "Initial and medial lowercase sigma";
-beginchar("s",dim_sigma);
-adjust_fit(fit_params_sigma);
-gen_mid_sigma; penlabels(0,1,2,3,4,5,6,7,8,9); endchar;% "Initial and medial lowercase sigma"
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-if small_caps: % tau
- def dims = 9.5u#,sclc*x_height#,0 enddef;
-else:
- def dims = if cbroman:7.5
- %elseif cbleipzig:8
- else:
- 8.5fi
- u#,x_height#,0 enddef;
-fi
-def ital = 0 enddef;
-def fit_params = -.25u#,0 enddef;
-
-def gen_letter=
- if small_caps:
- italcorr height#*slant-beak_jut#-.25u#;
- adjust_fit(fit_params);
- h:=vround(h-2stem_corr);
- pickup tiny.nib; pos1(stem,0); pos2(stem,0);
- lft x1l=lft x2l=hround(.5w-.5stem); 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-.65u); y4=good.y(y3l-beak)-eps;
- arm(3,4,e,beak_darkness,.7beak_jut); % right arm and beak
- pos5(hair,180); x5=w-x4; y5=y4;
- arm(3,5,f,beak_darkness,-.7beak_jut); % left arm and beak
- if serifs: dish_serif(1,2,a,1/3,.5jut,b,1/3,.5jut); % upper bracketing
- dish_serif(2,1,c,1/3,1.414jut,d,1/3,1.414jut); % lower serif
- fi
- math_fit(-.75*height#*slant,ic#-2.5u#);
- else:
- if cursive and not SansSerif:
- if slitex or monospace: pickup fine.nib; fi
- pos1(hair,90); pos2(stem,90); pos3(stem,90);
- lft x1r= w- rt x3r=3/4u; lft x2=w/4;
- top y2r=top y3r=h; top y1r =bot y2l-.4(stem-hair);
- filldraw
- z1l{dir 75}..{right}z2l--z3l--z3r--z2r{left}..{down}z1r--cycle;
- pos4(if not monospace:.8fi stem,0); pos5(stem,0); pos6(.8[hair,stem],90);
- y4=y2; x4=x5+(fine+stem)/4=.5[rt x1r,rt x3r]; y5=h/3; x6=.5[rt x5r,rt x3-hair]; bot y6l=-oo;
- pos7(hair,180); top y7= y5; x7l=x3;
- filldraw stroke z4e..{down}z5e...{right}z6e...{up}z7e;
- elseif cbleipzig:
- pickup fine.nib;
- cbltau_bar; %bar
- pos4(stem,0); y4=y2; x4=.5[x2,x3]; %attachment
- pos5(stem,0); y5=.3x_height; x5=.4[x2,x3]; %midstems
- x6r=.5[x5r,x7r]; bot y6l=-oo; pos6(.5[hair,stem],60); pos7(hair,120); %stem
- y7r=min(2stem,bar_height/2); z7l=z11r+whatever*(z5-z4);
- filldraw circ_stroke z7e{(z5-z4)}...z6e{left}...z5e---z4e;
- elseif cbroman:
- pos1(stem,90); x1=u/2+stem/2; y1r=h;
- pos2(stem,90); x2=w-x1; y2r=y1r;
- pos3(stem,0); x3=.4[x1,x2]; y3=y1;
- pos4(stem,0); x4=x3; y4= (x6l-x4l)/2;
- x5r=.5[x4r,x6r]; x5l=.5[x4l,x6l]; y5l=-oo; y5r=y5l+.3[hair,stem]; z5=.5[z5r,z5l];
- pos6(hair,180); x6=x2; y6=y4;
- filldraw double_circ_stroke z1e--z2e;
- filldraw circ_stroke z6e{down}...z5e{left}...{up}z4e---z3e;
- elseif SansSerif:
- pickup fine.nib;
- pi_bar; %bar
- pos4(hair,0); y4=y2; x4=.5[x1,x3]-.15hair; %attachment
- pos5(hair,0); y5=1.6[y6l,y6r]; x5=x4; %midstems
- x6r=x4r+.5hair; bot y6l=-oo; y6r=.8hair; x6l=.5[x5l,x7l]; z6=.5[z6l,z6r]; %stem
- pos7(.7hair,180);
- x6r=.5[x5r,x7r]; y7=y5;
- filldraw stroke z7e{down}..z6e{left}...z5e---z4e;
- else:
- pickup fine.nib;
- pi_bar; %bar
- pos4(hair,0); y4=y2; lft x4l-(x1-.5hair)=rt x3-rt x4r; %attachment
- pos5(hair,0); y5=.5x_height; x5=x4; %midstems
- x6=x4+1.5u; bot y6l=-oo; pos6(stem,90); alpha_tail(6,7); %stem
- filldraw stroke z7e...z6e{left}...z5e---z4e;
- fi
- fi
-enddef;
-
-cmchar "Lowercase tau";
-beginchar("t",dims);
-this_letter; penlabels(1,2,3,4,5,6,7,8,11); endchar;% "Lowercase tau"
-
-picture savedpicture; currentbreadth:=0;
-
-
-
-if small_caps: % lowercase upsilon
- def width = 9u enddef;
- def dims = width#,sclc*x_height#,0 enddef;
-else:
- def width = %if cbleipzig:8else:
- 9%fi
- u enddef;
- def dims = width#,x_height#,0 enddef;
-fi
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-def gen_letter=
- if small_caps:% upsilon smal caps
- italcorr .8*height#*slant-.5u#;
- adjust_fit(0,0);
- pickup tiny.nib; pos1(stem,0); pos2(stem,0);
- lft x1l=lft x2l=hround(.5w-.5stem); y1=.5h; bot y2=0;
- filldraw stroke z1e--z2e; % stem
- penpos3(.6stem,0); penpos4(.75curve,90); penpos5(hair,180);
- z3l=lft z1l; x5r=.5hround u; y5=bot .8h; x4=.61803[x3l,x5l]; y4r=h+o;
- penpos5'(hair,180); x5'=x5; y5'=h;
- fill z3r{up}...z4r{left}...{down}diag_end(5'r,5r,1,1,5l,5'l){up}
- ...{right}z4l...{down}z3l--cycle; % left arc
- penpos6(.6stem,0); penpos7(.75curve,-90); penpos8(hair,-180);
- z6r=rt z1r; x8=w-x5; y8=y5; x7=w-x4; y7=y4;
- penpos8'(hair,-180); x8'=x8; y8'=h;
- fill z6r{up}...z7r{right}...{down}diag_end(8'r,8r,1,1,8l,8'l){up}
- ...{left}z7l...{down}z6l--cycle; % right arc
- if serifs: dish_serif(2,1,a,1/3,1.25jut,b,1/3,1.25jut); fi % serif
- math_fit(-.8*height#*slant-.5u#,ic#-2.5u#);
- numeric x_baryctr; x_baryctr=x1;
- else:
- if cursive and serifs and not monospace:% upsilon: oblique prportional
- adjust_fit(.5stem#,0);% upsilon italic
- pos1(hair,90); pos2(stem,45); pos3(stem,0);
- pos4(stem,10); pos5(.5[hair,stem],90); pos6(hair,180);
- numeric tip_slope; tip_slope=-70; pos7(stem,tip_slope-90);
- x1l=0; x2l=4/3u; x2=x3l=x4l;
- y1=y2l; y2r=h; y3=3/4h; y4l=max(1/3h,3/2stem);
- x6l=w-3/4u; x7l=x6r; y7+.5stem=h+o; y6=4/10h;
- y5l=-oo; x5=.5[x3l,x6l];
- filldraw circ_stroke z7e{dir(tip_slope)}..{down}z6e..{left}z5e
- ..{up}z4e..z3e..z2e..z1e;
- numeric x_baryctr; x_baryctr=(w-u/3)/2; numeric tip_slope;
- elseif cbleipzig:% upsilon Leipzig
- adjust_fit(0,.3u#);
- pickup fine.nib;
- pos1(hair,180);
- pos3(stem,0); %left tip
- lft x1r=.5u; y1=y3;
- top y2r=h+oo=bot y2l+.5[hair,stem]; x2l=.5[x1l,x3l]; x2r=.5[x1r,x3r];z2=.5[z2r,z2l];
- y3=2h/3;lft x3l=rt x1l+if stem<1.5u:2u else:.7stem fi ;
- pos4(stem,0); x4=x3;y4=h/3;
- bot y5l=-oo=top y5r-hair; x5r=.5[x4r,x6r];x5l=.5[x4l,x6l]; z5=.5[z5r,z5l];
- pos6(.5[hair,stem],180); y6=h/2; rt x6l+lft x1r=w;
- pos7(.1[stem,hair],220); top y7l= h; x7=.4[x5,x6];
- filldraw double_circ_stroke z1e{up}..{right}z2e..{down}z3e---z4e...%
- {right}z5e..{up}z6e...z7e;
- numeric x_baryctr; x_baryctr=.5[x2,x7];
- elseif cbroman:% upsilon roman
- pickup tiny.nib;
- pos1(stem,0);lft x1l=jut; top y1=h;
- pos2(stem,0); x2=x1; y2=(rt x5l -lft x1l)/2;
- pos3(hair,90);x3=w/2;bot y3l=-oo;
- pos4(stem,180);x4=x5; y4=y2; pos6(stem,0); z6=z4;
- pos5(stem,180); x5=w-x1; y5=y1; pos7(stem,0); z7=z5;
- filldraw stroke z1e---z2e{down}...{right}z3e...{up}z4e---z5e;
- serif (1,2,a,1/3,-.8jut);
- dish_serif(7,6,b,1/3,.8jut,c,1/3,.8jut);
- numeric x_baryctr; x_baryctr=x3;
- elseif SansSerif:% upsilon SansSerif
- adjust_fit(0,0);
- pickup fine.nib;
- top y2r=x_height; x2r=hround.75u; % left tip
- lft x4r=hround(x2r+.20stem+.75u); y4r=.5x_height; %left middle
- pos4(hair,180);z4'r=z4'l=down;
- y8r=y4r; rt x8r=hround(w-.75u); %right bulge
- pos8(hair,0); z8'l=z8'r=up;
- x6r=.5[x4r,x8r]; bot y6r=-oo; %bottom
- pos6(hair,-90);
- path cbp; cbp=z2r...{z4'r}z4r; z.a=direction 0 of cbp;
- pos2(hair/(abs(cosd(angle(z.a)-90)))-currentbreadth,180);
- y9=y2; x9=x8-u; %right tip
- path cbp; cbp=z8{up}...z9; z.b=direction 1 of cbp;
- pos9(hair/(abs(cosd(angle(z.b)+90))),0);
- filldraw stroke z2e...{z4'e}z4e...{right}z6e...{z8'e}z8e...z9e;
- numeric x_baryctr; x_baryctr=.6[x2,x9]-.15stem; % accent reference
- else:% upsilon other shapes: didot and tt
- adjust_fit(0,0);
- pickup fine.nib;
- y2+.5stem=x_height+o; x2-.5stem=hround.75u; %%%left tip
- lft x4r=hround(x2-.5stem+.75u); y4r=.5x_height; %left middle
- y8r=y4r; rt x8r=hround(w-.75u); %right bulge
- x6r=.5[x4r,x8r]; bot y6r=-oo; %bottom
- numeric tilt;
- tilt:=min(2*otilt,.5);
- if monospace:
- pos4(stem,180); pos6(stem,-90); pos8(stem,0);
- filldraw stroke z4e{down}...{right}z6e...{up}z8e;
- else:
- filldraw stroke gr_arc.e(6,7,8)(vair,stem,tilt) ;
- filldraw stroke gr_arc.e(4,5,6)(vair,.4[vair,stem],tilt);
- fi
- y9+.5hair=x_height+o; x9=x8-u;
- pos9(hair,angle ((z8-z9) xscaled 2)+90);
- pos2(stem,angle((z4-z2) xscaled 2)-90);
- if monospace:
- filldraw circ_stroke z9e...{down}z8e;
- filldraw circ_stroke z2e...{down}z4e;
- else:
- filldraw circ_stroke z9e...{-z8'e}z8e;
- filldraw circ_stroke z2e...{z4'e}z4e;
- fi
- numeric x_baryctr; x_baryctr=.5[x2,x9]-.15stem;
- fi
- fi
-enddef;
-
-
-cmchar "Lowercase upsilon";
-beginchar("u",dims);
-this_letter; penlabels(1,2,3,4,5,6,7,8,9); endchar;% "Lowercase upsilon"
-
-
-
-iff(not barebones):
-cmchar "Lowercase upsilon with grave";
-beginchar(oct"314",width#,acc_ht#,0);
-this_letter; if (not small_caps): grave(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with rough breathing";
-beginchar(oct"315",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with smooth breathing";
-beginchar(oct"316",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with acute";
-beginchar(oct"324",width#,acc_ht#,0);
-this_letter; if (not small_caps): acute(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with rough breathing and acute";
-beginchar(oct"325",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit_acute(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with smooth breathing and acute";
-beginchar(oct"326",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit_acute(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with rough breathing and grave";
-beginchar(oct"317",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit_grave(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with smooth breathing and grave";
-beginchar(oct"327",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit_grave(x_baryctr)>; fi endchar;
-
-
-iff(not barebones):
-cmchar "Lowercase upsilon with circumflex";
-beginchar(oct"334",width#,circ_ht#,0);
-this_letter; if (not small_caps):
-squeeze:=false; circumflex(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with rough breathing and circumflex";
-beginchar(oct"335",width#,Circ_ht#,0);
-this_letter; if (not small_caps):
-squeeze:=true; spirit_circumflex(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with smooth breathing and circumflex";
-beginchar(oct"336",width#,Circ_ht#,0);
-this_letter; if (not small_caps):
-squeeze:=true; spirit_circumflex(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with diaeresis";
-beginchar(oct"364",width#,circ_ht#,0);
-this_letter; diaeresis(x_baryctr);
-picture savedUpicture; savedUpicture:=currentpicture;
-endchar;
-iff(not barebones):
-cmchar "shifted Lowercase upsilon with diaeresis"; % for kerning with A or a
-beginchar(oct"017",width#,circ_ht#,0);
-adjust_fit(0,-aukern#);
-currentpicture:=savedUpicture shifted(-aukern,0); endchar;
-picture savedUpicture;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with diaeresis and grave";
-beginchar(oct"365",width#,Circ_ht#,0); % Circ_ht is chosen on purpose
-this_letter;
-if (not small_caps):
- diaeresis_grave(x_baryctr);
-else:
- diaeresis(x_baryctr);
-fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with diaeresis and acute";
-beginchar(oct"366",width#,Circ_ht#,0); % Circ_ht is chosen on purpose
-this_letter;
-if (not small_caps):
- diaeresis_acute(x_baryctr);
-else:
- diaeresis(x_baryctr);
-fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase upsilon with diaeresis and circumflex";
-beginchar(oct"367",width#,Circ_ht#,0);
-this_letter;
-if (not small_caps):
- squeeze:=true;
- diaeresis_circumflex(x_baryctr);
-else:
- diaeresis(x_baryctr);
-fi endchar;
-
-picture savedpicture; currentbreadth:=0;
-
-
-def dims = if small_caps: 9u#, sclc*x_height#,0 % phi
- else:
- if cbroman: 10
- elseif cbleipzig:10.5else:
- 10.5fi
- u#,x_height#,desc_depth#
- fi
- enddef;
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-
-def gen_letter =
- if small_caps:% phi small caps
- italcorr .5*height#*slant-.5u#;
- adjust_fit(0,0);
- numeric shaved_stem,light_curve;
- shaved_stem=stem-hround 2stem_corr;
- light_curve=curve-hround stem_corr;
- pickup tiny.nib; pos1(shaved_stem,0); pos2(shaved_stem,0);
- lft x1l=lft x2l=hround(.5w-.5stem); top y1=h; bot y2=0;
- filldraw stroke z1e--z2e; % stem
- penpos3(vair,90); penpos5(vair,-90);
- penpos4(light_curve,180); penpos6(light_curve,0);
- x4r=.5hround u; x6r=w-x4r; x3=x5=.5w;
- y3r=vround(.85h if serifs:-slab fi); y4=y6=.5[y3,y5];
- y5r=vround(.15h if serifs:+slab fi);
- penstroke pulled_arc.e(3,4) & pulled_arc.e(4,5)
- & pulled_arc.e(5,6) & pulled_arc.e(6,3) & cycle; % bowl
- if serifs: dish_serif(1,2,a,1/3,1.25jut,b,1/3,1.25jut); % upper serif
- dish_serif(2,1,c,1/3,1.25jut,d,1/3,1.25jut); fi % lower serif
- math_fit(-.5*height#*slant-.5u#,ic#);
-% phi Leipzig
- elseif cbleipzig: % Dimitri Filippou suggested to have the crossing at point 6 at
- lft x4r=w-rt x8r= hround .75u; ;y4r=y8r=bar_height; % right angles, but it does not
- x6=.47[x4l,x8l]; bot y6r=-oo;% look good!
- bot y10=-d+stem/2-oo; y11=y4r; x10=x11=x6;
- top y2r=h+oo=bot y2l+.3[hair,stem];
- x2l=.47[x12l,x4l]; x2r=.47[x12,x4r];z2=.5[z2r,z2l];
- pos12(.5[hair,stem],0); y12l=y7l; .5[x12l,x7l]=x6;
- pos4(stem,180); pos6(fine,-90); pos8(.2[hair,stem],0);
- x9r=.47[x7l,x8r]; x9l=.47[x7l,x8l]; top y9r=h+oo=bot y9l+.3[hair,stem]; z9=.5[z9r,z9l];
- pos10(stem,180); pos11(stem,180);
- pos7(.6[hair,stem],135); x7l=x11l; y7=.7[h+oo,y11r];
- pos13(.5[hair,stem],0); z13l=z11r;
- filldraw double_circ_stroke z13e{up}--z12e{up}...z2e{left}..z4e{down}..%
- z6e{right}..{up}z8e..{left}z9e...z7e{down}...z11e---z10e;
- elseif cbroman:% phi roman
- pickup tiny.nib;
- lft x4r=w-rt x8r= hround u/2; ;y4r=y8r=.5h;
- x6=.5[x4l,x8l]; bot y6r=-oo;
- bot y10=-d; y11=y4r; x10=x11=x6;
- top y2r=h+oo; .5[x2,x9]=x6;
- pos2(hair,60); pos12(stem,0); z12=z10;
- pos4(stem,180); pos6(hair,-90); pos8(stem,0); pos9(hair,120);
- pos10(stem,180); pos13(stem,0); z13=z11;
- pos11(stem,180); pos7(stem,135);
- x9r=.47[x10r,x8r]; top y9r=h+oo; x7l=x11l; y7=.5[y9r,y11r];
- filldraw stroke z2e{left}..z4e{down}..%
- z6e{right}..{up}z8e..{left}z9e...z7e...{down}z11e---z10e;
- dish_serif(12,13,a,1/3,.8jut,b,1/3,.8jut);
- else:% phi other shapes
- if cursive and serifs and not monospace: % phi regular, outline and cursive
- lft x4r=w-rt x8r=hround .75u; y4r=y8r=.5h;
- x6=.5[x4r,x8r]; bot y6r=-oo;
- y10=-d; y11=y4r; x10=x11=x6;
- numeric raggio; raggio=x8r-x4r-stem;
- y2=h; .4[x2,x9]=x6;
- pos2(hair,180);
- pos4(stem,180); pos6(hair,-90); pos8(stem,0); pos9(hair,120);
- pos10(stem,180); pos11(stem,180); pos7(stem,135);
- x9r=.41[x10r,x8r]; top y9r=h+oo; x7l=x11l; y7=.5[y9r,y11r];
- filldraw stroke z2e..z4e{down}..z6e{right}..{up}z8e..{left}z9e...z7e
- ..{down}z11e--z10e;
- elseif SansSerif:% phi SansSerif
- pickup fine.nib;
- lft x4r=w-rt x8r=hround .75u; y4r=y8r=.5h;
- pos4(.8hair,180); z4'r=z4'l=down;
- pos8(.8hair,0);z8'l=z8'r=up;
- x6r=.5[x4r,x8r]; bot y6r=-oo; pos6(.8hair,-90);
- numeric tilt; tilt:=min(2*otilt,.5);
- top y2r=h; x2r=hround(x4r+u);
- path cbp; cbp=z2r...{z4'r}z4r;
- z.a=direction 0 of cbp;
- pos2(stem/abs(cosd(angle(z.a)+90)),180);
- pos10(stem,180); pos11(hair,180);
- bot y10=-d; y11=.65h; x10=x11=x6;
- x9r=.5[x10r,x8r]; top y9r=h+oo; pos9(.8hair,90); z9'l=z9'r=left;
- filldraw stroke z2e...{z4'e}z4e...{right}z6e%
- ...{z8'e}z8e...{z9'e}z9e...{down}z11e--z10e;
- else: % typewriter, slides
- if monospace:
- if vair<=fine:
- pickup pencircle scaled 1.05fine;
- currentbreadth:=1.05fine;
- else:
- pickup fine.nib;
- fi
- else:
- pickup fine.nib;
- fi
- lft x4r=w-rt x8r=hround .75u; y4r=y8r=.5h;
- x6r=.5[x4r,x8r]; bot y6r=-oo;
- numeric tilt; tilt:=min(2*otilt,.5);
- if monospace:
- pos6(vair,-90); pos8(.4[vair,stem],0);
- pos4(vair,180);
- filldraw stroke z4e{down}..{right}z6e..{up}z8e;z8'l=(0,1);
- else:
- filldraw stroke gr_arc.e(6,7,8)(vair,stem,tilt) ;
- filldraw stroke gr_arc.e(4,5,6)(vair,.4[vair,stem],tilt) ;
- fi
- y2+.5stem=h+o; x2+.5stem=hround(x6-1.5u);
- pos2(stem,angle((z2-z4)xscaled 2)+90);
- filldraw circ_stroke z2e...if monospace:{down}else:{z4'e}fi z4e;
- pos10(stem,180); pos11(hair,180);
- y10-.5stem=-d-o; y11=.25h; x10=x11=x6;
- x9r=.5[x10r,x8r]; top y9r=h+o;
- filldraw stroke gr_arc.e(8,20,9)(vair,.4[vair,stem],.5tilt);
- filldraw circ_stroke z10e..z11e{up}..{-z9'e}z9e;
- fi
- fi
-enddef;
-
-
-cmchar "Lowercase phi";
-beginchar("f",dims);
-this_letter; penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13,20,21); endchar;% "Lowercase phi"
-
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-def ital = 0 enddef; % chi
-def fit_params = 0,0 enddef;
-if small_caps:
- def dims = 10u#,sclc*x_height#,0 enddef;
-else:
- def dims =
- if cbroman:9
- elseif cbleipzig:8.5
- else:
- 10fi
- u#,x_height#,desc_depth# enddef;
-fi
-
-
-def gen_letter=
- if small_caps:
- italcorr height#*slant-.25u#;
- adjust_fit(serif_fit#,serif_fit#);
- numeric stem[],outer_jut,xjut,alpha[];
- stem1=stem-2stem_corr; stem2=min(hair,stem1);
- outer_jut=.75jut; xjut= if serifs: (stem1-stem2)/4 else: 0 fi;
- x1l=l+letter_fit+.5u+outer_jut; x2r=r-letter_fit-u-outer_jut-xjut;
- x3l=l+letter_fit+.25u+outer_jut+xjut; x4r=r-letter_fit-.25u-outer_jut;
- y1=y2=h; y3=y4=0;
- 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);
- if hefty: z0=whatever[z1,z4]=whatever[z2,z3];
- x12=x34=x0; y13=y24=y0;
- z12=whatever[z2l,z3l]; z13=whatever[z2l,z3l];
- z24=whatever[z2r,z3r]; z34=whatever[z2r,z3r];
- forsuffixes $=13,24,34: z$'=.1[z$,z0]; endfor
- fill diag_end(12,1r,.5,1,1l,13')--z13'--diag_end(13',3l,1,.5,3r,34')--z34'
- --diag_end(34',4l,.5,1,4r,24')--z24'
- --diag_end(24',2r,1,.5,2l,12)--z12--cycle; % diagonals
- else: fill diag_end(4r,1r,.5,1,1l,4l)
- --diag_end(1l,4l,.5,1,4r,1r)--cycle; % left diagonal
- fill diag_end(2l,3l,.5,1,3r,2r)
- --diag_end(3r,2r,.5,1,2l,3l)--cycle; fi % right diagonal
- if serifs: numeric inner_jut[]; pickup tiny.nib;
- prime_points_inside(1,4); prime_points_inside(2,3);
- prime_points_inside(3,2); prime_points_inside(4,1);
- 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
- 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
- dish_serif(1',4,a,1/3,outer_jut,b,2/3,inner_jut1); % upper left serif
- dish_serif(4',1,c,2/3,inner_jut2,d,1/3,outer_jut); % lower right serif
- dish_serif(2',3,e,2/3,inner_jut1+xjut,
- f,1/2,outer_jut+xjut)(dark); % upper right serif
- dish_serif(3',2,g,1/2,outer_jut+xjut,
- h,2/3,inner_jut2+xjut)(dark); fi % lower left serif
- math_fit(0,.5ic#);
- else:
- if cursive and serifs and not monospace:
- adjust_fit(.5stem#,.5stem#);
- x0=w/2; y0=.5[-d,h]; numeric diagon; diagon=angle(w-2u,h+d);
- pos1(hair,90); pos2(stem,.5[90,diagon]); pos3(stem,diagon);
- pos0(stem,diagon); pos4(stem,diagon); pos5(stem,.5[90,diagon]); pos6(hair,90);
- z0=.5[z1,z6]=.5[z2,z5]=.5[z3,z4];
- x1=0; x2l=u; x2r+.5
- u=x3l; y1=y2l; y2r=h; y3=y2l;
- filldraw stroke z1e..z2e..z3e--z4e..z5e..z6e;
- pos7(.8stem,0); pos8(.5stem,-diagon); pos9(.8stem,0);
- z0=z8=.5[z7,z9]; x7l=0; y7=-d;
- filldraw stroke z7e{up}...{dir(diagon-10)}z8e...{up}z9e;
- elseif cbleipzig:
- x0=w/2; y0=.5[-d,h]; numeric diagon; diagon=angle(w-2u,h+d);
- pos1(hair,180); x1r=.2u; y1=h-min(2stem,bar_height/2);
- x2l=.5[x1l,x3l]; x2r=.5[x1r,x3r]; y2l+.5[hair,stem]=y2r=h+oo; z2=.5[z2r,z2l];
- pos3(.5[hair,stem],0);x3l=x1l+if stem>1.5u:3stem/4 else:2u fi; y3l=y1l;
- pos4(.5[hair,stem],0);
- x5l=.5[x4l,x6l]; x5r=.5[x4r,x6r];
- y5r-if stem>1.5u:.6else:1fi[hair,stem]=y5l=-d-oo; z5=.5[z5r,z5l];
- pos6(hair,180);
- z0=.5[z1,z6]=.5[z3,z4];
- filldraw double_circ_stroke
- z1e{up}..z2e{right}...z3e---z4e...z5e{right}..{up}z6e;
- pos7(stem,0);
- z0=.5[z7,z8]; x7l=u; y7=-d;
- x8:=x8-u/2;% Dimitri Filippou indicated that the straight stroke shouls be a liitle
- pos8(stem,0); % more vertical; shifting left the upper tip by u/2 looks OK
- filldraw stroke z7e---z8e;
- elseif cbroman:
- pickup tiny.nib;
- pos1(stem,0); lft x1l=jut; top y1=h;
- pos2(stem,0); x2=w-x1; bot y2= -d;
- filldraw stroke z1e---z2e;
- pos3(hair,0); rt x3r = w-lft x1l; y3=y1;
- pos4(hair,0); lft x4l=w- rt x2r; y4=y2;
- serif (1,2,a,1/3,-.8jut);
- dish_serif(2,1,b,1/3,.8jut,c,1/3,.8jut);
- filldraw stroke z3e---z4e;
- dish_serif(3,4,d,1/3,.8jut,e,1/3,.8jut);
- dish_serif(4,3,f,1/3,.8jut,g,1/3,.8jut);
- elseif SansSerif:
- pickup fine.nib;
- x1=hround .75u; y1+.5stem=h+oo; %top left
- z1'=(1,.2); pos1(stem,90); %direction at z1
- x3+x1=w; y3-.5stem=-d-oo; pos3(stem,90); %bottom right
- z2=.5[z1,z3]; %attachment
- z2'=(z3-z1)yscaled 2; pos2(hair,angle z2'+90); %direction at z4
- filldraw stroke z1e{z1'}... z2e{(z3-z1)yscaled 2}...{z1'}z3e;
- lft x7l=hround .75u; bot y7l=-d-oo; z2=.5[z7l,z8r]=.5[z7r,z8l];
- numeric stem'; stem'=stem-currentbreadth;
- numeric theta; theta=angle(z8r-z7l)+angle((x8r-x7l)++(y8r-y7l)+-+stem',stem');
- x7r=x7l+(stem'/sind theta); y7r=y7l;
- filldraw stroke z7e--z8e;
- else:
- pickup fine.nib;
- x1-.5stem=hround .75u; y1+.5stem=h+oo; %top left
- z1'=(1,.2); pos1(stem,angle z1'+90); %direction at z1
- x3+x1=w; y3-.5stem=-d-oo; pos3(stem,angle z1'+90); %bottom right
- z2=.5[z1,z3]; %attachment
- z2'=(z3-z1)yscaled 2; pos2(hair,angle z2'+90); %direction at z4
- filldraw double_circ_stroke z1e{z1'}... z2e{(z3-z1)yscaled 2}...{z1'}z3e;
- lft x7l=hround .75u; bot y7l=-d-oo; z2=.5[z7l,z8r]=.5[z7r,z8l];
- numeric stem'; stem'=stem-currentbreadth;
- numeric theta; theta=angle(z8r-z7l)+angle((x8r-x7l)++(y8r-y7l)+-+stem',stem');
- x7r=x7l+(stem'/sind theta); y7r=y7l;
- filldraw stroke z7e..z8e;
- fi
- fi
-enddef;
-
-
-cmchar "Lowercase chi";
-beginchar("q",dims);
-this_letter; penlabels(0,1,2,3,4,5,6,7,8,9); endchar;% "Lowercase chi"
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-
-if small_caps: % psi
- def dims = 10.5u#,sclc*x_height#,0 enddef;
-else:
- def dims = if cbleipzig:10
- else:
- 10.5
- fi
- u#,if cbleipzig or cbroman:x_height# else:asc_height# fi,desc_depth# enddef;
-fi
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-def gen_letter =
- adjust_fit(fit_params);
- if small_caps:
- italcorr .8*height#*slant-.5u#;
- numeric shaved_stem;
- shaved_stem=stem-hround 2stem_corr;
- pickup tiny.nib; pos1(shaved_stem,0); pos2(shaved_stem,0);
- lft x1l=lft x2l=hround(.5w-.5stem); top y1=h; bot y2=0;
- filldraw stroke z1e--z2e; % stem
- pos3(shaved_stem,-180); pos4(shaved_stem,-180);
- pos5(vair,-90); x5=x1; bot y5r=vround(.15h if serifs:+slab fi);
- pos6(shaved_stem,0); pos7(shaved_stem,0);
- lft x3r=.5hround u; x7=w-x3; lft x4=hround(w/2-3u); x6=w-x4;
- pos3'(vair,90); pos7'(vair,90); z3'r=z3r; z7'r=z7r;
- y3=y7; y4=y6=.6h; y3=good.y(y3+.84h if serifs:-slab fi-y3');
- interim superness:=more_super;
- filldraw z3'l{right}...z4r{down} & super_arc.r(4,5)
- & super_arc.r(5,6) & z6r{up}...z7'l{right}
- --z7r---z7l...z6l{down} & super_arc.l(6,5)
- & super_arc.l(5,4) & z4l{up}...z3l---z3r--cycle; % stroke
- if serifs: dish_serif(1,2,a,1/3,1.25jut,b,1/3,1.25jut); % upper serif
- dish_serif(2,1,c,1/3,1.25jut,d,1/3,1.25jut); fi % lower serif
- math_fit(-.8*height#*slant-.5u#,.4*height#*slant-1.25u#);
- else:
- if cursive and serifs and not monospace:
- pos4(hair,270); pos6(stem,-20); pos5(stem,270);
- lft x2r=w-rt x6r=.75u; y2=y6=.5[h,-d]; %left and right bulges
- x4r=.5[x2r,x6r]; bot y4r=-oo; %bottom
- pos7(stem,45);
- top y7r=x_height+o; x7=x6-u; %right tip
- filldraw circ_stroke z7e{dir(-45)}..{down}z6e;
- pos10(stem,0); pos9(hair,0); pos8(stem,0); %vertical stroke
- y10=-d; y9=y2; y8=h; x10=x9=x8=x4;
- filldraw stroke z10e..z9e{up}..z8e;
- z5-z9=(x6-x9)*dir(-45);
- filldraw stroke z4e{right}..z5e..{up}z6e;
- pos1(stem,220);pos2(stem,200); pos3(stem,270);
- z3-z9=(x9-x2)*dir(225);
- filldraw stroke z2e{down}..z3e..{right}z4e;
- top y1l=x_height+o; %left tip
- z2-z1=whatever*down;
- pos0(hair,-90); y0=y1-.5hair; x0=0;
- path gancio; gancio= z0l..z1l..{down}z2l;
- pair za, zb;
- za= direction 0 of gancio; zb=direction 1 of gancio;
- filldraw z0r{za}..z1r{zb}..{down}z2r--z2l{-down}..z1l..z0l--cycle;
- pair za, zb; path gancio;
- elseif cbleipzig:
- pickup fine.nib;% Dimitri Filippou suggested to have the crossing at pont 4 at
- pos1(hair,180); %pos2(.5[hair,stem],60);% right angle, but it does not look good!
- pos3(.9[hair,stem],0); pos7(stem,0);
- top y2r=h+oo=bot y2l+.5[hair,stem]; x2l=.5[x1l,x3l]; x2r=.5[x1r,x3r];
- x1r=u/2; x3l=x1l+1.5u; y7=.7bar_height; x7r=x3r;
- y1l=y3l=y2l-min(1.5stem,bar_height/3);
- pos4(hair,90); x4=.55w; bot y4l=-oo;
- pos5(.8[hair,stem],180); pos6(stem,225); pos11(stem,90); z11=z6;
- y5=bar_height; rt x5l=w-u/2; top y11r = top y2r; z6=z5+wherever*((.6w,asc_height)-z5);
- filldraw double_circ_stroke
- z1e{up}...{right}z2e...z3e..{down}z7e..{right}z4e..{up}z5e..z6e;
- pos10(stem,0); pos9(.3[hair,stem],0); pos8(hair,0); %vertical stroke
- bot y10-.5stem=-d-o; y9=.25x_height; top y8 + .35hair=h+oo; x10=x9=x8=x4;
- filldraw double_circ_stroke z10e...z9e...z8e;
- elseif cbroman:
- pickup tiny.nib;
- pos1(stem,0); lft x1l=jut; top y1=h;
- pos2(stem,0);x1=x2; y2=(rt x4l- lft x2l)/2;
- pos3(hair,90);x3=w/2; bot y3l=-oo;
- pos4(stem,180); .5[x4,x2]=x3; y4=y2;pos6(stem,0);z6=z4;
- pos5(stem,180); .5[x5,x1]=x3; y5=y1;pos7(stem,0);z7=z5;
- pos8(stem,0);x8=x3; y8=y1;
- pos9(stem,0);x9=x3; bot y9=-d;
- filldraw stroke z1e---z2e...{right}z3e...z4e---z5e;
- filldraw stroke z8e---z9e;
- serif(1,2,a,1/3,-.8jut);
- serif(7,6,b,1/3,.8jut);
- dish_serif(8,9,c,1/3,.8jut,d,1/3,.8jut);
- dish_serif(9,8,e,1/3,.8jut,f,1/3,.8jut);
- elseif SansSerif:
- pickup fine.nib;
- lft x2r=w-rt x6r=.75u; y2r=y6r=.6x_height; %left and right bulges
- x4r=.5[x2r,x6r]; bot y4r=-oo; %bottom
- numeric tilt; tilt:=min(2*otilt,.5);
- pos2(.8hair,180);pos6(.8hair,0);pos4(.8hair,-90);
- z6'r=z6'l=up; z2'l=z2'r=down;
- filldraw stroke z2e{z2'e}..{right}z4e..{z6'e}z6e;
- top y7=x_height; x4=.5[x1,x7]; %right tip
- pos7(hair,0);
- y1=y7; x1-.5stem=hround(lft x2r+.5u); %left tip
- pos1(stem,180);
- filldraw stroke z7e...{-z6'e}z6e;
- filldraw stroke z1e...{z2'e}z2e;
- pos10(.9stem,0); pos8(.9stem,0); %vertical stroke
- bot y10=-d; top y8=h; x10=x8=x4;
- filldraw stroke z10e--z8e;
- else:
- pickup fine.nib;
- lft x2r=w-rt x6r=.75u; y2r=y6r=.6x_height; %left and right bulges
- x4r=.5[x2r,x6r]; bot y4r=-oo; %bottom
- numeric tilt; tilt:=min(2*otilt,.5);
- if monospace:
- pos2(stem,180); pos4(stem,-90); pos6(stem,0);
- filldraw stroke z2e{down}..z4e{right}..{up}z6e;
- else:
- filldraw stroke gr_arc.e(4,5,6)(vair,stem,tilt) ;
- filldraw stroke gr_arc.e(2,3,4)(vair,.4[vair,stem],tilt) ;
- fi
- y7+.5hair=x_height+o; x7+.5hair=hround(rt x6r-.75u); %right tip
- pos7(hair,angle ((z6-z7) xscaled 2)+90);
- if monospace:
- filldraw circ_stroke z7e...{down}z6e;
- else:
- filldraw circ_stroke z7e...{-z6'e}z6e;
- fi
- y1+.5stem=x_height+o; x1-.5stem=hround(lft x2r+.5u); %left tip
- pos1(stem,angle((z2-z1) xscaled 2)-90);
- if monospace:
- filldraw circ_stroke z1e...{down}z2e;
- else:
- filldraw circ_stroke z1e...{z2'e}z2e;
- fi
- pos10(stem,0); pos9(hair,0); pos8(stem,0); %vertical stroke
- y10-.5stem=-d-o; y9=.25x_height; y8+.5stem=h+o; x10=x9=x8=x4;
- filldraw double_circ_stroke z10e..z9e{up}..z8e;
- fi
- fi
-enddef;
-
-
-cmchar "Lowercase psi";
-beginchar("y",dims);
-this_letter; penlabels(0,1,2,3,4,5,6,7,8,9,10,11); endchar;% "Lowercase psi"
-
-
-picture savedpicture; currentbreadth:=0;
-
-
-
-if small_caps: % omega
- def width = 10u enddef;
- def height = sclc*x_height enddef;
-else: % OK for all lowercase shapes including cbleipzig and cbroman
- def width = 12u enddef;
- def height = x_height enddef;
-fi
-def dims = width#,height#,0 enddef;
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-def gen_letter =
- if small_caps:
- pickup tiny.nib; pos1(vair,90); pos2(curve,180);
- pos3(vair,180); pos4(curve,0); pos5(vair,0);
- x1=.5w; top y1r=h+o; lft x2r=hround u; y2=y4=2/3h; x4=w-x2;
- rt x3l=hround(1/3(w+.5u)+.5hair); bot y3=bot y5=0; x5=w-x3;
- filldraw stroke z3e{up}...{up}z2e
- & pulled_super_arc.e(2,1)(.5superpull)
- & pulled_super_arc.e(1,4)(.5superpull)
- & z4e{down}...{down}z5e; % bowl
- numeric arm_thickness; path p; p=z3{up}...{up}z2;
- arm_thickness=Vround(if hefty:slab+2stem_corr else:.75[slab,vstem] fi);
- pickup crisp.nib; pos6(arm_thickness,-90); pos7(fudged.hair,-180);
- bot y6r=0; x6=x3; lft x7r=hround .55u; y7=good.y(y6l+.5beak)+eps;
- (x,y)=p intersectionpoint((0,y6l)--(w,y6l)); x6l:=x;
- arm(6,7,a,.5beak_darkness,-1.2beak_jut); % left arm and beak
- pos8(arm_thickness,-90); pos9(fudged.hair,0);
- y8=y6; y9=y7; x8+x6=x9+x7=w; x8l:=w-x6l;
- arm(8,9,b,.5beak_darkness,1.2beak_jut); % right arm and beak
- math_fit(0,.5ic#);
- numeric pos_stem; % iota sub position
- pos_stem=rt x9r + if serifs:.5elseif slitex:.4else:.6fi(tiny+ .5[vair,stem])+u;
- else:
- if cursive and not SansSerif:
- if slitex or monospace: pickup fine.nib; fi
- pos2(stem,-180); pos8(stem,0); lft x2r=w-rt x8r=hround(u-o);
- y2=y8+.3slant*(x8-x2)=.9bar_height; %left and right bulges
- if serifs:
- pos4(hair,0); pos6(hair,180); %left and right of loop
- else:
- pos4(.7vair,0); pos6(.7vair,180);
- fi
- y4=y6=.2[bar_height,h]; .5[x4,x6]=.5w;
- x4r-x6r=stem; %.5[flare,vair];
- bot y3r=bot y7r=-oo; x3=.5[x2,x4];
- x7 =.5[x6,x8];
- numeric ang; ang= if serifs:45 else:20 fi;
- numeric omegaloop; omegaloop=if not serifs: .7 fi stem;
- pos3(omegaloop,-90-ang); pos7(omegaloop,-90+ang); %left and right bottom
- top y1r=x_height=top y9r; %left tip
- x1=.6[x2,.5w]; pos1(hair,180); %left tip
- x9=.6[x8,.5w]; pos9(hair,0); %right tip
- filldraw stroke z1e{(z2-z1) xscaled 3}...z2e{down}...z3e{right};
- filldraw stroke z7e{right}...{up}z8e...{(z9-z8) xscaled 3}z9e;
- drawloop(3,4,6,7);
- elseif cbleipzig:
- pos2(stem,-180); pos8(stem,0); lft x2r=w-rt x8r=hround(u-o);
- y2=.8bar_height; y8= .7bar_height; %left and right bulges
- pos4(hair,0); pos6(hair,180); %left and right of loop
- y4=y6=.8h-stem/2; x4+x6=w;
- x4r-x6r=.9[hair,stem];
- bot y3r=bot y7r=-oo; x3=.5[x2,x4];
- x7 =.5[x6,x8];
- numeric ang; ang= 10;
- numeric omegaloop; omegaloop=.1[fine,stem];
- pos3(omegaloop,-90-ang); pos7(omegaloop,-90+ang); %left and right bottom
- top y1r=h; %left tip
- top y9r=h-hair/2;
- x1=.5[x2,.5w]; pos1(.9[stem,hair],180); %lft tip
- x9=.5[x8,.5w]+hair/2; pos9(.9[stem,hair],if stem>1.5u:110else:120fi); %rt tip
- filldraw stroke z1e{(z2-z1) xscaled 5}...z2e{down}...z3e{right};
- filldraw circ_stroke z9e{(z8-z9) xscaled 4}...z8e{down}...{left}z7e;
- drawloop(3,4,6,7);
- elseif cbroman:
- pos1(hair,90); x1=.5[x2l,x5]; y1r=h+oo;
- pos2(stem,180);x2r=u/2; y2=h/2;
- x3r=.5[x2r,x4r]; y3r=-oo=y3l-hair; x3l=.5[x2l,x4l]; z3=.5[z3r,z3l];
- pos4(hair,0);x4r=x5; y4=.5[y5,y3];
- pos5(stem,0); x5=w/2; y5=2h/3;
- pos6(hair,180);
- x7=w-x3; y7=y3; x7r=w-x3r; x7l=w-x3l; y7r=y3r; y7l=y3l;
- pos8(stem,0); x8=w-x2; y8=y2;
- pos9(hair,90);x9=w-x1; y9=y1;
- z10l=z4l;z10r=z6l; z10=z4r=z6r=.5[z10l,z10r];
- filldraw circ_stroke z5e---z10e;
- filldraw circ_stroke z1e{left}...{down}z2e...{right}z3e...{up}z4e;
- filldraw circ_stroke z9e{right}...z8e{down}...{left}z7e...{up}z6e;
- elseif SansSerif:
- pickup fine.nib;
- pos2(stem,-180); pos8(stem,0); lft x2r=w-rt x8r=hround(u-o);
- y2=y8=.8bar_height; %left and right bulges
- pos4(.9stem,0); pos6(.9stem,180);
- y4=y6=.8bar_height; .5[x4,x6]=.5w; x4l=x6l-.9stem;
- bot y3r=bot y7r=-oo; x3=.5[x2,x4];
- x7 =.5[x6,x8];
- numeric omegaloop; omegaloop=.8stem;
- pos3(omegaloop,-90); pos7(omegaloop,-90); %left and right bottom
- top y1r=x_height=top y9r; %left tip
- x1=.5[x2,.5w]; pos1(1.2stem,180); %lft tip
- x9=.5[x8,.5w]; pos9(1.2stem,0); %rt tip
- filldraw stroke z1e{(z2-z1) xscaled 2}...z2e{down}...z3e{right}...{up}z4e;
- filldraw stroke z6e{down}...z7e{right}...{up}z8e...{(z9-z8) xscaled 2}z9e;
- x10l=x4l; x10r=x6l; y10l=y10r; bar_height=.5[y10l,y4l];
- filldraw z4l--z6l--z10r--z10l--cycle;
- else:
- pickup fine.nib;
- pos2(stem,-180); pos8(stem,0); lft x2r=w-rt x8r=hround(u-o);
- y2=y8=.8bar_height; %left and right bulges
- if serifs:
- pos4(hair,0); pos6(hair,180); %left and right of loop
- else:
- pos4(.7vair,0); pos6(.7vair,180);
- fi
- y4=y6=bar_height; .5[x4,x6]=.5w;
- x4r-x6r=.5[flare,vair];
- bot y3r=bot y7r=-oo; x3=.5[x2,x4];
- x7 =.5[x6,x8];
- numeric ang; ang= 60;
- numeric omegaloop; omegaloop=if not serifs: .7 fi stem;
- pos3(omegaloop,-90-ang); pos7(omegaloop,-90+ang); %left and right bottom
- top y1r=x_height+o=top y9r; %left tip
- x1=.5[x2,.5w]; pos1(.2[stem,hair],angle(-.5w,y2-x_height)-90); %lft tip
- x9=.5[x8,.5w]; pos9(.8[stem,hair],angle(-.5w,x_height-y2)-90); %rt tip
- filldraw stroke z1e{(z2-z1) xscaled 2}...z2e{down}...z3e{right};
- filldraw stroke z7e{right}...{up}z8e...{(z9-z8) xscaled 2}z9e;
- drawloop(3,4,6,7);
- fi
- numeric x_baryctr; x_baryctr=.5[x4,x6];
- numeric pos_stem; pos_stem=x_baryctr; % iota sub position
- fi
-enddef;
-
-
-cmchar "Lowercase omega";
-beginchar("w",dims);
-this_letter; penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar;% "Lowercase omega"
-
-
-
-iff(not barebones):
-cmchar "Lowercase omega with grave";
-beginchar(oct"260",width#,acc_ht#,0);
-this_letter; if (not small_caps): grave(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with rough breathing";
-beginchar(oct"261",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with smooth breathing";
-beginchar(oct"262",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with grave and iota subscript";
-beginchar(oct"264",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+tiny#
- if (slitex or (not serifs)):+.5*(.5[vair#,stem#])
- else:+.7jut# fi+.7u#);
-gen_letter;
-else:
-this_letter; grave(x_baryctr);fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with rough breathing and iota subscript";
-beginchar(oct"265",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+tiny#
- if (slitex or (not serifs)):+.5*(.5[vair#,stem#])
- else:+.7jut# fi+.7u#);
-gen_letter;
-else:
-this_letter; spirit(x_baryctr)<;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with smooth breathing and iota subscript";
-beginchar(oct"266",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+tiny#
- if (slitex or (not serifs)):+.5*(.5[vair#,stem#])
- else:+.7jut# fi+.7u#);
-gen_letter;
-else:
-this_letter; spirit(x_baryctr)>;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with acute";
-beginchar(oct"270",width#,acc_ht#,0);
-this_letter; if (not small_caps): acute(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with rough breathing and acute";
-beginchar(oct"271",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit_acute(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with smooth breathing and acute";
-beginchar(oct"272",width#,acc_ht#,0);
-this_letter; if (not small_caps): spirit_acute(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with rough breathing and grave";
-beginchar(oct"263",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit_grave(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with smooth breathing and grave";
-beginchar(oct"273",width#,acc_ht#,0);
-this_letter; if not small_caps: spirit_grave(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with rough breathing and grave and iota subscript";
-beginchar(oct"267",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+tiny#
- if (slitex or (not serifs)):+.5*(.5[vair#,stem#])
- else:+.7jut# fi+.7u#);
-gen_letter;
-else:
-this_letter; spirit_grave(x_baryctr)<;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with smooth breathing and grave and iota subscript";
-beginchar(oct"277",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+tiny#
- if (slitex or (not serifs)):+.5*(.5[vair#,stem#])
- else:+.7jut# fi+.7u#);
-gen_letter;
-else:
-this_letter; spirit_grave(x_baryctr)>;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with acute and iota subscript";
-beginchar(oct"274",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+tiny#
- if (slitex or (not serifs)):+.5*(.5[vair#,stem#])
- else:+.7jut# fi+.7u#);
-gen_letter;
-else:
-this_letter; acute(x_baryctr);
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with rough breathing, acute and iota subscript";
-beginchar(oct"275",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+tiny#
- if (slitex or (not serifs)):+.5*(.5[vair#,stem#])
- else:+.7jut# fi+.7u#);
-gen_letter;
-else:
-this_letter; spirit_acute(x_baryctr)<;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with smooth breathing and acute and iota subscript";
-beginchar(oct"276",width#,if small_caps:height#else:acc_ht#fi,iota_dp#);
-if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+tiny#
- if (slitex or (not serifs)):+.5*(.5[vair#,stem#])
- else:+.7jut# fi+.7u#);
-gen_letter;
-else:
-this_letter; spirit_acute(x_baryctr)>;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with circumflex";
-beginchar(oct"300",width#,circ_ht#,0);
-this_letter; if (not small_caps):
-squeeze:=false; circumflex(x_baryctr); fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with rough breathing and circumflex";
-beginchar(oct"301",width#,Circ_ht#,0);
-this_letter; if (not small_caps):
-squeeze:=true; spirit_circumflex(x_baryctr)<; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with smooth breathing and circumflex";
-beginchar(oct"302",width#,Circ_ht#,0);
-this_letter; if (not small_caps):
-squeeze:=true; spirit_circumflex(x_baryctr)>; fi endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with circumflex and iota subscript";
-beginchar(oct"304",width#,if small_caps:height#else:circ_ht#fi,iota_dp#);
-if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+tiny#
- if (slitex or (not serifs)):+.5*(.5[vair#,stem#])
- else:+.7jut# fi+.7u#);
-gen_letter;
-else:
-this_letter; squeeze:=false; circumflex(x_baryctr);
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with rough breathing, circumflex and iota subscript";
-beginchar(oct"305",width#,if small_caps:height#else:Circ_ht#fi,iota_dp#);
-if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+tiny#
- if (slitex or (not serifs)):+.5*(.5[vair#,stem#])
- else:+.7jut# fi+.7u#);
-gen_letter;
-else:
-this_letter; squeeze:=true; spirit_circumflex(x_baryctr)<;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with smooth breathing, circumflex and iota subscript";
-beginchar(oct"306",width#,if small_caps:height#else:Circ_ht#fi,iota_dp#);
-if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+tiny#
- if (slitex or (not serifs)):+.5*(.5[vair#,stem#])
- else:+.7jut# fi+.7u#);
-gen_letter;
-else:
-this_letter; squeeze:=true; spirit_circumflex(x_baryctr)>;
-fi
-iota_sub(pos_stem); endchar;
-
-iff(not barebones):
-cmchar "Lowercase omega with iota subscript";
-beginchar(oct"372",width#,height#,iota_dp#);
-if small_caps:
- italcorr .75*height#*slant-.5u#;
- adjust_fit(0,serif_fit#+.5[vair#,stem#]+tiny#
- if (slitex or (not serifs)):+.5*(.5[vair#,stem#])
- else:+.7jut# fi+.7u#);
-gen_letter;
-else:
-this_letter;
-fi
-iota_sub(pos_stem); endchar;
-
-%picture pic.iota;
-picture savedpicture; currentbreadth:=0;
-
-
-% digamma
-def dims = if small_caps:
- 10u#,sclc*x_height#,0
- else:
- if cbroman:9.5
- %elseif cbleipzig:7.5
- else:9
- fi
- u#,%
- if cbleipzig:asc_height#
- else:x_height#
- fi,
- if cbleipzig:0
- else:desc_depth#
- fi
- fi enddef;
-def ital = 0 enddef;
-def fit_params = if small_caps: serif_fit#,0elseif cbroman: -.5u#,0 else:0,0 fi enddef;
-
-def gen_letter =
- adjust_fit(fit_params);
- if small_caps:
- italcorr height#*slant-serif_fit#+jut#-2.5u#+min(.5stem#,u#);
- h:=vround(h-stem_corr);
- pickup tiny.nib; pos1(stem,0); pos2(stem,0);
- lft x1l=lft x2l=hround max(2u,3u-.5stem); 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-0.6beak)-eps;
- arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak
- pos5(bar,-90); pos6(hair,0);
- top y5l=vround(.5[y2,y1]+.5bar); x5=x1;
- pos0(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,jut,b,1/3,.5jut); % upper serif
- dish_serif(2,1,c,1/3,jut,d,1/3,1.25jut); % lower serif
- fi
- else:
- if cursive:
- if slitex or monospace: pickup fine.nib; fi
- pos1(stem,0); bot y1=-d; lft x1l=u;
- pos2(hair,-90); rt x2 + lft x1l=w; top y2l=h;
- pos3(hair,-90);
- x3=x1+stem;
- y3= y2;
- pos7(.3[hair,stem],0); rt x7r=rt x1r; z3-z7=whatever*(1,1);
- pos5(hair,90); x5=.5[x1,x7]; pos6(hair,90);
- y6=y5; top y6r=bar_height;
- z6-z1=whatever*(z2-z1);
- filldraw stroke z1e..z7e{up}..{right}z3e..z2e;
- filldraw stroke z6e..z5e;
- elseif cbleipzig:
- italcorr asc_height#*slant-.5u#;
- pos1(stem,-90); bot y1r=-d; lft x1l-.5stem=0;
- pos2(.7[hair,stem],-60); z2l=z1l+.3u*dir(10);
- pos3(hair,0); z3l=z1l+u*dir(45);
- pos4(hair,0);x3=x4;
- pos5(.7[hair,stem],-60); z5r=z6r-.3u*dir(10);
- pos6(stem,-90); z6r=z4r+u*dir(45); top y6l=h;
- pos7(stem,-90);y7=y6; rt x7l=w-.7u;
- pos8(.7[hair,stem],90); z8-(w/2,-d)=whatever*(z7-(w/2,-d)); y8=y6-(x_height-4/5bar_height);
- pos9(.7[hair,stem],90); y9=y8;x9=x3;
- filldraw circ_stroke z1e{right}...z2e...{up}z3e...{up}z4e...z5e...{right}z6e---z7e;
- filldraw circ_stroke z8e---z9e;
- %currentpicture:=currentpicture shifted (slant*d,d);
- elseif cbroman:
- h:=vround(h-stem_corr);
- pickup tiny.nib; pos1(stem,0); pos2(stem,0);
- lft x1l=lft x2l=hround max(2u,3u-.5stem); top y1=h; bot y2=-d;
- 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-0.6beak)-eps;
- arm(3,4,e,beak_darkness,.8beak_jut); % upper arm and beak
- pos5(bar,-90); pos6(hair,0);
- top y5l=vround(.5[y2,y1]+.5bar); x5=x1;
- pos0(bar,90); pos7(hair,0);
- z0=z5; x6=x7; y6-y5l=y0l-y7;
- z10=z2+whatever*(z4-z2); y10=.5[y6,y7];x6=x10;
- y6=good.y(y5l+.5beak)+eps;
- rt x9r=hround(w-.5u);
- arm(5,6,f,beak_darkness,0);
- arm(0,7,g,beak_darkness,0); % middle arm and serif
- serif(1,2,a,1/3,-.8jut); % upper serif
- dish_serif(2,1,c,1/3,.8jut,d,1/3,jut); % lower serif
- elseif SansSerif:
- pickup fine.nib;
- pos1(stem,0); bot y1=-d; lft x1l=u;
- pos2(.2[stem,hair],-90); x2+ lft x1l=w; top y2l=h;
- pos3(.2[hair,stem],-90); % x3=max(.5[x1,x2],x1+stem);
- x3=x1+stem;
- y3= y2;
- pos7(.2[hair,stem],0); rt x7r=rt x1r; z3-z7=whatever*(1,1);
- pos4(.2[hair,stem],0); pos5(hair,90); x5=x4; pos6(.2[stem,hair],90);
- rt x4r=rt x1r; y4=.5[bot y6l,y1]; y6=y5; top y6r=bar_height;
- z6-z1=whatever*(z2-z1);
- filldraw stroke z1e..z4e{up}..z7e{up}..{right}z3e..z2e;
- filldraw stroke z6e..{left}z5e;
- else:
- if serifs: pickup crisp.nib; else: pickup fine.nib; fi
- pos1(stem,0); bot y1-.5(stem-currentbreadth)=-d; lft x1l=u;
- pos2(.2[stem,hair],-90); x2+.5stem + lft x1l=w; top y2l=h;
- pos3(.2[hair,stem],-90); % x3=max(.5[x1,x2],x1+stem);
- x3=x1+stem;
- y3= y2;
- pos7(.2[hair,stem],0); rt x7r=rt x1r; z3-z7=whatever*(1,1);
- pos4(.2[hair,stem],0); pos5(hair,90); x5=x4; pos6(.2[stem,hair],90);
- rt x4r=rt x1r; y4=.5[bot y6l,y1]; y6=y5; top y6r=bar_height;
- z6-z1=whatever*(z2-z1);
- filldraw double_circ_stroke z1e..z4e{up}..z7e{up}..{right}z3e..z2e;
- filldraw circ_stroke z6e..{left}z5e;
- fi
- fi
-enddef;
-
-cmchar "Lowercase digamma";
-beginchar(oct"223",dims);
-gen_letter;
-penlabels(0,1,2,3,4,5,6,7,8,9);
-endchar;
-
-currentbreadth:=0;
-
-cmchar "The letter sva"; % per la forma italica bisogna provvedere 19/07/01<<<<<<<<<<<<<<
-% "e" cloned from romanl.mf; added 180 deg. rotation about a suitably chosen z6 or z7 point
-% that takes care of non zero font slant -- strangely enough z6 is not in the center
-% of the original letter "e" if slant<>0
-beginchar(oct"032",7.25u#+max(.75u#,.5curve#),x_height#,0);
-italcorr .5[bar_height#,x_height#]*slant+.5min(curve#-1.5u#,0);
-adjust_fit(if monospace: .25u#,.5u# else: 0,0 fi);
-if cursive or cbleipzig:
- italcorr max(1/3x_height#*slant,x_height#*slant+.5(.2[hair#,stem#])-u#);
- adjust_fit(0,0); pickup fine.nib;
- numeric heavy_hair; heavy_hair=hround .2[hair,stem];
- pos0(vair,-90); pos1(heavy_hair,0); pos2(vair,90);
- pos3(curve,180); pos4(vair,270); pos5(hair,320);
- x0=rt x3l; rt x1r=hround(w-1.5u+.5heavy_hair); x2=x4=.5(w+u);
- lft x3r=hround(1.5u-.5curve); x5r=good.x(w-eps); x6=x5;
- y0=y3=y6=bar_height; y1=.5[y0,y2]; top y2r=h+oo; bot y4r=-oo;
- top y5l=vround .5bar_height; path p; p=z4{right}..z5..z6;
- filldraw stroke z0e{right}...z1e{up}...pulled_arc.e(2,3)
- & pulled_arc.e(3,4)...{direction 1 of p}z5e; % arc
- z7=(.5[x3r,x5r]+slant[-u/4,3.5u],h/2);
-currentpicture:=currentpicture rotatedaround(z7,180);
-else:
- numeric left_curve,right_curve;
- left_curve=right_curve+6stem_corr=curve if not serifs: -3stem_corr fi;
- if right_curve<tiny.breadth: right_curve:=tiny.breadth; fi
- if left_curve<tiny.breadth: left_curve:=tiny.breadth; fi
- pickup tiny.nib; pos1(right_curve,0);
- pos2(vair,90); pos3(left_curve,180);
- y1=good.y bar_height; top y2r=h+vround 1.5oo; y0l=bot y1;
- rt x1r=hround min(w-.5u,w-u+.5right_curve);
- lft x3r=hround max(.5u,1.25u-.5left_curve); x2=.5w+.25u;
- {{interim superness:=more_super;
- filldraw stroke super_arc.e(1,2)}}; % right bowl
- y3=.5[y2,y4]; bot y4r=-oo; x4=x2+.25u;
- if serifs: pos4(vair',270); pos5(hair,360);
- y5=max(good.y(.5bar_height-.9),y4l+vair); x5r=x1r;
- (x,y4l)=whatever[z4r,z5]; x4l:=min(x,x4l+.5u);
- filldraw stroke pulled_arc.e(2,3) & pulled_arc.e(3,4)
- ...{x5-x4,5(y5-y4)}z5e; % left bowl, arc, and terminal
- else: pos4(vair,270);
- filldraw stroke super_arc.e(2,3) & super_arc.e(3,4); % left bowl and arc
- pickup fine.nib; pos4'(vair,270); z4=z4';
- pos5(.5[vair,flare],275); rt x5r=hround(w-.6u);
- y5r=good.y(y5r+1/3bar_height-y5); y5l:=good.y y5l; x5l:=good.x x5l;
- filldraw stroke term.e(4',5,right,1,4); fi % terminal
- path testpath; testpath=super_arc.r(2,3) & super_arc.r(3,4);
- y1'r=y0r=y0l+.6[thin_join,vair]; y1'l=y0l; x1'l=x1'r=x1;
- forsuffixes $=l,r:
- x0$=xpart(((0,y0$)--(x1,y0$)) intersectionpoint testpath); endfor
- fill stroke z0e--z1'e; % crossbar
- y6=.5[y2,y4];z6-(w/2,0)=whatever*(slant,1);
- currentpicture:=currentpicture rotatedaround(z6,180);
-fi
-penlabels(0,1,2,3,4,5,6,7); endchar;
-
-
-
-
-
-currentbreadth:=0;
-
-endinput;
-ÿ
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbmetre.mf b/Master/texmf-dist/fonts/source/public/cb/cbmetre.mf
deleted file mode 100644
index b33fff61a5b..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbmetre.mf
+++ /dev/null
@@ -1,892 +0,0 @@
-% File gmtr.mf
-% Copyright 2001 Claudio Beccari
-% version 1.0 (2001/03/24)
-% Metric symbols and other special signs for greek critical editions
-%
-def m_width=.6[hair,stem] enddef;
-def separator=max(1,vround(1/10x_height)) enddef;
-dot_diam#=dot_size#;dot_diam=dot_size;
-
-cmchar "English Opening quotes";
-beginchar(oct"20",3u#+max(2u#,dot_diam#),asc_height#,0);
-italcorr asc_height#*slant-.1u#;
-adjust_fit(.5u#,.5u#);
-x2+.5dot_diam=hround(w-.6u+.5dot_diam); y1+.5dot_diam=h-comma_depth;
-x1=w-x2; y2=y1;
-ammoc(1,a,dot_diam,.25u,comma_depth); % left dot and tail
-ammoc(2,b,dot_diam,.25u,comma_depth); % right dot and tail
-penlabels(1,2);currentbreadth:=0;
- endchar;
-
-
-cmchar "English Closing quotes";
-beginchar(oct"021",3u#+max(2u#,dot_diam#),asc_height#,0);
-italcorr asc_height#*slant+dot_diam#-4.1u#;
-adjust_fit(.5u#,.5u#);
-x1+.5dot_diam=hround(.6u+.5dot_diam); y2+.5dot_diam=h;
-x2=w-x1; y2=y1;
-comma(1,a,dot_diam,.25u,comma_depth); % left dot and tail
-comma(2,b,dot_diam,.25u,comma_depth); % right dot and tail
-penlabels(1,2);currentbreadth:=0;
- endchar;
-
-cmchar "German opening comma";
-beginchar(oct"015",5u#,dot_diam#,comma_depth#);
-adjust_fit(0,0);
-x1-.5dot_diam=hround(.5w-.5dot_diam); y1-.5dot_diam=0;
-comma(1,a,dot_diam,.2u,comma_depth); % dot and tail
-penlabels(1);currentbreadth:=0;
- endchar;
-
-
-cmchar "Reversed comma";
-beginchar(oct"016",5u#,dot_diam#,comma_depth#);
-adjust_fit(0,0);
-x1-.5dot_diam=hround(.5w-.5dot_diam); y1+.5dot_diam=h-d;
-pickup fine.nib; pos1(dot_size,-90);
-pos21(vair,90); pos22(vair,180); pos23(vair,-135);
- z21r=z1r; rt x22r=hround(x1+.5dot_size+u/4)+2eps; x23=x1-.5u;
- y22=1/3[y21,y23]; top y23r=vround(h);
- filldraw z1r{right}...z1l{left}...cycle; % dot
- filldraw stroke z21e{right}...z22e{up}...z23e; % tail
-penlabels(1,21,22,23);
-currentbreadth:=0;
-endchar;
-
-
-
-
-cmchar "German closing comma";
-beginchar(oct"023",5u#,asc_height#,0);
-italcorr asc_height#*slant+.5dot_diam#-2u#;
-adjust_fit(0,0);
-x1-.5dot_diam=hround(.5w-.5dot_diam); y1+.5dot_diam=h-comma_depth;
-if monospace: ammoc(1,a,dot_diam,.28u,vround 1.5comma_depth); % large ammoc
-else: ammoc(1,a,dot_diam,.25u,comma_depth); fi % normal ammoc
-penlabels(1); currentbreadth:=0;
-endchar;
-
-
-cmchar "German Opening quotes";
-beginchar(oct"022",3u#+max(2u#,dot_diam#),dot_diam#,comma_depth#);
-italcorr asc_height#*slant+dot_diam#-4.1u#;
-adjust_fit(.5u#,.5u#);
-x2+.5dot_diam=hround(w-.6u+.5dot_diam); y2-.5dot_diam=0;
-x1=w-x2; y2=y1;
-comma(1,a,dot_diam,.25u,comma_depth); % left dot and tail
-comma(2,b,dot_diam,.25u,comma_depth); % right dot and tail
-penlabels(1,2); endchar;
-
-currentbreadth:=0;
-
-
-cmchar "corona";
-beginchar(20,12u#,x_height#,0);
-adjust_fit(0,0);
-pos1(.7[hair,stem],180);
-pos2(.7[hair,stem],90);
-z1=z2;
-bot y2l=-oo;lft x1r=.75u;
-pos3(.7[hair,stem],0);
-pos4(.7[hair,stem],90);
-z3=z4;
-y4=y2; rt x3r=w-lft x1r;
-pos5(stem,90);
-pos6(stem,90);pos7(stem,0);
-z6=z7; x6=w/2; bot y6l=bot y2l;
-z5=z6+whatever*(z6r-z6l); top y5r= (rt x3r-lft x1r+.7[hair,stem])/2;
-filldraw z7r...z6r...z7l...z6l...cycle;
-filldraw double_circ_stroke z1e..z5e..z3e;
-penlabels(1,2,3,4,5,6,7,8);
-currentbreadth:=0;
-endchar;
-
-cmchar "corona inversa";
-beginchar(21,12u#,x_height#,0);
-pos1(.7[hair,stem],180);
-pos2(.7[hair,stem],90);
-z1=z2;
-lft x1r=.75u;
-pos3(.7[hair,stem],0);
-pos4(.7[hair,stem],90);
-z3=z4;
-y4=y2; rt x3r=w-lft x1r;
-top y2r=(rt x3r-lft x1r+.7[hair,stem])/2;
-pos5(stem,-90); x5=x6=w/2; bot y5r=-oo;
-pos6(stem,90);pos7(stem,0);
-z6=z7;top y6r=top y2r;
-filldraw z7r...z6r...z7l...z6l...cycle;
-filldraw double_circ_stroke z1e..z5e..z3e;
-penlabels(1,2,3,4,5,6,7,8);
-currentbreadth:=0;
-endchar;
-
-cmchar "longa";
-beginchar("l",12u#,x_height#,0);
-adjust_fit(0,0)
-pos1(stem,90); pos2(stem,90);
-bot y1l=-oo=bot y2l; lft x1-stem/2=.75u; rt x2=w-x1;
-filldraw double_circ_stroke z1e--z2e;
-penlabels(1,2);
-currentbreadth:=0;
-endchar;
-
-cmchar "brevis";
-beginchar("b",12u#,x_height#,0);
-adjust_fit(0,0)
-pos1(.7[hair,stem],180);
-pos2(.7[hair,stem],90);
-z1=z2;
-lft x1r=.75u;
-pos3(.7[hair,stem],0);
-pos4(.7[hair,stem],90);
-z3=z4;
-y4=y2; rt x3r=w-lft x1r;
-top y2r=(rt x3r-lft x1r+ .7[hair,stem])/2;
-pos5(stem,-90); x5=w/2; bot y5r=-oo;
-filldraw double_circ_stroke z1e..z5e..z3e;
-penlabels(1,2,3,4,5);
-currentbreadth:=0;
-endchar;
-
-cmchar "dupla brevis";
-beginchar("c",12u#,x_height#,0);
-adjust_fit(0,10.5u#-.5[hair#,stem#]);
-pos1(.7[hair,stem],180);
-pos2(.7[hair,stem],90);
-z1=z2;
-lft x1r=.75u;
-pos3(.7[hair,stem],0);
-pos4(.7[hair,stem],90);
-z3=z4;
-y4=y2; rt x3r=w-lft x1r;
-top y2r=(rt x3r-lft x1r+ .7[hair,stem])/2;
-pos5(stem,-90); x5=w/2; bot y5r=-oo;
-filldraw double_circ_stroke z1e..z5e..z3e;
-picture savedpicture;
-savedpicture:=currentpicture;
-currentpicture:= currentpicture+savedpicture shifted (10.5u-.5[hair,stem],0);
-penlabels(1,2,3,4,5,6);
-currentbreadth:=0;
-endchar;
-
-cmchar "brevis sublineata";
-beginchar("d",12u#,x_height#,0);
-adjust_fit(0,0)
-pos1(.7[hair,stem],180);
-pos2(.7[hair,stem],90);
-z1=z2;
-lft x1r=.75u;
-pos3(.7[hair,stem],0);
-pos4(.7[hair,stem],90);
-z3=z4;
-y4=y2; rt x3r=w-lft x1r;
-top y2r=(rt x3r-lft x1r+ .7[hair,stem])/2;
-pos5(stem,-90); x5=w/2; bot y5r=-oo;
-filldraw double_circ_stroke z1e..z5e..z3e;
-currentpicture:=currentpicture shifted(0,2stem);
-pos11(stem,90); pos12(stem,90);
-bot y11l=-oo=bot y12l; lft x11-stem/2=.75u; rt x12=w-x11;
-filldraw double_circ_stroke z11e--z12e;
-penlabels(1,2,3,4,5,11,12);
-currentbreadth:=0;
-endchar;
-
-cmchar "longa dupla brevis";
-beginchar("e",12u#,x_height#,0);
-adjust_fit(0,10.35u#-.5[hair#,stem#]);
-pos1(.7[hair,stem],180);
-pos2(.7[hair,stem],90);
-z1=z2;
-lft x1r=.75u;
-pos3(.7[hair,stem],0);
-pos4(.7[hair,stem],90);
-z3=z4;
-y4=y2; rt x3r=w-lft x1r;
-top y2r=(rt x3r-lft x1r+ .7[hair,stem])/2;
-pos5(stem,-90); x5=w/2; bot y5r=-oo;
-filldraw double_circ_stroke z1e..z5e..z3e;
-picture savedpicture;
-savedpicture:=currentpicture;
-currentpicture:= currentpicture+savedpicture shifted (10.35u-.5[hair,stem],0);
-currentpicture:=currentpicture shifted(0,2stem);
-pos11(stem,90); pos12(stem,90);
-bot y11l=-oo=bot y12l; lft x11-stem/2=.75u; rt x12=w-x11+10.35u-.5[hair,stem];
-filldraw double_circ_stroke z11e--z12e;
-penlabels(1,2,3,4,5,6);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "apicata longa dupla brevis";
-beginchar("f",12u#,x_height#,0);
-adjust_fit(0,14.5u#-.5[hair#,stem#]);
-pos1(.7[hair,stem],180);
-pos2(.7[hair,stem],90);
-z1=z2;
-lft x1r=.75u;
-pos3(.7[hair,stem],0);
-pos4(.7[hair,stem],90);
-z3=z4;
-y4=y2; rt x3r=w-lft x1r;
-top y2r=(rt x3r-lft x1r+ .7[hair,stem])/2;
-pos5(stem,-90); x5=w/2; bot y5r=-oo;
-filldraw double_circ_stroke z1e..z5e..z3e;
-picture savedpicture;
-savedpicture:=currentpicture;
-currentpicture:= currentpicture+savedpicture shifted (14.5u-.5[hair,stem],0);
-pos21(.5[hair,stem],0); pos22(.5[hair,stem],0);
-bot y21=-oo+hair/2;
-bot y22r=x_height-2stem;
-x21=x22=.5[x3,x1+14.5u-.5[hair,stem]];
-filldraw double_circ_stroke z21e--z22e;
-currentpicture:=currentpicture shifted(0,2stem);
-pos11(stem,90); pos12(stem,90);
-bot y11l=-oo=bot y12l; lft x11-stem/2=.75u; rt x12=w-x11+14.5u-.5[hair,stem];
-filldraw double_circ_stroke z11e--z12e;
-penlabels(1,2,3,4,5,6,11,12,21,22);
-currentbreadth:=0;
-endchar;
-
-
-
-cmchar"Longa sublineata breve";
-beginchar(oct"153",12u#,x_height#,desc_depth#);
-adjust_fit(0,0);
-pos1(stem,90); pos2(stem,90);
-bot y1l=-oo=bot y2l; lft x1-stem/2=.75u; rt x2=w-x1;
-filldraw double_circ_stroke z1e--z2e;
-pos3(.7[hair,stem],180);
-pos4(.7[hair,stem],90);
-z3=z4;
-top y4r=-separator;lft x3r=.75u;
-pos5(.7[hair,stem],0);
-pos6(.7[hair,stem],90);
-z5=z6;
-y6=y4; rt x5r=w-lft x3r;
-pos7(stem,-90); x7=w/2; top y7l=-d;
-filldraw double_circ_stroke z3e...z7e...z5e;
-penlabels(1,2,3,4,5,6,7);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "brevis superlineata";
-beginchar("i",12u#,x_height#,0);
-adjust_fit(0,0)
-pos1(.7[hair,stem],180);
-pos2(.7[hair,stem],90);
-z1=z2;
-lft x1r=.75u;
-pos3(.7[hair,stem],0);
-pos4(.7[hair,stem],90);
-z3=z4;
-y4=y2; rt x3r=w-lft x1r;
-top y2r=(rt x3r-lft x1r+ .7[hair,stem])/2;
-pos5(stem,-90); x5=w/2; bot y5r=-oo;
-pos6(stem,90); pos7(stem,90);
-x6=x1r+stem/2;x5=.5[x6,x7]; y6=y7=y1+2stem;
-filldraw double_circ_stroke z1e..z5e..z3e;
-filldraw double_circ_stroke z6e--z7e;
-penlabels(1,2,3,4,5,6,7);
-currentbreadth:=0;
-endchar;
-
-cmchar "dupla brevis superlineata";
-beginchar("j",12u#,bar_height#+2stem#,0);
-adjust_fit(0,9.5u#)
-pos1(.7[hair,stem],180);
-pos2(.7[hair,stem],90);
-z1=z2;
-lft x1r=.75u;
-pos3(.7[hair,stem],0);
-pos4(.7[hair,stem],90);
-z3=z4;
-y4=y2; rt x3r=w-lft x1r;
-top y2r=(rt x3r-lft x1r+ .7[hair,stem])/2;
-pos5(stem,-90); x5=w/2; bot y5r=-oo;
-pos6(stem,90); pos7(stem,90);
-x6=x1r+stem/2;x4=.5[x6,x7]; y6=y7=y1+2stem;
-filldraw double_circ_stroke z1e..z5e..z3e;
-addto currentpicture also currentpicture shifted (z3-z1);
-filldraw double_circ_stroke z6e--z7e;
-penlabels(1,2,3,4,5,6,7);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "anceps";
-beginchar("X",9.5u#,x_height#,0);
-adjust_fit(0,0);
-numeric Xstem; Xstem=m_width;
-pos1(Xstem,135);pos2(Xstem,135);
-pos3(Xstem,45); pos4(Xstem,45);
-z0=.5[z1,z2]=.5[z3,z4];
-bot y1l=oo; lft x1r=u;
-y3=y1;x1+x3=w;
-z0=z1+whatever*dir(45)=z3+whatever*dir(135);
-filldraw double_circ_stroke z1e--z2e;
-filldraw double_circ_stroke z3e--z4e;
-penlabels(0,1,2,3,4);
-currentbreadth:=0;
-endchar;
-
-cmchar "anceps superlineata";
-beginchar("Y",9.5u#,asc_height#,0);
-adjust_fit(0,0);
-numeric Xstem; Xstem=m_width;
-pos1(Xstem,135);pos2(Xstem,135);
-pos3(Xstem,45); pos4(Xstem,45);
-z0=.5[z1,z2]=.5[z3,z4];
-bot y1l=oo; lft x1r=u;
-y3=y1;x1+x3=w;
-z0=z1+whatever*dir(45)=z3+whatever*dir(135);
-filldraw double_circ_stroke z1e--z2e;
-filldraw double_circ_stroke z3e--z4e;
-pos5(Xstem,90); pos6(Xstem,90);
-x5=x4; x6=x2; y5l=y6l=y4r+stem;
-filldraw double_circ_stroke z5e--z6e;
-penlabels(0,1,2,3,4,5,6);
-currentbreadth:=0;
-endchar;
-
-cmchar "anceps dupla breve supersignata";
-beginchar("Z",9.5u#,asc_height#,0);
-adjust_fit(0,0);
-numeric Xstem; Xstem=m_width;
-pos1(Xstem,135);pos2(Xstem,135);
-pos3(Xstem,45); pos4(Xstem,45);
-z0=.5[z1,z2]=.5[z3,z4];
-bot y1l=oo; lft x1r=u;
-y3=y1;x1+x3=w;
-z0=z1+whatever*dir(45)=z3+whatever*dir(135);
-filldraw double_circ_stroke z1e--z2e;
-filldraw double_circ_stroke z3e--z4e;
-pos5(Xstem,0); pos6(Xstem,90); pos7(Xstem,180);
-pos8(Xstem,0); pos9(Xstem,90); pos10(Xstem,180);
-y5=y7=top y4r+.4(y4-y1)+Xstem/2; bot y6l=top y4r+Xstem/2;
-x5l=x4l; x7=x0; x6=.5[x5,x7];
-z8=z7=.5[z5,z10]; x0=.5[x6,x9]; y9=y6;
-filldraw double_circ_stroke z5e{down}...z6e...{up}z7e;
-filldraw double_circ_stroke z8e{down}...z9e...{up}z10e;
-penlabels(0,1,2,3,4,5,6,7,8,9,10);
-currentbreadth:=0;
-endchar;
-
-
-
-cmchar"catalepsis";
-beginchar("g", 10u#,0,desc_depth#);
-adjust_fit(0,0);
-pair za,zb; za=(w/2,0)-(0,-d);zb=za xscaled-1;
-numeric cat_width;cat_width=.6[hair,stem];
-pos1(cat_width,angle(za)+90);pos2(cat_width,angle(za)+90);
-pos3(cat_width,angle(zb)-90);pos4(cat_width,angle(zb)-90);
-lft x1r=.75u; rt x4r=w-lft x1r;
-bot y1l=-d-oo; bot y4l=bot y1l;
-z2=z3;x2=w/2;top y2r=h+oo;
-filldraw double_circ_stroke z1e--z2e; filldraw double_circ_stroke z3e--z4e;
-penlabels(1,2,3,4);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "ipercatalepsis";
-beginchar("h",8u#,asc_height#,0);
-adjust_fit(0,0);
-numeric ic_w,arm; ic_w=.6[hair,stem];arm=(3/4w-ic_w)/2;
-z0=(w/2,h-arm);
-pos1(ic_w,90); pos2(ic_w,90);
-y0=y1=y2; x1=x0-arm; x0=.5[x1,x2];
-pos3(ic_w,0); pos4(ic_w,0);
-x3=x4=x0;y0=.5[y3,y4]; y4=y0+arm;
-filldraw double_circ_stroke z1e--z2e;
-filldraw double_circ_stroke z3e--z4e;
-penlabels(0,1,2,3,4,5,6);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "sinafia";
-beginchar("s",6u#,asc_height#,0);
-adjust_fit(.5u#,.5u#);
-numeric sin_width,raggio;
-sin_width=.6[hair,stem];
-pos1(sin_width,0); pos2(sin_width,90);pos3(sin_width,180);
-pos4(sin_width,270);pos5(sin_width,0);
-top y2r=h+00;top y4l=x_height-oo; raggio=(y2-y4)/2; z0=(w/2,.5[y2,y4]);
-z5=z1=z0+(raggio,0); x2=x0=x4; z0=.5[z1,z3];
-pos6(sin_width,0); pos7(sin_width,0);
-z6=z4; x7=x6; y7=-oo-sin_width/2;
-filldraw stroke z1e{up}...z2e...z3e...z4e...{up}z5e;
-filldraw circ_stroke z7e--z6e;
-penlabels(0,1,2,3,4,5,6,7);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "uncinata clausa";
-beginchar(">",8u#,asc_height#,desc_depth#);
-adjust_fit(0,0);
-numeric q_w,angolo; q_w=.5[hair,stem];angolo=55;
-pos1(q_w,0); x1r=w-.75u; y1r=.5[h,-d];
-pos2(q_w,90-angolo);
-z2=z1+whatever*dir(-angolo);x2l=.75u;
-pos3(q_w,-90+angolo); z3=z1+whatever*dir(angolo); x3l=x2l;
-filldraw stroke z2e--z1e--z3e;
-penlabels(1,2,3,4);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "uncinata aperta";
-beginchar("<",8u#,asc_height#,desc_depth#);
-adjust_fit(0,0);
-numeric q_w,angolo; q_w=.5[hair,stem];angolo=55;
-pos1(q_w,180); x1r=.75u; y1r=.5[h,-d];
-pos2(q_w,angolo+90);
-z2=z1+whatever*dir(angolo);x2l=w-.75u;
-pos3(q_w,-90-angolo); z3=z1+whatever*dir(-angolo); x3l=x2l;
-filldraw stroke z2e--z1e--z3e;
-penlabels(1,2,3,4);
-currentbreadth:=0;
-endchar;
-
-
-
-cmchar "quadra aperta";
-beginchar("[",6u#,asc_height#,desc_depth#);
-adjust_fit(0,0);
-numeric q_w; q_w=.6u;
-z1=.5[z1r,z1l]; z1l=z1r-(0,q_w);
-z2=.5[z2r,z2l]; z2l=(x2r+q_w,y2r-q_w);
-z3=.5[z3r,z3l]; z3l=(x3r+q_w,y3r+q_w);
-z4=.5[z4r,z4l]; z4l=z4r+(0,q_w);
-x1=x4=w-.75u; x2r=x3r=.75u;
-y1=y2=1.05h;y3r=y4r=-d;
-filldraw stroke z1e--z2e--z3e--z4e;
-penlabels(1,2,3,4);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "quadra clausa";
-beginchar("]",6u#,asc_height#,desc_depth#);
-adjust_fit(0,0);
-numeric q_w; q_w=.6u;
-z1=.5[z1r,z1l]; z1l=z1r-(0,q_w);
-z2=.5[z2r,z2l]; z2l=z2r-(q_w,q_w);
-z3=.5[z3r,z3l]; z3l=z3r+(-q_w,q_w);
-z4=.5[z4r,z4l]; z4l=z4r+(0,q_w);
-x1=x4=.75u; x2r=x3r=w-.75u;
-y1=y2=1.05h;y3r=y4r=-d;
-filldraw stroke z1e--z2e--z3e--z4e;
-penlabels(1,2,3,4);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "media quadra aperta inferior";
-beginchar("!",4u#,bar_height#,desc_depth#+.6stem#);
-adjust_fit(0,0);
-numeric q_w; q_w=.4[hair,stem];
-pos2(q_w,180);
-z3=.5[z3r,z3l]; z3l=(x2l,y4l);
-pos4(q_w,-90);
-x4=4.5u+x2r; x2=x3=.65w;
-y2=h;y3r=y4r=-d;
-filldraw stroke z2e--z3e--z4e;
-penlabels(1,2,3,4);
-currentbreadth:=0;
-endchar;
-
-cmchar "media quadra aperta superior";
-beginchar("?",4u#,asc_height#+.75stem#,0);
-adjust_fit(0,0);
-numeric q_w; q_w=.4[hair,stem];
-pos2(q_w,180);
-z3=.5[z3r,z3l]; z3l=(x2l,y4l);
-pos4(q_w,90);
-x4=4.25u+x2; x2=x3=.65w;
-y2=bar_height;y3=y4=h;
-filldraw stroke z2e--z3e--z4e;
-penlabels(1,2,3,4);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "media quadra clausa inferior";
-beginchar(":",4u#,bar_height#,desc_depth#+.6stem#);
-adjust_fit(0,0);
-numeric q_w; q_w=.4[hair,stem];
-pos2(q_w,0);
-z3=.5[z3r,z3l]; z3l=(x2l,y4l);
-pos4(q_w,-90);
-x4=-4.5u+x2r; x2=x3=.65w;
-y2=h;y3r=y4r=-d;
-filldraw stroke z2e--z3e--z4e;
-penlabels(1,2,3,4);
-currentbreadth:=0;
-endchar;
-
-cmchar "media quadra clausa superior";
-beginchar(";",4u#,asc_height#+.75stem#,0);
-adjust_fit(0,0);
-numeric q_w; q_w=.4[hair,stem];
-pos2(q_w,0);
-z3=.5[z3r,z3l]; z3l=(x2l,y4l);
-pos4(q_w,90);
-x4=-4.5u+x2r; x2=x3=.65w;
-y2=bar_height;y3=y4=h;
-filldraw stroke z2e--z3e--z4e;
-penlabels(1,2,3,4);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "Finis Carmen";
-beginchar("F", asc_height#+desc_depth#+1.5u#,asc_height#,desc_depth#);
-adjust_fit(0,0);
-numeric raggio; raggio=(h+d)/2-m_width/2;
-z0=(w/2,.5[h,-d]);
-pos1(m_width,0);pos2(m_width,90);pos3(m_width,180);pos4(m_width,270);pos5(m_width,360);
-z0=.5[z1,z3]=.5[z2,z4]=.5[z6,z7]=.5[z8,z9]; z1=z5;
-z1=z0+(raggio,0); z2=z0+(0,raggio);
-pos6(m_width,135);pos7(m_width,135);
-z6=z0+(raggio,0)rotated45;
-pos8(m_width,45);pos9(m_width,45);
-z8=z0+(raggio,0)rotated-45;
-filldraw stroke z1e...z2e...z3e...z4e...z5e;
-filldraw stroke z6e--z7e;
-filldraw stroke z8e--z9e;
-penlabels(0,1,2,3,4,5,6,7,8,9);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "circumflexus latinus";
-beginchar("^",8u#,0,desc_depth#);
-adjust_fit(0,0);
-numeric chair; chair=.5[hair,stem];
-numeric angolo; angolo=angle((w/2,0)-(0,-d));
-pos1(chair,angolo+90);
-pos2(chair/(cosd angolo),90);
-pos3(chair,90-angolo);
-x2=w/2=.5[x1r,x3r]; top y2r=h; bot y1l=y3l=-d;
-lft x1r=.5u;
-filldraw double_circ_stroke z1e--z2e--z3e;
-penlabels(1,2,3);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "Left parenthesis";
-beginchar("(",7u# if monospace: -u# fi,body_height#,paren_depth#);
-italcorr body_height#*slant-.5u#;
-adjust_fit(u#,-u#); pickup fine.nib;
-pos1(vair,0); pos2(.75[hair,stem],0); pos3(vair,0);
-rt x1r=rt x3r=hround(w-u); lft x2l=hround(x1-4u if monospace: +4/3u fi);
-top y1=h; y2=.5[y1,y3]=math_axis;
-filldraw stroke z1e{3(x2e-x1e),y2-y1}...z2e
- ...{3(x3e-x2e),y3-y2}z3e; % arc
-penlabels(1,2,3); currentbreadth:=0;
-currentbreadth:=0;
-endchar;
-
-cmchar "Right parenthesis";
-beginchar(")",7u# if monospace: -u# fi,body_height#,paren_depth#);
-italcorr math_axis#*slant-.5u#;
-adjust_fit(0,-u#); pickup fine.nib;
-pos1(vair,0); pos2(.75[hair,stem],0); pos3(vair,0);
-lft x1l=lft x3l=hround u; rt x2r=hround(x1+4u if monospace: -4/3u fi);
-top y1=h; y2=.5[y1,y3]=math_axis;
-filldraw stroke z1e{3(x2e-x1e),y2-y1}...z2e
- ...{3(x3e-x2e),y3-y2}z3e; % arc
-penlabels(1,2,3);currentbreadth:=0;
-currentbreadth:=0;
-endchar;
-
-currentbreadth:=0;
-
-cmchar "Crux";
-beginchar(oct"171",8u#,asc_height#,desc_depth#);
-adjust_fit(0,0);
-numeric bstem; bstem=1.3stem;
-pos1(bstem,0); pos2(thin_join,0); pos3(1.2bstem,0); pos4(hair,0); pos7(hair,0);
-pos5(bstem,90); pos2'(thin_join,90); pos6(bstem,90); z2'=z2;
-x1=x2=x3=x4=x7; x1-.5stem=hround(.5w-.5stem); center_on(x1);
-x5-.5stem=hround u; x6=w-x5;
-y1+.5stem=h+oo; y2=y5=y6; y3=.57y2; bot y4=-d+hair;
-y5+.5stem=floor(x_height+.5stem);y3=.5[y2,y7];
-filldraw circ_stroke z1e{down}..z2e{down}..z3e; % upper stem
-filldraw circ_stroke z4e--z7e{up}..z3e;% lower stem
-filldraw circ_stroke z5e{right}..{right}z2'e; % left bulb
-filldraw circ_stroke z6e{left}..{left}z2'e; % right bulb
-penlabels(1,2,3,4,5,6,7); currentbreadth:=0;
-endchar;
-
-
-
-% minimum distance between vowel and accent
-def separator=max(1,vround(x_height/10)) enddef;
-
-def grave(expr center) =
-numeric acc_sgn,acc_displ; acc_displ:=center;
- acc_sgn:=+1;
-generate_grave;
-enddef;
-
-def acute(expr center) =
-numeric acc_sgn,acc_displ; acc_displ:=center;
- acc_sgn:=-1;
-generate_grave;
-enddef;
-
-% The next definition draws both the grave (as its name suggests) and the
-% acute accents, the difference being the value of acc_sgn, where
-% acc_sgn=+1 tilts the accent to the left (grave)
-% acc_sgn=-1 tilts the accent to the right (acute)
-% acc_sgn=0 does not tilt the accent (monotoniko)
-
-vardef generate_grave=
- numeric accent_tilt, alto, basso; accent_tilt:=30;
- alto:=h; basso:=vround .8[h,x_height];
- 1/3[x22,x21]=acc_displ;
- accent_tilt:= acc_sgn*(accent_tilt+angle(alto-basso,.5currentbreadth));
- pos22(max(stem/5,currentbreadth+eps),accent_tilt); pos21(stem,accent_tilt);
- bot y22=basso; top y21+.5stem=alto;
- z21-z22=whatever*dir(90+accent_tilt);
- filldraw circ_stroke z21e--z22e; % diagonal
-penlabels(21,22);
-currentbreadth:=0;
-enddef;
-
-
-cmchar "Left apex";
-beginchar("`",4u#,acc_ht#,0);
-adjust_fit(0,0);
-numeric center;
-numeric acc_sgn; acc_sgn:=+1;
-grave(2/3w);
-currentbreadth:=0;
-endchar;
-
-cmchar "Right apex";
-beginchar("'",4u#,acc_ht#,0);
-adjust_fit(0,0);
-numeric center;
-numeric acc_sgn; acc_sgn:=-1;
-acute(2/3w);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "Hyatus";
-beginchar("H",6u#,asc_height#,0);
-adjust_fit(0,0);
-numeric Hstem, Hd; Hstem=.5stem; Hd=.37h;
-pos1(Hstem,0);pos2(Hstem,0);pos3(Hstem,0);pos4(Hstem,0);pos5(Hstem,90);pos6(Hstem,90);
-top y1=top y3=h; bot y2=bot y4=Hd; y5=y6=.55[bot y2, top y1];
-lft x1l = lft x2l = x5= w-rt x3r=w-rt x4r= w-x6= .75u;
-filldraw stroke z1e--z2e;
-filldraw stroke z3e--z4e;
-filldraw stroke z5e--z6e;
-currentpicture:=currentpicture shifted (0,.5bar_height);
-penlabels(1,2,3,4,5,6);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "Ring";
-beginchar(oct"032",4u#,0,desc_depth#);
-adjust_fit(0,0);
-numeric raggio,rw ; raggio=(d/2-separator); rw=.25[fine,stem];
-pickup pencircle scaled rw;
-z0=(w/2,-separator-raggio-rw);
-.5[z1,z2]=z0;z1=z0+(0,1.05raggio);
-draw z1...z2...cycle;
-penlabels(0,1,2,3,4,5);
-currentbreadth:=0;
-endchar;
-
-
-cmchar "Dot";
-beginchar(oct"033",3u#,0,desc_depth#);
-adjust_fit(0,0);
-numeric raggio,rw ; raggio=stem; rw=.3stem;
-z0=(w/2,-separator-raggio);
-pos1(rw,0); pos2(rw,90 );pos3(rw,180); pos4(rw,-90 );
-z1r-z0=(raggio,0); z2r-z0=(0,raggio);
-z0=.5[z1,z3]=.5[z2,z4];
-filldraw z1r...z2r...z3r...z4r...cycle;
-penlabels(0,1,2,3,4,5);
-currentbreadth:=0;
-endchar;
-
-
-cmchar"Hemiobelion";
-beginchar("A",7.5u#,x_height#,0);
-adjust_fit(0,0);
-z0=(w/2+.75u,h/2);
-numeric raggio; raggio=h/2-m_width/2;
-pos1(m_width,60); pos2(m_width,-60); pos3(m_width,180);
-z1=z0+raggio*dir(60); z2=z0+raggio*dir(-60); z3=z0-(raggio,0);
-filldraw double_circ_stroke z1e...z3e...z2e;
-penlabels(0,1,2,3);
-currentbreadth:=0;
-endchar;
-
-cmchar"Tetartemorion";
-beginchar("B",7.5u#,x_height#,0);
-adjust_fit(0,0);
-z0=(w/2-.75u,h/2);
-numeric raggio; raggio=h/2-m_width/2;
-pos1(m_width,120); pos2(m_width,-120); pos3(m_width,0);
-z1=z0+raggio*dir(120); z2=z0+raggio*dir(-120); z3=z0+(raggio,0);
-filldraw double_circ_stroke z1e...z3e...z2e;
-penlabels(0,1,2,3);
-currentbreadth:=0;
-endchar;
-
-cmchar"Stater";
-beginchar("C",8u#,asc_height#,0);
-adjust_fit(0,0);
-z0=(w/2,h/2)=.5[z1,z4]=.5[z2,z3]; z.a=dir(-10); z.b=dir(40);
-pos2(m_width,angle(z.a)-90);pos3(m_width,angle(z.a)-90);
-pos22(m_width,angle(z.b)+90);pos33(m_width,angle(z.b)+90);
-z22=z2;z33=z3;
-z2=z0+whatever*z.a; x22r=.75u=x4r;
-pos1(m_width,angle(z.b)+90);pos4(m_width,angle(z.b)+90);
-z4=z3+whatever*z.b;
-filldraw double_circ_stroke z1e--z22e;
-filldraw double_circ_stroke z2e--z3e;
-filldraw double_circ_stroke z33e--z4e;
-penlabels(0,1,2,3,4,5,6,7,22,33);
-currentbreadth:=0;
-endchar;
-
-cmchar"Dracma";
-beginchar("D",10u#,cap_height#,0);
-adjust_fit(0,0);
-pos1(m_width,0);pos2(m_width,0);pos3(m_width,90);pos4(m_width,90);
-x1l=.75u=x2l=w-x4; y1=0;y2=h;
-filldraw stroke z1e--z2e;
-y3=y4=h/2; x3=x1;
-filldraw stroke z3e--z4e;
-penlabels(1,2,3,4,5);
-currentbreadth:=0;
-endchar;
-
-cmchar"Denarius";
-beginchar("E",14u#,asc_height#,0);
-adjust_fit(0,0);
-z0=(w/2,h/2)=.5[z1,z4]=.5[z2,z5]=.5[z3,z6];
-numeric raggio; raggio=max(w/2,h/(2cosd45))-m_width/2;
-z1=z0+raggio*dir(45); z2=z0+raggio*dir(135); z3=z0+whatever*dir(180); x3=x2;
-pos1(m_width,angle(z1-z0)+90);
-pos2(m_width,angle(z2-z0)+90);
-pos3(m_width,angle(z3-z0)+90);
-pos4(m_width,angle(z1-z0)+90);
-pos5(m_width,angle(z2-z0)+90);
-pos6(m_width,angle(z3-z0)+90);
-filldraw double_circ_stroke z1e--z4e;
-filldraw double_circ_stroke z2e--z5e;
-filldraw double_circ_stroke z3e--z6e;
-penlabels(0,1,2,3,4,5,6,7,8);
-currentbreadth:=0;
-endchar;
-
-
-cmchar"Etos";
-beginchar("G",11.75u#,x_height#,0);
-adjust_fit(0,0);
-pos1(m_width,0); pos2(m_width,0); pos3(m_width,90); pos4(m_width,90);
-z2=z3; x1l=x2l=.75u; y1=1.25h; y3l=y4l=0; x4-x3=y1-y2;
-filldraw double_circ_stroke z1e--z2e;
-filldraw double_circ_stroke z3e--z4e;
-penlabels(1,2,3,4);
-currentbreadth:=0;
-endchar;
-
-cmchar"slopingzeugma";
-beginchar(oct"170",17u#,asc_height#,0);
-adjust_fit(0,0);
-z1r=(.75u,.8[x_height,h]);
-z3r=(w-x1r,x_height);
-numeric angolo; angolo=angle((z3r-z1r));
-y2r=h;z2r=(w/2,x_height)+whatever*dir(90-2angolo);
-pos1(m_width,135+angolo);
-pos2(stem,90);
-pos3(m_width,45+angolo);
-filldraw double_circ_stroke z1e..z2e{right}..z3e;
-currentpicture:=currentpicture shifted (0,(h-x_height)/2);
-penlabels(0,1,2,3,4,5);
-endchar;
-
-cmchar"raisingzeugma";
-beginchar(oct"172",17u#,asc_height#,0);
-adjust_fit(0,0);
-z1r=(.75u,x_height);
-z3r=(w-x1r,.8[x_height,h]);
-numeric angolo; angolo=angle((z3r-z1r));
-y2r=h;z2r=(w/2,x_height)+whatever*dir(90-2angolo);
-pos1(m_width,135+angolo);
-pos2(stem,90);
-pos3(m_width,45+angolo);
-filldraw double_circ_stroke z1e..z2e{right}..z3e;
-currentpicture:=currentpicture shifted (0,(h-x_height)/2);
-penlabels(0,1,2,3,4,5);
-endchar;
-
-
-
-cmchar"Base eolica 2";
-beginchar(oct"111",14u#,x_height#,0);
-adjust_fit(0,0);
-pickup pencircle scaled m_width;
-.5[z0,z1]=(w/2,h/2); y0=h/2; x1-x0=w/2;
-numeric raggio; raggio=(x1-x0)/2-m_width;
-z0=.5[z2,z3];z1=.5[z4,z5];
-z2=z0+(0,raggio);z4=z1+(0,raggio);
-draw z2{right}...z3{left}...cycle;
-draw z4{right}...z5{left}...cycle;
-penlabels(0,1,2,3,4,5,6,7,8);
-currentbreadth:=o;
-endchar;
-
-cmchar"Base eolica 3";
-beginchar(oct"112",21u#,x_height#,0);
-adjust_fit(0,0);
-pickup pencircle scaled m_width;
-z10=(3.5u,h/2); z11=z10+(7u,0); z12=z11+(7u,0);
-numeric raggio; raggio=(x11-x10)/2-m_width;
-z10=.5[z2,z3];z11=.5[z4,z5];z12=.5[z6,z7];
-z2=z10+(0,raggio);z4=z11+(0,raggio);z6=z12+(0,raggio);
-draw z2{right}...z3{left}...cycle;
-draw z4{right}...z5{left}...cycle;
-draw z6{right}...z7{left}...cycle;
-penlabels(0,1,2,3,4,5,6,7,8,10,11,12);
-currentbreadth:=o;
-endchar;
-
-cmchar"Base eolica 4";
-beginchar(oct"113",28u#,x_height#,0);
-adjust_fit(0,0);
-pickup pencircle scaled m_width;
-z10=(3.5u,h/2); z11=z10+(7u,0); z12=z11+(7u,0);z13=z12+(7u,0);
-numeric raggio; raggio=(x11-x10)/2-m_width;
-z10=.5[z2,z3];z11=.5[z4,z5];z12=.5[z6,z7];z13=.5[z8,z9];
-z2=z10+(0,raggio);z4=z11+(0,raggio);z6=z12+(0,raggio);z8=z13+(0,raggio);
-draw z2{right}...z3{left}...cycle;
-draw z4{right}...z5{left}...cycle;
-draw z6{right}...z7{left}...cycle;
-draw z8{right}...z9{left}...cycle;
-penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13);
-currentbreadth:=o;
-endchar;
-
-ligtable oct"111": oct"111"=:oct"112";
-ligtable oct"112": oct"111"=:oct"113";
-
-
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbpunct.mf b/Master/texmf-dist/fonts/source/public/cb/cbpunct.mf
deleted file mode 100644
index 11f370b33a8..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbpunct.mf
+++ /dev/null
@@ -1,435 +0,0 @@
-% cbpunct.mf
-% Copyright (C) 1997,1998,1999, 2000,2002 Claudio Beccari
-% version 2.3c 2002/11/24
-%
-% Most of these glyphs were designed by Silvio Levy; CB modified and
-% "corrected" most of them in order to be valid for all family, series, and
-% shapes; he added also the per mill and the euro signs, plus two invisible
-% characters. For the CB romanstyle Greek alphabet he modified the open and
-% closed quotes so as to look like the "English" raised quotes; may be this
-% is a little detail that breaks up with Greek typesetting tradition, but
-% this is what appears with no doubts from the printed pages of the magazine
-% Nemecis, where CB got the idea of the CB romanstyle Greek fonts.
-%
-%%% Punctuation marks
-
-cmchar "Open quotes (eisagwgik'a)";
-beginchar("{",if cbroman:7u#+max(2u#,dot_size#),asc_height#,0else:9u#,x_height#,0fi);
- adjust_fit(0,0);
- if cbroman:
- italcorr asc_height#*slant-.1u#;
- adjust_fit(0,0);
- x2+.5dot_size=hround(w-.6u); y1+.5dot_size=h-comma_depth;
- 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
-else:
- pickup fine.nib;
- numeric centro, alto;
- centro=if monospace: vair else: stem fi;
- alto=vair;
- pos0(alto,0); pos1(centro,0); pos2(alto,0);
- pos3(alto,0); pos4(centro,0); pos5(alto,0);
- top y0=h+o; bot y2=-o;
- y0=y3;
- y1=y4=.5[y0,y2];
- y2=y5;
- lft x1l =u;
- rt x3r = w - u;
- lft x4l- rt x1r=lft x3l - rt x0r = centro + .7fine;
- x0=x2;
- x3=x5;
- filldraw stroke z0e--z1e--z2e;
- filldraw stroke z3e--z4e--z5e;
-fi
-penlabels(0,1,2,3,4,5);
-endchar;
-
-cmchar "Close quotes (eisagwgik'a)";
-beginchar("}",if cbroman:7u#+max(2u#,dot_size#),asc_height#,0else:9u#,x_height#,0fi);
- adjust_fit(0,0);
- if cbroman:
- 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;
- comma(1,a,dot_size,.25u,comma_depth); % left dot and tail
- comma(2,b,dot_size,.25u,comma_depth); % right dot and tail
-else:
- pickup fine.nib;
- numeric centro, alto;
- centro=if monospace: vair else: stem fi;
- alto=vair;
- pos0(alto,0); pos1(centro,0); pos2(alto,0);
- pos3(alto,0); pos4(centro,0); pos5(alto,0);
- top y0=h+o; bot y2=-o;
- y0=y3;
- y1=y4=.5[y0,y2];
- y2=y5;
- lft x0l =u;
- rt x4r = w - u;
- lft x4l- rt x1r=lft x3l - rt x0r = centro + .7fine;
- x0=x2;
- x3=x5;
- filldraw stroke z0e--z1e--z2e;
- filldraw stroke z3e--z4e--z5e;
-fi
-penlabels(0,1,2,3,4,5);
-endchar;
-
-
-
-cmchar "Exclamation point";
-beginchar("!",5u#+width_adj#,asc_height#,0);
-italcorr asc_height#*slant-2u#-.5width_adj#+.5dot_size#;
-adjust_fit(0,0);
-pickup tiny.nib; pos3(dot_size,0); pos4(dot_size,90);
-lft x3l=hround(.5w-.5dot_size); bot y4l=0; z3=z4; dot(3,4); % dot
-numeric bot_width;
-bot_width=if hefty:max(hround .8dot_size,fine.breadth) else: hair fi;
-pickup fine.nib; pos1(dot_size,0); pos2(bot_width,0);
-x1=x2=x3; bot y2=.25[top y4r,x_height]+1;
-if square_dots: top y1=h;
- filldraw stroke z1e--z2e; % stem
-else: top z0=(x1,h+o); y1+.5dot_size=h+o;
- filldraw z1r...z0...z1l---z2l--z2r---cycle; fi % stem and bulb
-penlabels(0,1,2,3,4); endchar;
-
-cmchar "Per cent sign";
-beginchar("%",9u#+max(6u#,2fudge*(hair#+stem#)),
- body_height#,body_height#-asc_height#);
-italcorr if hefty: .4asc_height#*slant-.5u# else: h#*slant-u# fi;
-adjust_fit(0,0); pickup fine.nib;
-numeric left_curve,right_curve;
-left_curve=hround 5/6[fudged.hair,fudged.stem];
-right_curve=max(fine.breadth,hround(fudged.hair if hefty:-2stem_corr fi));
-pos1(vair,90); pos2(left_curve,180); pos3(vair,270); pos4(right_curve,360);
-top y1r=h; lft x2r=hround u; rt x4r=hround(.5w-1.5u);
-bot y3r=floor(if monospace: .7 else: .5 fi\\ asc_height);
-x1=x3=.5[x2,x4]; y2=y4=.5[y1,y3];
-filldraw stroke pulled_super_arc.e(1,2)(superpull)
- & pulled_super_arc.e(2,3)(superpull); % left half of upper bowl
-filldraw stroke super_arc.e(3,4) & super_arc.e(4,1); % right half of upper bowl
-pos5(vair,90); pos6(left_curve,180); pos7(vair,270); pos8(right_curve,360);
-bot y7r=-d; rt x8r=hround(w-u); lft x6r=hround(.5w+1.5u);
-top y5r=vround(if monospace: .3 else: .5 fi\\ asc_height);
-x5=x7=.5[x6,x8]; y6=y8=.5[y5,y7];
-filldraw stroke pulled_super_arc.e(5,6)(superpull)
- & pulled_super_arc.e(6,7)(superpull); % left half of lower bowl
-filldraw stroke super_arc.e(7,8) & super_arc.e(8,5); % right half of lower bowl
-pickup rule.nib; top y9=h; bot y10=-d;
-if hefty: x9=good.x(x5-eps); x10=good.x(x1+eps);
- draw z9--z10; % diagonal
-else: rt x9=hround(w-2.5u); lft x10=hround 2.5u; draw z9--z10; % diagonal
- pickup fine.nib; pos9(rule_thickness,angle(z9-z10)+90);
- pos11(vair,angle(z1r-z4r)-90); pos12(vair,angle(z9-z10)+90);
- path p; p=super_arc.r(1,4); z11r=point 2/3 of p; z12r=z9r;
- filldraw stroke z11e{direction 2/3 of p}...{z9-z10}z12e; fi % link
-penlabels(1,2,3,4,5,6,7,8,9,10,11,12); endchar;
-
-
-cmchar"Euro";
-beginchar(24,if slitex:11 else:14fi u#,cap_height#,0); %Inizialmente ''12u#,body_height,0''
-adjust_fit(0,if monospace:0 else: -u# fi);
-italcorr slant*body_height#-.5u#;
-numeric spess,diagon,penspess;
-pair za, zb, zc, zd;
-numeric raggio; raggio=.5*(min(w,h)-stem);
-spess=.5[hair,stem]; if 2spess+fine > raggio: spess:=.6spess fi;
- penspess:=fine; % Trick to cope with very small sizes, typically 5pt;
- if spess<=fine:
- penspess:=.9spess;
- fi
- currentbreadth:=penspess;
- pickup pencircle scaled penspess;
-x0=7/12w=xpart zd; y0=if monospace: 1.2* fi raggio+.5stem;
-zb=z0+raggio*dir(45); xpart zc=x0-raggio; ypart zc=0=ypart zd; za=.9[zc,zd];
-diagon=angle(zb-za);
-pos1(spess,diagon); pos2(spess,diagon); pos3(spess,diagon); pos4(spess,diagon);
-pos9(stem,180); pos10(stem,90); pos11(stem,diagon);
-pos12(stem,-90); pos13(stem,-90);
-zc:= whatever[zb,za]; ypart zc=y0;
-z1-z3 = whatever*up;
-z2-z4=whatever*dir(diagon); .5[z2,z4]=zc;
-lft x1l=0;
-x11r=x13r; x12=x10;
-y2l-y4r=.5[if serifs:hair else: fine fi,stem]; y2=y1; y3=y4;
-x9=x0-raggio;
-y0=y9=.5[y12,y10]=.5[y11,y13];
-z11=z0+raggio*dir(45);
-z10=z0+if monospace: 1.2* fi raggio*dir(90);
-%bot y12r=-o;
-%
-filldraw stroke z1e--z2e; % upper stroke
-filldraw stroke z3e--z4e; % lower stroke
-filldraw stroke z11e..{left}z10e..z9e..z12e{right}..z13e; % arc
-numeric raggio,spess,diagon;
-pair za, zb, zc, zd;
-penlabels(0,1,2,3,4,9,10,11,12,13);
-endchar;
-
-
-cmchar "Per mill sign";
-beginchar(25,15u#+max(6u#,2fudge*(hair#+stem#)),
- body_height#,body_height#-asc_height#);
-italcorr .4asc_height#*slant-.5u#;
-adjust_fit(0,0); pickup fine.nib;
-numeric left_curve,right_curve;
-left_curve=hround 5/6[fudged.hair,fudged.stem];
-right_curve=max(fine.breadth,hround(fudged.hair if hefty:-2stem_corr fi));
-pos1(vair,90); pos2(left_curve,180); pos3(vair,270); pos4(right_curve,360);
-top y1r=h; lft x2r=hround u; rt x4r=hround(.5(w-6u)-1.5u);
-bot y3r=floor(if monospace: .7 else: .5 fi asc_height);
-x1=x3=.5[x2,x4]; y2=y4=.5[y1,y3];
-fill top z1r{left}...lft z2r...bot z3r{right}...rt z4r...cycle;
-unfill bot z1l{left}...rt z2l...top z3l{right}...lft z4l...cycle;
-picture p_zero; p_zero=currentpicture;
-numeric x_dev; x_dev:=(d+bot y3r)*slant;
-addto currentpicture also p_zero shifted (8u-x_dev,-d-bot y3r);
-addto currentpicture also p_zero shifted (14u-x_dev,-d-bot y3r);
-picture p_zero; numeric x_dev;
-%
-%
-pickup rule.nib; top y5=h; bot y6=-d;
-if hefty:
- x5=good.x(x1+8u -eps); x6=good.x(x1+eps);
- draw z5--z6; % diagonal
-else:
- rt x5=hround(w-8.5u); lft x6=hround 2.5u; draw z5--z6; % diagonal
- numeric deviat; deviat:=60; pickup fine.nib;
- pos5(rule_thickness,angle(z5-z6)+deviat);
- path p[]; p1= z1r{right}...{down}z4r; z9=point 1/3 of p1;
- p2= z1l{right}...{down}z4l; z10=point 1/3 of p2; z7=.5[z9,z10];
- pos7(max(length(z9-z10),currentbreadth+eps),angle(z9-z10));
- pos8(vair,angle(z5-z6)+deviat); z8r=z5r;
- filldraw stroke z7e{direction 1/3 of p1}...{z5-z6}z8e; % link
- numeric deviat; path p[];
-fi
-penlabels(1,2,3,4,5,6,7,8); endchar;
-
-
-
-
-def dims = 5u#,asc_height#,0 enddef;
-def ital = 0 enddef;
-def fit_params = 0,0 enddef;
-
-def gen_letter=
-x1-.5dot_size=hround(.5w-.5dot_size); y1+.5dot_size=h;
-if monospace: comma(1,a,dot_size,.28u,vround 1.5comma_depth); % large comma
-else: comma(1,a,dot_size,.25u,comma_depth); fi % comma with increased jut
-enddef;
-
-cmchar "Apostrophe";
-beginchar(oct"035",dims);
-this_letter; penlabels(1); endchar;
-
-picture savedpicture;
-
-cmchar "Left parenthesis";
-beginchar("(",7u# if monospace: -u# fi,body_height#,paren_depth#);
-italcorr body_height#*slant-.5u#;
-adjust_fit(0,0); pickup fine.nib;
-pos1(vair,0); pos2(.75[hair,stem],0); pos3(vair,0);
-rt x1r=rt x3r=hround(w-u); lft x2l=hround(x1-4u if monospace: +4/3u fi);
-top y1=h; y2=.5[y1,y3]=math_axis;
-filldraw stroke z1e{3(x2e-x1e),y2-y1}...z2e
- ...{3(x3e-x2e),y3-y2}z3e; % arc
-penlabels(1,2,3); endchar;
-
-cmchar "Right parenthesis";
-beginchar(")",7u# if monospace: -u# fi,body_height#,paren_depth#);
-italcorr math_axis#*slant-.5u#;
-adjust_fit(0,0); pickup fine.nib;
-pos1(vair,0); pos2(.75[hair,stem],0); pos3(vair,0);
-lft x1l=lft x3l=hround u; rt x2r=hround(x1+4u if monospace: -4/3u fi);
-top y1=h; y2=.5[y1,y3]=math_axis;
-filldraw stroke z1e{3(x2e-x1e),y2-y1}...z2e
- ...{3(x3e-x2e),y3-y2}z3e; % arc
-penlabels(1,2,3); endchar;
-
-cmchar "Asterisk";
-beginchar("*",9u#,
- if low_asterisk:math_axis#+.5x_height# else: body_height# fi,0);
-italcorr h#*slant-.75u#;
-adjust_fit(0,0);
-numeric ast_flare; ast_flare=hround .7[thin_join,stem];
-x0=.5w; y0=h-.5x_height;
-for d=-150 step 60 until 150: z[d]=z0+.5dir d xscaled 7.5u yscaled x_height;
- numeric theta; theta=angle(z[d]-z0);
- fill z0+.5(0,-thin_join)rotated theta
- ---z[d]+.5(-ast_flare,-ast_flare)rotated theta
- ..z[d]..z[d]+.5(-ast_flare,ast_flare)rotated theta
- ---z0+.5(0,thin_join)rotated theta--cycle; endfor % diagonal at angle |d|
-labels(0,[-150],[-90],[-30],30,90,150); endchar;
-
-cmchar "Plus sign";
-beginarithchar("+"); pickup rule.nib;
-x1=x2=good.x .5w; top y1=h+eps; .5[y1,y2]=math_axis;
-lft x3=hround u-eps; x4=w-x3; y3=y4=math_axis;
-draw z1--z2; % stem
-draw z3--z4; % crossbar
-labels(1,2,3,4); endchar;
-
-cmchar "Comma";
-numeric dot_diam#; dot_diam#=if monospace: 5/4 fi\\ dot_size#;
-define_whole_blacker_pixels(dot_diam);
-beginchar(",",5u#,dot_diam#,comma_depth#);
-adjust_fit(0,0);
-x1-.5dot_diam=hround(.5w-.5dot_diam); y1-.5dot_diam=0;
-comma(1,a,dot_diam,.2u,comma_depth); % dot and tail
-penlabels(1); endchar;
-
-cmchar "Period";
-numeric dot_diam#; dot_diam#=if monospace: 5/4 fi\\ dot_size#;
-define_whole_blacker_pixels(dot_diam);
-beginchar(".",5u#,dot_diam#,0);
-adjust_fit(0,0); pickup fine.nib;
-pos1(dot_diam,0); pos2(dot_diam,90);
-lft x1l=hround(.5w-.5dot_diam); bot y2l=0; z1=z2; dot(1,2); % dot
-penlabels(1,2); endchar;
-
-cmchar "Virgule (slash)";
-beginchar("/",9u#,body_height#,paren_depth#);
-italcorr body_height#*slant-.5u#;
-adjust_fit(0,0); pickup rule.nib;
-rt x1=hround(w-u)+eps; top y1=h+eps;
-lft x2=hround u-eps; bot y2=-d-eps;
-draw z1--z2; % diagonal
-penlabels(1,2); endchar;
-
-cmchar "Colon";
-numeric dot_diam#; dot_diam#=if monospace: 5/4 fi\\ dot_size#;
-define_whole_blacker_pixels(dot_diam);
-beginchar(":",5u#,x_height#,0);
-italcorr x_height#*slant+.5dot_diam#-2u#;
-adjust_fit(0,0); pickup fine.nib;
-pos1(dot_diam,0); pos2(dot_diam,90);
-lft x1l=hround(.5w-.5dot_diam); top y2r=h; z1=z2; dot(1,2); % upper dot
-pos3(dot_diam,0); pos4(dot_diam,90);
-x3=x1; bot y4l=0; z3=z4; dot(3,4); % lower dot
-penlabels(1,2,3,4); endchar;
-
-cmchar "'Anw tele'ia";
-numeric dot_diam#; dot_diam#=if monospace: 5/4 fi\\ dot_size#;
-define_whole_blacker_pixels(dot_diam);
-beginchar(";",5u#,x_height#,0);
-italcorr x_height#*slant+.5dot_diam#-2u#;
-adjust_fit(0,0); pickup fine.nib;
-pos1(dot_diam,0); pos2(dot_diam,90);
-lft x1l=hround(.5w-.5dot_diam); top y2r=h; z1=z2; dot(1,2); % upper dot
-penlabels(1,2); endchar;
-
-cmchar "Question mark";
-numeric dot_diam#; dot_diam#=if monospace: 5/4 fi\\ dot_size#;
-define_whole_blacker_pixels(dot_diam);
-beginchar("?",5u#,x_height#,comma_depth#);
-italcorr x_height#*slant+.5dot_diam#-2u#;
-adjust_fit(0,0); pickup fine.nib;
-pos1(dot_diam,0); pos2(dot_diam,90);
-lft x1l=hround(.5w-.5dot_diam); top y2r=h; z1=z2; dot(1,2); % upper dot
-x3-.5dot_diam=hround(.5w-.5dot_diam); y3-.5dot_diam=0;
-comma(3,a,dot_diam,.05u,comma_depth); % lower dot and tail
-penlabels(1,2,3); endchar;
-
-cmchar "Equals sign";
-compute_spread(.45x_height#,.55x_height#);
-beginchar("=",14u#,v_center(spread#+rule_thickness#));
-italcorr h#*slant-.5u#;
-adjust_fit(0,0); pickup rule.nib;
-lft x1=hround u-eps; x3=x1; x2=x4=w-x1;
-y1=y2; y3=y4; y1-y3=spread; .5[y1,y3]=math_axis;
-draw z1--z2; % upper bar
-draw z3--z4; % lower bar
-labels(1,2,3,4); endchar;
-
-cmchar "Left bracket";
-numeric wd#; wd#=max(5u#,4.5u#+.5if hefty:stem# else:rule_thickness# fi);
-beginchar("[",wd#,body_height#,paren_depth#);
-italcorr body_height#*slant;
-adjust_fit(0,0);
-numeric top_thickness,side_thickness;
-if hefty: top_thickness=vair;
- side_thickness=max(crisp.breadth,stem-2stem_corr);
-else: top_thickness=side_thickness=rule_thickness; fi;
-pickup crisp.nib; pos1(side_thickness,0); pos2(side_thickness,0);
-top y1=h; bot y2=-d; lft x1l=lft x2l=hround(2.5u-.5side_thickness)-1-eps;
-filldraw stroke z1e--z2e; % stem
-pos3(top_thickness,90); pos4(top_thickness,90);
-pos5(top_thickness,90); pos6(top_thickness,90);
-x3=x5=x1l; rt x4=rt x6=ceiling(w-.4u)+eps; y3r=y4r=y1; y5l=y6l=y2;
-filldraw stroke z3e--z4e; % upper bar
-filldraw stroke z5e--z6e; % lower bar
-penlabels(1,2,3,4,5,6); endchar;
-
-cmchar "Right bracket";
-numeric wd#; wd#=max(5u#,4.5u#+.5if hefty:stem# else:rule_thickness# fi);
-beginchar("]",wd#,body_height#,paren_depth#);
-italcorr body_height#*slant-2u#+.5if hefty:stem# else:rule_thickness# fi;
-adjust_fit(0,0);
-numeric top_thickness,side_thickness;
-if hefty: top_thickness=vair;
- side_thickness=max(crisp.breadth,stem-2stem_corr);
-else: top_thickness=side_thickness=rule_thickness; fi;
-pickup crisp.nib; pos1(side_thickness,0); pos2(side_thickness,0);
-top y1=h; bot y2=-d; rt x1r=rt x2r=hround(w-2.5u+.5side_thickness)+1+eps;
-filldraw stroke z1e--z2e; % stem
-pos3(top_thickness,90); pos4(top_thickness,90);
-pos5(top_thickness,90); pos6(top_thickness,90);
-x3=x5=x1r; lft x4=lft x6=floor .4u-eps; y3r=y4r=y1; y5l=y6l=y2;
-filldraw stroke z3e--z4e; % upper bar
-filldraw stroke z5e--z6e; % lower bar
-penlabels(1,2,3,4,5,6); endchar;
-
-cmchar "Reverse apostrophe";
-beginchar(oct"034",5u#,asc_height#,0);
-italcorr asc_height#*slant+.5dot_size#-2u#;
-adjust_fit(0,0);
-x1-.5dot_size=hround(.5w-.5dot_size); y1+.5dot_size=h-comma_depth;
-if monospace: ammoc(1,a,dot_size,.28u,vround 1.5comma_depth); % large ammoc
-else: ammoc(1,a,dot_size,.25u,comma_depth); fi % normal ammoc
-penlabels(1); endchar;
-
-cmchar "Hyphen";
-beginchar("-",6u#,x_height#,0);
-italcorr .5x_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric thickness; thickness=if hefty:bar else:.75[hair,stem] fi;
-pickup crisp.nib; pos1(thickness,90); pos2(thickness,90);
-top y1r=top y2r=vround(.5h+.5thickness); rt x2=hround(w-u)+eps;
-if monospace: x2=w-x1 else: lft x1=hround .2u-eps fi;
-filldraw stroke z1e--z2e; % bar
-penlabels(1,2); endchar;
-
-cmchar "En dash";
-beginchar(oct"000",9u#,x_height#,0);
-italcorr .61803x_height#*slant+.5u#;
-adjust_fit(0,0);
-pickup crisp.nib; pos1(vair,90); pos2(vair,90);
-top y1r=top y2r=vround(.61803h+.5vair); lft x1=-eps; rt x2=w+eps;
-filldraw stroke z1e--z2e; % bar
-penlabels(1,2); endchar;
-
-cmchar "Em dash";
-beginchar(oct"177",18u#,x_height#,0);
-italcorr .61803x_height#*slant+.5u#;
-adjust_fit(letter_fit#,letter_fit#);
-pickup crisp.nib; pos1(vair,90); pos2(vair,90);
-top y1r=top y2r=vround(.61803h+.5vair); lft x1=-eps; rt x2=w+eps;
-filldraw stroke z1e--z2e; % bar
-penlabels(1,2); endchar;
-
-cmchar "void char - compound word marker";
-beginchar("v",eps*u#,x_height#,0);
-%adjust_fit(0,0);
-%charwd:=0; r:=l-shrink_fit;
-endchar;
-
-cmchar "null char";
-beginchar(159,eps*u#,0,0); % hexadecimal "9F
-%adjust_fit(0,0);
-%charwd:=0; r:=l-shrink_fit;
-endchar;
-
-
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbspline.mf b/Master/texmf-dist/fonts/source/public/cb/cbspline.mf
deleted file mode 100644
index 8bdeff88bfb..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbspline.mf
+++ /dev/null
@@ -1,112 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% The copyright holds only for the file that enucleates the spline macros,
-% not for the macros themselves that are copyright of J"orge Knappen.
-%
-% This file includes the spline macros for computing font paramenters
-% from a table. It includes all the macros written by J"orge Knappen for the
-% ec fonts. Thanks to J"orge for the good things these macros do, blame to me
-% for their misuse.
-
-
-vardef simple_gendef@#(text aa)(text t)=
- string s[];
- s1:="";
- s2:=str @#;
- index:=1;
- forsuffixes $=t: ydata[index]:=$ if s1<>s2: *@# fi;
- index:=index+1;
- endfor;
- if numpoints>(index-1): errmessage "Missing parameter"; message str aa; fi;
- if numpoints<(index-1): errmessage "Too many parameters"; message str aa; fi;
- aa:=ydata[merke];
- if gencheck: message str aa fi;
-enddef;
-
-vardef extended_gendef@#(text aa)(text t)=
- string s[];
- s1:="";
- s2:=str @#;
- index:=1;
- forsuffixes $=t: ydata[index]:=$ if s1<>s2: *@# fi;
- index:=index+1;
- endfor;
- if numpoints>(index-1): errmessage "Missing parameter"; message str aa; fi;
- if numpoints<(index-1): errmessage "Too many parameters"; message str aa; fi;
- if gensize>basedata[numpoints]:
- numeric hilf [];
- hilf[1]:=(ydata[numpoints]-ydata[numpoints-1])/(basedata[numpoints]-basedata[numpoints-1]);
- hilf[2]:=(ydata[numpoints]-ydata[numpoints-2])/(basedata[numpoints]-basedata[numpoints-2]);
- hilf[3]:=ydata[numpoints]-hilf1*basedata[numpoints];
- hilf[4]:=ydata[numpoints]-hilf2*basedata[numpoints];
- spy:=(hilf[1]*gensize+hilf[3])/2+(hilf[2]*gensize+hilf[4])/2;
- aa:=spy;
- else:
- for index = 1 upto numpoints-1:
- interval[index]:=basedata[index+1]-basedata[index];
- endfor;
- for index=1 upto numpoints:
- spline[1][index]:=ydata[index];
- endfor;
- for index=2 upto numpoints-1:
- alpha[index]:=3*((spline[1][index+1]*interval[index-1])%
- -(spline[1][index]*(basedata[index+1]-basedata[index-1]))%
- +(spline[1][index-1]*interval[index]))%
- /(interval[index-1]*interval[index]);
- endfor;
- spl[1]:=0;
- spmu[1]:=0;
- spz[1]:=0;
- for index=2 upto numpoints-1:
- spl[index]:=2*(basedata[index+1]-basedata[index-1])%
- -interval[index-1]*spmu[index-1];
- spmu[index]:=interval[index]/spl[index];
- spz[index]:=(alpha[index]-interval[index-1]*spz[index-1])/spl[index];
- endfor;
- spline[3][numpoints]:=0;
- for index=numpoints-1 downto 1:
- spline[3][index]:=spz[index]-spmu[index]*spline[3][index+1];
- endfor;
- for index=numpoints -1 downto 1:
- spline[2][index]:=(spline[1][index+1]-spline[1][index])/interval[index]%
- -interval[index]*(spline[3][index+1]*spline[3][index])/3;
- spline[4][index]:=(spline[3][index+1]-spline[3][index])/(3*interval[index]);
- endfor;
- location:=1;
- for term=1 upto numpoints-1:
- if gensize > basedata[term]: location:=term; fi
- endfor;
- spx:=gensize-basedata[location];
- spy:=((spline[4][location]*spx+spline[3][location])*spx+spline[2][location])*spx+spline[1][location];
- aa:=spy; fi;
- if gencheck: message str aa fi;
-enddef;
-
-vardef basedef(text t)=
- boolean basevalue; boolean gencheck;
- numeric index; numeric ergbnis; numeric location; numeric term;
- numeric numpoints; numeric spx; numeric spy;
- numeric basedata[]; numeric interval[]; numeric alpha[];
- numeric spl[]; numeric spmu[]; numeric spz[];
- numeric ydata[]; numeric spline[][];
- basevalue:=false; gencheck:=false;
- index:=1;
- forsuffixes $=t: basedata[index]:=$;
- if $=gensize: basevalue:=true; merke:=index; fi;
- index:=index+1;
- endfor;
- numpoints:=index-1;
- if numpoints<3: errmessage "Not enough reference points"; fi
- if basevalue: def gendef=simple_gendef enddef; else:
- def gendef=extended_gendef enddef; fi
-enddef;
-
-def clear_extra_memory= % Release ressources hold by the extrapolation routine
- numeric index; numeric ergbnis; numeric location; numeric term;
- numeric numpoints; numeric spx; numeric spy;
- numeric basedata[]; numeric interval[]; numeric alpha[];
- numeric spl[]; numeric spmu[]; numeric spz[];
- numeric ydata[]; numeric spline[][];
- numeric hilf []; string s[];
-enddef;
-
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbupper.mf b/Master/texmf-dist/fonts/source/public/cb/cbupper.mf
deleted file mode 100644
index f9b641add03..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/cbupper.mf
+++ /dev/null
@@ -1,858 +0,0 @@
-% Copyright (C) 1997, 1999, 2000, 2001 Claudio Beccari
-% version 2.1c 2001/02/27
-% This file is a rearrangement of code in Computer Modern's romanu.mf
-% It contains definitions for Greek capitals.
-%
-% This rearrangement was done by Silvio Levy; I just controlled the validity
-% for all the family series and shapes and introduced those simple
-% "corrections" that proved necessary.
-%
-% Added adscript iota for capital letters A, H, W (1999/10/25 CB)
-% Added dummy glyphs for the ligatures A"U, A"u, a"u (2000/02/13 CB)
-% Modified capital Upsilon for Leipzig italics and CB roman (2000/07/06 CB)
-% Modified capital Theta and Omega for Leipzig italics (2001/02/27 CB)
-
-def gen_letter = % Capital Alpha
-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+outer_jut+.5u; y1=y4=0;
-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 y0<h-cap_notch_cut: y0:=h-cap_notch_cut;
- fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r)
- --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1}
- ...{up}z0+.5left--cycle; % left and right diagonals
-else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)
- --diag_end(2l,1l,1,1,1r,0)--cycle; fi % 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 =5/12y0;
-y5r-y5l=y6r-y6l=cap_band; penstroke z5e--z6e; % bar line
-if serifs: numeric inner_jut; 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(1',2,a,1/2,outer_jut,b,.6,inner_jut)(dark); % left serif
- dish_serif(4',3,c,1/2,inner_jut,d,1/3,outer_jut); fi % right serif
- numeric pos_stem; %Iota reference
- pos_stem:=rt x4r if serifs:+outer_jut-.5slab fi+.5(tiny+stem)+u;
-enddef;
-
-cmchar "Uppercase alpha";
-beginchar("A",13u#,cap_height#,0);
-adjust_fit(cap_serif_fit#,cap_serif_fit#);
-gen_letter;
-penlabels(0,1,2,3,4,5,6); endchar;
-
-cmchar "Uppercase alpha with adscript iota";
-beginchar(oct"011",13u#,cap_height#,0);
-adjust_fit(cap_serif_fit#,cap_serif_fit#+stem#+.7jut#+1.2u#+.5tiny# if monospace:+1.3tiny# fi);
-gen_letter; Iota_sub(pos_stem);
-penlabels(0,1,2,3,4,5,6,51,52); endchar;
-
-cmchar "Uppercase alpha with right phantom diaeresis";% The diaeresis is not actually there
-beginchar(oct"014",13u#,cap_height#,0); % this glyph is just for kerning with
-adjust_fit(cap_serif_fit#,cap_serif_fit#); % uppercase upsilon with diaeresis
-gen_letter;
-endchar;
-
-% This is why we define here a variable AUkern that will be used also for left shifting
-% a copy of uppercase upsilon with diaersis to be used with the above Adiaeresis glyph;
-% the idea is that the ligkern table specifies the correct ammount of negative kern when
-% A is followed by Udiaeresis (which is possible only by inputting text with a Greek
-% keyboard and the iso-8859-7 input encoding), but fails when Greek text is input with
-% a Latin keyboard, because in this case the sequence A"U cannot operate; in facts the kern
-% between A and " cannot be inserted if it is still unknown if the next character will
-% be U or I. In order to deal with such situation it would be necessary a ligkern command
-% that involves three adiacent characters; up to now (2000/02/13) this command is missing
-% from METAFONT.
-
-numeric AUkern,AUkern#;
-if cbleipzig: AUkern:=2u; AUkern#:=2u#;
-else: AUkern:=2.5u; AUkern#:=2.5u#;
-fi
-
-cmchar "Uppercase beta";
-beginchar("B",12.5u#,cap_height#,0);
-italcorr .75cap_height#*slant-.5u#;
-adjust_fit(cap_serif_fit#,0);
-numeric left_stem,right_curve,middle_weight;
-left_stem=cap_stem-hround 2stem_corr; middle_weight=.6vair+.5;
-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
-penpos3(cap_band,90); penpos4(cap_band,90);
-penpos6(middle_weight,-90); penpos7(middle_weight,-90);
-penpos8(middle_weight,90); penpos9(middle_weight,90);
-penpos5(right_curve-stem_corr,0); penpos10(right_curve,0);
-penpos11(cap_band,-90); penpos12(cap_band,-90);
-z3r=top z1; y4=y3; y5=.5[y4,y6]; y6=y7; y7l-y8l=vair;
-z12r=bot z2; y11=y12; y10=.5[y11,y9]; y8=y9; .5[y7l,y8l]=.52h;
-x4=x6; x9=x11=x4+.5u; x7=x8=x1; x9l:=x4+.25u;
-x5r=hround(w-1.5u); x10r=hround(w-u);
-if serifs: right_curve=cap_curve-stem_corr; x4=.5[x1,w-1.5u];
-else: right_curve=cap_curve-3stem_corr; x4=.5[x1,w-2.5u];
- x4l:=x4l-.5u; x9l:=x9l-.5u; fi
-x6l:=x6l-.5u; x11l:=x11l-.5u;
-fill stroke z3e..super_arc.e(4,5) & super_arc.e(5,6)..z7e; % upper lobe
-fill stroke z8e..super_arc.e(9,10) & super_arc.e(10,11)..z12e; % lower lobe
-if serifs: dish_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,.5cap_jut); fi % lower serif
-math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,7,8,9,10,11,12); endchar;
-
-cmchar "Uppercase epsilon";
-beginchar("E",12u#-width_adj#,cap_height#,0);
-italcorr cap_height#*slant-beak_jut#-.5u#;
-adjust_fit(cap_serif_fit#,0);
-h:=vround(h-stem_corr);
-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: dish_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,.5cap_jut); fi % lower serif
-math_fit(0,.5ic#); penlabels(0,1,2,3,4,5,6,7,8,9); endchar;
-
-
-def gen_letter = % Capital Eta
-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 left serif
- dish_serif(4,3,g,1/3,inner_jut,h,1/3,cap_jut); fi % lower left serif
- numeric pos_stem; %Iota reference
- pos_stem:=rt x4r if serifs:+cap_jut fi+.5(stem+tiny)+u;
-enddef;
-
-
-
-cmchar "Uppercase eta";
-beginchar("H",13u#+width_adj#,cap_height#,0);
-italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#);
-adjust_fit(cap_serif_fit#,cap_serif_fit#);
-gen_letter;
-math_fit(0,.5ic#); penlabels(1,2,3,4,5,6); endchar;
-
-cmchar "Uppercase eta with adscript Iota";
-beginchar(oct"012",13u#+width_adj#,cap_height#,0);
-italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#);
-adjust_fit(cap_serif_fit#,cap_serif_fit#+stem#+.7jut#+1.2u# if monospace:+1.6tiny# fi);
-gen_letter; Iota_sub(pos_stem);
-math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,51,52); endchar;
-
-
-cmchar "Uppercase iota with diaeresis";
-beginchar(oct"333",max(6u#,4u#+cap_stem#),cap_height#,0);
-italcorr cap_height#*slant-.25u#;
-adjust_fit(cap_serif_fit#,cap_serif_fit#);
-pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0);
-lft x1l=lft x2l=hround(.5w-.5cap_stem);
-numeric iota_h; iota_h=cap_height;
-top y1=iota_h ; bot y2=0;
-filldraw stroke z1e--z2e; % stem
-if serifs:
- dish_serif(1,2,a,1/3,1.05cap_jut,b,1/3,1.05cap_jut); % upper serif
- dish_serif(2,1,c,1/3,1.05cap_jut,d,1/3,1.05cap_jut); % lower serif
-elseif slitex:
- dish_serif(1,2,a,1/3,1.05u,b,1/3,1.05u); % upper serif
- dish_serif(2,1,c,1/3,1.05u,d,1/3,1.05u); % lower serif
-fi
-generate_diaeresis(.5w,dot_size,dot_size+4/5cap_stem,h+separator+dot_size,iota_h+separator);
-math_fit(0,.5ic#); penlabels(1,2); endchar;
-
-
-
-
-
-cmchar "Uppercase iota";
-beginchar("I",max(6u#,4u#+cap_stem#),cap_height#,0);
-italcorr cap_height#*slant-.25u#;
-adjust_fit(cap_serif_fit#,cap_serif_fit#);
-pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0);
-lft x1l=lft x2l=hround(.5w-.5cap_stem); top y1=h; bot y2=0;
-filldraw stroke z1e--z2e; % stem
-if serifs:
- dish_serif(1,2,a,1/3,1.05cap_jut,b,1/3,1.05cap_jut); % upper serif
- dish_serif(2,1,c,1/3,1.05cap_jut,d,1/3,1.05cap_jut); % lower serif
-else:
- if slitex:
- dish_serif(1,2,a,1/3,1.05u,b,1/3,1.05u); % upper serif
- dish_serif(2,1,c,1/3,1.05u,d,1/3,1.05u); % lower serif
- fi
-fi
-math_fit(0,.5ic#); penlabels(1,2); endchar;
-
-
-
-
-
-cmchar "Uppercase kappa";
-beginchar("K",13.5u#,cap_height#,0);
-italcorr cap_height#*slant-.5u#;
-adjust_fit(cap_serif_fit#,cap_serif_fit#);
-numeric right_jut,stem[],alpha[];
-if serifs: right_jut=.6cap_jut;
-else: right_jut=.4tiny; fi
-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
-stem2=max(tiny.breadth,fudged.cap_stem-3stem_corr);
-stem1=max(tiny.breadth,fudged.hair if hefty:-3stem_corr fi);
-top y3=h; rt x3r=hround(r-letter_fit-u-right_jut);
-bot y6=0; rt x6r=hround(r-letter_fit-.75u-right_jut);
-x4=x1; y4=1/3h;
-alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4);
-penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90);
-alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1);
-penpos6(alpha2*(stem2-tiny),0);
-forsuffixes $=l,r: y3'$=h; y6'$=0; z4$=z3'$+whatever*(z3-z4);
- z5$=z6'$+whatever*(z1-z6)=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 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
-fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle; % lower diagonal
-if serifs: numeric inner_jut;
- if rt x2r+cap_jut+.5u+1<=lft x6l-cap_jut: inner_jut=cap_jut;
- else: rt x2r+cap_jut+.5u+1=lft x6l-inner_jut; fi
- 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); % lower stem serif
- dish_serif(3,4,e,2/3,1.2cap_jut,f,1/2,right_jut)(dark); % upper diagonal serif
- dish_serif(6,5,g,1/2,inner_jut,h,1/3,right_jut)(dark);fi % lower diagonal serif
-math_fit(0,.5ic#); penlabels(1,2,3,4,5,6); endchar;
-
-cmchar "Uppercase mu";
-beginchar("M",16u#+width_adj#,cap_height#,0);
-italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#);
-adjust_fit(cap_serif_fit#,cap_serif_fit#);
-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 stem4<stem1: stem4:=stem1; fi
-pickup tiny.nib; pos1(stem1,0); pos2(stem1,0);
-pos3(stem4,0); pos4(stem4,0);
-x1=x2; x3=x4; x1l=w-x3r; rt x3r=hround min(w-2u,w-3u+.5stem4);
-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: o fi;
- numeric upper_notch,lower_notch;
- upper_notch=h-cap_notch_cut; lower_notch=y6+cap_notch_cut;
- x1'=rt x1r; z1'=whatever[z5l,z6l]; x3'=lft x3l; z3'=whatever[z7r,z8r];
- z0=whatever[z5r,z6r]=whatever[z7l,z8l];
- fill z5l..
- if y1'<upper_notch: {right}(x1'+1,upper_notch){down}... fi
- {z6-z5}diag_in(5l,6l,1,6r)..diag_out(7l,1,7r,8r){z8-z7}
- if y3'<upper_notch: ...{up}(x3'-1,upper_notch){right} fi
- ..z8r--diag_out(8r,1,8l,7l){z7-z8}
- if y0<=lower_notch: ..{z7-z8}z0{z5-z6}..
- else: ...{down}(x0+.5,lower_notch)--(x0-.5,lower_notch){up}... fi
- {z5-z6}diag_in(6r,5r,1,5l)--cycle; % diagonals
-else: y6=0; z0=whatever[z5r,z6r]=whatever[z7l,z8l];
- fill z5l..{z6-z5}diag_in(5l,6l,1,6r)..diag_out(7l,1,7r,8r){z8-z7}
- ..z8r--diag_out(8r,1,8l,7l){z7-z8}..{z7-z8}z0{z5-z6}
- ..{z5-z6}diag_in(6r,5r,1,5l)--cycle; fi % diagonals
-if serifs: serif(1,2,a,1/3,-cap_jut); % upper left serif
- dish_serif(2,1,b,1/2,cap_jut,c,1/2,cap_jut)(dark); % lower left serif
- serif(3,4,d,1/3,cap_jut); % upper right serif
- dish_serif(4,3,e,1/3,cap_jut,f,1/3,cap_jut); fi % lower right serif
-math_fit(0,max(.5ic#-.5u#,0));
-penlabels(0,1,1',2,3,3',4,5,6,7,8); endchar;
-
-cmchar "Uppercase nu";
-beginchar("N",13u#+width_adj#,cap_height#,0);
-italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#);
-adjust_fit(cap_serif_fit#,cap_serif_fit#);
-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);
-pickup tiny.nib; top y1=top y3=h; bot y2=bot y4=0;
-x1=x2; x3=x4; x1l=w-x3r;
-rt x3r=hround min(w-2u,w-3u+.5fudged.cap_stem);
-filldraw stroke z1e--z2e; % left stem
-filldraw stroke z3e--z4e; % right stem
-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;
- upper_notch=h-cap_notch_cut; lower_notch=cap_notch_cut;
- x1'=rt x1r; z1'=whatever[z5l,z6l]; x4'=lft x4l; z4'=whatever[z5r,z6r];
- fill z5l..
- if y1'<upper_notch: {right}(x1'+1,upper_notch){down}... fi
- {z6-z5}diag_in(5l,6l,1,6r)--z6r..
- if y4'>lower_notch: {left}(x4'-1,lower_notch){up}... fi
- {z5-z6}diag_in(6r,5r,1,5l)--cycle; % diagonal
-else: penpos5(whatever,0); penpos6(whatever,90);
- z5l=z1l; z6l=z4l;
- z7=z6l+(max(eps,cap_stem-3stem_corr-tiny),0) rotated (angle(z5l-z6l)-90);
- z5r=z7+whatever*(z5l-z6l); z6r=z7+whatever*(z5l-z6l);
- filldraw stroke z5e..z6e; fi % diagonal
-if serifs: if hefty: serif(1,2,a,1/3,-cap_jut); % upper left serif
- else: serif(5,6,a,1/3,-cap_jut); fi % upper left serif
- dish_serif(2,1,b,1/2,cap_jut,c,1/2,cap_jut)(dark); % lower left serif
- dish_serif(3,4,e,1/2,cap_jut,f,1/2,cap_jut)(dark); fi % upper right serif
-math_fit(0,max(.5ic#-.5u#,0)); penlabels(1,1',2,3,4,4',5,6,7); endchar;
-
-cmchar "Uppercase omicron";
-beginchar("O",14u#-width_adj#,cap_height#,0);
-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: 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
-math_fit(-.3cap_height#*slant-.5u#,ic#-.5u#); penlabels(1,2,3,4); endchar;
-
-cmchar "Uppercase rho";
-beginchar("R",12u#,cap_height#,0);
-italcorr .75cap_height#*slant-.5u#;
-adjust_fit(cap_serif_fit#,0);
-pickup tiny.nib; penpos1(cap_stem'-tiny,0); penpos2(cap_stem-tiny,0);
-pos0(cap_stem',0); pos0'(cap_stem,0);
-lft x1l=hround max(2u,3u-.5cap_stem'); top y1=h; bot y2=0;
-x1l=x2l=x0l=x0'l; y0=y0'=y7;
-penpos3(cap_band,90); penpos4(cap_band,90);
-penpos5(cap_curve if hefty:-3stem_corr fi,0);
-penpos6(.5[vair,cap_band],-90); penpos7(.5[vair,cap_band],-90);
-z3r=top z1; y4=y3; y5=.5[y4l,y6l]; y6=y7;
-x7=x2; y7l=vround .5h; x4=x6=.5w+.75u; x5r=hround(w-u);
-x4l:=x6l:=x4-.25cap_curve;
-filldraw stroke z1e--z0e--z0'e--z2e; % stem
-fill stroke z3e..pulled_arc.e(4,5) & pulled_arc.e(5,6)..z7e; % lobe
-if serifs: dish_serif(1,0,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif
- dish_serif(2,0',c,1/3,cap_jut,d,1/3,cap_jut); fi % lower serif
-math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7); endchar;
-
-cmchar "Uppercase tau";
-beginchar("T",13u#-width_adj#,cap_height#,0);
-italcorr cap_height#*slant-beak_jut#-.25u#;
-adjust_fit(0,0);
-h:=vround(h-2stem_corr);
-pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0);
-lft x1l=lft x2l=hround(.5w-.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-.65u); y4=good.y(y3l-beak)-eps;
-arm(3,4,e,beak_darkness,.7beak_jut); % right arm and beak
-pos5(hair,180); x5=w-x4; y5=y4;
-arm(3,5,f,beak_darkness,-.7beak_jut); % left arm and beak
-if serifs: dish_serif(1,2,a,1/3,.5cap_jut,b,1/3,.5cap_jut); % upper bracketing
- dish_serif(2,1,c,1/3,1.414cap_jut,d,1/3,1.414cap_jut); fi % lower serif
-math_fit(-.75cap_height#*slant,ic#-2.5u#); penlabels(1,2,3,4,5,6); endchar;
-
-cmchar "Uppercase chi";
-beginchar("Q",13u#,cap_height#,0);
-italcorr cap_height#*slant-.25u#;
-adjust_fit(cap_serif_fit#,cap_serif_fit#);
-numeric stem[],outer_jut,xjut,alpha[];
-stem1=cap_stem-2stem_corr; stem2=min(cap_hair,stem1);
-outer_jut=.75cap_jut; xjut= if serifs: (stem1-stem2)/4 else: 0 fi;
-x1l=l+letter_fit+.5u+outer_jut; x2r=r-letter_fit-u-outer_jut-xjut;
-x3l=l+letter_fit+.25u+outer_jut+xjut; x4r=r-letter_fit-.25u-outer_jut;
-y1=y2=h; y3=y4=0;
-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);
-if hefty: z0=whatever[z1,z4]=whatever[z2,z3];
- x12=x34=x0; y13=y24=y0;
- z12=whatever[z2l,z3l]; z13=whatever[z2l,z3l];
- z24=whatever[z2r,z3r]; z34=whatever[z2r,z3r];
- forsuffixes $=13,24,34: z$'=.1[z$,z0]; endfor
- fill diag_end(12,1r,.5,1,1l,13')--z13'--diag_end(13',3l,1,.5,3r,34')--z34'
- --diag_end(34',4l,.5,1,4r,24')--z24'
- --diag_end(24',2r,1,.5,2l,12)--z12--cycle; % diagonals
-else: fill diag_end(4r,1r,.5,1,1l,4l)
- --diag_end(1l,4l,.5,1,4r,1r)--cycle; % left diagonal
- fill diag_end(2l,3l,.5,1,3r,2r)
- --diag_end(3r,2r,.5,1,2l,3l)--cycle; fi % right diagonal
-if serifs: numeric inner_jut[]; pickup tiny.nib;
- prime_points_inside(1,4); prime_points_inside(2,3);
- prime_points_inside(3,2); prime_points_inside(4,1);
- if rt x1'r+cap_jut+.5u+1<=lft x2'l-cap_jut-xjut: inner_jut1=cap_jut;
- else: rt x1'r+inner_jut1+.5u+1=lft x2'l-inner_jut1-xjut; fi
- if rt x3'r+cap_jut+.5u+1<=lft x4'l-cap_jut-xjut: inner_jut2=cap_jut;
- else: rt x3'r+inner_jut2+.5u+1=lft x4'l-inner_jut2-xjut; fi
- dish_serif(1',4,a,1/3,outer_jut,b,2/3,inner_jut1); % upper left serif
- dish_serif(4',1,c,2/3,inner_jut2,d,1/3,outer_jut); % lower right serif
- dish_serif(2',3,e,2/3,inner_jut1+xjut,
- f,1/2,outer_jut+xjut)(dark); % upper right serif
- dish_serif(3',2,g,1/2,outer_jut+xjut,
- h,2/3,inner_jut2+xjut)(dark); fi % lower left serif
-math_fit(0,.5ic#); penlabels(0,1,2,3,4,12,13,24,34); endchar;
-
-cmchar "Uppercase zeta";
-beginchar("Z",11u#,cap_height#,0);
-italcorr cap_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric arm_thickness[],z_stem;
-if hefty: arm_thickness1=Vround(slab-vair_corr); arm_thickness2=slab;
- z_stem=.8[vair,cap_stem];
-else: arm_thickness1=slab; arm_thickness2=vround(slab+vair_corr);
- z_stem=.9[vair,cap_stem]; fi
-pickup tiny.nib; x3l=x4l=w-x1r=w-x2r; lft x3l=hround u;
-top y1=h; y2=min(y1,h-2/3arm_thickness1);
-bot y4=0; y3=max(y4,2/3arm_thickness2);
-numeric alpha; alpha=diag_ratio(1,z_stem-tiny,y2-y3,x2r-x3l);
-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 1.25u; y6=good.y(y5l-beak)-eps;
-arm(5,6,a,beak_darkness**.8,-.4beak_jut); % upper arm and beak
-pos7(arm_thickness2,-90); pos8(hair,0);
-bot y7r=0; x7=x4; rt x8r=hround(w-.9u); y8=good.y(y7l+1.2beak)+eps;
-arm(7,8,b,beak_darkness**.9,.6beak_jut); % lower arm and beak
-math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,7,8); endchar;
-
-cmchar "Uppercase gamma";
-beginchar("G",11u#-width_adj#,cap_height#,0);
-italcorr cap_height#*slant-beak_jut#-.25u#;
-adjust_fit(cap_serif_fit#,0);
-h:=vround(h-stem_corr);
-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); % arm and beak
-if serifs: dish_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
-math_fit(0,ic#-2.5u#); penlabels(1,2,3,4); endchar;
-
-cmchar "Uppercase delta";
-beginchar("D",15u#,cap_height#,0);
-adjust_fit(0,0);
-numeric left_stem,alpha;
-left_stem=cap_hair if hefty: -3stem_corr fi;
-x1l=w-x4r=.75u; y1=y4=0;
-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*cap_stem,0); penpos4(alpha*cap_stem,0);
-fill diag_end(2l,1l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)--cycle; % triangle
-z0=whatever[z1r,z2r]=whatever[z3l,z4l];
-y5=y6=cap_vstem; z5=whatever[z1r,z2r]; z6=whatever[z3l,z4l];
-if y0<h-cap_notch_cut: y0:=h-cap_notch_cut;
- unfill z0+.5right{down}...{z4-z3}z6--z5{z2-z1}
- ...{up}z0+.5left--cycle; % counter
-else: unfill z0--z5--z6--cycle; fi % counter
-penlabels(0,1,2,3,4,5,6); endchar;
-
-cmchar "Uppercase theta";
-beginchar("J",14u#,cap_height#,0);
-italcorr .7cap_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric light_curve; light_curve=hround(cap_curve-2stem_corr);
-penpos1(vair,90); penpos3(vround(vair+.5vair_corr),-90);
-penpos2(light_curve,180); penpos4(light_curve,0);
-if monospace: x2r=hround 1.5u;
- interim superness:=sqrt superness; % make |"O"|, not |"0"|
-else: x2r=hround u; fi
-x4r=w-x2r; x1=x3=.5w; y1r=h+o; y2=y4=.5h-vair_corr; y3r=-o;
-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
-pickup crisp.nib; pos5(cap_vstem,90); pos6(cap_vstem,90);
-lft x5=w-rt x6=hround(x2l+if cbleipzig:1.5fi u)+1; y5=y6=.5[y1l,y3l];
-filldraw stroke z5e--z6e; % bar
-if serifs: pos7(hair,0); pos8(hair,0); pos9(hair,0); pos10(hair,0);
- x7l=x8l=x5; x9r=x10r=x6;
- y7-y5r=y9-y6r=y5l-y8=y6l-y10=vround .05h;
- filldraw stroke z7e--z8e; % left serif
- filldraw stroke z9e--z10e; fi % right serif
-math_fit(-.3cap_height#*slant-.5u#,ic#-.5u#);
-penlabels(1,2,3,4,5,6,7,8,9,10); endchar;
-
-cmchar "Uppercase lambda";
-beginchar("L",12u#,cap_height#,0);
-adjust_fit(cap_serif_fit#,cap_serif_fit#);
-numeric left_stem,outer_jut,alpha;
-left_stem=cap_hair if hefty: -3stem_corr fi;
-outer_jut=.7cap_jut; x1l=w-x4r=l+letter_fit+outer_jut+.5u; y1=y4=0;
-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*cap_stem,0); penpos4(alpha*cap_stem,0);
-z0=whatever[z1r,z2r]=whatever[z3l,z4l];
-if y0<h-cap_notch_cut: y0:=h-cap_notch_cut;
- fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r)
- --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1}
- ...{up}z0+.5left--cycle; % left and right diagonals
-else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)
- --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals
-if serifs: numeric inner_jut; 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(1',2,a,1/2,outer_jut,b,.6,inner_jut)(dark); % left serif
- dish_serif(4',3,c,1/2,inner_jut,d,1/3,outer_jut); fi % right serif
-penlabels(0,1,2,3,4,5,6); endchar;
-
-cmchar "Uppercase xi";
-beginchar("X",12u#,cap_height#,0);
-italcorr cap_height#*slant-.35u#;
-adjust_fit(0,0);
-h:=vround(h-2stem_corr);
-numeric shaved_stem; shaved_stem=hround .9[vair,.85cap_stem];
-pickup crisp.nib; pos1(shaved_stem,90); pos2(hair,0);
-top y1r=h; x1=.5w; rt x2r=hround(w-.85u); y2=good.y(y1l-4/9beak)-eps;
-arm(1,2,a,.4beak_darkness,.3beak_jut); % upper right arm and beak
-pos3(hair,180); x3=w-x2; y3=y2;
-arm(1,3,b,.4beak_darkness,-.3beak_jut); % upper left arm and beak
-pos4(shaved_stem,-90); pos5(hair,0);
-bot y4r=0; x4=.5w; rt x5r=hround(w-.75u); y5=good.y(y4l+.5beak)+eps;
-arm(4,5,c,.4beak_darkness,.3beak_jut); % lower right arm and beak
-pos6(hair,180); x6=w-x5; y6=y5;
-arm(4,6,d,.4beak_darkness,-.3beak_jut); % lower left arm and beak
-pos7(shaved_stem,90); pos8(shaved_stem,90);
-lft x7=w-rt x8=hround if serifs: 2.5 else: 2 fi\\ u;
-top y7r=top y8r=vround(.52h+.5shaved_stem);
-filldraw stroke z7e--z8e; % middle bar
-if serifs: numeric xjut;
- if bot y2>top y7r+.75cap_jut: xjut=.5cap_jut;
- else: bot y2=top y7r+1.5xjut; fi
- pos11(hair,0); pos12(hair,0); y11=y12;
- pos13(hair,0); pos14(hair,0); y13=y14;
- lft x11l=lft x13l=w-rt x12r=w-rt x14r=hround 2.5u;
- top y11-bot y13=shaved_stem+2xjut; .5[y11,y13]=y7;
- filldraw stroke z11e--z13e; filldraw stroke z12e--z14e; fi % middle serifs
-math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,7,8,11,12,13,14); endchar;
-
-cmchar "Uppercase pi";
-beginchar("P",13u#+width_adj#,cap_height#,0);
-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;
-h:=vround(h-stem_corr);
-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; y5r=y6r=h;
-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,eps); % 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,eps,f,1/3,cap_jut); % upper left serif
- dish_serif(4,3,g,1/3,inner_jut,h,1/3,cap_jut); fi % lower left serif
-math_fit(0,.5ic#); penlabels(1,2,3,4,5,6); endchar;
-
-cmchar "Uppercase sigma";
-beginchar("S",13u#,cap_height#,0);
-italcorr cap_height#*slant-beak_jut#-.5u#;
-adjust_fit(0,0);
-numeric bot_arm_thickness;
-bot_arm_thickness=Vround .25[slab,cap_vstem];
-pickup tiny.nib; lft x1l=hround u; x1l=x2l=x4l;
-top y1=h; bot y2=h-slab; bot y4=0; x3l-x1l=4/11(w-2u); y3=.5h;
-numeric alpha[]; alpha1=((x3l-x1l)++(y2-y3))/(y2-y3);
-penpos1(alpha1*(cap_stem-tiny),0); penpos2(alpha1*(cap_stem-tiny),0);
-penpos3(alpha1*(cap_stem-tiny),0);
-alpha2=diag_ratio(1,cap_hair-tiny,y3-y4,x3r-x4l);
-penpos4(alpha2*(cap_hair-tiny),0);
-z0=whatever[z2l,z3l]=z4l+whatever*(z3r-z4r);
-filldraw z1l--z2l--z0--z4l--z4r--z3r--z2r--z1r--cycle; % diagonals
-pickup crisp.nib; pos5(slab,90); pos6(hair,0);
-top y5r=h; x5=x1; rt x6r=hround(w-u); y6=good.y(y5l-beak)-eps;
-arm(5,6,a,beak_darkness,beak_jut); % upper arm and beak
-pos7(bot_arm_thickness,-90); pos8(hair,0);
-bot y7r=0; z7l=whatever[z4,z3]; x7r:=x4; x8=x6; y8=good.y(y7l+beak)+eps;
-arm(7,8,b,beak_darkness,beak_jut); % lower arm and beak
-math_fit(0,.5ic#); penlabels(0,1,2,3,4,5,6,7,8); endchar;
-
-cmchar "Uppercase upsilon";
-beginchar("U",if cbleipzig or cbroman:12else:14fi u#,cap_height#,0);
-if cbleipzig or cbroman:
- italcorr cap_height#*slant+.45u#;
- adjust_fit(cap_serif_fit#,cap_serif_fit#);
- numeric left_stem,right_stem,outer_jut,dy,alpha;
- left_stem=cap_stem-stem_corr;
- right_stem=min(cap_hair if hefty:-2stem_corr fi,left_stem);
- outer_jut=.75cap_jut; x1l=w-x4r=l+letter_fit+outer_jut+.05u;
- x2l=x5l=hround(.5w-.5left_stem); x3r=x5r; y1=y4=h; y2=y3=y5=.4h;
- dy=y1-y2; alpha=((x2l-x1l)++dy)/dy;
- penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0);
- penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0);
- penpos5(left_stem,0); penpos6(left_stem,0); x5=x6; y6=0;
- z0=whatever[z1r,z2r]=whatever[z3l,z4l];
- if y0>y2+cap_notch_cut: y0:=y2+cap_notch_cut;
- fill z0+.5right{up}...{z4-z3}diag_end(3l,4l,1,1,4r,3r)--z5r
- --diag_end(5r,6r,1,1,6l,5l)--z5l--diag_end(2l,1l,1,1,1r,2r){z2-z1}
- ...{down}z0+.5left--cycle; % diagonals and stem
- else: fill z0--diag_end(0,4l,1,1,4r,3r)--z5r
- --diag_end(5r,6r,1,1,6l,5l)--z5l
- --diag_end(2l,1l,1,1,1r,0)--cycle; fi % diagonals and stem
- if serifs: numeric inner_jut; pickup tiny.nib;
- prime_points_inside(1,2); prime_points_inside(4,3); prime_points_inside(6,5);
- 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(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
- dish_serif(6',5,e,1/3,cap_jut,f,1/3,cap_jut); fi % lower serif
- math_fit(.5u#-cap_height#*slant,ic#-4u#);
-else:
- italcorr .8cap_height#*slant-.5u#;
- adjust_fit(0,0);
- pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0);
- lft x1l=lft x2l=hround(.5w-.5cap_stem); y1=.5h; bot y2=0;
- filldraw stroke z1e--z2e; % stem
- penpos3(.6cap_stem,0); penpos4(.75cap_curve,90); penpos5(cap_hair,180);
- z3l=lft z1l; x5r=hround u; y5=bot .8h; x4=.61803[x3l,x5l]; y4r=h+o;
- penpos5'(cap_hair,180); x5'=x5; y5'=h;
- fill z3r{up}...z4r{left}...{down}diag_end(5'r,5r,1,1,5l,5'l){up}
- ...{right}z4l...{down}z3l--cycle; % left arc
- penpos6(.6cap_stem,0); penpos7(.75cap_curve,-90); penpos8(cap_hair,-180);
- z6r=rt z1r; x8=w-x5; y8=y5; x7=w-x4; y7=y4;
- penpos8'(cap_hair,-180); x8'=x8; y8'=h;
- fill z6r{up}...z7r{right}...{down}diag_end(8'r,8r,1,1,8l,8'l){up}
- ...{left}z7l...{down}z6l--cycle; % right arc
- if serifs: dish_serif(2,1,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); fi % serif
- math_fit(-.8cap_height#*slant-.5u#,ic#-2.5u#);
-fi
-penlabels(1,2,3,4,5,6,7,8); endchar;
-
-
-cmchar "Uppercase Upsilon with diaeresis";
-beginchar(oct"337",if cbleipzig or cbroman:12else:14fi u#,cap_height#,0);
-if cbleipzig or cbroman:
- italcorr cap_height#*slant+.45u#;
- adjust_fit(cap_serif_fit#,cap_serif_fit#);
- numeric left_stem,right_stem,outer_jut,dy,alpha;
- left_stem=cap_stem-stem_corr;
- right_stem=min(cap_hair if hefty:-2stem_corr fi,left_stem);
- outer_jut=.75cap_jut; x1l=w-x4r=l+letter_fit+outer_jut+.05u;
- x2l=x5l=hround(.5w-.5left_stem); x3r=x5r; y1=y4=h; y2=y3=y5=.4h;
- dy=y1-y2; alpha=((x2l-x1l)++dy)/dy;
- penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0);
- penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0);
- penpos5(left_stem,0); penpos6(left_stem,0); x5=x6; y6=0;
- z0=whatever[z1r,z2r]=whatever[z3l,z4l];
- if y0>y2+cap_notch_cut: y0:=y2+cap_notch_cut;
- fill z0+.5right{up}...{z4-z3}diag_end(3l,4l,1,1,4r,3r)--z5r
- --diag_end(5r,6r,1,1,6l,5l)--z5l--diag_end(2l,1l,1,1,1r,2r){z2-z1}
- ...{down}z0+.5left--cycle; % diagonals and stem
- else: fill z0--diag_end(0,4l,1,1,4r,3r)--z5r
- --diag_end(5r,6r,1,1,6l,5l)--z5l
- --diag_end(2l,1l,1,1,1r,0)--cycle; fi % diagonals and stem
- if serifs: numeric inner_jut; pickup tiny.nib;
- prime_points_inside(1,2); prime_points_inside(4,3); prime_points_inside(6,5);
- 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(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
- dish_serif(6',5,e,1/3,cap_jut,f,1/3,cap_jut); fi % lower serif
- math_fit(.5u#-cap_height#*slant,ic#-4u#);
-else:
- italcorr .8cap_height#*slant-.5u#;
- adjust_fit(0,0);
- pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0);
- lft x1l=lft x2l=hround(.5w-.5cap_stem); y1=.5cap_height; bot y2=0;
- filldraw stroke z1e--z2e; % stem
- penpos3(.6cap_stem,0); penpos4(.75cap_curve,90); penpos5(cap_hair,180);
- z3l=lft z1l; x5r=hround u; y5=bot .8cap_height;
- x4=.61803[x3l,x5l]; y4r=cap_height+o;
- penpos5'(cap_hair,180); x5'=x5; y5'=cap_height;
- fill z3r{up}...z4r{left}...{down}diag_end(5'r,5r,1,1,5l,5'l){up}
- ...{right}z4l...{down}z3l--cycle; % left arc
- penpos6(.6cap_stem,0); penpos7(.75cap_curve,-90); penpos8(cap_hair,-180);
- z6r=rt z1r; x8=w-x5; y8=y5; x7=w-x4; y7=y4;
- penpos8'(cap_hair,-180); x8'=x8; y8'=cap_height;
- fill z6r{up}...z7r{right}...{down}diag_end(8'r,8r,1,1,8l,8'l){up}
- ...{left}z7l...{down}z6l--cycle; % right arc
- if serifs: dish_serif(2,1,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); fi % serif
- math_fit(-.8cap_height#*slant-.5u#,ic#-2.5u#);
-fi
-generate_diaeresis(.5w,dot_size,dot_size+cap_stem,h+separator+dot_size,cap_height+separator);
-picture savedpicture; savedpicture:=currentpicture;
-penlabels(1,2,3,4,5,6,7,8); endchar;
-
-cmchar "shifted uppercase Upsilon with diaeresis";% for kerning with A
-beginchar(oct"15",if cbleipzig or cbroman:12else:14fi u#,cap_height#,0);
-adjust_fit(0,-AUkern#);
-currentpicture:=savedpicture shifted (-AUkern,0);
-endchar;
-picture savedpicture;
-
-cmchar "Uppercase phi";
-beginchar("F",13u#,cap_height#,0);
-italcorr .5cap_height#*slant-.5u#;
-adjust_fit(0,0);
-numeric shaved_stem,light_curve;
-shaved_stem=cap_stem-hround 2stem_corr;
-light_curve=cap_curve-hround stem_corr;
-pickup tiny.nib; pos1(shaved_stem,0); pos2(shaved_stem,0);
-lft x1l=lft x2l=hround(.5w-.5cap_stem); top y1=h; bot y2=0;
-filldraw stroke z1e--z2e; % stem
-penpos3(vair,90); penpos5(vair,-90);
-penpos4(light_curve,180); penpos6(light_curve,0);
-x4r=hround u; x6r=w-x4r; x3=x5=.5w;
-y3r=vround(.85h if serifs:-slab fi); y4=y6=.5[y3,y5];
-y5r=vround(.15h if serifs:+slab fi);
-penstroke pulled_arc.e(3,4) & pulled_arc.e(4,5)
- & pulled_arc.e(5,6) & pulled_arc.e(6,3) & cycle; % bowl
-if serifs: dish_serif(1,2,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); % upper serif
- dish_serif(2,1,c,1/3,1.25cap_jut,d,1/3,1.25cap_jut); fi % lower serif
-math_fit(-.5cap_height#*slant-.5u#,ic#); penlabels(1,2,3,4,5,6); endchar;
-
-cmchar "Uppercase psi";
-beginchar("Y",14u#,cap_height#,0);
-italcorr .8cap_height#*slant-.5u#;
-adjust_fit(0,0);
-if cbroman:% This is CB romanstyle capital Psi
- numeric shaved_stem;
- shaved_stem=cap_stem-hround 2stem_corr;
- pickup tiny.nib; pos1(shaved_stem,0); pos2(shaved_stem,0);
- lft x1l=lft x2l=hround(.5w-.5cap_stem); top y1=h; bot y2=0;
- filldraw stroke z1e--z2e; % stem
- pos3(shaved_stem,-180); pos4(shaved_stem,-180);
- pos8(shaved_stem,0);z8=z3; pos9(shaved_stem,0);z9=z4;
- pos5(vair,-90); x5=x1; bot y5r=vround(.15h +slab);
- pos6(shaved_stem,0); pos7(shaved_stem,0);
- lft x3r=hround u+jut; x7=w-x3; lft x4r=lft x3r; x6=w-x4;
- y3=y7; y4=y6=.6h; y3=.84h -slab;
- interim superness:=more_super;
- filldraw z3r---z4r{down} & super_arc.r(4,5)
- & super_arc.r(5,6) & z6r{up}---z7r
- --z7l---z6l{down} & super_arc.l(6,5)
- & super_arc.l(5,4) & z4l{up}---z3l--cycle; % stroke
- dish_serif(1,2,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); % upper serif
- dish_serif(2,1,c,1/3,1.25cap_jut,d,1/3,1.25cap_jut); % lower serif
- dish_serif(8,9,e,1/3,jut,f,1/3,jut); % left arm serif
- dish_serif(7,6,g,1/3,jut,h,1/3,jut); % right arm serif
-else:%
- numeric shaved_stem;
- shaved_stem=cap_stem-hround 2stem_corr;
- pickup tiny.nib; pos1(shaved_stem,0); pos2(shaved_stem,0);
- lft x1l=lft x2l=hround(.5w-.5cap_stem); top y1=h; bot y2=0;
- filldraw stroke z1e--z2e; % stem
- pos3(shaved_stem,-180); pos4(shaved_stem,-180);
- pos5(vair,-90); x5=x1; bot y5r=vround(.15h if serifs:+slab fi);
- pos6(shaved_stem,0); pos7(shaved_stem,0);
- lft x3r=hround u; x7=w-x3; lft x4r=hround(3u-.5shaved_stem); x6=w-x4;
- pos3'(vair,90); pos7'(vair,90); z3'r=z3r; z7'r=z7r;
- y3=y7; y4=y6=.6h; y3=good.y(y3+.84h if serifs:-slab fi-y3');
- interim superness:=more_super;
- filldraw z3'l{right}...z4r{down} & super_arc.r(4,5)
- & super_arc.r(5,6) & z6r{up}...z7'l{right}
- --z7r---z7l...z6l{down} & super_arc.l(6,5)
- & super_arc.l(5,4) & z4l{up}...z3l---z3r--cycle; % stroke
- if serifs: dish_serif(1,2,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); % upper serif
- dish_serif(2,1,c,1/3,1.25cap_jut,d,1/3,1.25cap_jut);fi % lower serif
-
- math_fit(-.8cap_height#*slant-.5u#,.4cap_height#*slant-1.25u#);
-fi
-penlabels(1,2,3,4,5,6,7); endchar;
-
-
-
-def gen_letter = % Capital Omega
-pickup tiny.nib; pos1(vair,90); pos2(cap_curve,180);
-pos3(vair,180); pos4(cap_curve,0); pos5(vair,0);
-x1=.5w; top y1r=h+o; lft x2r=hround u; y2=y4=2/3h; x4=w-x2;
-rt x3l=hround(1/3(w+if cbleipzig:2\else:.5fi u)+.5hair); bot y3=bot y5=0; x5=w-x3;
-filldraw stroke z3e{up}...{up}z2e
- & pulled_super_arc.e(2,1)(.5superpull)
- & pulled_super_arc.e(1,4)(.5superpull)
- & z4e{down}...{down}z5e; % bowl
-numeric arm_thickness; path p; p=z3{up}...{up}z2;
-arm_thickness=Vround(if hefty:slab+2stem_corr else:.75[slab,cap_vstem] fi);
-pickup crisp.nib; pos6(arm_thickness,-90); pos7(fudged.hair,-180);
-bot y6r=0; x6=x3; lft x7r=hround .8u; y7=good.y(y6l+.5beak)+eps;
-(x,y)=p intersectionpoint((0,y6l)--(w,y6l)); x6l:=x;
-arm(6,7,a,.5beak_darkness,-1.2beak_jut); % left arm and beak
-pos8(arm_thickness,-90); pos9(fudged.hair,0);
-y8=y6; y9=y7; x8+x6=x9+x7=w; x8l:=w-x6l;
-arm(8,9,b,.5beak_darkness,1.2beak_jut); % right arm and beak
- numeric pos_stem; %Iota reference
- pos_stem:=rt x9r +.5(stem+tiny) + 1.4u;
-enddef;
-
-
-cmchar "Uppercase omega";
-beginchar("W",13u#,cap_height#,0);
-italcorr .75cap_height#*slant-.5u#;
-adjust_fit(0,0); gen_letter;
-math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,7,8,9); endchar;
-
-cmchar "Uppercase omega with iota adscript";
-beginchar(oct"013",13u#,cap_height#,0);
-italcorr .75cap_height#*slant-.5u#;
-adjust_fit(0,stem# + .5tiny# + .7jut# + 1.4u# if monospace:+1.3tiny# fi);
-gen_letter; Iota_sub(pos_stem);
-penlabels(1,2,3,4,5,6,7,8,9); endchar;
-
-
-
-cmchar "Uppercase digamma";
-beginchar(oct"303",11.5u#-width_adj#,cap_height#,0);
-italcorr cap_height#*slant-beak_jut#-.25u#;
-adjust_fit(cap_serif_fit#,0);
-h:=vround(h-stem_corr);
-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
-math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9); endchar;
-
-
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glic.mf b/Master/texmf-dist/fonts/source/public/cb/glic.mf
deleted file mode 100644
index 6228b6ea07c..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glic.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-%% file glic v.2.0
-%
-% creates the invisible slide font from glmc by defining a new boolean
-%
-boolean invisibile; invisibile:=true;
-input glmc;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glic1000.mf b/Master/texmf-dist/fonts/source/public/cb/glic1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glic1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glii.mf b/Master/texmf-dist/fonts/source/public/cb/glii.mf
deleted file mode 100644
index f8da44dfb14..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glii.mf
+++ /dev/null
@@ -1,8 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-%% file glii v.2.0
-%
-% creates the invisible slide font from glmi by defining a new boolean
-%
-boolean invisibile; invisibile:=true;
-input glmi;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glii1000.mf b/Master/texmf-dist/fonts/source/public/cb/glii1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glii1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glin.mf b/Master/texmf-dist/fonts/source/public/cb/glin.mf
deleted file mode 100644
index f8620141f08..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glin.mf
+++ /dev/null
@@ -1,8 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-%% file glin v.2.0
-%
-% creates the invisible slide font from glmn by defining a new boolean
-%
-boolean invisibile; invisibile:=true;
-input glmn;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glin1000.mf b/Master/texmf-dist/fonts/source/public/cb/glin1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glin1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glio.mf b/Master/texmf-dist/fonts/source/public/cb/glio.mf
deleted file mode 100644
index d50cd44f170..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glio.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-%% file glio v.2.0
-%
-% creates the invisible slide font from glmo by defining a new boolean
-%
-boolean invisibile; invisibile:=true;
-input glmo;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glio1000.mf b/Master/texmf-dist/fonts/source/public/cb/glio1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glio1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gliu.mf b/Master/texmf-dist/fonts/source/public/cb/gliu.mf
deleted file mode 100644
index de584d518f9..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gliu.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-%% file glii v.2.0
-%
-% creates the invisible slide font from glmu by defining a new boolean
-%
-boolean invisibile; invisibile:=true;
-input glmu;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gliu1000.mf b/Master/texmf-dist/fonts/source/public/cb/gliu1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gliu1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gljc.mf b/Master/texmf-dist/fonts/source/public/cb/gljc.mf
deleted file mode 100644
index 5055564018a..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gljc.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-%% file gljc v.2.0
-%
-% creates the invisible slide font from gltc by defining a new boolean
-%
-boolean invisibile; invisibile:=true;
-input gltc;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gljc1000.mf b/Master/texmf-dist/fonts/source/public/cb/gljc1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gljc1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gljn.mf b/Master/texmf-dist/fonts/source/public/cb/gljn.mf
deleted file mode 100644
index f40abaad2ea..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gljn.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-%% file gljn v.2.0
-%
-% creates the invisible slide font from gltn by defining a new boolean
-%
-boolean invisibile; invisibile:=true;
-input gltn;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gljn1000.mf b/Master/texmf-dist/fonts/source/public/cb/gljn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gljn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gljo.mf b/Master/texmf-dist/fonts/source/public/cb/gljo.mf
deleted file mode 100644
index fb0bac0c49e..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gljo.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-%% file gljo v.2.0
-%
-% creates the invisible slide font from glto by defining a new boolean
-%
-boolean invisibile; invisibile:=true;
-input glto;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gljo1000.mf b/Master/texmf-dist/fonts/source/public/cb/gljo1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gljo1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glmc.mf b/Master/texmf-dist/fonts/source/public/cb/glmc.mf
deleted file mode 100644
index 3817f5940db..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glmc.mf
+++ /dev/null
@@ -1,85 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file glmc v.1.0a 1999/11/05
-% Content: 256 glyph greek upright caps and small caps font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GLMC";
-small_caps:=true; sclc:=1;
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 20, 25, 34.55, 49.78, 71.65, 250);
-gendef [1/36pt#]( width_adj# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-gendef [1/36pt#]( serif_fit# )( [-10],[-12.5], [-17.28], [-24.89], [-35.83], [-125]);
-gendef [1/36pt#]( cap_serif_fit# )( [-14],[-17.5], [-24.19], [-34.84], [-50.16], [-175]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 220, 275, 380, 548, 788, 2750);
-gendef [1/36pt#]( asc_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( cap_height# )( 197, 246, 340, 490, 706, 2463);
-gendef [1/36pt#]( fig_height# )( 190, 238, 328, 473, 681, 2375);
-gendef [1/36pt#]( x_height# )( 150, 188, 259, 373, 537, 1875);
-gendef [1/36pt#]( math_axis# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( bar_height# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 48, 60, 83, 120, 171, 600);
-gendef [1/36pt#](acc_ht# )( 230, 275, 375, 530, 760, 2750);
-gendef [1/36pt#](circ_ht# )( 230, 275, 375, 530, 760, 2750);
-gendef [1/36pt#](Circ_ht# )( 230, 275, 375, 530, 760, 2750);
-gendef [1/36pt#](iota_dp# )( 58, 72, 100, 144, 208, 725);
-gendef [1/36pt#]( crisp# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( tiny# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( fine# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( thin_join# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( hair# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( stem# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( curve# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( ess# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( flare# )( 21, 26.3, 36.3, 52.3, 75.2, 262.5);
-gendef [1/36pt#]( dot_size# )( 28, 35, 48.4, 69.7, 100.3, 350);
-gendef [1/36pt#]( cap_hair# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( cap_stem# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [1/36pt#]( cap_curve# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [1/36pt#]( cap_ess# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [1/36pt#]( rule_thickness#)( 20, 25, 34.55, 49.78, 71.65, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( notch_cut# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( bar# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( slab# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_bar# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_band# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_notch_cut# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( vair_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( apex_corr# )( 4, 5, 6.91, 9.96, 14.33, 50);
-gendef [1/36pt#]( o# )( 6, 7.5, 10.36, 14.99, 21.5, 75);
-gendef [1/36pt#]( apex_o# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .95, .95, .96, .98, .98, .98);
-gendef ( math_spread )( 0, 0, 0, 0, 0, 0);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=1/10;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=true;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=true;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glmc1000.mf b/Master/texmf-dist/fonts/source/public/cb/glmc1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glmc1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glmi.mf b/Master/texmf-dist/fonts/source/public/cb/glmi.mf
deleted file mode 100644
index 18b7465007f..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glmi.mf
+++ /dev/null
@@ -1,86 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-% file glmi v.1.0a 1999/11/05
-% Content: 256 glyph greek cursive medium font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GMLI";
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 20, 25, 34.55, 49.78, 71.65, 250);
-gendef [1/36pt#]( width_adj# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-gendef [1/36pt#]( serif_fit# )( [-10],[-12.5], [-17.28], [-24.89], [-35.83], [-125]);
-gendef [1/36pt#]( cap_serif_fit# )( [-14],[-17.5], [-24.19], [-34.84], [-50.16], [-175]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 220, 275, 380, 548, 788, 2750);
-gendef [1/36pt#]( asc_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( cap_height# )( 197, 246, 340, 490, 706, 2463);
-gendef [1/36pt#]( fig_height# )( 190, 238, 328, 473, 681, 2375);
-gendef [1/36pt#]( x_height# )( 150, 188, 259, 373, 537, 1875);
-gendef [1/36pt#]( math_axis# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( bar_height# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 48, 60, 83, 120, 171, 600);
-gendef [1/36pt#](acc_ht# )( 210, 250, 346, 498, 717, 2750);
-gendef [1/36pt#](circ_ht# )( 210, 250, 346, 498, 717, 2750);
-gendef [1/36pt#](Circ_ht# )( 210, 250, 346, 498, 717, 2750);
-gendef [1/36pt#](iota_dp# )( 58, 72, 100, 144, 208, 725);
-gendef [1/36pt#]( crisp# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( tiny# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( fine# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( thin_join# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( hair# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( stem# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( curve# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( ess# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( flare# )( 21, 26.3, 36.3, 52.3, 75.2, 262.5);
-gendef [1/36pt#]( dot_size# )( 28, 35, 48.4, 69.7, 100.3, 350);
-gendef [1/36pt#]( cap_hair# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( cap_stem# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [1/36pt#]( cap_curve# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [1/36pt#]( cap_ess# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [pt#]( rule_thickness#)( .55555, .69444, .95972, 1.38264, 1.99028, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( notch_cut# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( bar# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( slab# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_bar# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_band# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_notch_cut# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( vair_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( apex_corr# )( 4, 5, 6.91, 9.96, 14.33, 50);
-gendef [1/36pt#]( o# )( 6, 7.5, 10.36, 14.99, 21.5, 75);
-gendef [1/36pt#]( apex_o# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( .95, .95, .96, .98, .98, .98);
-gendef ( math_spread )( 0, 0, 0, 0, 0, 0);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=1/10;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=true;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=true;
-straight:=false;
-monowidth:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glmi1000.mf b/Master/texmf-dist/fonts/source/public/cb/glmi1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glmi1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glmn.mf b/Master/texmf-dist/fonts/source/public/cb/glmn.mf
deleted file mode 100644
index e5ba77a184b..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glmn.mf
+++ /dev/null
@@ -1,83 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file glmn v.1.0a 1999/11/05
-% Content: 256 glyph greek upright normal font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GLMN";
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 20, 25, 34.55, 49.78, 71.65, 250);
-gendef [1/36pt#]( width_adj# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-gendef [1/36pt#]( serif_fit# )( [-10],[-12.5], [-17.28], [-24.89], [-35.83], [-125]);
-gendef [1/36pt#]( cap_serif_fit# )( [-14],[-17.5], [-24.19], [-34.84], [-50.16], [-175]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 220, 275, 380, 548, 788, 2750);
-gendef [1/36pt#]( asc_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( cap_height# )( 197, 246, 340, 490, 706, 2463);
-gendef [1/36pt#]( fig_height# )( 190, 238, 328, 473, 681, 2375);
-gendef [1/36pt#]( x_height# )( 150, 188, 259, 373, 537, 1875);
-gendef [1/36pt#]( math_axis# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( bar_height# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 48, 60, 83, 120, 171, 600);
-gendef [1/36pt#](acc_ht# )( 210, 250, 346, 498, 717, 2750);
-gendef [1/36pt#](circ_ht# )( 210, 250, 346, 498, 717, 2750);
-gendef [1/36pt#](Circ_ht# )( 230, 275, 375, 530, 760, 2750);
-gendef [1/36pt#](iota_dp# )( 58, 72, 100, 144, 208, 725);
-gendef [1/36pt#]( crisp# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( tiny# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( fine# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( thin_join# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( hair# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( stem# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( curve# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( ess# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( flare# )( 21, 26.3, 36.3, 52.3, 75.2, 262.5);
-gendef [1/36pt#]( dot_size# )( 28, 35, 48.4, 69.7, 100.3, 350);
-gendef [1/36pt#]( cap_hair# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( cap_stem# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [1/36pt#]( cap_curve# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [1/36pt#]( cap_ess# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [pt#]( rule_thickness#)( .55555, .69444, .95972, 1.38264, 1.99028, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( notch_cut# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( bar# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( slab# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_bar# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_band# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_notch_cut# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( vair_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( apex_corr# )( 4, 5, 6.91, 9.96, 14.33, 50);
-gendef [1/36pt#]( o# )( 6, 7.5, 10.36, 14.99, 21.5, 75);
-gendef [1/36pt#]( apex_o# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .95, .95, .96, .98, .98, .98);
-gendef ( math_spread )( 0, 0, 0, 0, 0, 0);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=1/10;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=true;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=true;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glmn1000.mf b/Master/texmf-dist/fonts/source/public/cb/glmn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glmn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glmo.mf b/Master/texmf-dist/fonts/source/public/cb/glmo.mf
deleted file mode 100644
index ea1a6dfaf62..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glmo.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file glmo v.1.0a 1999/11/05
-% Content: 256 glyph greek oblique medium font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GMLO";
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 20, 25, 34.55, 49.78, 71.65, 250);
-gendef [1/36pt#]( width_adj# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-gendef [1/36pt#]( serif_fit# )( [-10],[-12.5], [-17.28], [-24.89], [-35.83], [-125]);
-gendef [1/36pt#]( cap_serif_fit# )( [-14],[-17.5], [-24.19], [-34.84], [-50.16], [-175]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 220, 275, 380, 548, 788, 2750);
-gendef [1/36pt#]( asc_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( cap_height# )( 197, 246, 340, 490, 706, 2463);
-gendef [1/36pt#]( fig_height# )( 190, 238, 328, 473, 681, 2375);
-gendef [1/36pt#]( x_height# )( 150, 188, 259, 373, 537, 1875);
-gendef [1/36pt#]( math_axis# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( bar_height# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 48, 60, 83, 120, 171, 600);
-gendef [1/36pt#](acc_ht# )( 210, 250, 346, 498, 717, 2750);
-gendef [1/36pt#](circ_ht# )( 210, 250, 346, 498, 717, 2750);
-gendef [1/36pt#](Circ_ht# )( 210, 250, 346, 498, 717, 2750);
-gendef [1/36pt#](iota_dp# )( 58, 72, 100, 144, 208, 725);
-gendef [1/36pt#]( crisp# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( tiny# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( fine# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( thin_join# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( hair# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( stem# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( curve# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( ess# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( flare# )( 21, 26.3, 36.3, 52.3, 75.2, 262.5);
-gendef [1/36pt#]( dot_size# )( 28, 35, 48.4, 69.7, 100.3, 350);
-gendef [1/36pt#]( cap_hair# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( cap_stem# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [1/36pt#]( cap_curve# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [1/36pt#]( cap_ess# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [pt#]( rule_thickness#)( .55555, .69444, .95972, 1.38264, 1.99028, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( notch_cut# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( bar# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( slab# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_bar# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_band# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_notch_cut# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( vair_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( apex_corr# )( 4, 5, 6.91, 9.96, 14.33, 50);
-gendef [1/36pt#]( o# )( 6, 7.5, 10.36, 14.99, 21.5, 75);
-gendef [1/36pt#]( apex_o# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( .95, .95, .96, .98, .98, .98);
-gendef ( math_spread )( 0, 0, 0, 0, 0, 0);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=1/10;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=true;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=true;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glmo1000.mf b/Master/texmf-dist/fonts/source/public/cb/glmo1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glmo1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glmu.mf b/Master/texmf-dist/fonts/source/public/cb/glmu.mf
deleted file mode 100644
index a6dd572d887..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glmu.mf
+++ /dev/null
@@ -1,86 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-% file glmu v.1.0a 1999/11/05
-% 256 glyph greek upright cursive medium font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GMLU";
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 20, 25, 34.55, 49.78, 71.65, 250);
-gendef [1/36pt#]( width_adj# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-gendef [1/36pt#]( serif_fit# )( [-10],[-12.5], [-17.28], [-24.89], [-35.83], [-125]);
-gendef [1/36pt#]( cap_serif_fit# )( [-14],[-17.5], [-24.19], [-34.84], [-50.16], [-175]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 220, 275, 380, 548, 788, 2750);
-gendef [1/36pt#]( asc_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( cap_height# )( 197, 246, 340, 490, 706, 2463);
-gendef [1/36pt#]( fig_height# )( 190, 238, 328, 473, 681, 2375);
-gendef [1/36pt#]( x_height# )( 150, 188, 259, 373, 537, 1875);
-gendef [1/36pt#]( math_axis# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( bar_height# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 48, 60, 83, 120, 171, 600);
-gendef [1/36pt#](acc_ht# )( 210, 250, 346, 498, 717, 2750);
-gendef [1/36pt#](circ_ht# )( 210, 250, 346, 498, 717, 2750);
-gendef [1/36pt#](Circ_ht# )( 210, 250, 346, 498, 717, 2750);
-gendef [1/36pt#](iota_dp# )( 58, 72, 100, 144, 208, 725);
-gendef [1/36pt#]( crisp# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( tiny# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( fine# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( thin_join# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( hair# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( stem# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( curve# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( ess# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( flare# )( 21, 26.3, 36.3, 52.3, 75.2, 262.5);
-gendef [1/36pt#]( dot_size# )( 28, 35, 48.4, 69.7, 100.3, 350);
-gendef [1/36pt#]( cap_hair# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( cap_stem# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [1/36pt#]( cap_curve# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [1/36pt#]( cap_ess# )( 27, 33.8, 46.6, 67.2, 96.7, 337.5);
-gendef [pt#]( rule_thickness#)( .55555, .69444, .95972, 1.38264, 1.99028, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( notch_cut# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( bar# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( slab# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_bar# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_band# )( 19, 23.8, 32.8, 47.3, 68.1, 237.5);
-gendef [1/36pt#]( cap_notch_cut# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( vair_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( apex_corr# )( 4, 5, 6.91, 9.96, 14.33, 50);
-gendef [1/36pt#]( o# )( 6, 7.5, 10.36, 14.99, 21.5, 75);
-gendef [1/36pt#]( apex_o# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .95, .95, .96, .98, .98, .98);
-gendef ( math_spread )( 0, 0, 0, 0, 0, 0);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=1/10;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=true;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=true;
-straight:=false;
-monowidth:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glmu1000.mf b/Master/texmf-dist/fonts/source/public/cb/glmu1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glmu1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gltc.mf b/Master/texmf-dist/fonts/source/public/cb/gltc.mf
deleted file mode 100644
index e8b93691848..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gltc.mf
+++ /dev/null
@@ -1,86 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file gltc v.1.0a 1999/11/05
-% 256 glyph greek typewriter type caps and small caps font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GLTC";
-small_caps:=true; sclc:=1.19;
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 17, 21, 29, 42, 60, 210);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( asc_height# )( 180, 230, 318, 456, 659, 2300);
-gendef [1/36pt#]( cap_height# )( 180, 230, 318, 456, 659, 2300);
-gendef [1/36pt#]( fig_height# )( 180, 230, 318, 456, 669, 2300);
-gendef [1/36pt#]( x_height# )( 124, 155, 214, 307, 444, 1550);
-gendef [1/36pt#]( math_axis# )( 80, 110, 152, 219, 315, 1100);
-gendef [1/36pt#]( bar_height# )( 63, 79, 109, 157, 226, 790);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 64, 80, 111, 159, 229, 800);
-gendef [1/36pt#](acc_ht# )( 230, 270, 370, 530, 659, 2700);
-gendef [1/36pt#](circ_ht# )( 230, 270, 370, 530, 659, 2700);
-gendef [1/36pt#](Circ_ht# )( 230, 270, 370, 530, 659, 2700);
-gendef [1/36pt#](iota_dp# )( 57, 64, 88, 127, 183, 640);
-gendef [1/36pt#]( crisp# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( tiny# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( fine# )( 18, 21, 29.0, 42, 60, 210);
-gendef [1/36pt#]( thin_join# )( 18, 21, 29.0, 42, 60, 210);
-gendef [1/36pt#]( hair# )( 22, 24, 33.2, 48, 69, 240);
-gendef [1/36pt#]( stem# )( 22, 24, 33.2, 48, 69, 240);
-gendef [1/36pt#]( curve# )( 22, 24, 33.2, 48, 69, 240);
-gendef [1/36pt#]( ess# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( flare# )( 22, 24, 33.2, 48, 69, 240);
-gendef [1/36pt#]( dot_size# )( 31, 36, 49.8, 72, 103, 360);
-gendef [1/36pt#]( cap_hair# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( cap_stem# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( cap_curve# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( cap_ess# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( rule_thickness#)( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 27, 34, 47, 68, 98, 340);
-gendef [1/36pt#]( cap_jut# )( 27, 34, 47, 68, 98, 340);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 27, 34, 47, 68, 98, 340);
-gendef [1/36pt#]( vair# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( notch_cut# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( bar# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( slab# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( cap_bar# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( cap_band# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( cap_notch_cut# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( apex_corr# )( 8, 10, 14, 20, 29, 100);
-gendef [1/36pt#]( o# )( 3, 4, 6, 8, 12, 40);
-gendef [1/36pt#]( apex_o# )( 3, 3, 4, 6, 9, 30);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .81, .81, .81, .81, .81, .81);
-gendef ( math_spread )( [-1], [-1], [-1], [-1], [-1], [-1]);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=0;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=true;
-monospace:=true;
-variant_g:=true;
-low_asterisk:=true;
-math_fitting:=false;
-slitex:=true;
-straight:=true;
-monowidth:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gltc1000.mf b/Master/texmf-dist/fonts/source/public/cb/gltc1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gltc1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gltn.mf b/Master/texmf-dist/fonts/source/public/cb/gltn.mf
deleted file mode 100644
index 120cbca2f25..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gltn.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file gltn v.1.0a 1999/11/05
-% 256 glyph greek typewriter type normal font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GLTN";
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 17, 21, 29, 42, 60, 210);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( asc_height# )( 180, 230, 318, 456, 659, 2300);
-gendef [1/36pt#]( cap_height# )( 180, 230, 318, 456, 659, 2300);
-gendef [1/36pt#]( fig_height# )( 180, 230, 318, 456, 669, 2300);
-gendef [1/36pt#]( x_height# )( 124, 155, 214, 307, 444, 1550);
-gendef [1/36pt#]( math_axis# )( 80, 110, 152, 219, 315, 1100);
-gendef [1/36pt#]( bar_height# )( 63, 79, 109, 157, 226, 790);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 64, 80, 111, 159, 229, 800);
-gendef [1/36pt#](acc_ht# )( 180, 230, 318, 456, 659, 2700);
-gendef [1/36pt#](circ_ht# )( 180, 230, 318, 456, 659, 2700);
-gendef [1/36pt#](Circ_ht# )( 230, 270, 370, 530, 770, 2700);
-gendef [1/36pt#](iota_dp# )( 57, 64, 88, 127, 183, 640);
-gendef [1/36pt#]( crisp# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( tiny# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( fine# )( 18, 21, 29.0, 42, 60, 210);
-gendef [1/36pt#]( thin_join# )( 18, 21, 29.0, 42, 60, 210);
-gendef [1/36pt#]( hair# )( 22, 24, 33.2, 48, 69, 240);
-gendef [1/36pt#]( stem# )( 22, 24, 33.2, 48, 69, 240);
-gendef [1/36pt#]( curve# )( 22, 24, 33.2, 48, 69, 240);
-gendef [1/36pt#]( ess# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( flare# )( 22, 24, 33.2, 48, 69, 240);
-gendef [1/36pt#]( dot_size# )( 31, 36, 49.8, 72, 103, 360);
-gendef [1/36pt#]( cap_hair# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( cap_stem# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( cap_curve# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( cap_ess# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( rule_thickness#)( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 27, 34, 47, 68, 98, 340);
-gendef [1/36pt#]( cap_jut# )( 27, 34, 47, 68, 98, 340);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 27, 34, 47, 68, 98, 340);
-gendef [1/36pt#]( vair# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( notch_cut# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( bar# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( slab# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( cap_bar# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( cap_band# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( cap_notch_cut# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( apex_corr# )( 8, 10, 14, 20, 29, 100);
-gendef [1/36pt#]( o# )( 3, 4, 6, 8, 12, 40);
-gendef [1/36pt#]( apex_o# )( 3, 3, 4, 6, 9, 30);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .81, .81, .81, .81, .81, .81);
-gendef ( math_spread )( [-1], [-1], [-1], [-1], [-1], [-1]);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=0;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=true;
-monospace:=true;
-variant_g:=true;
-low_asterisk:=true;
-math_fitting:=false;
-slitex:=true;
-straight:=true;
-monowidth:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gltn1000.mf b/Master/texmf-dist/fonts/source/public/cb/gltn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gltn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glto.mf b/Master/texmf-dist/fonts/source/public/cb/glto.mf
deleted file mode 100644
index e0abcfd0757..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glto.mf
+++ /dev/null
@@ -1,85 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file glto v.1.0a 1999/11/05
-% 256 glyph greek typewriter type oblique font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GLTO";
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 17, 21, 29, 42, 60, 210);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( asc_height# )( 180, 230, 318, 456, 659, 2300);
-gendef [1/36pt#]( cap_height# )( 180, 230, 318, 456, 659, 2300);
-gendef [1/36pt#]( fig_height# )( 180, 230, 318, 456, 669, 2300);
-gendef [1/36pt#]( x_height# )( 124, 155, 214, 307, 444, 1550);
-gendef [1/36pt#]( math_axis# )( 80, 110, 152, 219, 315, 1100);
-gendef [1/36pt#]( bar_height# )( 63, 79, 109, 157, 226, 790);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 64, 80, 111, 159, 229, 800);
-gendef [1/36pt#](acc_ht# )( 180, 230, 318, 456, 659, 2700);
-gendef [1/36pt#](circ_ht# )( 180, 230, 318, 456, 659, 2700);
-gendef [1/36pt#](Circ_ht# )( 210, 250, 346, 498, 717, 2700);
-gendef [1/36pt#](iota_dp# )( 57, 64, 88, 127, 183, 640);
-gendef [1/36pt#]( crisp# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( tiny# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( fine# )( 18, 21, 29.0, 42, 60, 210);
-gendef [1/36pt#]( thin_join# )( 18, 21, 29.0, 42, 60, 210);
-gendef [1/36pt#]( hair# )( 22, 24, 33.2, 48, 69, 240);
-gendef [1/36pt#]( stem# )( 22, 24, 33.2, 48, 69, 240);
-gendef [1/36pt#]( curve# )( 22, 24, 33.2, 48, 69, 240);
-gendef [1/36pt#]( ess# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( flare# )( 22, 24, 33.2, 48, 69, 240);
-gendef [1/36pt#]( dot_size# )( 31, 36, 49.8, 72, 103, 360);
-gendef [1/36pt#]( cap_hair# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( cap_stem# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( cap_curve# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( cap_ess# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( rule_thickness#)( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 27, 34, 47, 68, 98, 340);
-gendef [1/36pt#]( cap_jut# )( 27, 34, 47, 68, 98, 340);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 27, 34, 47, 68, 98, 340);
-gendef [1/36pt#]( vair# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( notch_cut# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( bar# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( slab# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( cap_bar# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( cap_band# )( 19, 22, 30.4, 44, 63, 220);
-gendef [1/36pt#]( cap_notch_cut# )( 22, 25, 34.6, 50, 72, 250);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( apex_corr# )( 8, 10, 14, 20, 29, 100);
-gendef [1/36pt#]( o# )( 3, 4, 6, 8, 12, 40);
-gendef [1/36pt#]( apex_o# )( 3, 3, 4, 6, 9, 30);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( .81, .81, .81, .81, .81, .81);
-gendef ( math_spread )( [-1], [-1], [-1], [-1], [-1], [-1]);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=0;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=true;
-monospace:=true;
-variant_g:=true;
-low_asterisk:=true;
-math_fitting:=false;
-slitex:=true;
-straight:=true;
-monowidth:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glto1000.mf b/Master/texmf-dist/fonts/source/public/cb/glto1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glto1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glwc.mf b/Master/texmf-dist/fonts/source/public/cb/glwc.mf
deleted file mode 100644
index 4c31421fa68..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glwc.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-% Copyright (C) 1997, 2000 Claudio Beccari
-%% file glwc v.1.1 2000/02/12
-%
-% creates the invisible slide font glxc by redefining extra_endchar
-%
-boolean invisibile; invisibile:=true;
-input glxc;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glwc1000.mf b/Master/texmf-dist/fonts/source/public/cb/glwc1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glwc1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glwi.mf b/Master/texmf-dist/fonts/source/public/cb/glwi.mf
deleted file mode 100644
index 2eaff853c2f..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glwi.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1998, 2000 Claudio Beccari
-%% file glwi v.1.1 2000/02/12
-%
-% creates the invisible slide font glxi by redefining extra_endchar
-%
-boolean invisibile; invisibile:=true;
-input glxi;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glwi1000.mf b/Master/texmf-dist/fonts/source/public/cb/glwi1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glwi1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glwn.mf b/Master/texmf-dist/fonts/source/public/cb/glwn.mf
deleted file mode 100644
index 410e4504eb2..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glwn.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1997, 2000 Claudio Beccari
-%% file glwn v.1.1 2000/02/12
-%
-% creates the invisible slide font glxn by redefining extra_endchar
-%
-boolean invisibile; invisibile:=true;
-input glxn;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glwn1000.mf b/Master/texmf-dist/fonts/source/public/cb/glwn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glwn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glwo.mf b/Master/texmf-dist/fonts/source/public/cb/glwo.mf
deleted file mode 100644
index 6cb06b3dd1e..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glwo.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1997, 2000 Claudio Beccari
-%% file glwo v.1.1 2000/02/12
-%
-% creates the invisible slide font glxo by redefining extra_endchar
-%
-boolean invisibile; invisibile:=true;
-input glxo;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glwo1000.mf b/Master/texmf-dist/fonts/source/public/cb/glwo1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glwo1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glwu.mf b/Master/texmf-dist/fonts/source/public/cb/glwu.mf
deleted file mode 100644
index 1dfd0e8597f..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glwu.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-% Copyright (C) 1998, 2000 Claudio Beccari
-%% file glwi v.1.1 2000/02/12
-%
-% creates the invisible slide font glxu by redefining extra_endchar
-%
-boolean invisibile; invisibile:=true;
-input glxu;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glwu1000.mf b/Master/texmf-dist/fonts/source/public/cb/glwu1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glwu1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glxc.mf b/Master/texmf-dist/fonts/source/public/cb/glxc.mf
deleted file mode 100644
index d29622e940a..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glxc.mf
+++ /dev/null
@@ -1,86 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file glxc v.1.0a 1999/11/05
-% Content: 256 glyph greek upright bold caps and small caps font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GLXC";
-small_caps:=true; sclc:=1;
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 22, 27, 38, 55, 78.82, 275);
-gendef [1/36pt#]( width_adj# )( 3, 3.75, 5.18, 7.47, 10.75, 37.5);
-gendef [1/36pt#]( serif_fit# )( [-12], [-15], [-20.73], [-29.87], [-43], [-150]);
-gendef [1/36pt#]( cap_serif_fit# )( [-15],[-18.8], [-25.91], [-37.33], [-54.74],[-187.5]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 220, 275, 380, 548, 788, 2750);
-gendef [1/36pt#]( asc_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( cap_height# )( 197, 246, 340, 490, 706, 2462.5);
-gendef [1/36pt#]( fig_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( x_height# )( 155, 194, 268, 386, 555, 1937.5);
-gendef [1/36pt#]( math_axis# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( bar_height# )( 85, 106, 147, 216, 305, 1062.5);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 48, 60, 83, 120, 171, 600);
-gendef [1/36pt#](acc_ht# )( 230, 270, 370, 530, 770, 2500);
-gendef [1/36pt#](circ_ht# )( 230, 270, 370, 530, 770, 2500);
-gendef [1/36pt#](Circ_ht# )( 230, 270, 370, 530, 770, 2750);
-gendef [1/36pt#](iota_dp# )( 58, 72, 100, 144, 208, 725);
-gendef [1/36pt#]( crisp# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( tiny# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( fine# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( thin_join# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( hair# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( stem# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( curve# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( ess# )( 40, 50.0, 70.0, 100.0, 148.0, 500);
-gendef [1/36pt#]( flare# )( 36, 45.0, 62.2, 89.6, 130.0, 450);
-gendef [1/36pt#]( dot_size# )( 41, 51.3, 70.8, 102.0, 146.9, 512.5);
-gendef [1/36pt#]( cap_hair# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( cap_stem# )( 46, 57.5, 79.5, 114.5, 164.8, 575);
-gendef [1/36pt#]( cap_curve# )( 46, 57.5, 79.5, 114.5, 168.8, 575);
-gendef [1/36pt#]( cap_ess# )( 46, 57.5, 79.5, 114.5, 164.8, 575);
-gendef [1/36pt#]( rule_thickness#)( 26, 32.5, 44.9, 64.7, 93.1, 325);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair# )( 22, 27.5, 38.0, 54.7, 78.8, 275);
-gendef [1/36pt#]( notch_cut# )( 48, 60.0, 82.9, 119.5, 172.0, 600);
-gendef [1/36pt#]( bar# )( 22, 27.5, 38.0, 54.7, 78.8, 275);
-gendef [1/36pt#]( slab# )( 24, 30.0, 41.5, 59.7, 86.0, 300);
-gendef [1/36pt#]( cap_bar# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( cap_band# )( 30, 37.5, 51.8, 74.7, 107.5, 375);
-gendef [1/36pt#]( cap_notch_cut# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( vair_corr# )( 1, 1.25, 1.73, 2.49, 3.58, 12.5);
-gendef [1/36pt#]( apex_corr# )( 15, 18.8, 25.9, 37.36, 53.73, 187.5);
-gendef [1/36pt#]( o# )( 6, 7.5, 10.36, 14.99, 21.5, 75);
-gendef [1/36pt#]( apex_o# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .85, .86, .87, .88, .89, .89);
-gendef ( math_spread )( 0, 0, 0, 0, 0, 0);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=1/9;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=true;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=true;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glxc1000.mf b/Master/texmf-dist/fonts/source/public/cb/glxc1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glxc1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glxi.mf b/Master/texmf-dist/fonts/source/public/cb/glxi.mf
deleted file mode 100644
index 6428fbf98ef..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glxi.mf
+++ /dev/null
@@ -1,87 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-% file glxi v.1.0a 1999/11/05
-% Content: 256 glyph greek cursive bold font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GLXI";
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 22, 27, 38, 55, 78.82, 275);
-gendef [1/36pt#]( width_adj# )( 3, 3.75, 5.18, 7.47, 10.75, 37.5);
-gendef [1/36pt#]( serif_fit# )( [-12], [-15], [-20.73], [-29.87], [-43], [-150]);
-gendef [1/36pt#]( cap_serif_fit# )( [-15],[-18.8], [-25.91], [-37.33], [-54.74],[-187.5]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 220, 275, 380, 548, 788, 2750);
-gendef [1/36pt#]( asc_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( cap_height# )( 197, 246, 340, 490, 706, 2462.5);
-gendef [1/36pt#]( fig_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( x_height# )( 155, 194, 268, 386, 555, 1937.5);
-gendef [1/36pt#]( math_axis# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( bar_height# )( 85, 106, 147, 216, 305, 1062.5);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 48, 60, 83, 120, 171, 600);
-gendef [1/36pt#](acc_ht# )( 210, 250, 346, 498, 717, 2500);
-gendef [1/36pt#](circ_ht# )( 210, 250, 346, 498, 717, 2500);
-gendef [1/36pt#](Circ_ht# )( 230, 270, 370, 530, 770, 2750);
-gendef [1/36pt#](iota_dp# )( 58, 72, 100, 144, 208, 725);
-gendef [1/36pt#]( crisp# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( tiny# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( fine# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( thin_join# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( hair# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( stem# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( curve# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( ess# )( 40, 50.0, 70.0, 100.0, 148.0, 500);
-gendef [1/36pt#]( flare# )( 36, 45.0, 62.2, 89.6, 130.0, 450);
-gendef [1/36pt#]( dot_size# )( 41, 51.3, 70.8, 102.0, 146.9, 512.5);
-gendef [1/36pt#]( cap_hair# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( cap_stem# )( 46, 57.5, 79.5, 114.5, 164.8, 575);
-gendef [1/36pt#]( cap_curve# )( 46, 57.5, 79.5, 114.5, 168.8, 575);
-gendef [1/36pt#]( cap_ess# )( 46, 57.5, 79.5, 114.5, 164.8, 575);
-gendef [1/36pt#]( rule_thickness#)( 26, 32.5, 44.9, 64.7, 93.1, 325);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair# )( 22, 27.5, 38.0, 54.7, 78.8, 275);
-gendef [1/36pt#]( notch_cut# )( 48, 60.0, 82.9, 119.5, 172.0, 600);
-gendef [1/36pt#]( bar# )( 22, 27.5, 38.0, 54.7, 78.8, 275);
-gendef [1/36pt#]( slab# )( 24, 30.0, 41.5, 59.7, 86.0, 300);
-gendef [1/36pt#]( cap_bar# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( cap_band# )( 30, 37.5, 51.8, 74.7, 107.5, 375);
-gendef [1/36pt#]( cap_notch_cut# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( vair_corr# )( 1, 1.25, 1.73, 2.49, 3.58, 12.5);
-gendef [1/36pt#]( apex_corr# )( 15, 18.8, 25.9, 37.36, 53.73, 187.5);
-gendef [1/36pt#]( o# )( 6, 7.5, 10.36, 14.99, 21.5, 75);
-gendef [1/36pt#]( apex_o# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( .85, .86, .87, .88, .89, .89);
-gendef ( math_spread )( 0, 0, 0, 0, 0, 0);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=1/9;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=true;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=true;
-straight:=false;
-monowidth:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glxi1000.mf b/Master/texmf-dist/fonts/source/public/cb/glxi1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glxi1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glxn.mf b/Master/texmf-dist/fonts/source/public/cb/glxn.mf
deleted file mode 100644
index 47cbbb3609e..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glxn.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file glxn v.1.0a 1999/11/05
-% Content: 256 glyph greek upright bold font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GLXN";
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 22, 27, 38, 55, 78.82, 275);
-gendef [1/36pt#]( width_adj# )( 3, 3.75, 5.18, 7.47, 10.75, 37.5);
-gendef [1/36pt#]( serif_fit# )( [-12], [-15], [-20.73], [-29.87], [-43], [-150]);
-gendef [1/36pt#]( cap_serif_fit# )( [-15],[-18.8], [-25.91], [-37.33], [-54.74],[-187.5]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 220, 275, 380, 548, 788, 2750);
-gendef [1/36pt#]( asc_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( cap_height# )( 197, 246, 340, 490, 706, 2462.5);
-gendef [1/36pt#]( fig_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( x_height# )( 155, 194, 268, 386, 555, 1937.5);
-gendef [1/36pt#]( math_axis# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( bar_height# )( 85, 106, 147, 216, 305, 1062.5);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 48, 60, 83, 120, 171, 600);
-gendef [1/36pt#](acc_ht# )( 210, 250, 346, 498, 717, 2500);
-gendef [1/36pt#](circ_ht# )( 210, 250, 346, 498, 717, 2500);
-gendef [1/36pt#](Circ_ht# )( 230, 270, 370, 530, 770, 2750);
-gendef [1/36pt#](iota_dp# )( 58, 72, 100, 144, 208, 725);
-gendef [1/36pt#]( crisp# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( tiny# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( fine# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( thin_join# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( hair# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( stem# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( curve# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( ess# )( 40, 50.0, 70.0, 100.0, 148.0, 500);
-gendef [1/36pt#]( flare# )( 36, 45.0, 62.2, 89.6, 130.0, 450);
-gendef [1/36pt#]( dot_size# )( 41, 51.3, 70.8, 102.0, 146.9, 512.5);
-gendef [1/36pt#]( cap_hair# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( cap_stem# )( 46, 57.5, 79.5, 114.5, 164.8, 575);
-gendef [1/36pt#]( cap_curve# )( 46, 57.5, 79.5, 114.5, 168.8, 575);
-gendef [1/36pt#]( cap_ess# )( 46, 57.5, 79.5, 114.5, 164.8, 575);
-gendef [1/36pt#]( rule_thickness#)( 26, 32.5, 44.9, 64.7, 93.1, 325);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair# )( 22, 27.5, 38.0, 54.7, 78.8, 275);
-gendef [1/36pt#]( notch_cut# )( 48, 60.0, 82.9, 119.5, 172.0, 600);
-gendef [1/36pt#]( bar# )( 22, 27.5, 38.0, 54.7, 78.8, 275);
-gendef [1/36pt#]( slab# )( 24, 30.0, 41.5, 59.7, 86.0, 300);
-gendef [1/36pt#]( cap_bar# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( cap_band# )( 30, 37.5, 51.8, 74.7, 107.5, 375);
-gendef [1/36pt#]( cap_notch_cut# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( vair_corr# )( 1, 1.25, 1.73, 2.49, 3.58, 12.5);
-gendef [1/36pt#]( apex_corr# )( 15, 18.8, 25.9, 37.36, 53.73, 187.5);
-gendef [1/36pt#]( o# )( 6, 7.5, 10.36, 14.99, 21.5, 75);
-gendef [1/36pt#]( apex_o# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .85, .86, .87, .88, .89, .89);
-gendef ( math_spread )( 0, 0, 0, 0, 0, 0);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=1/9;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=true;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=true;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glxn1000.mf b/Master/texmf-dist/fonts/source/public/cb/glxn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glxn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glxo.mf b/Master/texmf-dist/fonts/source/public/cb/glxo.mf
deleted file mode 100644
index da7a8236f73..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glxo.mf
+++ /dev/null
@@ -1,85 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file glxo v.1.0a 1999/11/05
-% Content: 256 glyph greek oblique bold font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GLXO";
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 22, 27, 38, 55, 78.82, 275);
-gendef [1/36pt#]( width_adj# )( 3, 3.75, 5.18, 7.47, 10.75, 37.5);
-gendef [1/36pt#]( serif_fit# )( [-12], [-15], [-20.73], [-29.87], [-43], [-150]);
-gendef [1/36pt#]( cap_serif_fit# )( [-15],[-18.8], [-25.91], [-37.33], [-54.74],[-187.5]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 220, 275, 380, 548, 788, 2750);
-gendef [1/36pt#]( asc_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( cap_height# )( 197, 246, 340, 490, 706, 2462.5);
-gendef [1/36pt#]( fig_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( x_height# )( 155, 194, 268, 386, 555, 1937.5);
-gendef [1/36pt#]( math_axis# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( bar_height# )( 85, 106, 147, 216, 305, 1062.5);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 48, 60, 83, 120, 171, 600);
-gendef [1/36pt#](acc_ht# )( 210, 250, 346, 498, 717, 2500);
-gendef [1/36pt#](circ_ht# )( 210, 250, 346, 498, 717, 2500);
-gendef [1/36pt#](Circ_ht# )( 230, 270, 370, 530, 770, 2750);
-gendef [1/36pt#](iota_dp# )( 58, 72, 100, 144, 208, 725);
-gendef [1/36pt#]( crisp# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( tiny# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( fine# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( thin_join# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( hair# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( stem# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( curve# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( ess# )( 40, 50.0, 70.0, 100.0, 148.0, 500);
-gendef [1/36pt#]( flare# )( 36, 45.0, 62.2, 89.6, 130.0, 450);
-gendef [1/36pt#]( dot_size# )( 41, 51.3, 70.8, 102.0, 146.9, 512.5);
-gendef [1/36pt#]( cap_hair# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( cap_stem# )( 46, 57.5, 79.5, 114.5, 164.8, 575);
-gendef [1/36pt#]( cap_curve# )( 46, 57.5, 79.5, 114.5, 168.8, 575);
-gendef [1/36pt#]( cap_ess# )( 46, 57.5, 79.5, 114.5, 164.8, 575);
-gendef [1/36pt#]( rule_thickness#)( 26, 32.5, 44.9, 64.7, 93.1, 325);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair# )( 22, 27.5, 38.0, 54.7, 78.8, 275);
-gendef [1/36pt#]( notch_cut# )( 48, 60.0, 82.9, 119.5, 172.0, 600);
-gendef [1/36pt#]( bar# )( 22, 27.5, 38.0, 54.7, 78.8, 275);
-gendef [1/36pt#]( slab# )( 24, 30.0, 41.5, 59.7, 86.0, 300);
-gendef [1/36pt#]( cap_bar# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( cap_band# )( 30, 37.5, 51.8, 74.7, 107.5, 375);
-gendef [1/36pt#]( cap_notch_cut# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( vair_corr# )( 1, 1.25, 1.73, 2.49, 3.58, 12.5);
-gendef [1/36pt#]( apex_corr# )( 15, 18.8, 25.9, 37.36, 53.73, 187.5);
-gendef [1/36pt#]( o# )( 6, 7.5, 10.36, 14.99, 21.5, 75);
-gendef [1/36pt#]( apex_o# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( .85, .86, .87, .88, .89, .89);
-gendef ( math_spread )( 0, 0, 0, 0, 0, 0);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=1/9;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=true;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=true;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glxo1000.mf b/Master/texmf-dist/fonts/source/public/cb/glxo1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glxo1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/glxu.mf b/Master/texmf-dist/fonts/source/public/cb/glxu.mf
deleted file mode 100644
index 101a7e0b2b5..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glxu.mf
+++ /dev/null
@@ -1,87 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-% file glxu v.1.0a 1999/11/05
-% Content: 256 glyph greek upright cursive bold font for slides
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GLXU";
-font_size (gensize*pt#);
-basedef ( 8, 10, 13.82, 19.91, 28.66, 100);
-gendef [1/36pt#]( u# )( 22, 27, 38, 55, 78.82, 275);
-gendef [1/36pt#]( width_adj# )( 3, 3.75, 5.18, 7.47, 10.75, 37.5);
-gendef [1/36pt#]( serif_fit# )( [-12], [-15], [-20.73], [-29.87], [-43], [-150]);
-gendef [1/36pt#]( cap_serif_fit# )( [-15],[-18.8], [-25.91], [-37.33], [-54.74],[-187.5]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 220, 275, 380, 548, 788, 2750);
-gendef [1/36pt#]( asc_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( cap_height# )( 197, 246, 340, 490, 706, 2462.5);
-gendef [1/36pt#]( fig_height# )( 200, 250, 346, 498, 717, 2500);
-gendef [1/36pt#]( x_height# )( 155, 194, 268, 386, 555, 1937.5);
-gendef [1/36pt#]( math_axis# )( 80, 100, 138, 199, 287, 1000);
-gendef [1/36pt#]( bar_height# )( 85, 106, 147, 216, 305, 1062.5);
-gendef [1/36pt#]( comma_depth# )( 40, 50, 69, 100, 143, 500);
-gendef [1/36pt#]( desc_depth# )( 48, 60, 83, 120, 171, 600);
-gendef [1/36pt#](acc_ht# )( 210, 250, 346, 498, 717, 2500);
-gendef [1/36pt#](circ_ht# )( 210, 250, 346, 498, 717, 2500);
-gendef [1/36pt#](Circ_ht# )( 230, 270, 370, 530, 770, 2750);
-gendef [1/36pt#](iota_dp# )( 58, 72, 100, 144, 208, 725);
-gendef [1/36pt#]( crisp# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( tiny# )( 18, 22.5, 31.1, 44.8, 64.5, 225);
-gendef [1/36pt#]( fine# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( thin_join# )( 8, 10, 13.8, 19.9, 28.7, 100);
-gendef [1/36pt#]( hair# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( stem# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( curve# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( ess# )( 40, 50.0, 70.0, 100.0, 148.0, 500);
-gendef [1/36pt#]( flare# )( 36, 45.0, 62.2, 89.6, 130.0, 450);
-gendef [1/36pt#]( dot_size# )( 41, 51.3, 70.8, 102.0, 146.9, 512.5);
-gendef [1/36pt#]( cap_hair# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( cap_stem# )( 46, 57.5, 79.5, 114.5, 164.8, 575);
-gendef [1/36pt#]( cap_curve# )( 46, 57.5, 79.5, 114.5, 168.8, 575);
-gendef [1/36pt#]( cap_ess# )( 46, 57.5, 79.5, 114.5, 164.8, 575);
-gendef [1/36pt#]( rule_thickness#)( 26, 32.5, 44.9, 64.7, 93.1, 325);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair# )( 22, 27.5, 38.0, 54.7, 78.8, 275);
-gendef [1/36pt#]( notch_cut# )( 48, 60.0, 82.9, 119.5, 172.0, 600);
-gendef [1/36pt#]( bar# )( 22, 27.5, 38.0, 54.7, 78.8, 275);
-gendef [1/36pt#]( slab# )( 24, 30.0, 41.5, 59.7, 86.0, 300);
-gendef [1/36pt#]( cap_bar# )( 23, 28.8, 39.7, 57.2, 82.4, 287.5);
-gendef [1/36pt#]( cap_band# )( 30, 37.5, 51.8, 74.7, 107.5, 375);
-gendef [1/36pt#]( cap_notch_cut# )( 42, 52.5, 72.6, 104.5, 150.5, 525);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( .5, .625, .864, 1.24, 1.79, 6.25);
-gendef [1/36pt#]( vair_corr# )( 1, 1.25, 1.73, 2.49, 3.58, 12.5);
-gendef [1/36pt#]( apex_corr# )( 15, 18.8, 25.9, 37.36, 53.73, 187.5);
-gendef [1/36pt#]( o# )( 6, 7.5, 10.36, 14.99, 21.5, 75);
-gendef [1/36pt#]( apex_o# )( 2, 2.5, 3.46, 4.98, 7.17, 25);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .85, .86, .87, .88, .89, .89);
-gendef ( math_spread )( 0, 0, 0, 0, 0, 0);
-otilt:=.2;
-superness:=(sqrt 2)/2;
-superpull:=1/9;
-beak_darkness:=0;
-square_dots:=true;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=true;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=true;
-straight:=false;
-monowidth:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/glxu1000.mf b/Master/texmf-dist/fonts/source/public/cb/glxu1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/glxu1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gmmn.mf b/Master/texmf-dist/fonts/source/public/cb/gmmn.mf
deleted file mode 100644
index 63fc1e95dc4..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gmmn.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file grmr v.1.0a 2000/07/06
-% 256 character upright greek roman font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:= "GRMN";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 13.13,17.85, 21, 24.68, 34.13, 210);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 2, 4.1, 5, 5.8, 8, 50);
-gendef [1/36pt#]( letter_fit# )( 5, 0, 0, 0, [-0.1], [-1]);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 246, 295, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 268, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 45, 70, 82, 100, 140, 820);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 90, 120, 170, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 114, 180, 225, 275, 395, 2250);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 6, 8, 8, 8, 8, 53);
-gendef [1/36pt#]( fine# )( 5, 7, 7, 7, 7, 47);
-gendef [1/36pt#]( thin_join# )( 5, 7, 7, 7.5, 9, 60);
-gendef [1/36pt#]( hair# )( 7, 8, 9, 9.5, 11, 70);
-gendef [1/36pt#]( stem# )( 15, 24, 27, 28, 33, 200);
-gendef [1/36pt#]( curve# )( 18, 25.5, 30, 33, 40, 220);
-gendef [1/36pt#]( ess# )( 12, 23, 27, 30, 35, 200);
-gendef [1/36pt#]( flare# )( 17, 23, 27, 36, 45, 220);
-gendef [1/36pt#]( dot_size# )( 22, 32, 38, 42, 51, 253);
-gendef [1/36pt#]( cap_hair# )( 8, 9.5, 11, 11.5, 13, 80);
-gendef [1/36pt#]( cap_stem# )( 19, 26.5, 32, 35, 41, 220);
-gendef [1/36pt#]( cap_curve# )( 21, 30, 37, 40, 47, 247);
-gendef [1/36pt#]( cap_ess# )( 18, 27, 35, 38, 43, 233);
-gendef [1/36pt#]( rule_thickness#)( 10, 13, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 10, 16, 20, 24, 34, 200);
-gendef [1/36pt#]( jut# )( 15, 22, 28, 33, 42, 280);
-gendef [1/36pt#]( cap_jut# )( 20, 29, 37, 41, 50, 370);
-gendef [1/36pt#]( beak_jut# )( 6, 8.4, 10, 11.4, 15, 100);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( vair# )( 6, 6.6, 8, 8.5, 10, 53);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( slab# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_band# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 2, 3.2, 4, 4.8, 7, 40);
-gendef [1/36pt#]( stem_corr# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( .5, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 4, 6, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 4, 6, 8, 9, 10, 53);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1, .4, 0, [-0.2], [-0.4], [-1]);
-otilt:=.2;
-superness:=(sqrt2)/2;
-superpull:=1/6;
-beak_darkness:=11/30;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-if not boolean cbroman: boolean cbroman; fi cbroman:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gmmn1000.mf b/Master/texmf-dist/fonts/source/public/cb/gmmn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gmmn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gmmo.mf b/Master/texmf-dist/fonts/source/public/cb/gmmo.mf
deleted file mode 100644
index af13b2fbc08..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gmmo.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file grmr v.1.0a 2000/07/06
-% 256 character upright greek roman font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:= "GRMN";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 13.13,17.85, 21, 24.68, 34.13, 210);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 2, 4.1, 5, 5.8, 8, 50);
-gendef [1/36pt#]( letter_fit# )( 5, 0, 0, 0, [-0.1], [-1]);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 246, 295, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 268, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 45, 70, 82, 100, 140, 820);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 90, 120, 170, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 114, 180, 225, 275, 395, 2250);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 6, 8, 8, 8, 8, 53);
-gendef [1/36pt#]( fine# )( 5, 7, 7, 7, 7, 47);
-gendef [1/36pt#]( thin_join# )( 5, 7, 7, 7.5, 9, 60);
-gendef [1/36pt#]( hair# )( 7, 8, 9, 9.5, 11, 70);
-gendef [1/36pt#]( stem# )( 15, 24, 27, 28, 33, 200);
-gendef [1/36pt#]( curve# )( 18, 25.5, 30, 33, 40, 220);
-gendef [1/36pt#]( ess# )( 12, 23, 27, 30, 35, 200);
-gendef [1/36pt#]( flare# )( 17, 23, 27, 36, 45, 220);
-gendef [1/36pt#]( dot_size# )( 22, 32, 38, 42, 51, 253);
-gendef [1/36pt#]( cap_hair# )( 8, 9.5, 11, 11.5, 13, 80);
-gendef [1/36pt#]( cap_stem# )( 19, 26.5, 32, 35, 41, 220);
-gendef [1/36pt#]( cap_curve# )( 21, 30, 37, 40, 47, 247);
-gendef [1/36pt#]( cap_ess# )( 18, 27, 35, 38, 43, 233);
-gendef [1/36pt#]( rule_thickness#)( 10, 13, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 10, 16, 20, 24, 34, 200);
-gendef [1/36pt#]( jut# )( 15, 22, 28, 33, 42, 280);
-gendef [1/36pt#]( cap_jut# )( 20, 29, 37, 41, 50, 370);
-gendef [1/36pt#]( beak_jut# )( 6, 8.4, 10, 11.4, 15, 100);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( vair# )( 6, 6.6, 8, 8.5, 10, 53);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( slab# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_band# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 2, 3.2, 4, 4.8, 7, 40);
-gendef [1/36pt#]( stem_corr# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( .5, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 4, 6, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 4, 6, 8, 9, 10, 53);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1, .4, 0, [-0.2], [-0.4], [-1]);
-otilt:=.2;
-superness:=(sqrt2)/2;
-superpull:=1/6;
-beak_darkness:=11/30;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-if not boolean cbroman: boolean cbroman; fi cbroman:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gmmo1000.mf b/Master/texmf-dist/fonts/source/public/cb/gmmo1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gmmo1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gmtr.mf b/Master/texmf-dist/fonts/source/public/cb/gmtr.mf
deleted file mode 100644
index d44047aeeb6..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gmtr.mf
+++ /dev/null
@@ -1,83 +0,0 @@
-% Copyright (C) 2001 Claudio Beccari
-% file grmn v.1.0a 2001/02/25
-% Special signs for greek poem metrics
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:= "GMTR";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 2, 4.1, 5, 5.8, 8, 50);
-gendef [1/36pt#]( letter_fit# )( 5, 0, 0, 0, [-0.1], [-1]);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 246, 295, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 268, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 45, 70, 82, 100, 140, 820);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 90, 120, 170, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 114, 180, 225, 275, 395, 2250);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 6, 8, 8, 8, 8, 53);
-gendef [1/36pt#]( fine# )( 5, 7, 7, 7, 7, 47);
-gendef [1/36pt#]( thin_join# )( 5, 7, 7, 7.5, 9, 60);
-gendef [1/36pt#]( hair# )( 7, 8, 9, 9.5, 11, 70);
-gendef [1/36pt#]( stem# )( 15, 24, 27, 28, 33, 200);
-gendef [1/36pt#]( curve# )( 18, 25.5, 30, 33, 40, 220);
-gendef [1/36pt#]( ess# )( 12, 23, 27, 30, 35, 200);
-gendef [1/36pt#]( flare# )( 17, 23, 27, 36, 45, 220);
-gendef [1/36pt#]( dot_size# )( 22, 32, 38, 42, 51, 253);
-gendef [1/36pt#]( cap_hair# )( 8, 9.5, 11, 11.5, 13, 80);
-gendef [1/36pt#]( cap_stem# )( 19, 26.5, 32, 35, 41, 220);
-gendef [1/36pt#]( cap_curve# )( 21, 30, 37, 40, 47, 247);
-gendef [1/36pt#]( cap_ess# )( 18, 27, 35, 38, 43, 233);
-gendef [1/36pt#]( rule_thickness#)( 10, 13, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 10, 16, 20, 24, 34, 200);
-gendef [1/36pt#]( jut# )( 15, 22, 28, 33, 42, 280);
-gendef [1/36pt#]( cap_jut# )( 20, 29, 37, 41, 50, 370);
-gendef [1/36pt#]( beak_jut# )( 6, 8.4, 10, 11.4, 15, 100);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( vair# )( 6, 6.6, 8, 8.5, 10, 53);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( slab# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_band# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 2, 3.2, 4, 4.8, 7, 40);
-gendef [1/36pt#]( stem_corr# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( .5, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 4, 6, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 4, 6, 8, 9, 10, 53);
-slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1, .4, 0, [-0.2], [-0.4], [-1]);
-otilt:=.2;
-superness:=(sqrt2)/2;
-superpull:=1/6;
-beak_darkness:=11/30;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-metrics:=true;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gmtr1000.mf b/Master/texmf-dist/fonts/source/public/cb/gmtr1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gmtr1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gmxn.mf b/Master/texmf-dist/fonts/source/public/cb/gmxn.mf
deleted file mode 100644
index fcd529614df..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gmxn.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file grxr v.1.0a 2000/07/06
-% 256 character bold greek roman font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GRXR";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 100);
-gendef [1/36pt#]( u# )( 15.8, 21, 24.2, 28.4, 242);
-gendef [1/36pt#]( width_adj# )( 7, 9, 11, 13, 110);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 3, 5.6, 7, 8, 70);
-gendef [1/36pt#]( letter_fit# )( 3, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 2500);
-gendef [1/36pt#]( cap_height# )( 123,197.6, 247, 296, 2470);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 160, 192, 1600);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 900);
-gendef [1/36pt#]( bar_height# )( 42, 68, 85, 102, 850);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 90, 120, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 2500);
-gendef [1/36pt#](circ_ht# )( 114, 184, 230, 275, 2300);
-gendef [1/36pt#](Circ_ht# )( 130, 200, 250, 300, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 9, 10, 13, 13, 87);
-gendef [1/36pt#]( fine# )( 8, 10, 10, 10, 70);
-gendef [1/36pt#]( thin_join# )( 8, 10, 10, 10, 70);
-gendef [1/36pt#]( hair# )( 17, 18, 19, 20, 135);
-gendef [1/36pt#]( stem# )( 26, 33, 40, 47, 270);
-gendef [1/36pt#]( curve# )( 29, 35, 43, 52, 280);
-gendef [1/36pt#]( ess# )( 23, 33, 40, 44, 250);
-gendef [1/36pt#]( flare# )( 29, 35, 43, 51, 280);
-gendef [1/36pt#]( dot_size# )( 33, 46, 58, 62, 387);
-gendef [1/36pt#]( cap_hair# )( 17, 18, 19, 20, 135);
-gendef [1/36pt#]( cap_stem# )( 28, 41, 51, 57, 340);
-gendef [1/36pt#]( cap_curve# )( 31, 44, 55, 61, 367);
-gendef [1/36pt#]( cap_ess# )( 24, 42.4, 53, 59, 353);
-gendef [1/36pt#]( rule_thickness#)( 15, 19.5, 22, 24, 220);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 5, 8, 10, 12, 100);
-gendef [1/36pt#]( jut# )( 13, 20, 25, 30, 250);
-gendef [1/36pt#]( cap_jut# )( 14, 32, 39, 46, 390);
-gendef [1/36pt#]( beak_jut# )( 7, 8.8, 11, 12, 110);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 700);
-gendef [1/36pt#]( vair# )( 10, 12, 13, 14, 87);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 3600);
-gendef [1/36pt#]( bar# )( 8, 15.3, 17, 18, 170);
-gendef [1/36pt#]( slab# )( 8, 15.3, 17, 18, 170);
-gendef [1/36pt#]( cap_bar# )( 8, 15.3, 17, 18, 170);
-gendef [1/36pt#]( cap_band# )( 8, 15.3, 17, 18, 170);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 3600);
-gendef [1/36pt#]( serif_drop# )( 1.5, 2.4, 3, 3.6, 30);
-gendef [1/36pt#]( stem_corr# )( 1.5, 2, 2, 2, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1.5, 1.5, 1.5, 1.5);
-gendef [1/36pt#]( apex_corr# )( 9, 1, 0, 0, 0);
-gendef [1/36pt#]( o# )( 3, 3.2, 4, 5, 27);
-gendef [1/36pt#]( apex_o# )( 3, 2.4, 3, 4, 20);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1.5, .9, .5, .5, .5);
-otilt:=.2;
-superness:=8/11;
-superpull:=1/8;
-beak_darkness:=.4;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-if not boolean cbroman: boolean cbroman; fi cbroman:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gmxn1000.mf b/Master/texmf-dist/fonts/source/public/cb/gmxn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gmxn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gmxo.mf b/Master/texmf-dist/fonts/source/public/cb/gmxo.mf
deleted file mode 100644
index 9ae6068bd2c..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gmxo.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file grxr v.1.0a 2000/07/06
-% 256 character bold greek roman font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GRXR";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 100);
-gendef [1/36pt#]( u# )( 15.8, 21, 24.2, 28.4, 242);
-gendef [1/36pt#]( width_adj# )( 7, 9, 11, 13, 110);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 3, 5.6, 7, 8, 70);
-gendef [1/36pt#]( letter_fit# )( 3, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 2500);
-gendef [1/36pt#]( cap_height# )( 123,197.6, 247, 296, 2470);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 160, 192, 1600);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 900);
-gendef [1/36pt#]( bar_height# )( 42, 68, 85, 102, 850);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 90, 120, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 2500);
-gendef [1/36pt#](circ_ht# )( 114, 184, 230, 275, 2300);
-gendef [1/36pt#](Circ_ht# )( 130, 200, 250, 300, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 9, 10, 13, 13, 87);
-gendef [1/36pt#]( fine# )( 8, 10, 10, 10, 70);
-gendef [1/36pt#]( thin_join# )( 8, 10, 10, 10, 70);
-gendef [1/36pt#]( hair# )( 17, 18, 19, 20, 135);
-gendef [1/36pt#]( stem# )( 26, 33, 40, 47, 270);
-gendef [1/36pt#]( curve# )( 29, 35, 43, 52, 280);
-gendef [1/36pt#]( ess# )( 23, 33, 40, 44, 250);
-gendef [1/36pt#]( flare# )( 29, 35, 43, 51, 280);
-gendef [1/36pt#]( dot_size# )( 33, 46, 58, 62, 387);
-gendef [1/36pt#]( cap_hair# )( 17, 18, 19, 20, 135);
-gendef [1/36pt#]( cap_stem# )( 28, 41, 51, 57, 340);
-gendef [1/36pt#]( cap_curve# )( 31, 44, 55, 61, 367);
-gendef [1/36pt#]( cap_ess# )( 24, 42.4, 53, 59, 353);
-gendef [1/36pt#]( rule_thickness#)( 15, 19.5, 22, 24, 220);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 5, 8, 10, 12, 100);
-gendef [1/36pt#]( jut# )( 13, 20, 25, 30, 250);
-gendef [1/36pt#]( cap_jut# )( 14, 32, 39, 46, 390);
-gendef [1/36pt#]( beak_jut# )( 7, 8.8, 11, 12, 110);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 700);
-gendef [1/36pt#]( vair# )( 10, 12, 13, 14, 87);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 3600);
-gendef [1/36pt#]( bar# )( 8, 15.3, 17, 18, 170);
-gendef [1/36pt#]( slab# )( 8, 15.3, 17, 18, 170);
-gendef [1/36pt#]( cap_bar# )( 8, 15.3, 17, 18, 170);
-gendef [1/36pt#]( cap_band# )( 8, 15.3, 17, 18, 170);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 3600);
-gendef [1/36pt#]( serif_drop# )( 1.5, 2.4, 3, 3.6, 30);
-gendef [1/36pt#]( stem_corr# )( 1.5, 2, 2, 2, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1.5, 1.5, 1.5, 1.5);
-gendef [1/36pt#]( apex_corr# )( 9, 1, 0, 0, 0);
-gendef [1/36pt#]( o# )( 3, 3.2, 4, 5, 27);
-gendef [1/36pt#]( apex_o# )( 3, 2.4, 3, 4, 20);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1.5, .9, .5, .5, .5);
-otilt:=.2;
-superness:=8/11;
-superpull:=1/8;
-beak_darkness:=.4;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-if not boolean cbroman: boolean cbroman; fi cbroman:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gmxo1000.mf b/Master/texmf-dist/fonts/source/public/cb/gmxo1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gmxo1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gomc.mf b/Master/texmf-dist/fonts/source/public/cb/gomc.mf
deleted file mode 100644
index ac112df4958..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gomc.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-%
-% Outline font based on grmc
-%
-boolean outlining;
-outlining:=true;
-extra_endchar:=extra_endchar & "outline;";
-input grmc
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gomc1000.mf b/Master/texmf-dist/fonts/source/public/cb/gomc1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gomc1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gomi.mf b/Master/texmf-dist/fonts/source/public/cb/gomi.mf
deleted file mode 100644
index 186029cf5f2..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gomi.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-%
-% Outline font based on grmi
-%
-boolean outlining;
-outlining:=true;
-extra_endchar:=extra_endchar & "outline;";
-input grmi
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gomi1000.mf b/Master/texmf-dist/fonts/source/public/cb/gomi1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gomi1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gomn.mf b/Master/texmf-dist/fonts/source/public/cb/gomn.mf
deleted file mode 100644
index cd0cd48bf4b..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gomn.mf
+++ /dev/null
@@ -1,8 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-%
-% Outline font based on grmn
-%
-boolean outlining;
-outlining:=true;
-extra_endchar:=extra_endchar & "outline;";
-input grmn
diff --git a/Master/texmf-dist/fonts/source/public/cb/gomn1000.mf b/Master/texmf-dist/fonts/source/public/cb/gomn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gomn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gomo.mf b/Master/texmf-dist/fonts/source/public/cb/gomo.mf
deleted file mode 100644
index 59c5679c198..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gomo.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-%
-% Outline font based on grmo
-%
-boolean outlining;
-outlining:=true;
-extra_endchar:=extra_endchar & "outline;";
-input grmo
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gomo1000.mf b/Master/texmf-dist/fonts/source/public/cb/gomo1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gomo1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gomu.mf b/Master/texmf-dist/fonts/source/public/cb/gomu.mf
deleted file mode 100644
index fea9843b0fe..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gomu.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-%
-% Outline font based on grmu
-%
-boolean outlining;
-outlining:=true;
-extra_endchar:=extra_endchar & "outline;";
-input grmu
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gomu1000.mf b/Master/texmf-dist/fonts/source/public/cb/gomu1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gomu1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/goxc.mf b/Master/texmf-dist/fonts/source/public/cb/goxc.mf
deleted file mode 100644
index 4acfd41d9a8..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/goxc.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-%
-% Outline font based on grxc
-%
-boolean outlining;
-outlining:=true;
-extra_endchar:=extra_endchar & "outline;";
-input grxc
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/goxc1000.mf b/Master/texmf-dist/fonts/source/public/cb/goxc1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/goxc1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/goxi.mf b/Master/texmf-dist/fonts/source/public/cb/goxi.mf
deleted file mode 100644
index 9ed92f1b9df..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/goxi.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-%
-% Outline font based on grxi
-%
-boolean outlining;
-outlining:=true;
-extra_endchar:=extra_endchar & "outline;";
-input grxi
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/goxi1000.mf b/Master/texmf-dist/fonts/source/public/cb/goxi1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/goxi1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/goxn.mf b/Master/texmf-dist/fonts/source/public/cb/goxn.mf
deleted file mode 100644
index 9e88cb4f422..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/goxn.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-%
-% Outline font based on grxn
-%
-boolean outlining;
-outlining:=true;
-extra_endchar:=extra_endchar & "outline;";
-input grxn
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/goxn1000.mf b/Master/texmf-dist/fonts/source/public/cb/goxn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/goxn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/goxo.mf b/Master/texmf-dist/fonts/source/public/cb/goxo.mf
deleted file mode 100644
index 381baea695d..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/goxo.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-%
-% Outline font based on grxo
-%
-boolean outlining;
-outlining:=true;
-extra_endchar:=extra_endchar & "outline;";
-input grxo
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/goxo1000.mf b/Master/texmf-dist/fonts/source/public/cb/goxo1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/goxo1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/goxu.mf b/Master/texmf-dist/fonts/source/public/cb/goxu.mf
deleted file mode 100644
index 7dc1d7e4389..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/goxu.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-%
-% Outline font based on grxu
-%
-boolean outlining;
-outlining:=true;
-extra_endchar:=extra_endchar & "outline;";
-input grxu
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/goxu1000.mf b/Master/texmf-dist/fonts/source/public/cb/goxu1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/goxu1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grbl.mf b/Master/texmf-dist/fonts/source/public/cb/grbl.mf
deleted file mode 100644
index 18998363012..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grbl.mf
+++ /dev/null
@@ -1,85 +0,0 @@
-% Copyright (C) 2000 Claudio Beccari
-% file grbl v.1.0 2000/11/25
-% 256 character slightly darker than normal Leipzig greek font
-
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:= "GRMBL";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 2, 4.1, 5, 5.8, 8, 50);
-gendef [1/36pt#]( letter_fit# )( 5, 0, 0, 0, [-0.1], [-1]);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 246, 295, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 268, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 45, 70, 82, 100, 140, 820);
-gendef [1/36pt#]( comma_depth# )( 29.75, 47.6, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 29.75, 47.6, 76.5, 102, 144.5, 765);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 114, 183, 229, 275, 395, 2290);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 260, 310, 450, 2600);
-gendef [1/36pt#](iota_dp# )( 27, 50.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 7, 9, 9, 9, 9, 9);
-gendef [1/36pt#]( fine# )( 6, 8, 8, 8, 8, 8);
-gendef [1/36pt#]( thin_join# )( 6, 8, 8, 8.5, 10, 65);
-%gendef [1/36pt#]( hair# )( 8, 10, 11, 11.5, 13, 80);
-gendef [1/36pt#]( hair# )( 10, 12, 14, 15, 17, 85);
-gendef [1/36pt#]( stem# )( 16, 25, 28, 29, 34, 210);
-gendef [1/36pt#]( curve# )( 19, 26.5, 31, 34, 41, 230);
-gendef [1/36pt#]( ess# )( 13, 24, 27, 30, 35, 200);
-gendef [1/36pt#]( flare# )( 17, 23, 27, 36, 45, 220);
-gendef [1/36pt#]( dot_size# )( 22, 32, 38, 42, 51, 253);
-gendef [1/36pt#]( cap_hair# )( 9, 10.5, 12, 12.5, 14, 88);
-gendef [1/36pt#]( cap_stem# )( 19, 26.5, 32, 35, 41, 220);
-gendef [1/36pt#]( cap_curve# )( 21, 30, 37, 40, 47, 247);
-gendef [1/36pt#]( cap_ess# )( 18, 27, 35, 38, 43, 233);
-gendef [1/36pt#]( rule_thickness#)( 10, 13, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 10, 16, 20, 24, 34, 200);
-gendef [1/36pt#]( jut# )( 15, 22, 28, 33, 42, 280);
-gendef [1/36pt#]( cap_jut# )( 20, 29, 37, 41, 50, 370);
-gendef [1/36pt#]( beak_jut# )( 6, 8.4, 10, 11.4, 15, 100);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( vair# )( 6, 6.6, 8, 8.5, 10, 53);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 9, 10.5, 12, 13.5, 17, 110);
-gendef [1/36pt#]( slab# )( 9, 10.5, 12, 13.5, 17, 110);
-gendef [1/36pt#]( cap_bar# )( 9, 10.5, 12, 13.5, 17, 110);
-gendef [1/36pt#]( cap_band# )( 9, 10.5, 12, 13.5, 17, 110);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 2, 3.2, 4, 4.8, 7, 40);
-gendef [1/36pt#]( stem_corr# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( .5, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 4, 6, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 4, 6, 8, 9, 10, 53);
-slant:=sind 15/cosd 15;
-%slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1, .4, 0, [-0.2], [-0.4], [-1]);
-otilt:=.2;
-superness:=(sqrt2)/2;
-superpull:=1/6;
-beak_darkness:=11/30;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-if not boolean cbleipzig: boolean cbleipzig fi; cbleipzig:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grbl1000.mf b/Master/texmf-dist/fonts/source/public/cb/grbl1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grbl1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grmc.mf b/Master/texmf-dist/fonts/source/public/cb/grmc.mf
deleted file mode 100644
index 908e57d5fbe..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grmc.mf
+++ /dev/null
@@ -1,85 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file grmc v.1.0a 1999/11/05
-% 256 character small caps normal upright greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-small_caps:=true; sclc:=1.19;
-font_identifier:="GRMC" ;
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 2, 4.1, 5, 5.8, 8, 50);
-gendef [1/36pt#]( letter_fit# )( 5, 0, 0, 0, [-0.1], [-1]);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 246, 295, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 268, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 45, 70, 82, 100, 140, 820);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 90, 120, 170, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 130, 210, 250, 300, 432, 2250);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 6, 8, 8, 8, 8, 53);
-gendef [1/36pt#]( fine# )( 5, 7, 7, 7, 7, 47);
-gendef [1/36pt#]( thin_join# )( 5, 7, 7, 7.5, 9, 60);
-gendef [1/36pt#]( hair# )( 7, 8, 9, 9.5, 11, 70);
-gendef [1/36pt#]( stem# )( 15, 24, 27, 28, 33, 200);
-gendef [1/36pt#]( curve# )( 18, 25.5, 30, 33, 40, 220);
-gendef [1/36pt#]( ess# )( 12, 23, 27, 30, 35, 200);
-gendef [1/36pt#]( flare# )( 17, 23, 27, 36, 45, 220);
-gendef [1/36pt#]( dot_size# )( 22, 32, 38, 42, 51, 253);
-gendef [1/36pt#]( cap_hair# )( 8, 9.5, 11, 11.5, 13, 80);
-gendef [1/36pt#]( cap_stem# )( 19, 26.5, 32, 35, 41, 220);
-gendef [1/36pt#]( cap_curve# )( 21, 30, 37, 40, 47, 247);
-gendef [1/36pt#]( cap_ess# )( 18, 27, 35, 38, 43, 233);
-gendef [1/36pt#]( rule_thickness#)( 10, 13, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 10, 16, 20, 24, 34, 200);
-gendef [1/36pt#]( jut# )( 15, 22, 28, 33, 42, 280);
-gendef [1/36pt#]( cap_jut# )( 20, 29, 37, 41, 50, 370);
-gendef [1/36pt#]( beak_jut# )( 6, 8.4, 10, 11.4, 15, 100);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( vair# )( 6, 6.6, 8, 8.5, 10, 53);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( slab# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_band# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 2, 3.2, 4, 4.8, 7, 40);
-gendef [1/36pt#]( stem_corr# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( .5, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 4, 6, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 4, 6, 8, 9, 10, 53);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1, .4, 0, [-0.2], [-0.4], [-1]);
-otilt:=.2;
-superness:=1/sqrt 2;
-superpull:=1/6;
-beak_darkness:=11/30;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/grmc1000.mf b/Master/texmf-dist/fonts/source/public/cb/grmc1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grmc1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grmi.mf b/Master/texmf-dist/fonts/source/public/cb/grmi.mf
deleted file mode 100644
index e4e23199158..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grmi.mf
+++ /dev/null
@@ -1,86 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-% file grmi v.1.0a 1999/11/05
-% 256 character regular italic or cursive greek font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GRMI";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 2, 4.1, 5, 5.8, 8, 50);
-gendef [1/36pt#]( letter_fit# )( 5, 0, 0, 0, [-0.1], [-1]);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 246, 295, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 268, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 45, 70, 82, 100, 140, 820);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 90, 120, 171, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 114, 180, 225, 275, 395, 2250);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 6, 8, 8, 8, 8, 53);
-gendef [1/36pt#]( fine# )( 5, 7, 7, 7, 7, 47);
-gendef [1/36pt#]( thin_join# )( 5, 7, 7, 7.5, 9, 60);
-gendef [1/36pt#]( hair# )( 7, 8, 9, 9.5, 11, 70);
-gendef [1/36pt#]( stem# )( 15, 24, 27, 28.7, 33, 200);
-gendef [1/36pt#]( curve# )( 18, 25.5, 30, 33.5, 40, 220);
-gendef [1/36pt#]( ess# )( 12, 23, 27, 30, 35, 200);
-gendef [1/36pt#]( flare# )( 17, 23, 27, 32, 45, 220);
-gendef [1/36pt#]( dot_size# )( 22, 32, 38, 42, 51, 253);
-gendef [1/36pt#]( cap_hair# )( 8, 9.5, 11, 11.5, 13, 80);
-gendef [1/36pt#]( cap_stem# )( 19, 26.5, 32, 35, 41, 220);
-gendef [1/36pt#]( cap_curve# )( 21, 30, 37, 40, 47, 247);
-gendef [1/36pt#]( cap_ess# )( 18, 27, 35, 38, 43, 233);
-gendef [1/36pt#]( rule_thickness#)( 10, 13, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 10, 16, 20, 24, 34, 200);
-gendef [1/36pt#]( jut# )( 15, 22, 28, 33, 42, 280);
-gendef [1/36pt#]( cap_jut# )( 20, 29, 37, 41, 50, 370);
-gendef [1/36pt#]( beak_jut# )( 6, 8.4, 10, 11.4, 15, 100);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( vair# )( 6, 7.5, 8, 8.5, 10, 53);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( slab# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_band# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 2, 3.2, 4, 4.8, 7, 40);
-gendef [1/36pt#]( stem_corr# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( .5, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 4, 6, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 4, 6, 8, 9, 10, 53);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1, .4, 0, [-0.2], [-0.4], [-1]);
-otilt:=.2;
-superness:=(sqrt2)/2;
-superpull:=1/6;
-beak_darkness:=11/30;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/grmi1000.mf b/Master/texmf-dist/fonts/source/public/cb/grmi1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grmi1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grml.mf b/Master/texmf-dist/fonts/source/public/cb/grml.mf
deleted file mode 100644
index afea143bed6..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grml.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file grml v.1.0a 1999/11/05
-% 256 character regular Leipzig greek font
-
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:= "GRML";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 2, 4.1, 5, 5.8, 8, 50);
-gendef [1/36pt#]( letter_fit# )( 5, 0, 0, 0, [-0.1], [-1]);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 246, 295, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 268, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 45, 70, 82, 100, 140, 820);
-gendef [1/36pt#]( comma_depth# )( 29.75, 47.6, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 29.75, 47.6, 76.5, 102, 144.5, 765);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 114, 183, 229, 275, 395, 2290);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 260, 310, 450, 2600);
-gendef [1/36pt#](iota_dp# )( 27, 50.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 6, 8, 8, 8, 8, 8);
-gendef [1/36pt#]( fine# )( 5, 7, 7, 7, 7, 7);
-gendef [1/36pt#]( thin_join# )( 5, 7, 7, 7.5, 9, 60);
-gendef [1/36pt#]( hair# )( 7, 8, 9, 9.5, 11, 70);
-gendef [1/36pt#]( stem# )( 15, 24, 27, 28, 33, 200);
-gendef [1/36pt#]( curve# )( 18, 25.5, 30, 33, 40, 220);
-gendef [1/36pt#]( ess# )( 12, 23, 27, 30, 35, 200);
-gendef [1/36pt#]( flare# )( 17, 23, 27, 36, 45, 220);
-gendef [1/36pt#]( dot_size# )( 22, 32, 38, 42, 51, 253);
-gendef [1/36pt#]( cap_hair# )( 8, 9.5, 11, 11.5, 13, 80);
-gendef [1/36pt#]( cap_stem# )( 19, 26.5, 32, 35, 41, 220);
-gendef [1/36pt#]( cap_curve# )( 21, 30, 37, 40, 47, 247);
-gendef [1/36pt#]( cap_ess# )( 18, 27, 35, 38, 43, 233);
-gendef [1/36pt#]( rule_thickness#)( 10, 13, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 10, 16, 20, 24, 34, 200);
-gendef [1/36pt#]( jut# )( 15, 22, 28, 33, 42, 280);
-gendef [1/36pt#]( cap_jut# )( 20, 29, 37, 41, 50, 370);
-gendef [1/36pt#]( beak_jut# )( 6, 8.4, 10, 11.4, 15, 100);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( vair# )( 6, 6.6, 8, 8.5, 10, 53);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( slab# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_band# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 2, 3.2, 4, 4.8, 7, 40);
-gendef [1/36pt#]( stem_corr# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( .5, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 4, 6, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 4, 6, 8, 9, 10, 53);
-slant:=sind 15/cosd 15;
-%slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1, .4, 0, [-0.2], [-0.4], [-1]);
-otilt:=.2;
-superness:=(sqrt2)/2;
-superpull:=1/6;
-beak_darkness:=11/30;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-if not boolean cbleipzig: boolean cbleipzig fi; cbleipzig:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grml1000.mf b/Master/texmf-dist/fonts/source/public/cb/grml1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grml1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grmn.mf b/Master/texmf-dist/fonts/source/public/cb/grmn.mf
deleted file mode 100644
index 9cfad525309..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grmn.mf
+++ /dev/null
@@ -1,83 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file grmn v.1.0a 1999/11/05
-% 256 character regular upright greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:= "GRMN";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 2, 4.1, 5, 5.8, 8, 50);
-gendef [1/36pt#]( letter_fit# )( 5, 0, 0, 0, [-0.1], [-1]);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 246, 295, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 268, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 45, 70, 82, 100, 140, 820);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 90, 120, 170, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 114, 180, 225, 275, 395, 2250);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 6, 8, 8, 8, 8, 53);
-gendef [1/36pt#]( fine# )( 5, 7, 7, 7, 7, 47);
-gendef [1/36pt#]( thin_join# )( 5, 7, 7, 7.5, 9, 60);
-gendef [1/36pt#]( hair# )( 7, 8, 9, 9.5, 11, 70);
-gendef [1/36pt#]( stem# )( 15, 24, 27, 28, 33, 200);
-gendef [1/36pt#]( curve# )( 18, 25.5, 30, 33, 40, 220);
-gendef [1/36pt#]( ess# )( 12, 23, 27, 30, 35, 200);
-gendef [1/36pt#]( flare# )( 17, 23, 27, 36, 45, 220);
-gendef [1/36pt#]( dot_size# )( 22, 32, 38, 42, 51, 253);
-gendef [1/36pt#]( cap_hair# )( 8, 9.5, 11, 11.5, 13, 80);
-gendef [1/36pt#]( cap_stem# )( 19, 26.5, 32, 35, 41, 220);
-gendef [1/36pt#]( cap_curve# )( 21, 30, 37, 40, 47, 247);
-gendef [1/36pt#]( cap_ess# )( 18, 27, 35, 38, 43, 233);
-gendef [1/36pt#]( rule_thickness#)( 10, 13, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 10, 16, 20, 24, 34, 200);
-gendef [1/36pt#]( jut# )( 15, 22, 28, 33, 42, 280);
-gendef [1/36pt#]( cap_jut# )( 20, 29, 37, 41, 50, 370);
-gendef [1/36pt#]( beak_jut# )( 6, 8.4, 10, 11.4, 15, 100);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( vair# )( 6, 6.6, 8, 8.5, 10, 53);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( slab# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_band# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 2, 3.2, 4, 4.8, 7, 40);
-gendef [1/36pt#]( stem_corr# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( .5, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 4, 6, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 4, 6, 8, 9, 10, 53);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1, .4, 0, [-0.2], [-0.4], [-1]);
-otilt:=.2;
-superness:=(sqrt2)/2;
-superpull:=1/6;
-beak_darkness:=11/30;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grmn1000.mf b/Master/texmf-dist/fonts/source/public/cb/grmn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grmn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grmo.mf b/Master/texmf-dist/fonts/source/public/cb/grmo.mf
deleted file mode 100644
index abe1a2806aa..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grmo.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file grmo v.1.0a 1999/11/05
-% 256 character regular oblique greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GRMO";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 2, 4.1, 5, 5.8, 8, 50);
-gendef [1/36pt#]( letter_fit# )( 5, 0, 0, 0, [-0.1], [-1]);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 246, 295, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 268, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 45, 70, 82, 100, 140, 820);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 90, 120, 171, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 114, 180, 225, 275, 395, 2250);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 6, 8, 8, 8, 8, 53);
-gendef [1/36pt#]( fine# )( 5, 7, 7, 7, 7, 47);
-gendef [1/36pt#]( thin_join# )( 5, 7, 7, 7.5, 9, 60);
-gendef [1/36pt#]( hair# )( 7, 8, 9, 9.5, 11, 70);
-gendef [1/36pt#]( stem# )( 15, 24, 27, 28.7, 33, 200);
-gendef [1/36pt#]( curve# )( 18, 25.5, 30, 33.5, 40, 220);
-gendef [1/36pt#]( ess# )( 12, 23, 27, 30, 35, 200);
-gendef [1/36pt#]( flare# )( 17, 23, 27, 32, 45, 220);
-gendef [1/36pt#]( dot_size# )( 22, 32, 38, 42, 51, 253);
-gendef [1/36pt#]( cap_hair# )( 8, 9.5, 11, 11.5, 13, 80);
-gendef [1/36pt#]( cap_stem# )( 19, 26.5, 32, 35, 41, 220);
-gendef [1/36pt#]( cap_curve# )( 21, 30, 37, 40, 47, 247);
-gendef [1/36pt#]( cap_ess# )( 18, 27, 35, 38, 43, 233);
-gendef [1/36pt#]( rule_thickness#)( 10, 13, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 10, 16, 20, 24, 34, 200);
-gendef [1/36pt#]( jut# )( 15, 22, 28, 33, 42, 280);
-gendef [1/36pt#]( cap_jut# )( 20, 29, 37, 41, 50, 370);
-gendef [1/36pt#]( beak_jut# )( 6, 8.4, 10, 11.4, 15, 100);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( vair# )( 6, 7.5, 8, 8.5, 10, 53);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( slab# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_band# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 2, 3.2, 4, 4.8, 7, 40);
-gendef [1/36pt#]( stem_corr# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( .5, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 4, 6, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 4, 6, 8, 9, 10, 53);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1, .4, 0, [-0.2], [-0.4], [-1]);
-otilt:=.2;
-superness:=(sqrt2)/2;
-superpull:=1/6;
-beak_darkness:=11/30;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/grmo1000.mf b/Master/texmf-dist/fonts/source/public/cb/grmo1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grmo1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grmu.mf b/Master/texmf-dist/fonts/source/public/cb/grmu.mf
deleted file mode 100644
index de08a8bcef3..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grmu.mf
+++ /dev/null
@@ -1,86 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-% file grmu v.1.0a 1999/11/05
-% 256 character regular upright cursive greek font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GRMU";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 2, 4.1, 5, 5.8, 8, 50);
-gendef [1/36pt#]( letter_fit# )( 5, 0, 0, 0, [-0.1], [-1]);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 246, 295, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 268, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 45, 70, 82, 100, 140, 820);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 90, 120, 171, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 114, 180, 225, 275, 395, 2250);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 6, 8, 8, 8, 8, 53);
-gendef [1/36pt#]( fine# )( 5, 7, 7, 7, 7, 47);
-gendef [1/36pt#]( thin_join# )( 5, 7, 7, 7.5, 9, 60);
-gendef [1/36pt#]( hair# )( 7, 8, 9, 9.5, 11, 70);
-gendef [1/36pt#]( stem# )( 15, 24, 27, 28.7, 33, 200);
-gendef [1/36pt#]( curve# )( 18, 25.5, 30, 33.5, 40, 220);
-gendef [1/36pt#]( ess# )( 12, 23, 27, 30, 35, 200);
-gendef [1/36pt#]( flare# )( 17, 23, 27, 32, 45, 220);
-gendef [1/36pt#]( dot_size# )( 22, 32, 38, 42, 51, 253);
-gendef [1/36pt#]( cap_hair# )( 8, 9.5, 11, 11.5, 13, 80);
-gendef [1/36pt#]( cap_stem# )( 19, 26.5, 32, 35, 41, 220);
-gendef [1/36pt#]( cap_curve# )( 21, 30, 37, 40, 47, 247);
-gendef [1/36pt#]( cap_ess# )( 18, 27, 35, 38, 43, 233);
-gendef [1/36pt#]( rule_thickness#)( 10, 13, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 10, 16, 20, 24, 34, 200);
-gendef [1/36pt#]( jut# )( 15, 22, 28, 33, 42, 280);
-gendef [1/36pt#]( cap_jut# )( 20, 29, 37, 41, 50, 370);
-gendef [1/36pt#]( beak_jut# )( 6, 8.4, 10, 11.4, 15, 100);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( vair# )( 6, 7.5, 8, 8.5, 10, 53);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( slab# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_bar# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_band# )( 8, 9.5, 11, 12.5, 16, 100);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 2, 3.2, 4, 4.8, 7, 40);
-gendef [1/36pt#]( stem_corr# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( .5, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 4, 6, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 4, 6, 8, 9, 10, 53);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1, .4, 0, [-0.2], [-0.4], [-1]);
-otilt:=.2;
-superness:=(sqrt2)/2;
-superpull:=1/6;
-beak_darkness:=11/30;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/grmu1000.mf b/Master/texmf-dist/fonts/source/public/cb/grmu1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grmu1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grxc.mf b/Master/texmf-dist/fonts/source/public/cb/grxc.mf
deleted file mode 100644
index 1e256c07cb8..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grxc.mf
+++ /dev/null
@@ -1,86 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file grxc v.1.0a 1999/11/05
-% 256 character small caps bold upright greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-small_caps:=true; sclc:=1.19;
-font_identifier:= "GRXC" ;
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 15, 20, 24, 28, 40.3, 230);
-gendef [1/36pt#]( width_adj# )( 7, 9.4, 11, 13, 18, 110);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 3, 5.4, 7, 8, 9, 70);
-gendef [1/36pt#]( letter_fit# )( 5, 5, 5, 5, 5, 5);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 247, 296, 425, 2470);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 160, 192, 268, 1600);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 40, 67, 85, 102, 140, 850);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 40, 67, 90, 120, 170, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 130, 210, 250, 300, 432, 2300);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 9, 10, 13, 13, 13, 87);
-gendef [1/36pt#]( fine# )( 8, 10, 10, 10, 10, 70);
-gendef [1/36pt#]( thin_join# )( 8, 10, 10, 10, 10, 70);
-gendef [1/36pt#]( hair# )( 15, 16, 17, 18, 18, 135);
-gendef [1/36pt#]( stem# )( 24, 35, 41, 47, 59, 270);
-gendef [1/36pt#]( curve# )( 27, 39, 46, 52, 64, 280);
-gendef [1/36pt#]( ess# )( 19, 32, 38, 44, 56, 250);
-gendef [1/36pt#]( flare# )( 27, 39, 45, 51, 62, 280);
-gendef [1/36pt#]( dot_size# )( 31, 46, 56, 62, 74, 387);
-gendef [1/36pt#]( cap_hair# )( 17, 19, 19, 20, 21, 135);
-gendef [1/36pt#]( cap_stem# )( 28, 43, 51, 57, 69, 340);
-gendef [1/36pt#]( cap_curve# )( 31, 46, 55, 61, 73, 367);
-gendef [1/36pt#]( cap_ess# )( 24, 42.4, 53, 59, 71, 353);
-gendef [1/36pt#]( rule_thickness#)( 15, 19.5, 22, 24, 25, 220);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 5, 8, 10, 12, 17, 100);
-gendef [1/36pt#]( jut# )( 13, 19, 25, 30, 42, 250);
-gendef [1/36pt#]( cap_jut# )( 19, 31, 39, 46, 56, 390);
-gendef [1/36pt#]( beak_jut# )( 7, 9.4, 11, 12, 14, 110);
-gendef [1/36pt#]( beak# )( 25, 55, 70, 84, 114, 700);
-gendef [1/36pt#]( vair# )( 10, 12, 13, 14, 14, 87);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( slab# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_bar# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_band# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 1.5, 2.4, 3, 4, 5, 30);
-gendef [1/36pt#]( stem_corr# )( 1.5, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1.5, 1.5, 1.5, 1.5, 1.5);
-gendef [1/36pt#]( apex_corr# )( 9, 1, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 3, 4, 4, 5, 6, 27);
-gendef [1/36pt#]( apex_o# )( 3, 3, 3, 4, 5, 20);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1.5, .9, .5, .5, .5, .5);
-otilt:=.2;
-superness:=8/11;
-superpull:=1/8;
-beak_darkness:=.4;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/grxc1000.mf b/Master/texmf-dist/fonts/source/public/cb/grxc1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grxc1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grxi.mf b/Master/texmf-dist/fonts/source/public/cb/grxi.mf
deleted file mode 100644
index a88fa1f3512..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grxi.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1998, 1999, 2002 Claudio Beccari
-% file grxi v.1.0b 2002/11/11
-% 256 character extended bold italic or cursive greek font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GRXI";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 15, 20, 24, 28, 40.3, 230);
-gendef [1/36pt#]( width_adj# )( 7, 9.4, 11, 13, 18, 110);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 3, 5.4, 7, 8, 9, 70);
-gendef [1/36pt#]( letter_fit# )( 5, 5, 5, 5, 5, 5);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 247, 296, 425, 2470);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 160, 192, 268, 1600);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 40, 67, 85, 102, 140, 850);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 40, 67, 90, 120, 170, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 130, 210, 250, 300, 432, 2300);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 9, 10, 13, 13, 13, 87);
-gendef [1/36pt#]( fine# )( 8, 10, 10, 10, 10, 70);
-gendef [1/36pt#]( thin_join# )( 8, 10, 10, 10, 10, 70);
-gendef [1/36pt#]( hair# )( 15, 16, 17, 18, 18, 135);
-gendef [1/36pt#]( stem# )( 24, 35, 41, 47, 59, 270);
-gendef [1/36pt#]( curve# )( 27, 39, 46, 52, 64, 280);
-gendef [1/36pt#]( ess# )( 19, 32, 38, 44, 56, 250);
-gendef [1/36pt#]( flare# )( 27, 39, 45, 51, 62, 280);
-gendef [1/36pt#]( dot_size# )( 31, 46, 56, 62, 74, 387);
-gendef [1/36pt#]( cap_hair# )( 17, 19, 19, 20, 21, 135);
-gendef [1/36pt#]( cap_stem# )( 28, 43, 51, 57, 69, 340);
-gendef [1/36pt#]( cap_curve# )( 31, 46, 55, 61, 73, 367);
-gendef [1/36pt#]( cap_ess# )( 24, 42.4, 53, 59, 71, 353);
-gendef [1/36pt#]( rule_thickness#)( 15, 19.5, 22, 24, 25, 220);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 5, 8, 10, 12, 17, 100);
-gendef [1/36pt#]( jut# )( 13, 19, 25, 30, 42, 250);
-gendef [1/36pt#]( cap_jut# )( 19, 31, 39, 46, 56, 390);
-gendef [1/36pt#]( beak_jut# )( 7, 9.4, 11, 12, 14, 110);
-gendef [1/36pt#]( beak# )( 25, 55, 70, 84, 114, 700);
-gendef [1/36pt#]( vair# )( 10, 12, 13, 14, 14, 87);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( slab# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_bar# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_band# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 1.5, 2.4, 3, 4, 5, 30);
-gendef [1/36pt#]( stem_corr# )( 1.5, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1.5, 1.5, 1.5, 1.5, 1.5);
-gendef [1/36pt#]( apex_corr# )( 9, 1, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 3, 4, 4, 5, 6, 27);
-gendef [1/36pt#]( apex_o# )( 3, 3, 3, 4, 5, 20);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1.5, .9, .5, .5, .5, .5);
-otilt:=.2;
-superness:=8/11;
-superpull:=1/8;
-beak_darkness:=.4;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grxi1000.mf b/Master/texmf-dist/fonts/source/public/cb/grxi1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grxi1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grxl.mf b/Master/texmf-dist/fonts/source/public/cb/grxl.mf
deleted file mode 100644
index 823518b6f4e..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grxl.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file grxn v.1.0a 1999/11/05
-% 256 character regular bold greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GRXN";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 100);
-gendef [1/36pt#]( u# )( 15, 20, 23, 27, 230);
-gendef [1/36pt#]( width_adj# )( 7, 9, 11, 13, 110);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 3, 5.6, 7, 8, 70);
-gendef [1/36pt#]( letter_fit# )( 3, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 2500);
-gendef [1/36pt#]( cap_height# )( 123,197.6, 247, 296, 2470);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 160, 192, 1600);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 900);
-gendef [1/36pt#]( bar_height# )( 42, 68, 85, 102, 850);
-gendef [1/36pt#]( comma_depth# )( 29.75, 47.6, 70, 84, 700);
-gendef [1/36pt#]( desc_depth# )( 29.75, 47.6, 76.5, 102, 765);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 2500);
-gendef [1/36pt#](circ_ht# )( 114, 183, 229, 275, 2290);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 260, 310, 2600);
-gendef [1/36pt#](iota_dp# )( 27, 50.6, 72, 86.4, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 9, 10, 13, 13, 87);
-gendef [1/36pt#]( fine# )( 8, 10, 10, 10, 70);
-gendef [1/36pt#]( thin_join# )( 8, 10, 10, 10, 70);
-gendef [1/36pt#]( hair# )( 17, 18, 19, 20, 135);
-gendef [1/36pt#]( stem# )( 26, 33, 40, 47, 270);
-gendef [1/36pt#]( curve# )( 29, 35, 43, 52, 280);
-gendef [1/36pt#]( ess# )( 23, 33, 40, 44, 250);
-gendef [1/36pt#]( flare# )( 29, 35, 43, 51, 280);
-gendef [1/36pt#]( dot_size# )( 33, 46, 58, 62, 387);
-gendef [1/36pt#]( cap_hair# )( 17, 18, 19, 20, 135);
-gendef [1/36pt#]( cap_stem# )( 28, 41, 51, 57, 340);
-gendef [1/36pt#]( cap_curve# )( 31, 44, 55, 61, 367);
-gendef [1/36pt#]( cap_ess# )( 24, 42.4, 53, 59, 353);
-gendef [1/36pt#]( rule_thickness#)( 15, 19.5, 22, 24, 220);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 5, 8, 10, 12, 100);
-gendef [1/36pt#]( jut# )( 13, 20, 25, 30, 250);
-gendef [1/36pt#]( cap_jut# )( 14, 32, 39, 46, 390);
-gendef [1/36pt#]( beak_jut# )( 7, 8.8, 11, 12, 110);
-gendef [1/36pt#]( beak# )( 35, 56, 70, 84, 700);
-gendef [1/36pt#]( vair# )( 10, 12, 13, 14, 87);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 3600);
-gendef [1/36pt#]( bar# )( 8, 15.3, 17, 18, 170);
-gendef [1/36pt#]( slab# )( 8, 15.3, 17, 18, 170);
-gendef [1/36pt#]( cap_bar# )( 8, 15.3, 17, 18, 170);
-gendef [1/36pt#]( cap_band# )( 8, 15.3, 17, 18, 170);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 3600);
-gendef [1/36pt#]( serif_drop# )( 1.5, 2.4, 3, 3.6, 30);
-gendef [1/36pt#]( stem_corr# )( 1.5, 2, 2, 2, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1.5, 1.5, 1.5, 1.5);
-gendef [1/36pt#]( apex_corr# )( 9, 1, 0, 0, 0);
-gendef [1/36pt#]( o# )( 3, 3.2, 4, 5, 27);
-gendef [1/36pt#]( apex_o# )( 3, 2.4, 3, 4, 20);
-slant:=sind 15/cosd 15;
-%slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1.5, .9, .5, .5, .5);
-otilt:=.2;
-superness:=8/11;
-superpull:=1/8;
-beak_darkness:=.4;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-if not boolean cbleipzig: boolean cbleipzig fi; cbleipzig:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grxl1000.mf b/Master/texmf-dist/fonts/source/public/cb/grxl1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grxl1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grxn.mf b/Master/texmf-dist/fonts/source/public/cb/grxn.mf
deleted file mode 100644
index c66155a7c74..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grxn.mf
+++ /dev/null
@@ -1,83 +0,0 @@
-% Copyright (C) 1997, 1999, 2002 Claudio Beccari
-% file grxn v.1.0b 2002/11/11
-% 256 character regular bold greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GRXN";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 15, 20, 24, 28, 40.3, 230);
-gendef [1/36pt#]( width_adj# )( 7, 9.4, 11, 13, 18, 110);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 3, 5.4, 7, 8, 9, 70);
-gendef [1/36pt#]( letter_fit# )( 5, 5, 5, 5, 5, 5);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 247, 296, 425, 2470);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 160, 192, 268, 1600);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 40, 67, 85, 102, 140, 850);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 40, 67, 90, 120, 170, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 130, 210, 250, 300, 432, 2300);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 9, 10, 13, 13, 13, 87);
-gendef [1/36pt#]( fine# )( 8, 10, 10, 10, 10, 70);
-gendef [1/36pt#]( thin_join# )( 8, 10, 10, 10, 10, 70);
-gendef [1/36pt#]( hair# )( 15, 16, 17, 18, 18, 135);
-gendef [1/36pt#]( stem# )( 24, 35, 41, 47, 59, 270);
-gendef [1/36pt#]( curve# )( 27, 39, 46, 52, 64, 280);
-gendef [1/36pt#]( ess# )( 19, 32, 38, 44, 56, 250);
-gendef [1/36pt#]( flare# )( 27, 39, 45, 51, 62, 280);
-gendef [1/36pt#]( dot_size# )( 31, 46, 56, 62, 74, 387);
-gendef [1/36pt#]( cap_hair# )( 17, 19, 19, 20, 21, 135);
-gendef [1/36pt#]( cap_stem# )( 28, 43, 51, 57, 69, 340);
-gendef [1/36pt#]( cap_curve# )( 31, 46, 55, 61, 73, 367);
-gendef [1/36pt#]( cap_ess# )( 24, 42.4, 53, 59, 71, 353);
-gendef [1/36pt#]( rule_thickness#)( 15, 19.5, 22, 24, 25, 220);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 5, 8, 10, 12, 17, 100);
-gendef [1/36pt#]( jut# )( 13, 19, 25, 30, 42, 250);
-gendef [1/36pt#]( cap_jut# )( 19, 31, 39, 46, 56, 390);
-gendef [1/36pt#]( beak_jut# )( 7, 9.4, 11, 12, 14, 110);
-gendef [1/36pt#]( beak# )( 25, 55, 70, 84, 114, 700);
-gendef [1/36pt#]( vair# )( 10, 12, 13, 14, 14, 87);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( slab# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_bar# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_band# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 1.5, 2.4, 3, 4, 5, 30);
-gendef [1/36pt#]( stem_corr# )( 1.5, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1.5, 1.5, 1.5, 1.5, 1.5);
-gendef [1/36pt#]( apex_corr# )( 9, 1, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 3, 4, 4, 5, 6, 27);
-gendef [1/36pt#]( apex_o# )( 3, 3, 3, 4, 5, 20);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1.5, .9, .5, .5, .5, .5);
-otilt:=.2;
-superness:=8/11;
-superpull:=1/8;
-beak_darkness:=.4;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grxn1000.mf b/Master/texmf-dist/fonts/source/public/cb/grxn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grxn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grxo.mf b/Master/texmf-dist/fonts/source/public/cb/grxo.mf
deleted file mode 100644
index 4207da779f9..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grxo.mf
+++ /dev/null
@@ -1,83 +0,0 @@
-% Copyright (C) 1997, 1999, 2002 Claudio Beccari
-% file grxo v.1.0b 2002/11/11
-% 256 character regular bold oblique greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GRXO";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 15, 20, 24, 28, 40.3, 230);
-gendef [1/36pt#]( width_adj# )( 7, 9.4, 11, 13, 18, 110);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 3, 5.4, 7, 8, 9, 70);
-gendef [1/36pt#]( letter_fit# )( 5, 5, 5, 5, 5, 5);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 247, 296, 425, 2470);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 160, 192, 268, 1600);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 40, 67, 85, 102, 140, 850);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 40, 67, 90, 120, 170, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 130, 210, 250, 300, 432, 2300);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 9, 10, 13, 13, 13, 87);
-gendef [1/36pt#]( fine# )( 8, 10, 10, 10, 10, 70);
-gendef [1/36pt#]( thin_join# )( 8, 10, 10, 10, 10, 70);
-gendef [1/36pt#]( hair# )( 15, 16, 17, 18, 18, 135);
-gendef [1/36pt#]( stem# )( 24, 35, 41, 47, 59, 270);
-gendef [1/36pt#]( curve# )( 27, 39, 46, 52, 64, 280);
-gendef [1/36pt#]( ess# )( 19, 32, 38, 44, 56, 250);
-gendef [1/36pt#]( flare# )( 27, 39, 45, 51, 62, 280);
-gendef [1/36pt#]( dot_size# )( 31, 46, 56, 62, 74, 387);
-gendef [1/36pt#]( cap_hair# )( 17, 19, 19, 20, 21, 135);
-gendef [1/36pt#]( cap_stem# )( 28, 43, 51, 57, 69, 340);
-gendef [1/36pt#]( cap_curve# )( 31, 46, 55, 61, 73, 367);
-gendef [1/36pt#]( cap_ess# )( 24, 42.4, 53, 59, 71, 353);
-gendef [1/36pt#]( rule_thickness#)( 15, 19.5, 22, 24, 25, 220);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 5, 8, 10, 12, 17, 100);
-gendef [1/36pt#]( jut# )( 13, 19, 25, 30, 42, 250);
-gendef [1/36pt#]( cap_jut# )( 19, 31, 39, 46, 56, 390);
-gendef [1/36pt#]( beak_jut# )( 7, 9.4, 11, 12, 14, 110);
-gendef [1/36pt#]( beak# )( 25, 55, 70, 84, 114, 700);
-gendef [1/36pt#]( vair# )( 10, 12, 13, 14, 14, 87);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( slab# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_bar# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_band# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 1.5, 2.4, 3, 4, 5, 30);
-gendef [1/36pt#]( stem_corr# )( 1.5, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1.5, 1.5, 1.5, 1.5, 1.5);
-gendef [1/36pt#]( apex_corr# )( 9, 1, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 3, 4, 4, 5, 6, 27);
-gendef [1/36pt#]( apex_o# )( 3, 3, 3, 4, 5, 20);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1.5, .9, .5, .5, .5, .5);
-otilt:=.2;
-superness:=8/11;
-superpull:=1/8;
-beak_darkness:=.4;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grxo1000.mf b/Master/texmf-dist/fonts/source/public/cb/grxo1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grxo1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grxu.mf b/Master/texmf-dist/fonts/source/public/cb/grxu.mf
deleted file mode 100644
index c037fe493ef..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grxu.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1998, 1999, 2002 Claudio Beccari
-% file grxu v.1.0b 2002/11/11
-% 256 character extended bold upright cursive greek font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GRXU";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 15, 20, 24, 28, 40.3, 230);
-gendef [1/36pt#]( width_adj# )( 7, 9.4, 11, 13, 18, 110);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 3, 5.4, 7, 8, 9, 70);
-gendef [1/36pt#]( letter_fit# )( 5, 5, 5, 5, 5, 5);
-gendef [1/36pt#]( body_height# )( 135, 216, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 125, 200, 250, 300, 432, 2500);
-gendef [1/36pt#]( cap_height# )( 123, 197, 247, 296, 425, 2470);
-gendef [1/36pt#]( fig_height# )( 116,185.6, 232, 278.4, 401, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 160, 192, 268, 1600);
-gendef [1/36pt#]( math_axis# )( 45, 72, 90, 108, 156, 900);
-gendef [1/36pt#]( bar_height# )( 40, 67, 85, 102, 140, 850);
-gendef [1/36pt#]( comma_depth# )( 35, 56, 70, 84, 121, 700);
-gendef [1/36pt#]( desc_depth# )( 40, 67, 90, 120, 170, 900);
-gendef [1/36pt#](acc_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 130, 210, 250, 300, 432, 2300);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 9, 10, 13, 13, 13, 87);
-gendef [1/36pt#]( fine# )( 8, 10, 10, 10, 10, 70);
-gendef [1/36pt#]( thin_join# )( 8, 10, 10, 10, 10, 70);
-gendef [1/36pt#]( hair# )( 15, 16, 17, 18, 18, 135);
-gendef [1/36pt#]( stem# )( 24, 35, 41, 47, 59, 270);
-gendef [1/36pt#]( curve# )( 27, 39, 46, 52, 64, 280);
-gendef [1/36pt#]( ess# )( 19, 32, 38, 44, 56, 250);
-gendef [1/36pt#]( flare# )( 27, 39, 45, 51, 62, 280);
-gendef [1/36pt#]( dot_size# )( 31, 46, 56, 62, 74, 387);
-gendef [1/36pt#]( cap_hair# )( 17, 19, 19, 20, 21, 135);
-gendef [1/36pt#]( cap_stem# )( 28, 43, 51, 57, 69, 340);
-gendef [1/36pt#]( cap_curve# )( 31, 46, 55, 61, 73, 367);
-gendef [1/36pt#]( cap_ess# )( 24, 42.4, 53, 59, 71, 353);
-gendef [1/36pt#]( rule_thickness#)( 15, 19.5, 22, 24, 25, 220);
-gendef [1/36pt#]( dish# )( .7, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( bracket# )( 5, 8, 10, 12, 17, 100);
-gendef [1/36pt#]( jut# )( 13, 19, 25, 30, 42, 250);
-gendef [1/36pt#]( cap_jut# )( 19, 31, 39, 46, 56, 390);
-gendef [1/36pt#]( beak_jut# )( 7, 9.4, 11, 12, 14, 110);
-gendef [1/36pt#]( beak# )( 25, 55, 70, 84, 114, 700);
-gendef [1/36pt#]( vair# )( 10, 12, 13, 14, 14, 87);
-gendef [1/36pt#]( notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( bar# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( slab# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_bar# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_band# )( 12, 15.3, 17, 18, 18, 170);
-gendef [1/36pt#]( cap_notch_cut# )( 180, 288, 360, 432, 622, 3600);
-gendef [1/36pt#]( serif_drop# )( 1.5, 2.4, 3, 4, 5, 30);
-gendef [1/36pt#]( stem_corr# )( 1.5, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1.5, 1.5, 1.5, 1.5, 1.5);
-gendef [1/36pt#]( apex_corr# )( 9, 1, 0, 0, 0, 0);
-gendef [1/36pt#]( o# )( 3, 4, 4, 5, 6, 27);
-gendef [1/36pt#]( apex_o# )( 3, 3, 3, 4, 5, 20);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( 1, 1, 1, 1, 1, 1);
-gendef ( math_spread )( 1.5, .9, .5, .5, .5, .5);
-otilt:=.2;
-superness:=8/11;
-superpull:=1/8;
-beak_darkness:=.4;
-square_dots:=false;
-hefty:=false;
-serifs:=true;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/grxu1000.mf b/Master/texmf-dist/fonts/source/public/cb/grxu1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/grxu1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsmc.mf b/Master/texmf-dist/fonts/source/public/cb/gsmc.mf
deleted file mode 100644
index ff8421f6074..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsmc.mf
+++ /dev/null
@@ -1,85 +0,0 @@
-% Copyright (C) 1997, 1999, 2002 Claudio Beccari
-% file gsmc v.1.0b 2002/04/14
-% 256 character sans serif upright greek caps and small caps font
-% mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GSMC";
-small_caps:=true; sclc:=1.19;
-font_size (gensize*pt#);
-basedef ( 5, 8, 9, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 13.5, 17, 18.5, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 9, 12, 13, 15, 17, 24, 130);
-gendef [1/36pt#]( serif_fit# )( [-4], [-6], [-6.5], [-7], [-9], [-12], [-70]);
-gendef [1/36pt#]( cap_serif_fit# )( [-6], [-8.5], [-9], [-10], [-13], [-17],[-100]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 135, 216, 243, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 130, 205, 235, 260, 315, 445, 2500);
-gendef [1/36pt#]( cap_height# )( 125, 200, 225, 250, 300, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 118, 189, 212, 236, 283, 408, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 144, 160, 192, 267.8, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 81, 90, 108, 155.5, 900);
-gendef [1/36pt#]( bar_height# )( 40, 63, 71, 79, 97, 136, 820);
-gendef [1/36pt#]( comma_depth# )( 23, 37, 41, 45, 54, 78, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 63, 70, 84, 121, 900);
-gendef [1/36pt#](acc_ht# )( 125, 200, 225, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 113, 180, 203, 225, 275, 395, 2250);
-gendef [1/36pt#](Circ_ht# )( 125, 210, 230, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 36, 57.6, 64.8, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( fine# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( thin_join# )( 12, 15, 16, 17, 20, 24, 113);
-gendef [1/36pt#]( hair# )( 19, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( stem# )( 19, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( curve# )( 21, 25, 27, 28, 30, 33, 187);
-gendef [1/36pt#]( ess# )( 21, 25, 27, 28, 33, 37, 180);
-gendef [1/36pt#]( flare# )( 20, 22, 24, 25, 30, 33, 180);
-gendef [1/36pt#]( dot_size# )( 20, 26, 28, 30, 35, 40, 380);
-gendef [1/36pt#]( cap_hair# )( 21, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( cap_stem# )( 26, 29, 31, 32, 33, 39, 206);
-gendef [1/36pt#]( cap_curve# )( 26, 29, 31, 32, 37, 42, 247);
-gendef [1/36pt#]( cap_ess# )( 21, 28, 31, 32, 37, 42, 233);
-gendef [1/36pt#]( rule_thickness#)( 10.9, 13, 13.7, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( .3, .4, .5, .5, .6, .8, 5);
-gendef [1/36pt#]( vair# )( 15, 19, 21, 22, 26, 31, 147);
-gendef [1/36pt#]( notch_cut# )( 15, 16, 17, 18, 22, 32, 180);
-gendef [1/36pt#]( bar# )( 14, 18, 20, 21, 25, 30, 210);
-gendef [1/36pt#]( slab# )( 16, 20, 22, 23, 27, 32, 230);
-gendef [1/36pt#]( cap_bar# )( 15, 19, 21, 22, 26, 31, 220);
-gendef [1/36pt#]( cap_band# )( 12, 17, 19, 20, 24, 30, 200);
-gendef [1/36pt#]( cap_notch_cut# )( 18, 22, 24, 25, 31, 36, 250);
-gendef [1/36pt#]( serif_drop# )( 2, 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( stem_corr# )( 1, 1, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 2.5, 4, 4.5, 5, 6, 7, 33);
-gendef [1/36pt#]( o# )( 3, 6, 7, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 0, 0, 0, 0, 0, 0, 0);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .9, .93, .95, .96, .98, .98, 1);
-gendef ( math_spread )( .8, .4, .2, 0, [-.2], [-.2], [-1]);
-otilt:=.2;
-superness:=1/sqrt 2;
-superpull:=1/20;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=false ;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsmc1000.mf b/Master/texmf-dist/fonts/source/public/cb/gsmc1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsmc1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsmi.mf b/Master/texmf-dist/fonts/source/public/cb/gsmi.mf
deleted file mode 100644
index e36ffe8e6a2..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsmi.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1998, 1999,2002 Claudio Beccari
-% file gsmi v.1.0b 2002/04/14
-% 256 character sans serif oblique greek font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GSMI";
-font_size (gensize*pt#);
-basedef ( 5, 8, 9, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 13.5, 17, 18.5, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 9, 12, 13, 15, 17, 24, 130);
-gendef [1/36pt#]( serif_fit# )( [-4], [-6], [-6.5], [-7], [-9], [-12], [-70]);
-gendef [1/36pt#]( cap_serif_fit# )( [-6], [-8.5], [-9], [-10], [-13], [-17],[-100]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 135, 216, 243, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 130, 205, 235, 260, 315, 445, 2500);
-gendef [1/36pt#]( cap_height# )( 125, 200, 225, 250, 300, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 118, 189, 212, 236, 283, 408, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 144, 160, 192, 267.8, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 81, 90, 108, 155.5, 900);
-gendef [1/36pt#]( bar_height# )( 40, 63, 71, 79, 97, 136, 820);
-gendef [1/36pt#]( comma_depth# )( 23, 37, 41, 45, 54, 78, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 63, 70, 84, 121, 900);
-gendef [1/36pt#](acc_ht# )( 125, 200, 225, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 113, 180, 203, 225, 275, 395, 2250);
-gendef [1/36pt#](Circ_ht# )( 125, 210, 230, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 36, 57.6, 64.8, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( fine# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( thin_join# )( 12, 15, 16, 17, 20, 24, 113);
-gendef [1/36pt#]( hair# )( 19, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( stem# )( 19, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( curve# )( 21, 25, 27, 28, 30, 33, 187);
-gendef [1/36pt#]( ess# )( 21, 25, 27, 28, 33, 37, 180);
-gendef [1/36pt#]( flare# )( 20, 22, 24, 25, 30, 33, 180);
-gendef [1/36pt#]( dot_size# )( 20, 26, 28, 30, 35, 40, 380);
-gendef [1/36pt#]( cap_hair# )( 21, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( cap_stem# )( 26, 29, 31, 32, 33, 39, 206);
-gendef [1/36pt#]( cap_curve# )( 26, 29, 31, 32, 37, 42, 247);
-gendef [1/36pt#]( cap_ess# )( 21, 28, 31, 32, 37, 42, 233);
-gendef [1/36pt#]( rule_thickness#)( 10.9, 13, 13.7, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( .3, .4, .5, .5, .6, .8, 5);
-gendef [1/36pt#]( vair# )( 15, 19, 21, 22, 26, 31, 147);
-gendef [1/36pt#]( notch_cut# )( 15, 16, 17, 18, 22, 32, 180);
-gendef [1/36pt#]( bar# )( 14, 18, 20, 21, 25, 30, 210);
-gendef [1/36pt#]( slab# )( 16, 20, 22, 23, 27, 32, 230);
-gendef [1/36pt#]( cap_bar# )( 15, 19, 21, 22, 26, 31, 220);
-gendef [1/36pt#]( cap_band# )( 12, 17, 19, 20, 24, 30, 200);
-gendef [1/36pt#]( cap_notch_cut# )( 18, 22, 24, 25, 31, 36, 250);
-gendef [1/36pt#]( serif_drop# )( 2, 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( stem_corr# )( 1, 1, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 2.5, 4, 4.5, 5, 6, 7, 33);
-gendef [1/36pt#]( o# )( 3, 6, 7, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 0, 0, 0, 0, 0, 0, 0);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( .9, .93, .95, .96, .98, .98, 1);
-gendef ( math_spread )( .8, .4, .2, 0, [-.2], [-.2], [-1]);
-otilt:=.2;
-superness:=1/sqrt 2;
-superpull:=1/20;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=false ;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsmi1000.mf b/Master/texmf-dist/fonts/source/public/cb/gsmi1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsmi1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsmn.mf b/Master/texmf-dist/fonts/source/public/cb/gsmn.mf
deleted file mode 100644
index 66a0cd5a641..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsmn.mf
+++ /dev/null
@@ -1,83 +0,0 @@
-% Copyright (C) 1997, 1999, 2002 Claudio Beccari
-% file gsmn v.1.0b 2002/04/14
-% 256 character sans serif upright greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GSMN";
-font_size (gensize*pt#);
-basedef ( 5, 8, 9, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 13.5, 17, 18.5, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 9, 12, 13, 15, 17, 24, 130);
-gendef [1/36pt#]( serif_fit# )( [-4], [-6], [-6.5], [-7], [-9], [-12], [-70]);
-gendef [1/36pt#]( cap_serif_fit# )( [-6],[-8.5], [-9], [-10], [-13], [-17],[-100]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 135, 216, 243, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 130, 205, 235, 260, 315, 445, 2500);
-gendef [1/36pt#]( cap_height# )( 125, 200, 225, 250, 300, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 118, 189, 212, 236, 283, 408, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 144, 160, 192, 267.8, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 81, 90, 108, 155.5, 900);
-gendef [1/36pt#]( bar_height# )( 40, 63, 71, 79, 97, 136, 820);
-gendef [1/36pt#]( comma_depth# )( 23, 37, 41, 45, 54, 78, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 63, 70, 84, 121, 900);
-gendef [1/36pt#](acc_ht# )( 125, 200, 225, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 113, 180, 203, 225, 275, 395, 2250);
-gendef [1/36pt#](Circ_ht# )( 125, 210, 230, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 36, 57.6, 64.8, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( fine# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( thin_join# )( 12, 15, 16, 17, 20, 24, 113);
-gendef [1/36pt#]( hair# )( 19, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( stem# )( 19, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( curve# )( 21, 25, 27, 28, 30, 33, 187);
-gendef [1/36pt#]( ess# )( 21, 25, 27, 28, 33, 37, 180);
-gendef [1/36pt#]( flare# )( 20, 22, 24, 25, 30, 33, 180);
-gendef [1/36pt#]( dot_size# )( 20, 26, 28, 30, 35, 40, 380);
-gendef [1/36pt#]( cap_hair# )( 21, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( cap_stem# )( 26, 29, 31, 32, 33, 39, 206);
-gendef [1/36pt#]( cap_curve# )( 26, 29, 31, 32, 37, 42, 247);
-gendef [1/36pt#]( cap_ess# )( 21, 28, 31, 32, 37, 42, 233);
-gendef [1/36pt#]( rule_thickness#)( 10.9, 13, 13.7, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( .3, .4, .5, .5, .6, .8, 5);
-gendef [1/36pt#]( vair# )( 15, 19, 21, 22, 26, 31, 147);
-gendef [1/36pt#]( notch_cut# )( 15, 16, 17, 18, 22, 32, 180);
-gendef [1/36pt#]( bar# )( 14, 18, 20, 21, 25, 30, 210);
-gendef [1/36pt#]( slab# )( 16, 20, 22, 23, 27, 32, 230);
-gendef [1/36pt#]( cap_bar# )( 15, 19, 21, 22, 26, 31, 220);
-gendef [1/36pt#]( cap_band# )( 12, 17, 19, 20, 24, 30, 200);
-gendef [1/36pt#]( cap_notch_cut# )( 18, 22, 24, 25, 31, 36, 250);
-gendef [1/36pt#]( serif_drop# )( 2, 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( stem_corr# )( 1, 1, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 2.5, 4, 4.5, 5, 6, 7, 33);
-gendef [1/36pt#]( o# )( 3, 6, 7, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 0, 0, 0, 0, 0, 0, 0);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .9, .93, .95, .96, .98, .98, 1);
-gendef ( math_spread )( .8, .4, .2, 0, [-.2], [-.2], [-1]);
-otilt:=.2;
-superness:=1/sqrt 2;
-superpull:=1/20;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=false ;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsmn1000.mf b/Master/texmf-dist/fonts/source/public/cb/gsmn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsmn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsmo.mf b/Master/texmf-dist/fonts/source/public/cb/gsmo.mf
deleted file mode 100644
index 17db21bd7f6..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsmo.mf
+++ /dev/null
@@ -1,83 +0,0 @@
-% Copyright (C) 1997, 1999,2002 Claudio Beccari
-% file gsmo v.1.0b 2002/04/14
-% 256 character sans serif oblique greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GSMO";
-font_size (gensize*pt#);
-basedef ( 5, 8, 9, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 13.5, 17, 18.5, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 9, 12, 13, 15, 17, 24, 130);
-gendef [1/36pt#]( serif_fit# )( [-4], [-6], [-6.5], [-7], [-9], [-12], [-70]);
-gendef [1/36pt#]( cap_serif_fit# )( [-6], [-8.5], [-9], [-10], [-13], [-17],[-100]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 135, 216, 243, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 130, 205, 235, 260, 315, 445, 2500);
-gendef [1/36pt#]( cap_height# )( 125, 200, 225, 250, 300, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 118, 189, 212, 236, 283, 408, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 144, 160, 192, 267.8, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 81, 90, 108, 155.5, 900);
-gendef [1/36pt#]( bar_height# )( 40, 63, 71, 79, 97, 136, 820);
-gendef [1/36pt#]( comma_depth# )( 23, 37, 41, 45, 54, 78, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 63, 70, 84, 121, 900);
-gendef [1/36pt#](acc_ht# )( 125, 200, 225, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 113, 180, 203, 225, 275, 395, 2250);
-gendef [1/36pt#](Circ_ht# )( 125, 210, 230, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 36, 57.6, 64.8, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( fine# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( thin_join# )( 12, 15, 16, 17, 20, 24, 113);
-gendef [1/36pt#]( hair# )( 19, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( stem# )( 19, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( curve# )( 21, 25, 27, 28, 30, 33, 187);
-gendef [1/36pt#]( ess# )( 21, 25, 27, 28, 33, 37, 180);
-gendef [1/36pt#]( flare# )( 20, 22, 24, 25, 30, 33, 180);
-gendef [1/36pt#]( dot_size# )( 20, 26, 28, 30, 35, 40, 380);
-gendef [1/36pt#]( cap_hair# )( 21, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( cap_stem# )( 26, 29, 31, 32, 33, 39, 206);
-gendef [1/36pt#]( cap_curve# )( 26, 29, 31, 32, 37, 42, 247);
-gendef [1/36pt#]( cap_ess# )( 21, 28, 31, 32, 37, 42, 233);
-gendef [1/36pt#]( rule_thickness#)( 10.9, 13, 13.7, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( .3, .4, .5, .5, .6, .8, 5);
-gendef [1/36pt#]( vair# )( 15, 19, 21, 22, 26, 31, 147);
-gendef [1/36pt#]( notch_cut# )( 15, 16, 17, 18, 22, 32, 180);
-gendef [1/36pt#]( bar# )( 14, 18, 20, 21, 25, 30, 210);
-gendef [1/36pt#]( slab# )( 16, 20, 22, 23, 27, 32, 230);
-gendef [1/36pt#]( cap_bar# )( 15, 19, 21, 22, 26, 31, 220);
-gendef [1/36pt#]( cap_band# )( 12, 17, 19, 20, 24, 30, 200);
-gendef [1/36pt#]( cap_notch_cut# )( 18, 22, 24, 25, 31, 36, 250);
-gendef [1/36pt#]( serif_drop# )( 2, 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( stem_corr# )( 1, 1, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 2.5, 4, 4.5, 5, 6, 7, 33);
-gendef [1/36pt#]( o# )( 3, 6, 7, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 0, 0, 0, 0, 0, 0, 0);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( .9, .93, .95, .96, .98, .98, 1);
-gendef ( math_spread )( .8, .4, .2, 0, [-.2], [-.2], [-1]);
-otilt:=.2;
-superness:=1/sqrt 2;
-superpull:=1/20;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=false ;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsmo1000.mf b/Master/texmf-dist/fonts/source/public/cb/gsmo1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsmo1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsmu.mf b/Master/texmf-dist/fonts/source/public/cb/gsmu.mf
deleted file mode 100644
index 22f2b7d46c4..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsmu.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1998, 1999, 2002 Claudio Beccari
-% file gsmu v.1.0b 2002/04/14
-% 256 character sans serif upright greek font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GSMU";
-font_size (gensize*pt#);
-basedef ( 5, 8, 9, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 13.5, 17, 18.5, 20, 23.5, 32.5, 200);
-gendef [1/36pt#]( width_adj# )( 9, 12, 13, 15, 17, 24, 130);
-gendef [1/36pt#]( serif_fit# )( [-4], [-6], [-6.5], [-7], [-9], [-12], [-70]);
-gendef [1/36pt#]( cap_serif_fit# )( [-6], [-8.5], [-9], [-10], [-13], [-17],[-100]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 135, 216, 243, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )( 130, 205, 235, 260, 315, 445, 2500);
-gendef [1/36pt#]( cap_height# )( 125, 200, 225, 250, 300, 425, 2460);
-gendef [1/36pt#]( fig_height# )( 118, 189, 212, 236, 283, 408, 2320);
-gendef [1/36pt#]( x_height# )( 80, 128, 144, 160, 192, 267.8, 1550);
-gendef [1/36pt#]( math_axis# )( 45, 72, 81, 90, 108, 155.5, 900);
-gendef [1/36pt#]( bar_height# )( 40, 63, 71, 79, 97, 136, 820);
-gendef [1/36pt#]( comma_depth# )( 23, 37, 41, 45, 54, 78, 700);
-gendef [1/36pt#]( desc_depth# )( 35, 56, 63, 70, 84, 121, 900);
-gendef [1/36pt#](acc_ht# )( 125, 210, 230, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )( 113, 180, 203, 225, 275, 395, 2250);
-gendef [1/36pt#](Circ_ht# )( 125, 210, 230, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 36, 57.6, 64.8, 72, 86.4, 125, 720);
-gendef [1/36pt#]( crisp# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( tiny# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( fine# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( thin_join# )( 12, 15, 16, 17, 20, 24, 113);
-gendef [1/36pt#]( hair# )( 19, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( stem# )( 19, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( curve# )( 21, 25, 27, 28, 30, 33, 187);
-gendef [1/36pt#]( ess# )( 21, 25, 27, 28, 33, 37, 180);
-gendef [1/36pt#]( flare# )( 20, 22, 24, 25, 30, 33, 180);
-gendef [1/36pt#]( dot_size# )( 20, 26, 28, 30, 35, 40, 380);
-gendef [1/36pt#]( cap_hair# )( 21, 25, 27, 28, 33, 37, 187);
-gendef [1/36pt#]( cap_stem# )( 26, 29, 31, 32, 33, 39, 206);
-gendef [1/36pt#]( cap_curve# )( 26, 29, 31, 32, 37, 42, 247);
-gendef [1/36pt#]( cap_ess# )( 21, 28, 31, 32, 37, 42, 233);
-gendef [1/36pt#]( rule_thickness#)( 10.9, 13, 13.7, 14.4, 16, 22, 144);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( .3, .4, .5, .5, .6, .8, 5);
-gendef [1/36pt#]( vair# )( 15, 19, 21, 22, 26, 31, 147);
-gendef [1/36pt#]( notch_cut# )( 15, 16, 17, 18, 22, 32, 180);
-gendef [1/36pt#]( bar# )( 14, 18, 20, 21, 25, 30, 210);
-gendef [1/36pt#]( slab# )( 16, 20, 22, 23, 27, 32, 230);
-gendef [1/36pt#]( cap_bar# )( 15, 19, 21, 22, 26, 31, 220);
-gendef [1/36pt#]( cap_band# )( 12, 17, 19, 20, 24, 30, 200);
-gendef [1/36pt#]( cap_notch_cut# )( 18, 22, 24, 25, 31, 36, 250);
-gendef [1/36pt#]( serif_drop# )( 2, 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( stem_corr# )( 1, 1, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( vair_corr# )( 1, 1, 1, 1, 1, 1, 2);
-gendef [1/36pt#]( apex_corr# )( 2.5, 4, 4.5, 5, 6, 7, 33);
-gendef [1/36pt#]( o# )( 3, 6, 7, 8, 9, 10, 53);
-gendef [1/36pt#]( apex_o# )( 0, 0, 0, 0, 0, 0, 0);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .9, .93, .95, .96, .98, .98, 1);
-gendef ( math_spread )( .8, .4, .2, 0, [-.2], [-.2], [-1]);
-otilt:=.2;
-superness:=1/sqrt 2;
-superpull:=1/20;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=false ;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsmu1000.mf b/Master/texmf-dist/fonts/source/public/cb/gsmu1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsmu1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsxc.mf b/Master/texmf-dist/fonts/source/public/cb/gsxc.mf
deleted file mode 100644
index edbcf343234..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsxc.mf
+++ /dev/null
@@ -1,85 +0,0 @@
-% Copyright (C) 1997, 1999, 2002 Claudio Beccari
-% file gsxc v.1.0b 2002/04/13
-% 256 character sans serif upright bold greek caps and small caps font
-% mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GSXC";
-small_caps:=true; sclc:=1.19;
-font_size (gensize*pt#);
-basedef ( 5, 9, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12, 19, 22, 27, 40, 220);
-gendef [1/36pt#]( width_adj# )( 12, 19, 22, 19, 27, 220);
-gendef [1/36pt#]( serif_fit# )([-5], [-8], [-9], [-10], [-14], [-90]);
-gendef [1/36pt#]( cap_serif_fit# )([-6], [-9], [-11], [-15], [-20], [-110]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )(135, 243, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )(130, 235, 260, 315, 445, 2500);
-gendef [1/36pt#]( cap_height# )(125, 225, 250, 300, 425, 2470);
-gendef [1/36pt#]( fig_height# )(125, 212, 250, 283, 408, 2320);
-gendef [1/36pt#]( x_height# )( 83, 149, 165, 198, 280, 1650);
-gendef [1/36pt#]( math_axis# )( 45, 80, 90, 108, 150, 900);
-gendef [1/36pt#]( bar_height# )( 45, 80, 90, 95, 135, 900);
-gendef [1/36pt#]( comma_depth# )( 19, 34, 38, 54, 75, 380);
-gendef [1/36pt#]( desc_depth# )( 35, 62, 70, 84, 120, 900);
-gendef [1/36pt#](acc_ht# )(120, 220, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )(114, 207, 230, 275, 397, 2300);
-gendef [1/36pt#](Circ_ht# )(130, 225, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 124.4, 720);
-gendef [1/36pt#]( crisp# )( 12, 25, 26, 26, 26, 0);
-gendef [1/36pt#]( tiny# )( 12, 24, 26, 26, 26, 0);
-gendef [1/36pt#]( fine# )( 5, 7, 9, 9, 9, 0);
-gendef [1/36pt#]( thin_join# )( 11, 18, 19, 21, 25, 126);
-gendef [1/36pt#]( hair# )( 25, 40, 49, 50, 67, 233);
-gendef [1/36pt#]( stem# )( 25, 41, 49, 50, 67, 233);
-gendef [1/36pt#]( curve# )( 25, 41, 49, 50, 67, 233);
-gendef [1/36pt#]( ess# )( 22, 35, 43, 44, 60, 227);
-gendef [1/36pt#]( flare# )( 20, 39, 40, 41, 58, 227);
-gendef [1/36pt#]( dot_size# )( 24, 40, 47, 48, 65, 410);
-gendef [1/36pt#]( cap_hair# )( 24, 41, 48, 50, 67, 280);
-gendef [1/36pt#]( cap_stem# )( 26, 43, 51, 54, 70, 300);
-gendef [1/36pt#]( cap_curve# )( 26, 43, 51, 54, 70, 300);
-gendef [1/36pt#]( cap_ess# )( 26, 43, 51, 52, 68, 300);
-gendef [1/36pt#]( rule_thickness#)( 16, 29, 30, 31, 36, 300);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )(.75, 1.1, 1.5, 1.8, 3.5, 2);
-gendef [1/36pt#]( vair# )( 15, 22, 26, 27, 35, 140);
-gendef [1/36pt#]( notch_cut# )( 25, 42, 49, 50, 57, 327);
-gendef [1/36pt#]( bar# )( 13, 26, 26, 27, 35, 173);
-gendef [1/36pt#]( slab# )( 18, 35, 36, 37, 45, 240);
-gendef [1/36pt#]( cap_bar# )( 17, 33, 34, 35, 42, 227);
-gendef [1/36pt#]( cap_band# )( 16, 30, 31, 32, 40, 207);
-gendef [1/36pt#]( cap_notch_cut# )( 23, 44, 45, 46, 53, 300);
-gendef [1/36pt#]( serif_drop# )( 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( stem_corr# )( 1, 1, 1, 1, 1, 1);
-gendef [1/36pt#]( vair_corr# )( 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( apex_corr# )( 15, 17, 18, 19, 20, 25);
-gendef [1/36pt#]( o# )( 5, 7, 8, 9, 10, 80);
-gendef [1/36pt#]( apex_o# )( 0, 0, 0, 0, 0, 0);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )(.88, .88, .88, .88, .88, .88);
-gendef ( math_spread )(.45, .45, .5, .5, .5, .5);
-otilt:=.2;
-superness:=3/4;
-superpull:=1/18;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsxc1000.mf b/Master/texmf-dist/fonts/source/public/cb/gsxc1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsxc1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsxi.mf b/Master/texmf-dist/fonts/source/public/cb/gsxi.mf
deleted file mode 100644
index 483ce62aca1..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsxi.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1998, 1999, 2002 Claudio Beccari
-% file gsxi v.1.0b 2002/04/13
-% 256 character sans serif bold cursive greek font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GSXI";
-font_size (gensize*pt#);
-basedef ( 5, 9, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12, 19, 22, 27, 40, 220);
-gendef [1/36pt#]( width_adj# )( 12, 19, 22, 19, 27, 220);
-gendef [1/36pt#]( serif_fit# )([-5], [-8], [-9], [-10], [-14], [-90]);
-gendef [1/36pt#]( cap_serif_fit# )([-6], [-9], [-11], [-15], [-20], [-110]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )(135, 243, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )(130, 235, 260, 315, 445, 2500);
-gendef [1/36pt#]( cap_height# )(125, 225, 250, 300, 425, 2470);
-gendef [1/36pt#]( fig_height# )(125, 212, 250, 283, 408, 2320);
-gendef [1/36pt#]( x_height# )( 83, 149, 165, 198, 280, 1650);
-gendef [1/36pt#]( math_axis# )( 45, 80, 90, 108, 150, 900);
-gendef [1/36pt#]( bar_height# )( 45, 80, 90, 95, 135, 900);
-gendef [1/36pt#]( comma_depth# )( 19, 34, 38, 54, 75, 380);
-gendef [1/36pt#]( desc_depth# )( 35, 62, 70, 84, 120, 900);
-gendef [1/36pt#](acc_ht# )(120, 220, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )(114, 207, 230, 275, 397, 2300);
-gendef [1/36pt#](Circ_ht# )(130, 225, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 124.4, 720);
-gendef [1/36pt#]( crisp# )( 12, 25, 26, 26, 26, 0);
-gendef [1/36pt#]( tiny# )( 12, 24, 26, 26, 26, 0);
-gendef [1/36pt#]( fine# )( 5, 7, 9, 9, 9, 0);
-gendef [1/36pt#]( thin_join# )( 11, 18, 19, 21, 25, 126);
-gendef [1/36pt#]( hair# )( 25, 40, 49, 50, 67, 233);
-gendef [1/36pt#]( stem# )( 25, 41, 49, 50, 67, 233);
-gendef [1/36pt#]( curve# )( 25, 41, 49, 50, 67, 233);
-gendef [1/36pt#]( ess# )( 22, 35, 43, 44, 60, 227);
-gendef [1/36pt#]( flare# )( 20, 39, 40, 41, 58, 227);
-gendef [1/36pt#]( dot_size# )( 24, 40, 47, 48, 65, 410);
-gendef [1/36pt#]( cap_hair# )( 24, 41, 48, 50, 67, 280);
-gendef [1/36pt#]( cap_stem# )( 26, 43, 51, 54, 70, 300);
-gendef [1/36pt#]( cap_curve# )( 26, 43, 51, 54, 70, 300);
-gendef [1/36pt#]( cap_ess# )( 26, 43, 51, 52, 68, 300);
-gendef [1/36pt#]( rule_thickness#)( 16, 29, 30, 31, 36, 300);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )(.75, 1.1, 1.5, 1.8, 3.5, 2);
-gendef [1/36pt#]( vair# )( 15, 22, 26, 27, 35, 140);
-gendef [1/36pt#]( notch_cut# )( 25, 42, 49, 50, 57, 327);
-gendef [1/36pt#]( bar# )( 13, 26, 26, 27, 35, 173);
-gendef [1/36pt#]( slab# )( 18, 35, 36, 37, 45, 240);
-gendef [1/36pt#]( cap_bar# )( 17, 33, 34, 35, 42, 227);
-gendef [1/36pt#]( cap_band# )( 16, 30, 31, 32, 40, 207);
-gendef [1/36pt#]( cap_notch_cut# )( 23, 44, 45, 46, 53, 300);
-gendef [1/36pt#]( serif_drop# )( 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( stem_corr# )( 1, 1, 1, 1, 1, 1);
-gendef [1/36pt#]( vair_corr# )( 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( apex_corr# )( 15, 17, 18, 19, 20, 25);
-gendef [1/36pt#]( o# )( 5, 7, 8, 9, 10, 80);
-gendef [1/36pt#]( apex_o# )( 0, 0, 0, 0, 0, 0);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )(.88, .88, .88, .88, .88, .88);
-gendef ( math_spread )(.45, .45, .5, .5, .5, .5);
-otilt:=.2;
-superness:=3/4;
-superpull:=1/18;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-cursive:=true;
-clear_extra_memory;
-generate cbgreek;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsxi1000.mf b/Master/texmf-dist/fonts/source/public/cb/gsxi1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsxi1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsxn.mf b/Master/texmf-dist/fonts/source/public/cb/gsxn.mf
deleted file mode 100644
index 0bbae386782..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsxn.mf
+++ /dev/null
@@ -1,83 +0,0 @@
-% Copyright (C) 1997, 1999, 2001, 2002 Claudio Beccari
-% file gsxn v.1.0c 2002/04/13
-% 256 character sans serif upright bold greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GSXN";
-font_size (gensize*pt#);
-basedef ( 5, 9, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12, 19, 22, 27, 40, 220);
-gendef [1/36pt#]( width_adj# )( 12, 19, 22, 19, 27, 220);
-gendef [1/36pt#]( serif_fit# )([-5], [-8], [-9], [-10], [-14], [-90]);
-gendef [1/36pt#]( cap_serif_fit# )([-6], [-9], [-11], [-15], [-20], [-110]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )(135, 243, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )(130, 235, 260, 315, 445, 2500);
-gendef [1/36pt#]( cap_height# )(125, 225, 250, 300, 425, 2470);
-gendef [1/36pt#]( fig_height# )(125, 212, 250, 283, 408, 2320);
-gendef [1/36pt#]( x_height# )( 83, 149, 165, 198, 280, 1650);
-gendef [1/36pt#]( math_axis# )( 45, 80, 90, 108, 150, 900);
-gendef [1/36pt#]( bar_height# )( 45, 80, 90, 95, 135, 900);
-gendef [1/36pt#]( comma_depth# )( 19, 34, 38, 54, 75, 380);
-gendef [1/36pt#]( desc_depth# )( 35, 62, 70, 84, 120, 900);
-gendef [1/36pt#](acc_ht# )(120, 220, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )(114, 207, 230, 275, 397, 2300);
-gendef [1/36pt#](Circ_ht# )(130, 225, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 124.4, 720);
-gendef [1/36pt#]( crisp# )( 12, 25, 26, 26, 26, 26);
-gendef [1/36pt#]( tiny# )( 12, 24, 26, 26, 26, 26);
-gendef [1/36pt#]( fine# )( 5, 7, 9, 9, 9, 9);
-gendef [1/36pt#]( thin_join# )( 11, 18, 19, 21, 25, 126);
-gendef [1/36pt#]( hair# )( 25, 40, 49, 50, 67, 233);
-gendef [1/36pt#]( stem# )( 25, 41, 49, 50, 67, 233);
-gendef [1/36pt#]( curve# )( 25, 41, 49, 50, 67, 233);
-gendef [1/36pt#]( ess# )( 22, 35, 43, 44, 60, 227);
-gendef [1/36pt#]( flare# )( 20, 39, 40, 41, 58, 227);
-gendef [1/36pt#]( dot_size# )( 24, 40, 47, 48, 65, 410);
-gendef [1/36pt#]( cap_hair# )( 24, 41, 48, 50, 67, 280);
-gendef [1/36pt#]( cap_stem# )( 26, 43, 51, 54, 70, 300);
-gendef [1/36pt#]( cap_curve# )( 26, 43, 51, 54, 70, 300);
-gendef [1/36pt#]( cap_ess# )( 26, 43, 51, 52, 68, 300);
-gendef [1/36pt#]( rule_thickness#)( 16, 29, 30, 31, 36, 300);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )(.75, 1.1, 1.5, 1.8, 3.5, 2);
-gendef [1/36pt#]( vair# )( 15, 22, 26, 27, 35, 140);
-gendef [1/36pt#]( notch_cut# )( 25, 42, 49, 50, 57, 327);
-gendef [1/36pt#]( bar# )( 13, 26, 26, 27, 35, 173);
-gendef [1/36pt#]( slab# )( 18, 35, 36, 37, 45, 240);
-gendef [1/36pt#]( cap_bar# )( 17, 33, 34, 35, 42, 227);
-gendef [1/36pt#]( cap_band# )( 16, 30, 31, 32, 40, 207);
-gendef [1/36pt#]( cap_notch_cut# )( 23, 44, 45, 46, 53, 300);
-gendef [1/36pt#]( serif_drop# )( 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( stem_corr# )( 1, 1, 1, 1, 1, 1);
-gendef [1/36pt#]( vair_corr# )( 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( apex_corr# )( 15, 17, 18, 19, 20, 25);
-gendef [1/36pt#]( o# )( 5, 7, 8, 9, 10, 80);
-gendef [1/36pt#]( apex_o# )( 0, 0, 0, 0, 0, 0);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )(.88, .88, .88, .88, .88, .88);
-gendef ( math_spread )(.45, .45, .5, .5, .5, .5);
-otilt:=.2;
-superness:=3/4;
-superpull:=1/18;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-generate cbgreek;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsxn1000.mf b/Master/texmf-dist/fonts/source/public/cb/gsxn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsxn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsxo.mf b/Master/texmf-dist/fonts/source/public/cb/gsxo.mf
deleted file mode 100644
index 0cca8571542..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsxo.mf
+++ /dev/null
@@ -1,83 +0,0 @@
-% Copyright (C) 1997, 1999, 2002 Claudio Beccari
-% file gsxo v.1.0b 2002/04/13
-% 256 character sans serif bold oblique greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GSXO";
-font_size (gensize*pt#);
-basedef ( 5, 9, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12, 19, 22, 27, 40, 220);
-gendef [1/36pt#]( width_adj# )( 12, 19, 22, 19, 27, 220);
-gendef [1/36pt#]( serif_fit# )([-5], [-8], [-9], [-10], [-14], [-90]);
-gendef [1/36pt#]( cap_serif_fit# )([-6], [-9], [-11], [-15], [-20], [-110]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )(135, 243, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )(130, 235, 260, 315, 445, 2500);
-gendef [1/36pt#]( cap_height# )(125, 225, 250, 300, 425, 2470);
-gendef [1/36pt#]( fig_height# )(125, 212, 250, 283, 408, 2320);
-gendef [1/36pt#]( x_height# )( 83, 149, 165, 198, 280, 1650);
-gendef [1/36pt#]( math_axis# )( 45, 80, 90, 108, 150, 900);
-gendef [1/36pt#]( bar_height# )( 45, 80, 90, 95, 135, 900);
-gendef [1/36pt#]( comma_depth# )( 19, 34, 38, 54, 75, 380);
-gendef [1/36pt#]( desc_depth# )( 35, 62, 70, 84, 120, 900);
-gendef [1/36pt#](acc_ht# )(120, 220, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )(114, 207, 230, 275, 397, 2300);
-gendef [1/36pt#](Circ_ht# )(130, 225, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 124.4, 720);
-gendef [1/36pt#]( crisp# )( 12, 25, 26, 26, 26, 0);
-gendef [1/36pt#]( tiny# )( 12, 24, 26, 26, 26, 0);
-gendef [1/36pt#]( fine# )( 5, 7, 9, 9, 9, 0);
-gendef [1/36pt#]( thin_join# )( 11, 18, 19, 21, 25, 126);
-gendef [1/36pt#]( hair# )( 25, 40, 49, 50, 67, 233);
-gendef [1/36pt#]( stem# )( 25, 41, 49, 50, 67, 233);
-gendef [1/36pt#]( curve# )( 25, 41, 49, 50, 67, 233);
-gendef [1/36pt#]( ess# )( 22, 35, 43, 44, 60, 227);
-gendef [1/36pt#]( flare# )( 20, 39, 40, 41, 58, 227);
-gendef [1/36pt#]( dot_size# )( 24, 40, 47, 48, 65, 410);
-gendef [1/36pt#]( cap_hair# )( 24, 41, 48, 50, 67, 280);
-gendef [1/36pt#]( cap_stem# )( 26, 43, 51, 54, 70, 300);
-gendef [1/36pt#]( cap_curve# )( 26, 43, 51, 54, 70, 300);
-gendef [1/36pt#]( cap_ess# )( 26, 43, 51, 52, 68, 300);
-gendef [1/36pt#]( rule_thickness#)( 16, 29, 30, 31, 36, 300);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )(.75, 1.1, 1.5, 1.8, 3.5, 2);
-gendef [1/36pt#]( vair# )( 15, 22, 26, 27, 35, 140);
-gendef [1/36pt#]( notch_cut# )( 25, 42, 49, 50, 57, 327);
-gendef [1/36pt#]( bar# )( 13, 26, 26, 27, 35, 173);
-gendef [1/36pt#]( slab# )( 18, 35, 36, 37, 45, 240);
-gendef [1/36pt#]( cap_bar# )( 17, 33, 34, 35, 42, 227);
-gendef [1/36pt#]( cap_band# )( 16, 30, 31, 32, 40, 207);
-gendef [1/36pt#]( cap_notch_cut# )( 23, 44, 45, 46, 53, 300);
-gendef [1/36pt#]( serif_drop# )( 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( stem_corr# )( 1, 1, 1, 1, 1, 1);
-gendef [1/36pt#]( vair_corr# )( 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( apex_corr# )( 15, 17, 18, 19, 20, 25);
-gendef [1/36pt#]( o# )( 5, 7, 8, 9, 10, 80);
-gendef [1/36pt#]( apex_o# )( 0, 0, 0, 0, 0, 0);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )(.88, .88, .88, .88, .88, .88);
-gendef ( math_spread )(.45, .45, .5, .5, .5, .5);
-otilt:=.2;
-superness:=3/4;
-superpull:=1/18;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-clear_extra_memory;
-generate cbgreek;
-endinput;
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsxo1000.mf b/Master/texmf-dist/fonts/source/public/cb/gsxo1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsxo1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsxu.mf b/Master/texmf-dist/fonts/source/public/cb/gsxu.mf
deleted file mode 100644
index 3f8de85795e..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsxu.mf
+++ /dev/null
@@ -1,84 +0,0 @@
-% Copyright (C) 1998, 1999, 2002 Claudio Beccari
-% file gsxu v.1.0b 2002/04/13
-% 256 character sans serif bold upright cursive greek font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GSXU";
-font_size (gensize*pt#);
-basedef ( 5, 9, 10, 12, 17.28, 100);
-gendef [1/36pt#]( u# )( 12, 19, 22, 27, 40, 220);
-gendef [1/36pt#]( width_adj# )( 12, 19, 22, 19, 27, 220);
-gendef [1/36pt#]( serif_fit# )([-5], [-8], [-9], [-10], [-14], [-90]);
-gendef [1/36pt#]( cap_serif_fit# )([-6], [-9], [-11], [-15], [-20], [-110]);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )(135, 243, 270, 324, 466, 2700);
-gendef [1/36pt#]( asc_height# )(130, 235, 260, 315, 445, 2500);
-gendef [1/36pt#]( cap_height# )(125, 225, 250, 300, 425, 2470);
-gendef [1/36pt#]( fig_height# )(125, 212, 250, 283, 408, 2320);
-gendef [1/36pt#]( x_height# )( 83, 149, 165, 198, 280, 1650);
-gendef [1/36pt#]( math_axis# )( 45, 80, 90, 108, 150, 900);
-gendef [1/36pt#]( bar_height# )( 45, 80, 90, 95, 135, 900);
-gendef [1/36pt#]( comma_depth# )( 19, 34, 38, 54, 75, 380);
-gendef [1/36pt#]( desc_depth# )( 35, 62, 70, 84, 120, 900);
-gendef [1/36pt#](acc_ht# )(120, 220, 250, 300, 432, 2500);
-gendef [1/36pt#](circ_ht# )(114, 207, 230, 275, 397, 2300);
-gendef [1/36pt#](Circ_ht# )(130, 225, 250, 300, 432, 2500);
-gendef [1/36pt#](iota_dp# )( 37, 57.6, 72, 86.4, 124.4, 720);
-gendef [1/36pt#]( crisp# )( 12, 25, 26, 26, 26, 0);
-gendef [1/36pt#]( tiny# )( 12, 24, 26, 26, 26, 0);
-gendef [1/36pt#]( fine# )( 5, 7, 9, 9, 9, 0);
-gendef [1/36pt#]( thin_join# )( 11, 18, 19, 21, 25, 126);
-gendef [1/36pt#]( hair# )( 25, 40, 49, 50, 67, 233);
-gendef [1/36pt#]( stem# )( 25, 41, 49, 50, 67, 233);
-gendef [1/36pt#]( curve# )( 25, 41, 49, 50, 67, 233);
-gendef [1/36pt#]( ess# )( 22, 35, 43, 44, 60, 227);
-gendef [1/36pt#]( flare# )( 20, 39, 40, 41, 58, 227);
-gendef [1/36pt#]( dot_size# )( 24, 40, 47, 48, 65, 410);
-gendef [1/36pt#]( cap_hair# )( 24, 41, 48, 50, 67, 280);
-gendef [1/36pt#]( cap_stem# )( 26, 43, 51, 54, 70, 300);
-gendef [1/36pt#]( cap_curve# )( 26, 43, 51, 54, 70, 300);
-gendef [1/36pt#]( cap_ess# )( 26, 43, 51, 52, 68, 300);
-gendef [1/36pt#]( rule_thickness#)( 16, 29, 30, 31, 36, 300);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )(.75, 1.1, 1.5, 1.8, 3.5, 2);
-gendef [1/36pt#]( vair# )( 15, 22, 26, 27, 35, 140);
-gendef [1/36pt#]( notch_cut# )( 25, 42, 49, 50, 57, 327);
-gendef [1/36pt#]( bar# )( 13, 26, 26, 27, 35, 173);
-gendef [1/36pt#]( slab# )( 18, 35, 36, 37, 45, 240);
-gendef [1/36pt#]( cap_bar# )( 17, 33, 34, 35, 42, 227);
-gendef [1/36pt#]( cap_band# )( 16, 30, 31, 32, 40, 207);
-gendef [1/36pt#]( cap_notch_cut# )( 23, 44, 45, 46, 53, 300);
-gendef [1/36pt#]( serif_drop# )( 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( stem_corr# )( 1, 1, 1, 1, 1, 1);
-gendef [1/36pt#]( vair_corr# )( 2, 2, 2, 2, 2, 2);
-gendef [1/36pt#]( apex_corr# )( 15, 17, 18, 19, 20, 25);
-gendef [1/36pt#]( o# )( 5, 7, 8, 9, 10, 80);
-gendef [1/36pt#]( apex_o# )( 0, 0, 0, 0, 0, 0);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )(.88, .88, .88, .88, .88, .88);
-gendef ( math_spread )(.45, .45, .5, .5, .5, .5);
-otilt:=.2;
-superness:=3/4;
-superpull:=1/18;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=false;
-monospace:=false;
-variant_g:=false;
-low_asterisk:=false;
-math_fitting:=false;
-slitex:=false;
-straight:=false;
-monowidth:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gsxu1000.mf b/Master/texmf-dist/fonts/source/public/cb/gsxu1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gsxu1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gttc.mf b/Master/texmf-dist/fonts/source/public/cb/gttc.mf
deleted file mode 100644
index e67bad67d17..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gttc.mf
+++ /dev/null
@@ -1,88 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file gttc v.1.1 1999/11/14
-% 256 character typewriter type upright greek caps and small caps font
-% mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GTTC";
-small_caps:=true; sclc:=1.19;
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 21, 24.7, 210);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 125, 200, 250, 300, 2500);
-gendef [1/36pt#]( asc_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( cap_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( fig_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 1550);
-gendef [1/36pt#]( math_axis# )( 55, 88, 110, 132, 1100);
-gendef [1/36pt#]( bar_height# )( 39.5, 63, 79, 95, 790);
-gendef [1/36pt#]( comma_depth# )( 25, 40, 50, 60, 500);
-gendef [1/36pt#]( desc_depth# )( 25, 64, 80, 96, 800);
-gendef [1/36pt#](acc_ht# )( 110, 210, 250, 300, 2300);
-gendef [1/36pt#](circ_ht# )( 110, 210, 250, 300, 2300);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 2500);
-gendef [1/36pt#](iota_dp# )( 22.5, 57.6, 64, 77, 640);
-gendef [1/36pt#]( crisp# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( tiny# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( fine# )( 14.5, 18, 21, 22, 183);
-gendef [1/36pt#]( thin_join# )( 14.5, 18, 21, 22, 183);
-gendef [1/36pt#]( hair# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( stem# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( curve# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( ess# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( flare# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( dot_size# )( 23.5, 31, 36, 39, 360);
-gendef [1/36pt#]( cap_hair# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_stem# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_curve# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_ess# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( rule_thickness#)( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( cap_jut# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( vair# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( notch_cut# )( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( bar# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( slab# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( cap_bar# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( cap_band# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( cap_notch_cut# )( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair_corr# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( apex_corr# )( 0, 8, 10, 11, 70);
-gendef [1/36pt#]( o# )( 2, 3, 4, 5, 25);
-gendef [1/36pt#]( apex_o# )( 3, 3, 3, 4, 15);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .81, .81, .81, .81, .81);
-gendef ( math_spread )( [-1], [-1], [-1], [-1], [-1]);
-otilt:=.2;
-superness:=1/sqrt 2;
-superpull:=0;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=true;
-monospace:=true;
-variant_g:=false;
-low_asterisk:=true;
-math_fitting:=false;
-straight:=true;
-monowidth:=true;
-slitex:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gttc1000.mf b/Master/texmf-dist/fonts/source/public/cb/gttc1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gttc1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gtti.mf b/Master/texmf-dist/fonts/source/public/cb/gtti.mf
deleted file mode 100644
index 5a3adf8afb9..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gtti.mf
+++ /dev/null
@@ -1,88 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-% file gtti v.1.1 1999/11/14
-% 256 character typewriter type cursive greek font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GTTI";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 21, 24.7, 210);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 125, 200, 250, 300, 2500);
-gendef [1/36pt#]( asc_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( cap_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( fig_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 1550);
-gendef [1/36pt#]( math_axis# )( 55, 88, 110, 132, 1100);
-gendef [1/36pt#]( bar_height# )( 39.5, 63, 79, 95, 790);
-gendef [1/36pt#]( comma_depth# )( 25, 40, 50, 60, 500);
-gendef [1/36pt#]( desc_depth# )( 25, 64, 80, 96, 800);
-gendef [1/36pt#](acc_ht# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#](circ_ht# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 2500);
-gendef [1/36pt#](iota_dp# )( 22.5, 57.6, 64, 77, 640);
-gendef [1/36pt#]( crisp# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( tiny# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( fine# )( 14.5, 18, 21, 22, 183);
-gendef [1/36pt#]( thin_join# )( 14.5, 18, 21, 22, 183);
-gendef [1/36pt#]( hair# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( stem# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( curve# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( ess# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( flare# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( dot_size# )( 23.5, 31, 36, 39, 360);
-gendef [1/36pt#]( cap_hair# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_stem# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_curve# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_ess# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( rule_thickness#)( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( cap_jut# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( vair# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( notch_cut# )( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( bar# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( slab# )( 15, 29, 22, 25, 220);
-gendef [1/36pt#]( cap_bar# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( cap_band# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( cap_notch_cut# )( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair_corr# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( apex_corr# )( 0, 8, 10, 11, 70);
-gendef [1/36pt#]( o# )( 2, 3, 4, 5, 25);
-gendef [1/36pt#]( apex_o# )( 3, 3, 3, 4, 15);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( .81, .81, .81, .81, .81);
-gendef ( math_spread )( [-1], [-1], [-1], [-1], [-1]);
-otilt:=.2;
-superness:=1/sqrt 2;
-superpull:=0;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=true;
-monospace:=true;
-variant_g:=false;
-low_asterisk:=true;
-math_fitting:=false;
-straight:=true;
-monowidth:=true;
-slitex:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gtti1000.mf b/Master/texmf-dist/fonts/source/public/cb/gtti1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gtti1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gttn.mf b/Master/texmf-dist/fonts/source/public/cb/gttn.mf
deleted file mode 100644
index 66633e37534..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gttn.mf
+++ /dev/null
@@ -1,85 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file gttn v.1.1 1999/11/14
-% 256 character typewriter type upright greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GTTN";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 21, 24.7, 210);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 125, 200, 250, 300, 2500);
-gendef [1/36pt#]( asc_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( cap_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( fig_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 1550);
-gendef [1/36pt#]( math_axis# )( 55, 88, 110, 132, 1100);
-gendef [1/36pt#]( bar_height# )( 39.5, 63, 79, 95, 790);
-gendef [1/36pt#]( comma_depth# )( 25, 40, 50, 60, 500);
-gendef [1/36pt#]( desc_depth# )( 25, 64, 80, 96, 800);
-gendef [1/36pt#](acc_ht# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#](circ_ht# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 2500);
-gendef [1/36pt#](iota_dp# )( 22.5, 57.6, 64, 77, 640);
-gendef [1/36pt#]( crisp# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( tiny# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( fine# )( 14.5, 18, 21, 22, 183);
-gendef [1/36pt#]( thin_join# )( 14.5, 18, 21, 22, 183);
-gendef [1/36pt#]( hair# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( stem# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( curve# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( ess# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( flare# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( dot_size# )( 23.5, 31, 36, 39, 360);
-gendef [1/36pt#]( cap_hair# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_stem# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_curve# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_ess# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( rule_thickness#)( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( cap_jut# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( vair# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( notch_cut# )( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( bar# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( slab# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( cap_bar# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( cap_band# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( cap_notch_cut# )( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair_corr# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( apex_corr# )( 0, 8, 10, 11, 70);
-gendef [1/36pt#]( o# )( 2, 3, 4, 5, 25);
-gendef [1/36pt#]( apex_o# )( 3, 3, 3, 4, 15);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .81, .81, .81, .81, .81);
-gendef ( math_spread )( [-1], [-1], [-1], [-1], [-1]);
-otilt:=.2;
-superness:=1/sqrt 2;
-superpull:=0;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=true;
-monospace:=true;
-variant_g:=false;
-low_asterisk:=true;
-math_fitting:=false;
-straight:=true;
-monowidth:=true;
-slitex:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gttn1000.mf b/Master/texmf-dist/fonts/source/public/cb/gttn1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gttn1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gtto.mf b/Master/texmf-dist/fonts/source/public/cb/gtto.mf
deleted file mode 100644
index 2925b07fc39..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gtto.mf
+++ /dev/null
@@ -1,86 +0,0 @@
-% Copyright (C) 1997, 1999 Claudio Beccari
-% file gtto v.1.1 1999/11/14
-% 256 character typewriter type oblique greek font mainly after Silvio Levy
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GTTO";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 21, 24.7, 210);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 125, 200, 250, 300, 2500);
-gendef [1/36pt#]( asc_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( cap_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( fig_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 1550);
-gendef [1/36pt#]( math_axis# )( 55, 88, 110, 132, 1100);
-gendef [1/36pt#]( bar_height# )( 39.5, 63, 79, 95, 790);
-gendef [1/36pt#]( comma_depth# )( 25, 40, 50, 60, 500);
-gendef [1/36pt#]( desc_depth# )( 25, 64, 80, 96, 800);
-gendef [1/36pt#](acc_ht# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#](circ_ht# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 2500);
-gendef [1/36pt#](iota_dp# )( 22.5, 57.6, 64, 77, 640);
-gendef [1/36pt#]( crisp# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( tiny# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( fine# )( 14.5, 18, 21, 22, 183);
-gendef [1/36pt#]( thin_join# )( 14.5, 18, 21, 22, 183);
-gendef [1/36pt#]( hair# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( stem# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( curve# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( ess# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( flare# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( dot_size# )( 23.5, 31, 36, 39, 360);
-gendef [1/36pt#]( cap_hair# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_stem# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_curve# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_ess# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( rule_thickness#)( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( cap_jut# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( vair# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( notch_cut# )( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( bar# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( slab# )( 15, 29, 22, 25, 220);
-gendef [1/36pt#]( cap_bar# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( cap_band# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( cap_notch_cut# )( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair_corr# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( apex_corr# )( 0, 8, 10, 11, 70);
-gendef [1/36pt#]( o# )( 2, 3, 4, 5, 25);
-gendef [1/36pt#]( apex_o# )( 3, 3, 3, 4, 15);
-slant:=sind 12/cosd 12;
-%slant:=0;
-gendef ( fudge )( .81, .81, .81, .81, .81);
-gendef ( math_spread )( [-1], [-1], [-1], [-1], [-1]);
-otilt:=.2;
-superness:=1/sqrt 2;
-superpull:=0;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=true;
-monospace:=true;
-variant_g:=false;
-low_asterisk:=true;
-math_fitting:=false;
-straight:=true;
-monowidth:=true;
-slitex:=false;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gtto1000.mf b/Master/texmf-dist/fonts/source/public/cb/gtto1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gtto1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/source/public/cb/gttu.mf b/Master/texmf-dist/fonts/source/public/cb/gttu.mf
deleted file mode 100644
index 0d9eb8d1245..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gttu.mf
+++ /dev/null
@@ -1,88 +0,0 @@
-% Copyright (C) 1998, 1999 Claudio Beccari
-% file gttu v.1.1 1999/11/14
-% 256 character typewriter type upright cursive greek font
-%
-if unknown cmbase: input cmbase fi;
-if unknown cbbase: input cbbase fi;
-font_identifier:="GTTU";
-font_size (gensize*pt#);
-basedef ( 5, 8, 10, 12, 100);
-gendef [1/36pt#]( u# )( 12.5, 17, 21, 24.7, 210);
-gendef [1/36pt#]( width_adj# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( cap_serif_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( letter_fit# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( body_height# )( 125, 200, 250, 300, 2500);
-gendef [1/36pt#]( asc_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( cap_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( fig_height# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#]( x_height# )( 77.5, 124, 155, 186, 1550);
-gendef [1/36pt#]( math_axis# )( 55, 88, 110, 132, 1100);
-gendef [1/36pt#]( bar_height# )( 39.5, 63, 79, 95, 790);
-gendef [1/36pt#]( comma_depth# )( 25, 40, 50, 60, 500);
-gendef [1/36pt#]( desc_depth# )( 25, 64, 80, 96, 800);
-gendef [1/36pt#](acc_ht# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#](circ_ht# )( 110, 180, 230, 274, 2300);
-gendef [1/36pt#](Circ_ht# )( 130, 210, 250, 300, 2500);
-gendef [1/36pt#](iota_dp# )( 22.5, 57.6, 64, 77, 640);
-gendef [1/36pt#]( crisp# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( tiny# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( fine# )( 14.5, 18, 21, 22, 183);
-gendef [1/36pt#]( thin_join# )( 14.5, 18, 21, 22, 183);
-gendef [1/36pt#]( hair# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( stem# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( curve# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( ess# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( flare# )( 19, 22, 24, 27, 225);
-gendef [1/36pt#]( dot_size# )( 23.5, 31, 36, 39, 360);
-gendef [1/36pt#]( cap_hair# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_stem# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_curve# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( cap_ess# )( 19, 22, 25, 28, 233);
-gendef [1/36pt#]( rule_thickness#)( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( dish# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( bracket# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( jut# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( cap_jut# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( beak_jut# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( beak# )( 17, 27, 34, 39, 325);
-gendef [1/36pt#]( vair# )( 15, 19, 22, 25, 208);
-gendef [1/36pt#]( notch_cut# )( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( bar# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( slab# )( 15, 29, 22, 25, 220);
-gendef [1/36pt#]( cap_bar# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( cap_band# )( 15, 19, 22, 25, 220);
-gendef [1/36pt#]( cap_notch_cut# )( 19, 22, 25, 28, 250);
-gendef [1/36pt#]( serif_drop# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( stem_corr# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( vair_corr# )( 0, 0, 0, 0, 0);
-gendef [1/36pt#]( apex_corr# )( 0, 8, 10, 11, 70);
-gendef [1/36pt#]( o# )( 2, 3, 4, 5, 25);
-gendef [1/36pt#]( apex_o# )( 3, 3, 3, 4, 15);
-%slant:=sind 12/cosd 12;
-slant:=0;
-gendef ( fudge )( .81, .81, .81, .81, .81);
-gendef ( math_spread )( [-1], [-1], [-1], [-1], [-1]);
-otilt:=.2;
-superness:=1/sqrt 2;
-superpull:=0;
-beak_darkness:=0;
-square_dots:=false;
-hefty:=true;
-serifs:=true;
-monospace:=true;
-variant_g:=false;
-low_asterisk:=true;
-math_fitting:=false;
-straight:=true;
-monowidth:=true;
-slitex:=false;
-cursive:=true;
-clear_extra_memory;
-
-generate cbgreek;
-endinput;
-
-
-
-
diff --git a/Master/texmf-dist/fonts/source/public/cb/gttu1000.mf b/Master/texmf-dist/fonts/source/public/cb/gttu1000.mf
deleted file mode 100644
index f7e5f7594fc..00000000000
--- a/Master/texmf-dist/fonts/source/public/cb/gttu1000.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-%Generated by mkcbfonts
-input cbgreek;
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glic1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glic1000.tfm
deleted file mode 100644
index cd4cfaa1fa8..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glic1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glii1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glii1000.tfm
deleted file mode 100644
index 04108c59dc8..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glii1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glin1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glin1000.tfm
deleted file mode 100644
index 2c4a94566bb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glin1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glio1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glio1000.tfm
deleted file mode 100644
index 1ee8164a9b3..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glio1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gliu1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gliu1000.tfm
deleted file mode 100644
index 417ee968f57..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gliu1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gljc1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gljc1000.tfm
deleted file mode 100644
index 1470086359a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gljc1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gljn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gljn1000.tfm
deleted file mode 100644
index 743c4564705..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gljn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gljo1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gljo1000.tfm
deleted file mode 100644
index 9daadc0b0fd..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gljo1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glmc1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glmc1000.tfm
deleted file mode 100644
index cd4cfaa1fa8..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glmc1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glmi1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glmi1000.tfm
deleted file mode 100644
index 04108c59dc8..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glmi1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glmn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glmn1000.tfm
deleted file mode 100644
index 2c4a94566bb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glmn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glmo1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glmo1000.tfm
deleted file mode 100644
index 1ee8164a9b3..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glmo1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glmu1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glmu1000.tfm
deleted file mode 100644
index 417ee968f57..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glmu1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gltc1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gltc1000.tfm
deleted file mode 100644
index 1470086359a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gltc1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gltn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gltn1000.tfm
deleted file mode 100644
index 743c4564705..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gltn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glto1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glto1000.tfm
deleted file mode 100644
index 9daadc0b0fd..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glto1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glwc1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glwc1000.tfm
deleted file mode 100644
index 51caac7f07d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glwc1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glwi1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glwi1000.tfm
deleted file mode 100644
index 290a3230a19..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glwi1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glwn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glwn1000.tfm
deleted file mode 100644
index d57f9e40c81..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glwn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glwo1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glwo1000.tfm
deleted file mode 100644
index 4e25c8d75ae..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glwo1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glwu1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glwu1000.tfm
deleted file mode 100644
index fa1a9df5d12..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glwu1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glxc1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glxc1000.tfm
deleted file mode 100644
index 51caac7f07d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glxc1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glxi1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glxi1000.tfm
deleted file mode 100644
index 290a3230a19..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glxi1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glxn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glxn1000.tfm
deleted file mode 100644
index d57f9e40c81..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glxn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glxo1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glxo1000.tfm
deleted file mode 100644
index 4e25c8d75ae..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glxo1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/glxu1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/glxu1000.tfm
deleted file mode 100644
index fa1a9df5d12..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/glxu1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gmmn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gmmn1000.tfm
deleted file mode 100644
index edf4b30609d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gmmn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gmmo1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gmmo1000.tfm
deleted file mode 100644
index d904dcbdc57..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gmmo1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gmtr1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gmtr1000.tfm
deleted file mode 100644
index 7369760eea9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gmtr1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gmxn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gmxn1000.tfm
deleted file mode 100644
index 01dbaa2f6c5..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gmxn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gmxo1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gmxo1000.tfm
deleted file mode 100644
index 9e03ac02a89..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gmxo1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gomc1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gomc1000.tfm
deleted file mode 100644
index e0338543ebb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gomc1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gomi1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gomi1000.tfm
deleted file mode 100644
index 0c48673cdeb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gomi1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gomn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gomn1000.tfm
deleted file mode 100644
index cea7935a6db..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gomn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gomo1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gomo1000.tfm
deleted file mode 100644
index 43b519971ea..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gomo1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gomu1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gomu1000.tfm
deleted file mode 100644
index f172d9c6624..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gomu1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/goxc1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/goxc1000.tfm
deleted file mode 100644
index 3eb264030be..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/goxc1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/goxi1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/goxi1000.tfm
deleted file mode 100644
index cb4eedf6bbb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/goxi1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/goxn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/goxn1000.tfm
deleted file mode 100644
index 9ecef2cbcd7..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/goxn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/goxo1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/goxo1000.tfm
deleted file mode 100644
index 3244685d190..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/goxo1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/goxu1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/goxu1000.tfm
deleted file mode 100644
index 18de4635067..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/goxu1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grbl1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grbl1000.tfm
deleted file mode 100644
index 8fba6813c60..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grbl1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grmc1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grmc1000.tfm
deleted file mode 100644
index e0338543ebb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grmc1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grmi1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grmi1000.tfm
deleted file mode 100644
index 0c48673cdeb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grmi1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grml1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grml1000.tfm
deleted file mode 100644
index cb971be78ad..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grml1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grmn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grmn1000.tfm
deleted file mode 100644
index cea7935a6db..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grmn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grmo1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grmo1000.tfm
deleted file mode 100644
index 43b519971ea..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grmo1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grmu1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grmu1000.tfm
deleted file mode 100644
index f172d9c6624..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grmu1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grxc1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grxc1000.tfm
deleted file mode 100644
index 3eb264030be..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grxc1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grxi1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grxi1000.tfm
deleted file mode 100644
index cb4eedf6bbb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grxi1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grxl1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grxl1000.tfm
deleted file mode 100644
index a9db2f63f58..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grxl1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grxn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grxn1000.tfm
deleted file mode 100644
index 9ecef2cbcd7..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grxn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grxo1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grxo1000.tfm
deleted file mode 100644
index 3244685d190..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grxo1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/grxu1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/grxu1000.tfm
deleted file mode 100644
index 18de4635067..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/grxu1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gsmc1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gsmc1000.tfm
deleted file mode 100644
index 8ac35295916..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gsmc1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gsmi1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gsmi1000.tfm
deleted file mode 100644
index 5ed68135336..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gsmi1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gsmn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gsmn1000.tfm
deleted file mode 100644
index b8e7edf922a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gsmn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gsmo1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gsmo1000.tfm
deleted file mode 100644
index 31ff1c6f51e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gsmo1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gsmu1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gsmu1000.tfm
deleted file mode 100644
index e6d71e55e13..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gsmu1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gsxc1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gsxc1000.tfm
deleted file mode 100644
index 3fb097ffa7d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gsxc1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gsxi1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gsxi1000.tfm
deleted file mode 100644
index 4478ceb095e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gsxi1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gsxn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gsxn1000.tfm
deleted file mode 100644
index 497c626db76..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gsxn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gsxo1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gsxo1000.tfm
deleted file mode 100644
index 7e7f2bdaff2..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gsxo1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gsxu1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gsxu1000.tfm
deleted file mode 100644
index 83dac2a6acb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gsxu1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gttc1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gttc1000.tfm
deleted file mode 100644
index ca6236561e5..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gttc1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gtti1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gtti1000.tfm
deleted file mode 100644
index b70093054d6..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gtti1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gttn1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gttn1000.tfm
deleted file mode 100644
index 587530cda07..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gttn1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gtto1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gtto1000.tfm
deleted file mode 100644
index 65afafde8ff..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gtto1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cb/gttu1000.tfm b/Master/texmf-dist/fonts/tfm/public/cb/gttu1000.tfm
deleted file mode 100644
index 1dd2ac3acbd..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cb/gttu1000.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glic1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glic1000.pfb
deleted file mode 100644
index 91e59b411a9..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glic1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glii1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glii1000.pfb
deleted file mode 100644
index 8805b80a318..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glii1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glin1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glin1000.pfb
deleted file mode 100644
index dcf9f4082e7..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glin1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glio1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glio1000.pfb
deleted file mode 100644
index c59f98a71cb..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glio1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gliu1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gliu1000.pfb
deleted file mode 100644
index 9b44dcc4107..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gliu1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gljc1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gljc1000.pfb
deleted file mode 100644
index f076523b4e5..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gljc1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gljn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gljn1000.pfb
deleted file mode 100644
index e46c0119923..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gljn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gljo1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gljo1000.pfb
deleted file mode 100644
index fb89660c9e7..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gljo1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glmc1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glmc1000.pfb
deleted file mode 100644
index 045de198e1e..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glmc1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glmi1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glmi1000.pfb
deleted file mode 100644
index 01761bf2520..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glmi1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glmn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glmn1000.pfb
deleted file mode 100644
index 7848eac7390..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glmn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glmo1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glmo1000.pfb
deleted file mode 100644
index 8cda71b2b84..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glmo1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glmu1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glmu1000.pfb
deleted file mode 100644
index 9d4dd6bce19..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glmu1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gltc1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gltc1000.pfb
deleted file mode 100644
index 71045cb6a6a..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gltc1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gltn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gltn1000.pfb
deleted file mode 100644
index 34ffb24b5ae..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gltn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glto1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glto1000.pfb
deleted file mode 100644
index a635235fe80..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glto1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glwc1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glwc1000.pfb
deleted file mode 100644
index b59bee809ca..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glwc1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glwi1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glwi1000.pfb
deleted file mode 100644
index 040578d5c2b..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glwi1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glwn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glwn1000.pfb
deleted file mode 100644
index 5ca330bede9..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glwn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glwo1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glwo1000.pfb
deleted file mode 100644
index 96fb9e2921a..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glwo1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glwu1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glwu1000.pfb
deleted file mode 100644
index 44a876473d0..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glwu1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glxc1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glxc1000.pfb
deleted file mode 100644
index fc0aec15d3f..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glxc1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glxi1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glxi1000.pfb
deleted file mode 100644
index 91b38acc4cd..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glxi1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glxn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glxn1000.pfb
deleted file mode 100644
index f17a2ec65a4..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glxn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glxo1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glxo1000.pfb
deleted file mode 100644
index 2fa1b8d4419..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glxo1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/glxu1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/glxu1000.pfb
deleted file mode 100644
index 58db9a40d16..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/glxu1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gmmn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gmmn1000.pfb
deleted file mode 100644
index 17d88b51f0b..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gmmn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gmmo1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gmmo1000.pfb
deleted file mode 100644
index ffc0248c259..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gmmo1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gmtr1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gmtr1000.pfb
deleted file mode 100644
index 04b297a0a6a..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gmtr1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gmxn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gmxn1000.pfb
deleted file mode 100644
index 536c8530339..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gmxn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gmxo1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gmxo1000.pfb
deleted file mode 100644
index 9ca91ce56b4..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gmxo1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gomc1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gomc1000.pfb
deleted file mode 100644
index 726cc91d485..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gomc1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gomi1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gomi1000.pfb
deleted file mode 100644
index 57197588858..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gomi1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gomn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gomn1000.pfb
deleted file mode 100644
index bd154c3c9d8..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gomn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gomo1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gomo1000.pfb
deleted file mode 100644
index bbf6f82af70..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gomo1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gomu1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gomu1000.pfb
deleted file mode 100644
index 1e6b24e04a2..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gomu1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/goxc1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/goxc1000.pfb
deleted file mode 100644
index 0842d269540..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/goxc1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/goxi1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/goxi1000.pfb
deleted file mode 100644
index e068c51051c..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/goxi1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/goxn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/goxn1000.pfb
deleted file mode 100644
index 4a76c14e8c0..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/goxn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/goxo1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/goxo1000.pfb
deleted file mode 100644
index 4e121ad1f6c..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/goxo1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/goxu1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/goxu1000.pfb
deleted file mode 100644
index 1604cd53730..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/goxu1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/grbl1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/grbl1000.pfb
deleted file mode 100644
index 141c30d19d6..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/grbl1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/grmc1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/grmc1000.pfb
deleted file mode 100644
index 2bd5a34066e..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/grmc1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/grmi1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/grmi1000.pfb
deleted file mode 100644
index 8757245a8ba..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/grmi1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/grmn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/grmn1000.pfb
deleted file mode 100644
index fc1b8efbd63..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/grmn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/grmo1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/grmo1000.pfb
deleted file mode 100644
index ca907166c3d..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/grmo1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/grmu1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/grmu1000.pfb
deleted file mode 100644
index 2cc91914c16..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/grmu1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/grxc1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/grxc1000.pfb
deleted file mode 100644
index 37ab00a23a0..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/grxc1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/grxi1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/grxi1000.pfb
deleted file mode 100644
index 96b1c695efb..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/grxi1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/grxn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/grxn1000.pfb
deleted file mode 100644
index acbb059677f..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/grxn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/grxo1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/grxo1000.pfb
deleted file mode 100644
index 02c97144162..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/grxo1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/grxu1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/grxu1000.pfb
deleted file mode 100644
index 6fa848a12fa..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/grxu1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gsmc1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gsmc1000.pfb
deleted file mode 100644
index 124ada9a069..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gsmc1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gsmi1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gsmi1000.pfb
deleted file mode 100644
index 2da441d0a20..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gsmi1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gsmn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gsmn1000.pfb
deleted file mode 100644
index 6d6ea63db85..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gsmn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gsmo1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gsmo1000.pfb
deleted file mode 100644
index 70046a829f9..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gsmo1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gsmu1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gsmu1000.pfb
deleted file mode 100644
index 9bf65ae41d5..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gsmu1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gsxc1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gsxc1000.pfb
deleted file mode 100644
index dfce52c9c0d..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gsxc1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gsxi1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gsxi1000.pfb
deleted file mode 100644
index f325b4c9320..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gsxi1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gsxn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gsxn1000.pfb
deleted file mode 100644
index babad626a0a..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gsxn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gsxo1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gsxo1000.pfb
deleted file mode 100644
index d42de05368e..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gsxo1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gsxu1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gsxu1000.pfb
deleted file mode 100644
index 26816497d6f..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gsxu1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gttc1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gttc1000.pfb
deleted file mode 100644
index 781d233bb2b..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gttc1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gtti1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gtti1000.pfb
deleted file mode 100644
index 6efd299084a..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gtti1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gttn1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gttn1000.pfb
deleted file mode 100644
index 9d754064418..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gttn1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gtto1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gtto1000.pfb
deleted file mode 100644
index cd694e24c33..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gtto1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cb/gttu1000.pfb b/Master/texmf-dist/fonts/type1/public/cb/gttu1000.pfb
deleted file mode 100644
index 45c3c85aa1e..00000000000
--- a/Master/texmf-dist/fonts/type1/public/cb/gttu1000.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/tlpkg/tlpsrc/cb.tlpsrc b/Master/tlpkg/tlpsrc/cb.tlpsrc
deleted file mode 100644
index f55e0bb6ac0..00000000000
--- a/Master/tlpkg/tlpsrc/cb.tlpsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-name cb
-category Package
-execute addMixedMap cbgreek.map