diff options
author | Karl Berry <karl@freefriends.org> | 2014-09-07 21:03:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-09-07 21:03:30 +0000 |
commit | 25a22e2f31a52677528aa5abf8ce4b574aa49942 (patch) | |
tree | 1ac1a1eba0c857da595d1595beb92c39869426a1 /Master/texmf-dist/fonts/source/public | |
parent | aa82b39fdf2a2273eea8f0f990ebf8c51cbc7d19 (diff) |
drm
git-svn-id: svn://tug.org/texlive/trunk@35125 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/source/public')
104 files changed, 133 insertions, 335 deletions
diff --git a/Master/texmf-dist/fonts/source/public/drm/drm10.mf b/Master/texmf-dist/fonts/source/public/drm/drm10.mf index 1862ea21628..6e1310491fb 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drm10.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drm10.mf @@ -67,6 +67,6 @@ input drmlow.mf input drmpunct.mf input drmacc.mf input drmacclet.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drm11.mf b/Master/texmf-dist/fonts/source/public/drm/drm11.mf index faba93fde20..a776fde2da3 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drm11.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drm11.mf @@ -67,6 +67,6 @@ input drmlow.mf input drmpunct.mf input drmacc.mf input drmacclet.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drm12.mf b/Master/texmf-dist/fonts/source/public/drm/drm12.mf index c4d669aab74..a33b0bc09ff 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drm12.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drm12.mf @@ -67,6 +67,6 @@ input drmlow.mf input drmpunct.mf input drmacc.mf input drmacclet.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drm14.mf b/Master/texmf-dist/fonts/source/public/drm/drm14.mf index a70293002e7..6ad191df010 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drm14.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drm14.mf @@ -67,6 +67,6 @@ input drmlow.mf input drmpunct.mf input drmacc.mf input drmacclet.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drm17.mf b/Master/texmf-dist/fonts/source/public/drm/drm17.mf index c7b42368537..6b60c5eefb2 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drm17.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drm17.mf @@ -67,6 +67,6 @@ input drmlow.mf input drmpunct.mf input drmacc.mf input drmacclet.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drm24.mf b/Master/texmf-dist/fonts/source/public/drm/drm24.mf index 5c81e3d1f3f..972fdd5482e 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drm24.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drm24.mf @@ -67,6 +67,6 @@ input drmlow.mf input drmpunct.mf input drmacc.mf input drmacclet.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drm6.mf b/Master/texmf-dist/fonts/source/public/drm/drm6.mf index 3455f6b18e4..8f244f7d9e9 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drm6.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drm6.mf @@ -67,6 +67,6 @@ input drmlow.mf input drmpunct.mf input drmacc.mf input drmacclet.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drm7.mf b/Master/texmf-dist/fonts/source/public/drm/drm7.mf index 998bce3edc2..1429767b28d 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drm7.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drm7.mf @@ -67,6 +67,6 @@ input drmlow.mf input drmpunct.mf input drmacc.mf input drmacclet.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drm8.mf b/Master/texmf-dist/fonts/source/public/drm/drm8.mf index b0715556b45..cf1cd060fd2 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drm8.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drm8.mf @@ -67,6 +67,6 @@ input drmlow.mf input drmpunct.mf input drmacc.mf input drmacclet.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drm9.mf b/Master/texmf-dist/fonts/source/public/drm/drm9.mf index 1f75cd94464..0a1f7c9d590 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drm9.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drm9.mf @@ -67,6 +67,6 @@ input drmlow.mf input drmpunct.mf input drmacc.mf input drmacclet.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmb10.mf b/Master/texmf-dist/fonts/source/public/drm/drmb10.mf index 8caff6d3688..5292b174e59 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmb10.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmb10.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmb11.mf b/Master/texmf-dist/fonts/source/public/drm/drmb11.mf index e2aab6dbd3c..c8850f43c71 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmb11.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmb11.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmb12.mf b/Master/texmf-dist/fonts/source/public/drm/drmb12.mf index 164cd1b6698..0493e56e833 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmb12.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmb12.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmb14.mf b/Master/texmf-dist/fonts/source/public/drm/drmb14.mf index 3b35129890d..b154446c9a4 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmb14.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmb14.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmb17.mf b/Master/texmf-dist/fonts/source/public/drm/drmb17.mf index c8a5fb22bb0..686a9c43632 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmb17.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmb17.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmb24.mf b/Master/texmf-dist/fonts/source/public/drm/drmb24.mf index 6e3f311e35f..479a39b69d4 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmb24.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmb24.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmb6.mf b/Master/texmf-dist/fonts/source/public/drm/drmb6.mf index 0599c0921d0..979c79d7ad9 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmb6.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmb6.mf @@ -10,7 +10,7 @@ phi=(1+sqrt5)/2; cap#=4pt#; u#=2cap#/3; em#=1.4cap#; -ex#=0.8cap#; +ex#=0.7cap#; exw# = ex#; define_pixels(exw); dep#=cap#/3; ss#=0.2pt#; @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmb7.mf b/Master/texmf-dist/fonts/source/public/drm/drmb7.mf index a6746ad2103..d2fa7795b73 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmb7.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmb7.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmb8.mf b/Master/texmf-dist/fonts/source/public/drm/drmb8.mf index 408d43d75f2..0f40d021cba 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmb8.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmb8.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmb9.mf b/Master/texmf-dist/fonts/source/public/drm/drmb9.mf index a74df8a88a9..21b308194be 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmb9.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmb9.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbl10.mf b/Master/texmf-dist/fonts/source/public/drm/drmbl10.mf deleted file mode 100644 index 259dcf47a28..00000000000 --- a/Master/texmf-dist/fonts/source/public/drm/drmbl10.mf +++ /dev/null @@ -1,71 +0,0 @@ -% +AMDG - -font_identifier:="drm"; font_size:=10pt#; font_coding_scheme "T1"; -pixels_per_inch:=1200; -mode_setup; - -%%%% Define Dimensions for Whole Boxes %%%% - -phi=(1+sqrt5)/2; -cap#=8pt#; -u#=2.5cap#/3; -em#=1.2cap#; -ex#=0.6cap#; -dep#=cap#/3; -ss#=0.3pt#; -asch#=12cap#/12; -digwid#=1ex#; -slant = 0; -font_slant 0u#; -font_normal_space 0.5u#; -font_normal_stretch 0.2u#; -font_normal_shrink 0.2u#; -font_x_height cap#/phi; -font_quad em#; -font_extra_space 0.5u#; - -penwidth#=0.01pt#; - -%%%% Define Dimensions for Letters %%%% - -lserc#=0.08u#; -lserh#=lserc#+lserstep#; -lhigh#=0.3u#; -lserstep#=0.05u#; -userc#=0.08u#; -userh#=userc#+userstep#; -lserw#=0.2u#; -userw#=0.2u#; -userstep#=0.05u#; -bulbsh#=0.10u#; -curvwid#=1.6pt#; -slantwid#=1.6pt#; -thickstroke#=1.4pt#; -thinstroke#=0.8pt#; -loopgap#=1.0pt#; -hair#=0.2pt#; -o#=0.1pt#; -ssslant#=0.1u#; -dotwidth#=userw#-o#; -pwid#=2userw#; -accwid# = pwid#/8; -theight#=7asch#/8; -define_pixels(theight); - -define_pixels(accwid,cap,u,em,ex,dep,ss,penwidth,lserh,userh,lhigh,lserw,bulbsh,userw,lserc,userc,lserstep,userstep,ssslant,curvwid,slantwid,pwid,hair,loopgap,dotwidth); -define_blacker_pixels(accwid,cap,u,em,ex,dep,ss,penwidth,lserh,userh,lhigh,lserw,bulbsh,userw,lserc,userc,lserstep,userstep,ssslant,curvwid,slantwid,pwid,hair); -define_blacker_pixels(thickstroke,thinstroke,penwidth,o,hair); - -pickup pencircle scaled penwidth; cappen:=savepen; -equalize=thickstroke/2-thinstroke/2; - -input drmligs -input drmcap.mf -input drmlowmac.mf -input drmlow.mf -input drmpunct.mf -input drmacc.mf -input drmacclet.mf -input drmdigs.mf - -end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbs10.mf b/Master/texmf-dist/fonts/source/public/drm/drmbs10.mf index 6d73c68bdfc..07c8253d8e1 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmbs10.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmbs10.mf @@ -70,6 +70,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbx10.mf b/Master/texmf-dist/fonts/source/public/drm/drmbx10.mf index 75e396f0574..4eb9e3892b7 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmbx10.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmbx10.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbx11.mf b/Master/texmf-dist/fonts/source/public/drm/drmbx11.mf index 47c374e624b..21f059f776b 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmbx11.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmbx11.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbx12.mf b/Master/texmf-dist/fonts/source/public/drm/drmbx12.mf index dc13d79c034..507977ff41a 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmbx12.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmbx12.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbx14.mf b/Master/texmf-dist/fonts/source/public/drm/drmbx14.mf index f1e4b1c31c1..b5efd2e7e63 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmbx14.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmbx14.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbx17.mf b/Master/texmf-dist/fonts/source/public/drm/drmbx17.mf index ba73fd56d57..2b6fb10aaa1 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmbx17.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmbx17.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbx24.mf b/Master/texmf-dist/fonts/source/public/drm/drmbx24.mf index 11685d5773b..71e3e023d41 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmbx24.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmbx24.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbx6.mf b/Master/texmf-dist/fonts/source/public/drm/drmbx6.mf index 333becd5083..a117e7c4905 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmbx6.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmbx6.mf @@ -10,7 +10,7 @@ phi=(1+sqrt5)/2; cap#=4pt#; u#=2.5cap#/3; em#=1.4cap#; -ex#=0.9cap#; +ex#=0.7cap#; exw# = 1.1ex#; define_pixels(exw); dep#=cap#/3; ss#=0.25pt#; @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbx7.mf b/Master/texmf-dist/fonts/source/public/drm/drmbx7.mf index b71e05954fe..88c6c78a0b8 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmbx7.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmbx7.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbx8.mf b/Master/texmf-dist/fonts/source/public/drm/drmbx8.mf index 5fcdcea7370..a2aa6808ca7 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmbx8.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmbx8.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbx9.mf b/Master/texmf-dist/fonts/source/public/drm/drmbx9.mf index 7ad7aceb908..126e0467436 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmbx9.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmbx9.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmcap.mf b/Master/texmf-dist/fonts/source/public/drm/drmcap.mf index c34580964a7..4f90cc9998a 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmcap.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmcap.mf @@ -527,7 +527,7 @@ z5=(w-ss-userw,h-userh); z6=z5-(thinstroke,0); z7=z5-(0,2h/3); z8=z7-(thinstroke,0); -z9=(w/2,0); +z9=(w/2,-o); z30=0.25[z9,z5]; z40 = z9 shifted (-thinstroke,0); z41 = z9 shifted (thickstroke,0); @@ -587,8 +587,8 @@ z3 = z2 shifted (userw+hair+userw,0); z4 = z3 shifted (thickstroke,0); z5 = z4 shifted (userw+hair+userw+thinstroke,0); z6 = z5 shifted (-thinstroke,0); -z7 = (w/3+thinstroke/2,0); -z8 = (2w/3+thinstroke/2,0); +z7 = (w/3+thinstroke/2,-o); +z8 = (2w/3+thinstroke/2,-o); z33=(w/2,3h/4); z34=z8+(.4thinstroke,2.2thickstroke); z35=z7+(0.4thinstroke,2.2thickstroke); @@ -1007,9 +1007,12 @@ beginchar(oct"327",em#+ss#,cap#,0); "The ligature OE"; italcorr(ex#*slant); z1=((w/2-(thickstroke/2)),lserh); +%z1=((w/2),lserh); z2=((ss_userw+(thickstroke/2)),lserh); z3=((w/2-(thickstroke/2)),(h-userh)); z4=((w/2+(thickstroke/2)),(h-thinstroke)); +%z3=((w/2),(h-userh)); +%z4=((w/2),(h-thinstroke)); z5=(x4,thinstroke); z6=(w-o-ssslant,0); z30=z6+(-thickstroke,thinstroke); @@ -1035,7 +1038,7 @@ z42 = (o,h/2); z43 = z42 shifted (curvwid,0); z44 = 0.5[z40,z41] shifted (curvwid/2,h/2+o/2); z45 = 0.5[z40,z41] shifted (curvwid/2,-(h/2+o/2)); -z46 = z15 shifted (-curvwid,0); +z46 = z15 shifted (-thickstroke,0); z47 = z44 shifted (0,-thinstroke); z48 = z45 shifted (0,thinstroke); diff --git a/Master/texmf-dist/fonts/source/public/drm/drmit10.mf b/Master/texmf-dist/fonts/source/public/drm/drmit10.mf index f3da4f717ef..6f42156dc0f 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmit10.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmit10.mf @@ -72,7 +72,7 @@ input drmpunct.mf; input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; -input itoldstydigs.mf; +input drmitoldstydigs.mf; input drmitligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmit11.mf b/Master/texmf-dist/fonts/source/public/drm/drmit11.mf index 44a3359c4ed..2c034d55386 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmit11.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmit11.mf @@ -73,6 +73,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; +input drmitoldstydigs.mf; input drmitligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmit12.mf b/Master/texmf-dist/fonts/source/public/drm/drmit12.mf index ae7e9727006..31f730bd2a2 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmit12.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmit12.mf @@ -73,6 +73,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; +input drmitoldstydigs.mf; input drmitligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmit14.mf b/Master/texmf-dist/fonts/source/public/drm/drmit14.mf index f26fc82b416..d08904c834a 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmit14.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmit14.mf @@ -73,6 +73,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; +input drmitoldstydigs.mf; input drmitligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmit17.mf b/Master/texmf-dist/fonts/source/public/drm/drmit17.mf index 750878f7f82..8c70936e69c 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmit17.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmit17.mf @@ -73,6 +73,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; +input drmitoldstydigs.mf; input drmitligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmit24.mf b/Master/texmf-dist/fonts/source/public/drm/drmit24.mf index 90310b57e78..d1a431063fd 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmit24.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmit24.mf @@ -73,6 +73,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; +input drmitoldstydigs.mf; input drmitligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmit6.mf b/Master/texmf-dist/fonts/source/public/drm/drmit6.mf index 7f0e50e12e9..5d808a30872 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmit6.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmit6.mf @@ -73,6 +73,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; +input drmitoldstydigs.mf; input drmitligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmit7.mf b/Master/texmf-dist/fonts/source/public/drm/drmit7.mf index d35b24d80c6..64ef23f3107 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmit7.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmit7.mf @@ -73,6 +73,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; +input drmitoldstydigs.mf; input drmitligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmit8.mf b/Master/texmf-dist/fonts/source/public/drm/drmit8.mf index 0156db5a707..24f4d7f4fae 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmit8.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmit8.mf @@ -73,6 +73,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; +input drmitoldstydigs.mf; input drmitligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmit9.mf b/Master/texmf-dist/fonts/source/public/drm/drmit9.mf index 1f3f2bda0f8..352d47fe548 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmit9.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmit9.mf @@ -73,6 +73,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; +input drmitoldstydigs.mf; input drmitligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/itoldstydigs.mf b/Master/texmf-dist/fonts/source/public/drm/drmitoldstydigs.mf index 5fe086cf2cf..5fe086cf2cf 100644 --- a/Master/texmf-dist/fonts/source/public/drm/itoldstydigs.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmitoldstydigs.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/drml10.mf b/Master/texmf-dist/fonts/source/public/drm/drml10.mf index 32b9ea5995c..503987cd63f 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drml10.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drml10.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drml11.mf b/Master/texmf-dist/fonts/source/public/drm/drml11.mf index 77e73fd1129..4009ddf34e3 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drml11.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drml11.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drml12.mf b/Master/texmf-dist/fonts/source/public/drm/drml12.mf index bf5c281f264..280daa3f4a8 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drml12.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drml12.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drml14.mf b/Master/texmf-dist/fonts/source/public/drm/drml14.mf index 994361b6354..812a00608e7 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drml14.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drml14.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drml17.mf b/Master/texmf-dist/fonts/source/public/drm/drml17.mf index 30d70c6a6a5..c948827ec39 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drml17.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drml17.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drml24.mf b/Master/texmf-dist/fonts/source/public/drm/drml24.mf index 582bda57177..a0f038fda66 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drml24.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drml24.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drml6.mf b/Master/texmf-dist/fonts/source/public/drm/drml6.mf index 6727e90c906..a45ea0692ae 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drml6.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drml6.mf @@ -10,7 +10,7 @@ phi=(1+sqrt5)/2; cap#=4pt#; u#=2cap#/3; em#=1.4cap#; -ex#=0.8cap#; +ex#=0.7cap#; exw# = ex#; define_pixels(exw); dep#=cap#/3; ss#=0.2pt#; @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drml7.mf b/Master/texmf-dist/fonts/source/public/drm/drml7.mf index 329a5368b2b..0fe0e945e9c 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drml7.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drml7.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drml8.mf b/Master/texmf-dist/fonts/source/public/drm/drml8.mf index 1b9b4a98384..a8001e530fe 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drml8.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drml8.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drml9.mf b/Master/texmf-dist/fonts/source/public/drm/drml9.mf index efe51ea1567..902b3d7f226 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drml9.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drml9.mf @@ -68,6 +68,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmlow.mf b/Master/texmf-dist/fonts/source/public/drm/drmlow.mf index ed5713c75a7..7fbdc156e0b 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmlow.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmlow.mf @@ -666,14 +666,16 @@ ulserif(10,12,13,14,15)(1); %z17 = z15 shifted (lserwl+o+lserwl+o,-userhl+2o); hookw = w-x15-ss-bulbsh; z17 = z16 shifted (hookw,userh/2); +rbulb(17,19,20,21,22); z18 = 0.5[z16,z17]; y18 := h+o; z23 = z18 shifted (0,-thinl); -z24 = z17 shifted (0,-2hair); +%z24 = z17 shifted (0,-2hair); +z24 = 0.5[z17,z20]; z25 = z16 shifted (thickl/2,-thinl); -rbulb(17,19,20,21,22); +z26 = (z11..z23..z24) intersectionpoint (z21..z17..z19..z20); fill -z1..z6..z7--z8--z4--z3..z2..z0--z10..z12..z13--z14--z15--z16--z10..{right}z18{right}..z17..z19..z20..z21{up}..{down}z24{dir +z1..z6..z7--z8--z4--z3..z2..z0--z10..z12..z13--z14--z15--z16--z10..{right}z18{right}..z17..z19..z20..z21{up}..z26..{down}z24{dir 160}..z23..z11--cycle; lowr := currentpicture; diff --git a/Master/texmf-dist/fonts/source/public/drm/matharrows.mf b/Master/texmf-dist/fonts/source/public/drm/drmmatharrows.mf index 66eeef38f11..66eeef38f11 100644 --- a/Master/texmf-dist/fonts/source/public/drm/matharrows.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmmatharrows.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/mathcursell.mf b/Master/texmf-dist/fonts/source/public/drm/drmmathcursell.mf index 12e91e232a6..12e91e232a6 100644 --- a/Master/texmf-dist/fonts/source/public/drm/mathcursell.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmmathcursell.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/mathgrklow.mf b/Master/texmf-dist/fonts/source/public/drm/drmmathgrklow.mf index 50bfd0fec54..50bfd0fec54 100644 --- a/Master/texmf-dist/fonts/source/public/drm/mathgrklow.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmmathgrklow.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/mathgrkup.mf b/Master/texmf-dist/fonts/source/public/drm/drmmathgrkup.mf index 2f4e8e55d08..2f4e8e55d08 100644 --- a/Master/texmf-dist/fonts/source/public/drm/mathgrkup.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmmathgrkup.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/mathoms.mf b/Master/texmf-dist/fonts/source/public/drm/drmmathoms.mf index 5ccbebddd7e..5ccbebddd7e 100644 --- a/Master/texmf-dist/fonts/source/public/drm/mathoms.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmmathoms.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/mathomx.mf b/Master/texmf-dist/fonts/source/public/drm/drmmathomx.mf index efd130ddd5b..efd130ddd5b 100644 --- a/Master/texmf-dist/fonts/source/public/drm/mathomx.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmmathomx.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/mathsym.mf b/Master/texmf-dist/fonts/source/public/drm/drmmathsym.mf index 91155c685cf..91155c685cf 100644 --- a/Master/texmf-dist/fonts/source/public/drm/mathsym.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmmathsym.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/drmmi10.mf b/Master/texmf-dist/fonts/source/public/drm/drmmi10.mf index 739fca97f04..6fc63a21572 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmmi10.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmmi10.mf @@ -68,16 +68,16 @@ input drmcap.mf input drmlowmac.mf currenttransform:=identity slanted 0 yscaled aspect_ratio scaled granularity; -input mathgrkup.mf +input drmmathgrkup.mf input drmpunct.mf currenttransform:=identity slanted slant yscaled aspect_ratio scaled granularity; input drmitlow.mf -input mathgrklow.mf -input mathcursell.mf +input drmmathgrklow.mf +input drmmathcursell.mf currenttransform:=identity slanted 0 yscaled 1 scaled 1; input drmdigs.mf -input matharrows.mf -input mathsym.mf +input drmmatharrows.mf +input drmmathsym.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/oe.mf b/Master/texmf-dist/fonts/source/public/drm/drmoe.mf index 792d276a1c3..792d276a1c3 100644 --- a/Master/texmf-dist/fonts/source/public/drm/oe.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmoe.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/oldstyfracs.mf b/Master/texmf-dist/fonts/source/public/drm/drmoldstyfracs.mf index b08bb87ba12..b08bb87ba12 100644 --- a/Master/texmf-dist/fonts/source/public/drm/oldstyfracs.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmoldstyfracs.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/oldstynums.mf b/Master/texmf-dist/fonts/source/public/drm/drmoldstynums.mf index fd6cbc1e3e7..fd6cbc1e3e7 100644 --- a/Master/texmf-dist/fonts/source/public/drm/oldstynums.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmoldstynums.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/drmomx10.mf b/Master/texmf-dist/fonts/source/public/drm/drmomx10.mf index 5637bb90ba7..fe67512d057 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmomx10.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmomx10.mf @@ -63,6 +63,6 @@ pickup pencircle scaled penwidth; cappen:=savepen; equalize=thickstroke/2-thinstroke/2; input drmlowmac.mf -input mathomx.mf +input drmmathomx.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/ornaments.mf b/Master/texmf-dist/fonts/source/public/drm/drmornaments.mf index 82a13829ce7..82a13829ce7 100644 --- a/Master/texmf-dist/fonts/source/public/drm/ornaments.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmornaments.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/ornbars.mf b/Master/texmf-dist/fonts/source/public/drm/drmornbars.mf index eac6eb7f492..eac6eb7f492 100644 --- a/Master/texmf-dist/fonts/source/public/drm/ornbars.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmornbars.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/ornfont.mf b/Master/texmf-dist/fonts/source/public/drm/drmornfont.mf index 5bcbf432562..5bcbf432562 100644 --- a/Master/texmf-dist/fonts/source/public/drm/ornfont.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmornfont.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/drmorns.mf b/Master/texmf-dist/fonts/source/public/drm/drmorns.mf index 48292df8066..1c582139f77 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmorns.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmorns.mf @@ -45,7 +45,7 @@ pen semiextextthickpen; semiextextthickpen = pensquare scaled 3thickline; pen extextthickpen; extextthickpen = pensquare scaled 4thickline; pen medpen; medpen = pensquare scaled 1.5thinline; -%input ornbars.mf; -input ornfont.mf; +%input drmornbars.mf; +input drmornfont.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsl10.mf b/Master/texmf-dist/fonts/source/public/drm/drmsl10.mf index 14f94a04995..65ddc2e9ce2 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsl10.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsl10.mf @@ -70,6 +70,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsl11.mf b/Master/texmf-dist/fonts/source/public/drm/drmsl11.mf index 527ca972141..ea3cc7c2719 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsl11.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsl11.mf @@ -70,6 +70,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsl12.mf b/Master/texmf-dist/fonts/source/public/drm/drmsl12.mf index f36d8767443..c5e2aeb1171 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsl12.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsl12.mf @@ -70,6 +70,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsl14.mf b/Master/texmf-dist/fonts/source/public/drm/drmsl14.mf index ade02c586c3..1bca6ba507a 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsl14.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsl14.mf @@ -70,6 +70,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsl17.mf b/Master/texmf-dist/fonts/source/public/drm/drmsl17.mf index 7c5503e4d0f..a179743af15 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsl17.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsl17.mf @@ -70,6 +70,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsl24.mf b/Master/texmf-dist/fonts/source/public/drm/drmsl24.mf index da8c8250592..3840eddee96 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsl24.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsl24.mf @@ -70,6 +70,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsl6.mf b/Master/texmf-dist/fonts/source/public/drm/drmsl6.mf index ba4de40bc31..c2a6d269b6f 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsl6.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsl6.mf @@ -10,7 +10,7 @@ phi=(1+sqrt5)/2; cap#=4pt#; u#=2cap#/3; em#=1.2cap#; -ex#=0.8cap#; +ex#=0.7cap#; exw# = ex#; define_pixels(exw); dep#=cap#/3; ss#=0.2pt#; @@ -70,6 +70,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsl7.mf b/Master/texmf-dist/fonts/source/public/drm/drmsl7.mf index 0a0a24ebf9d..735f043a3d7 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsl7.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsl7.mf @@ -70,6 +70,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsl8.mf b/Master/texmf-dist/fonts/source/public/drm/drmsl8.mf index cbb6e2c1f50..d651a039102 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsl8.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsl8.mf @@ -70,6 +70,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsl9.mf b/Master/texmf-dist/fonts/source/public/drm/drmsl9.mf index e717c6f630e..3b0a686fcdf 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsl9.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsl9.mf @@ -70,6 +70,6 @@ input drmpunct.mf input drmacc.mf input drmacclet.mf input drmdigs.mf -input oldstynums.mf +input drmoldstynums.mf end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsy10.mf b/Master/texmf-dist/fonts/source/public/drm/drmsy10.mf index 8510c178c43..3c59a13438c 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsy10.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsy10.mf @@ -63,7 +63,7 @@ pickup pencircle scaled penwidth; cappen:=savepen; equalize=thickstroke/2-thinstroke/2; input drmlowmac.mf -input mathoms.mf +input drmmathoms.mf input drmmathfrac.mf input drmmathheb.mf currenttransform:=identity slanted slant yscaled aspect_ratio scaled granularity; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsym10.mf b/Master/texmf-dist/fonts/source/public/drm/drmsym10.mf index f50bfd30586..661d2e627f7 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsym10.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsym10.mf @@ -63,12 +63,12 @@ pickup pencircle scaled penwidth; cappen:=savepen; equalize=thickstroke/2-thinstroke/2; input drmlowmac.mf -input symbols.mf +input drmsymbols.mf input drmacc.mf -input oldstynums.mf -input oldstyfracs.mf +input drmoldstynums.mf +input drmoldstyfracs.mf input drmdigs.mf input drmromannums.mf; -input ornaments.mf; +input drmornaments.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsym11.mf b/Master/texmf-dist/fonts/source/public/drm/drmsym11.mf index d522bd90870..62032e9a74f 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsym11.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsym11.mf @@ -63,12 +63,12 @@ pickup pencircle scaled penwidth; cappen:=savepen; equalize=thickstroke/2-thinstroke/2; input drmlowmac.mf -input symbols.mf +input drmsymbols.mf input drmacc.mf -input oldstynums.mf -input oldstyfracs.mf +input drmoldstynums.mf +input drmoldstyfracs.mf input drmdigs.mf input drmromannums.mf; -input ornaments.mf; +input drmornaments.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsym12.mf b/Master/texmf-dist/fonts/source/public/drm/drmsym12.mf index c90912da586..61cfa2b6cfd 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsym12.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsym12.mf @@ -63,12 +63,12 @@ pickup pencircle scaled penwidth; cappen:=savepen; equalize=thickstroke/2-thinstroke/2; input drmlowmac.mf -input symbols.mf +input drmsymbols.mf input drmacc.mf -input oldstynums.mf -input oldstyfracs.mf +input drmoldstynums.mf +input drmoldstyfracs.mf input drmdigs.mf input drmromannums.mf; -input ornaments.mf; +input drmornaments.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsym14.mf b/Master/texmf-dist/fonts/source/public/drm/drmsym14.mf index 20c1d10df5b..aeb2f2b9438 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsym14.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsym14.mf @@ -63,12 +63,12 @@ pickup pencircle scaled penwidth; cappen:=savepen; equalize=thickstroke/2-thinstroke/2; input drmlowmac.mf -input symbols.mf +input drmsymbols.mf input drmacc.mf -input oldstynums.mf -input oldstyfracs.mf +input drmoldstynums.mf +input drmoldstyfracs.mf input drmdigs.mf input drmromannums.mf; -input ornaments.mf; +input drmornaments.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsym17.mf b/Master/texmf-dist/fonts/source/public/drm/drmsym17.mf index d64076a5043..5c0eb1793cc 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsym17.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsym17.mf @@ -63,12 +63,12 @@ pickup pencircle scaled penwidth; cappen:=savepen; equalize=thickstroke/2-thinstroke/2; input drmlowmac.mf -input symbols.mf +input drmsymbols.mf input drmacc.mf -input oldstynums.mf -input oldstyfracs.mf +input drmoldstynums.mf +input drmoldstyfracs.mf input drmdigs.mf input drmromannums.mf; -input ornaments.mf; +input drmornaments.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsym24.mf b/Master/texmf-dist/fonts/source/public/drm/drmsym24.mf index d26f25c5a22..1f8f3fe1b41 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsym24.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsym24.mf @@ -63,12 +63,12 @@ pickup pencircle scaled penwidth; cappen:=savepen; equalize=thickstroke/2-thinstroke/2; input drmlowmac.mf -input symbols.mf +input drmsymbols.mf input drmacc.mf -input oldstynums.mf -input oldstyfracs.mf +input drmoldstynums.mf +input drmoldstyfracs.mf input drmdigs.mf input drmromannums.mf; -input ornaments.mf; +input drmornaments.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsym6.mf b/Master/texmf-dist/fonts/source/public/drm/drmsym6.mf deleted file mode 100644 index e9276d01075..00000000000 --- a/Master/texmf-dist/fonts/source/public/drm/drmsym6.mf +++ /dev/null @@ -1,74 +0,0 @@ -% +AMDG - -font_identifier:="drm"; font_size:=6pt#; font_coding_scheme "TS1"; -pixels_per_inch:=1200; -mode_setup; - -%%%% Define Dimensions for Whole Boxes %%%% - -phi=(1+sqrt5)/2; -cap#=4pt#; -u#=2cap#/3; -em#=1.4cap#; -ex#=0.8cap#; -exw# = ex#; define_pixels(exw); -dep#=cap#/3; -ss#=0.2pt#; -asch#=12cap#/12; -digwid#=1ex#; -slant = 0; -font_slant slant; -font_normal_space 0.7u#; -font_normal_stretch 0.2u#; -font_normal_shrink 0.1u#; -font_x_height cap#/phi; -font_quad em#; -font_extra_space 0.5u#; - -penwidth#=0.01pt#; - -%%%% Define Dimensions for Letters %%%% - -lserc#=0.09u#; -lserh#=lserc#+lserstep#; -lhigh#=0.3u#; -lserstep#=0.05u#; -userc#=0.08u#; -userh#=userc#+userstep#; -lserw#=0.2u#; -userw#=0.2u#; -userstep#=0.05u#; -bulbsh#=0.10u#; -curvwid#=0.6pt#; -slantwid#=0.6pt#; -thickstroke#=0.6pt#; -loopgap#=0.6pt#; -thinstroke#=0.3pt#; -o#=0.1thinstroke#; -hair#=0.2pt#; -ssslant#=0.1u#; -dotwidth#=userw#-o#; -pwid#=3userw#; -accwid# = pwid#/16; -theight#=8asch#/8; -define_pixels(theight); -thinwid# = 0.4pt#; -define_pixels(thinwid); - -define_pixels(accwid,cap,u,em,ex,dep,ss,penwidth,lserh,userh,lhigh,lserw,bulbsh,userw,lserc,userc,lserstep,userstep,ssslant,curvwid,slantwid,pwid,hair,loopgap,dotwidth); -define_blacker_pixels(accwid,cap,u,em,ex,dep,ss,penwidth,lserh,userh,lhigh,lserw,bulbsh,userw,lserc,userc,lserstep,userstep,ssslant,curvwid,slantwid,pwid,hair); -define_blacker_pixels(thickstroke,thinstroke,penwidth,o,hair); - -pickup pencircle scaled penwidth; cappen:=savepen; -equalize=thickstroke/2-thinstroke/2; - -input drmlowmac.mf -input symbols.mf -input drmacc.mf -input oldstynums.mf -input oldstyfracs.mf -input drmdigs.mf -input drmromannums.mf; -input ornaments.mf; - -end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsym7.mf b/Master/texmf-dist/fonts/source/public/drm/drmsym7.mf index 814af98e7eb..efbbdf672f4 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsym7.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsym7.mf @@ -63,12 +63,12 @@ pickup pencircle scaled penwidth; cappen:=savepen; equalize=thickstroke/2-thinstroke/2; input drmlowmac.mf -input symbols.mf +input drmsymbols.mf input drmacc.mf -input oldstynums.mf -input oldstyfracs.mf +input drmoldstynums.mf +input drmoldstyfracs.mf input drmdigs.mf input drmromannums.mf; -input ornaments.mf; +input drmornaments.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsym8.mf b/Master/texmf-dist/fonts/source/public/drm/drmsym8.mf index 1735510b800..9991247e176 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsym8.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsym8.mf @@ -63,12 +63,12 @@ pickup pencircle scaled penwidth; cappen:=savepen; equalize=thickstroke/2-thinstroke/2; input drmlowmac.mf -input symbols.mf +input drmsymbols.mf input drmacc.mf -input oldstynums.mf -input oldstyfracs.mf +input drmoldstynums.mf +input drmoldstyfracs.mf input drmdigs.mf input drmromannums.mf; -input ornaments.mf; +input drmornaments.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsym9.mf b/Master/texmf-dist/fonts/source/public/drm/drmsym9.mf index 73175bf1f83..96c9346a939 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmsym9.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsym9.mf @@ -63,12 +63,12 @@ pickup pencircle scaled penwidth; cappen:=savepen; equalize=thickstroke/2-thinstroke/2; input drmlowmac.mf -input symbols.mf +input drmsymbols.mf input drmacc.mf -input oldstynums.mf -input oldstyfracs.mf +input drmoldstynums.mf +input drmoldstyfracs.mf input drmdigs.mf input drmromannums.mf; -input ornaments.mf; +input drmornaments.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/symbols.mf b/Master/texmf-dist/fonts/source/public/drm/drmsymbols.mf index 0df981ac4ea..0df981ac4ea 100644 --- a/Master/texmf-dist/fonts/source/public/drm/symbols.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmsymbols.mf diff --git a/Master/texmf-dist/fonts/source/public/drm/drmtt10.mf b/Master/texmf-dist/fonts/source/public/drm/drmtt10.mf deleted file mode 100644 index 95dad68ca90..00000000000 --- a/Master/texmf-dist/fonts/source/public/drm/drmtt10.mf +++ /dev/null @@ -1,71 +0,0 @@ -% +AMDG - -font_identifier:="drm"; font_size:=10pt#; font_coding_scheme "T1"; -pixels_per_inch:=1200; -mode_setup; - -%%%% Define Dimensions for Whole Boxes %%%% - -phi=(1+sqrt5)/2; -cap#=8pt#; -u#=2cap#/3; -em#=cap#; -ex#=0.6cap#; -dep#=cap#/3; -ss#=0.2pt#; -asch#=12cap#/12; -digwid#=1ex#; -font_slant 0u#; -slant = 0; -font_normal_space 0.5u#; -font_normal_stretch 0.2u#; -font_normal_shrink 0.2u#; -font_x_height cap#/phi; -font_quad em#; -font_extra_space 0.5u#; - -penwidth#=0.01pt#; - -%%%% Define Dimensions for Letters %%%% - -lserc#=0; -lserh#=lserc#+lserstep#; -lhigh#=0.3u#; -lserstep#=0.08u#; -userc#=0; -userh#=userc#+userstep#; -lserw#=0.2u#; -userw#=0.2u#; -userstep#=0.08u#; -bulbsh#=0.10u#; -curvwid#=1.2pt#; -slantwid#=1.2pt#; -thickstroke#=1.0pt#; -thinstroke#=1.0pt#; -loopgap#=1.0pt#; -hair#=0.2pt#; -o#=0.1pt#; -ssslant#=0.0u#; -dotwidth#=userw#-o#; -pwid#=2userw#; -accwid# = pwid#/8; -theight#=7asch#/8; -define_pixels(theight); - -define_pixels(accwid,cap,u,em,ex,dep,ss,penwidth,lserh,userh,lhigh,lserw,bulbsh,userw,lserc,userc,lserstep,userstep,ssslant,curvwid,slantwid,pwid,hair,loopgap,dotwidth); -define_blacker_pixels(accwid,cap,u,em,ex,dep,ss,penwidth,lserh,userh,lhigh,lserw,bulbsh,userw,lserc,userc,lserstep,userstep,ssslant,curvwid,slantwid,pwid,hair); -define_blacker_pixels(thickstroke,thinstroke,penwidth,o,hair); - -pickup pencircle scaled penwidth; cappen:=savepen; -equalize=thickstroke/2-thinstroke/2; - -input drmligs -input drmttcap.mf -%input drmlowmac.mf -%input drmlow.mf -%input drmpunct.mf -%input drmacc.mf -%input drmacclet.mf -%input drmdigs.mf - -end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmui10.mf b/Master/texmf-dist/fonts/source/public/drm/drmui10.mf index a0f49f1f170..a496c976275 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmui10.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmui10.mf @@ -71,7 +71,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; -input itoldstydigs.mf; +input drmitoldstydigs.mf; input drmuiligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmui11.mf b/Master/texmf-dist/fonts/source/public/drm/drmui11.mf index 15df22c9893..39e63854c75 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmui11.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmui11.mf @@ -71,7 +71,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; -input itoldstydigs.mf; +input drmitoldstydigs.mf; input drmuiligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmui12.mf b/Master/texmf-dist/fonts/source/public/drm/drmui12.mf index 7db99ed9a5c..d47c6f24146 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmui12.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmui12.mf @@ -71,7 +71,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; -input itoldstydigs.mf; +input drmitoldstydigs.mf; input drmuiligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmui14.mf b/Master/texmf-dist/fonts/source/public/drm/drmui14.mf index a85319bf9d5..f8805a0303b 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmui14.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmui14.mf @@ -71,7 +71,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; -input itoldstydigs.mf; +input drmitoldstydigs.mf; input drmuiligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmui17.mf b/Master/texmf-dist/fonts/source/public/drm/drmui17.mf index 63ce1005b18..f2761eb363d 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmui17.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmui17.mf @@ -71,7 +71,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; -input itoldstydigs.mf; +input drmitoldstydigs.mf; input drmuiligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmui24.mf b/Master/texmf-dist/fonts/source/public/drm/drmui24.mf index cc8988bdf1f..918d33074a5 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmui24.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmui24.mf @@ -71,7 +71,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; -input itoldstydigs.mf; +input drmitoldstydigs.mf; input drmuiligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmui6.mf b/Master/texmf-dist/fonts/source/public/drm/drmui6.mf index aa7257860d6..ef5e2d233c8 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmui6.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmui6.mf @@ -10,7 +10,7 @@ phi=(1+sqrt5)/2; cap#=4pt#; u#=2cap#/3; em#=1.2cap#; -ex#=0.8cap#; +ex#=0.7cap#; dep#=cap#/3; ss#=0.2pt#; asch#=12cap#/12; @@ -71,7 +71,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; -input itoldstydigs.mf; +input drmitoldstydigs.mf; input drmuiligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmui7.mf b/Master/texmf-dist/fonts/source/public/drm/drmui7.mf index 4042b8bcb79..555dd017ca7 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmui7.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmui7.mf @@ -71,7 +71,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; -input itoldstydigs.mf; +input drmitoldstydigs.mf; input drmuiligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmui8.mf b/Master/texmf-dist/fonts/source/public/drm/drmui8.mf index 8d6eb304037..0bca95342da 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmui8.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmui8.mf @@ -71,7 +71,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; -input itoldstydigs.mf; +input drmitoldstydigs.mf; input drmuiligs.mf; end; diff --git a/Master/texmf-dist/fonts/source/public/drm/drmui9.mf b/Master/texmf-dist/fonts/source/public/drm/drmui9.mf index 24e5e39f488..5f4d625622e 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmui9.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmui9.mf @@ -71,7 +71,7 @@ input drmacc.mf; input drmitacclet.mf; input drmitpunct.mf; input drmitdigs.mf; -input itoldstydigs.mf; +input drmitoldstydigs.mf; input drmuiligs.mf; end; |