summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-08-19 21:49:32 +0000
committerKarl Berry <karl@freefriends.org>2015-08-19 21:49:32 +0000
commit4a6cd05140576229cbc491cdff4f700f5fb31f82 (patch)
tree2a5eed6438f65c967ecd537abb9ede2f015708cf /Master/texmf-dist/fonts/source
parente2ec7338df75a2667046f0793efc2d7caa43d46c (diff)
drm (19aug15)
git-svn-id: svn://tug.org/texlive/trunk@38157 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/source')
-rw-r--r--Master/texmf-dist/fonts/source/public/drm/drmdozdigs.mf2
-rw-r--r--Master/texmf-dist/fonts/source/public/drm/drmitligs.mf14
-rw-r--r--Master/texmf-dist/fonts/source/public/drm/drmitoldstydigs.mf75
-rw-r--r--Master/texmf-dist/fonts/source/public/drm/drmoldstynums.mf2
4 files changed, 39 insertions, 54 deletions
diff --git a/Master/texmf-dist/fonts/source/public/drm/drmdozdigs.mf b/Master/texmf-dist/fonts/source/public/drm/drmdozdigs.mf
index 2f2e9046234..065d159facc 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmdozdigs.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/drmdozdigs.mf
@@ -47,7 +47,7 @@ z8 = (w-ss,3threeh/4-dep);
z9 = (w-ss,threeh/4-dep);
z10 = (w/2-2thinstroke,threeh/2+thinstroke-dep);
z11 = z10 shifted (0,-thinstroke);
-z20 = z10 shifted (2thickstroke,-thinstroke/2);
+z20 = z10 shifted (1.5thickstroke,-thinstroke/2);
z21 = z9 shifted (-o/4,0);
z22 = z10 shifted (2thickl,0);
z23 = z11 shifted (2thickl,0);
diff --git a/Master/texmf-dist/fonts/source/public/drm/drmitligs.mf b/Master/texmf-dist/fonts/source/public/drm/drmitligs.mf
index 024a8d0fac3..29a08ea02e9 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmitligs.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/drmitligs.mf
@@ -233,17 +233,3 @@ ligtable "(" : "a" kern-0.15u#, "c" kern-0.15u#,
"s" kern-0.15u#,"t" kern-0.15u#,"u" kern-0.15u#,
"v" kern-0.15u#,"w" kern-0.15u#,"x" kern-0.15u#,
"z" kern-0.15u#;
-ligtable "1" : "0" kern-0.1u#,"3" kern-0.2u#,"4" kern-0.1u#,
- "5" kern-0.1u#,"6" kern-0.1u#,"7" kern-0.1u#,
- "8" kern-0.1u#,"9" kern-0.2u#;
-ligtable "2" : "3" kern-0.1u#,"4" kern-0.1u#,"5" kern-0.1u#,
- "9" kern-0.2u#;
-ligtable "3" : "0" kern 0.2u#,"1" kern 0.2u#,"2" kern 0.2u#,
- "5" kern 0.2u#,"6" kern 0.2u#,"7" kern 0.2u#,
- "8" kern-0.3u#;
-ligtable "6" : "3" kern-0.1u#,"4" kern-0.1u#,"5" kern-0.1u#,
- "9" kern-0.05u#;
-ligtable "7" : "1" kern 0.1u#;
-ligtable "8" : "1" kern 0.1u#,"5" kern-0.2u#;
-ligtable "9" : "1" kern 0.1u#;
-ligtable "5" : "," kern 0.2u#,"." kern 0.2u#;
diff --git a/Master/texmf-dist/fonts/source/public/drm/drmitoldstydigs.mf b/Master/texmf-dist/fonts/source/public/drm/drmitoldstydigs.mf
index 887ca95e446..05fbf1643e0 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmitoldstydigs.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/drmitoldstydigs.mf
@@ -4,7 +4,6 @@
% Mary for their prayers, and to the Sacred Heart of Jesus
% for His mercy.
-
beginchar("1",0.6ex#+2ss#,ex#,0); "The digit 1";
italcorr(ex#*slant);
@@ -61,19 +60,19 @@ beginchar("3",digwid#+2ss#,cap#,dep#); "The digit 3";
italcorr(ex#*slant);
penpos0(thickl,0);
-z0l = (ss,3h/4);
+z0l = (ss,3h/4-dep);
penpos1(thinl,-90);
-z1l = (w/2,h+o);
+z1l = (w/2,h+o-dep);
penpos2(thickl,180);
-z2l = (w-ss,3h/4);
+z2l = (w-ss,3h/4-dep);
penpos3(thinl,90);
-z3 = (w/2,h/2);
+z3 = (w/2,h/2-dep);
penpos4(thickl,0);
-z4r = (w-ss,h/4);
+z4r = (w-ss,h/4-dep);
penpos5(thinl,-90);
-z5r = (w/2,0-o);
+z5r = (w/2,0-o-dep);
penpos6(thickl,180);
-z6r = (ss,h/4);
+z6r = (ss,h/4-dep);
penpos7(1.5thinl,90);
z7 = z0 shifted (curlw,-curlh);
penpos8(thinl,180);
@@ -91,22 +90,22 @@ penstroke z9e..z8e..z7e..z0e{up}..z1e..z2e..z3e;
penstroke z3e..z4e..z5e..{up}z6e..z10e..z11e..z12e;
picture three; three := currentpicture;
-currentpicture := three shifted (0,-dep);
+currentpicture := three;
penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51);
endchar;
-beginchar("4",digwid#+2ss#,cap#,0); "The digit 4";
+beginchar("4",digwid#+2ss#,cap#,dep#); "The digit 4";
italcorr(ex#*slant);
penpos0(thickl,0);
-z0r = (5w/6,h+o);
+z0r = (5w/6,h+o-dep);
penpos1(thickl,0);
-z1r = (5w/6,0);
+z1r = (5w/6,0-dep);
penpos2(thickl,0);
-z2r = (0.6w,h+o);
+z2r = (0.6w,h+o-dep);
penpos3(thickl,0);
-z3l = (ss,h/3);
+z3l = (ss,h/3-dep);
penpos4(thinl,-45);
z4l = z3l;
penpos5(thinl,-45);
@@ -134,26 +133,26 @@ penstroke z1e--z7e--z10e--z12e--z14e;
penstroke z4e--z5e;
picture four; four := currentpicture;
-currentpicture := four shifted (0,-dep);
+currentpicture := four;
penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51);
endchar;
-beginchar("5",digwid#+2ss#,cap#,0); "The digit 5";
+beginchar("5",digwid#+2ss#,cap#,dep#); "The digit 5";
italcorr(ex#*slant);
penpos0(thickl,90);
-z0r = (w-ss-thickl/2,h+o);
+z0r = (w-ss-thickl/2,h+o-dep);
penpos1(thickl,90);
-z1r = (ss+thickl/2,h+o);
+z1r = (ss+thickl/2,h+o-dep);
penpos2(thickl,90);
-z2 = (ss+thickl/3,h/2);
+z2 = (ss+thickl/3,h/2-dep);
penpos3(thickl,0);
-z3r = (w-ss,h/3);
+z3r = (w-ss,h/3-dep);
penpos4(thinl,-90);
-z4r = (w/2,0-o);
+z4r = (w/2,0-o-dep);
penpos5(thickl,180);
-z5r = (ss,h/5);
+z5r = (ss,h/5-dep);
penpos6(thinl,0);
z6l = z1l;
penpos7(thinl,0);
@@ -168,7 +167,7 @@ penstroke z6e--z7e;
penstroke z2e..z3e..z4e..z5e..z8e..z9e;
picture five; five := currentpicture;
-currentpicture := five shifted (0,-dep);
+currentpicture := five;% shifted (0,-dep);
penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51);
endchar;
@@ -201,44 +200,44 @@ penstroke z0e..z1e..z2e;
penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51);
endchar;
-beginchar("9",digwid#+2ss#,cap#,0); "The digit 9";
+beginchar("9",digwid#+3ss#,cap#,dep#); "The digit 9";
italcorr(ex#*slant);
penpos0(thinl,90);
-z0l = (w/3,0-o);
+z0l = (w/3,0-o-dep);
penpos1(2thinl,180);
-z1l = (w-ss-thinl,h/3);
+z1l = (w-2ss-thinl,h/3-dep);
penpos2(thickl,180);
-z2l = (w-ss,h-ex/2);
+z2l = (w-2ss,h-ex/2-dep);
penpos3(thinl,90);
-z3l = (w/2,h-ex-o);
+z3l = (w/2,h-ex-o-dep);
penpos4(thickl,0);
-z4l = (ss,h-ex/2);
+z4l = (ss,h-ex/2-dep);
penpos5(thinl,-90);
-z5l = (w/2,h+o);
+z5l = (w/2,h+o-dep);
penstroke z5e..z2e..z3e..z4e..cycle;
penstroke z0e..z1e..z2e;
picture nine; nine := currentpicture;
-currentpicture := nine shifted (0,-dep);
+currentpicture := nine;
penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51);
endchar;
-beginchar("7",digwid#+2ss#,cap#,0); "The digit 7";
+beginchar("7",digwid#+2ss#,cap#,dep#); "The digit 7";
italcorr(ex#*slant);
penpos0(thickl,90);
-z0r = (ss,h+o);
+z0r = (ss,h+o-dep);
penpos1(thickl,90);
-z1r = (w-ss,h+o);
+z1r = (w-ss,h+o-dep);
penpos2(1.5thinl,180);
-z2 = (w/3,h/2);
+z2 = (w/3,h/2-dep);
penpos3(thickl,180);
-z3r = (w/3,0);
+z3r = (w/3,0-dep);
penpos4(thinl,45);
-z4 = (ss,h/2);
+z4 = (ss,h/2-dep);
penpos5(thinl,45);
z5 = 2[z4,z2] shifted (thickl,thickl);
penpos6(thinl,45);
@@ -249,7 +248,7 @@ penstroke z1e..z2e..z3e;
penstroke z6e--z5e;
picture seven; seven := currentpicture;
-currentpicture := seven shifted (0,-dep);
+currentpicture := seven;
penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51);
endchar;
diff --git a/Master/texmf-dist/fonts/source/public/drm/drmoldstynums.mf b/Master/texmf-dist/fonts/source/public/drm/drmoldstynums.mf
index fd6cbc1e3e7..a35aa402940 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmoldstynums.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/drmoldstynums.mf
@@ -80,7 +80,7 @@ z8 = (w-ss,3threeh/4-dep);
z9 = (w-ss,threeh/4-dep);
z10 = (w/2-2thinstroke,threeh/2+thinstroke-dep);
z11 = z10 shifted (0,-thinstroke);
-z20 = z10 shifted (2thickstroke,-thinstroke/2);
+z20 = z10 shifted (1.5thickstroke,-thinstroke/2);
z21 = z9 shifted (-o/4,0);
z22 = z10 shifted (2thickl,0);
z23 = z11 shifted (2thickl,0);