drm (4nov14)

git-svn-id: svn://tug.org/texlive/trunk@35509 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 37 insertions, 37 deletions

diff --git a/Master/texmf-dist/fonts/source/public/drm/drmbs10.mf b/Master/texmf-dist/fonts/source/public/drm/backslanttest.mf
index 07c8253d8e1..07c8253d8e1 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmbs10.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/backslanttest.mf
diff --git a/Master/texmf-dist/fonts/source/public/drm/drmcap.mf b/Master/texmf-dist/fonts/source/public/drm/drmcap.mf
index 7d979f8fd3a..0d9e5f22bd5 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmcap.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/drmcap.mf
@@ -481,7 +481,8 @@ llserif(1,5,6,7,8)(1);
 lrserif(2,13,14,15,16)(1);
 ulserif(3,9,10,11,12)(1);
 
-fill z18--z17--z12--z11--z10..z9..z3--z1..z5..z6--z7--z8--z15--z14..z13..z2--z24--z22---z26--z27--z28--z29--z32..z20..{left}z18..cycle;
+fill
+z18--z17--z12--z11--z10..z9..z3--z1..z5..z6--z7--z8--z15--z14..z13..z2--z24--z22---z26--z27--z28--z29--z31{right}..{up}z20{up}..{left}z18..cycle;
 unfill z25{right}..{right}z23..z21..z19{left}..{left}z4--z25--cycle;
 
 capr := currentpicture;
@@ -648,7 +649,6 @@ z4=z3+(thinstroke,0);
 z5=(w-ss-userw,h-userh);
 z6=z5-(thinstroke,0);
 z7=(w-ss-userw,-o);
-z28=z7+(-thinstroke,2.5thickstroke);
 z29=z27+(thickstroke/2,0);
 
 llserif(3,8,9,10,11)(1);
@@ -656,6 +656,8 @@ lrserif(4,12,13,14,15)(1);
 ulserif(6,16,17,18,19)(1);
 urserif(5,20,21,22,23)(1);
 ulserif(1,24,25,26,27)(1);
+z28 = (z6--(z7 shifted (-thinstroke,0))) intersectionpoint
+	(z29--(x21,y7));
 
 fill z7--z5..z20..z21--z22--z18--z17..z16..z6--z28--z29--z27--z26--z25..z24..z1--z3..z8..z9--z10--z14--z13..z12..z4--z2--z7--cycle;
 
diff --git a/Master/texmf-dist/fonts/source/public/drm/drmlow.mf b/Master/texmf-dist/fonts/source/public/drm/drmlow.mf
index 7fbdc156e0b..ecd1ed1da3e 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmlow.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/drmlow.mf
@@ -141,8 +141,8 @@ z27 = z19 shifted (0,w/3);
 z28 = z27 shifted (-thickl,0);
 z29 = z1 shifted (0,w/3);
 z30 = z29 shifted (-thickl,0);
-z35 = (x28,ex-thickl);
-z36 = (x27,ex-thickl);
+z35 = (x28,ex-thickl-thinl);
+z36 = (x27,ex-thickl-thinl);
 z37 = (x30,ex-thickl);
 z38 = (x29,ex-thickl);
 
@@ -156,7 +156,7 @@ path hone; path htwo;
 hone =
 z26--z10--z9..z8..z0--z2..z4..z5--z6--z16--z1..z31..z32--z33--cycle;
 htwo =
-z1--z29--z38{up}..{right}z18{right}..{right}z45{right}..{down}z35--z28--z20..z40..z41--z42--z23--z22..z21..z19--z27---z36{up}..{left}z44{left}..{left}z17{left}..{down}z37--z30--z0--cycle;
+z1--z29--z38{up}..{right}z18{right}..{right}z45{right}..{down}z35---z28--z20..z40..z41--z42--z23--z22..z21..z19--z27---z36{up}..{left}z44{left}..{left}z17{left}..{down}z37--z30--z0--cycle;
 fill hone; fill htwo;
 
 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);
@@ -281,13 +281,16 @@ z21 = 0.5[z19,z17] shifted (hair,0);
 z22 = (x19,y3);
 z27 = 0.5[z3,z22]; y27 := h+o;
 z28 = z27 shifted (0,-thinl);
-
 lrserif(1,4,5,6,7)(1);
 llserif(0,8,9,10,11)(1);
 dlftbulb(22,23,24,25,26);
+z29 = 0.5[z25,z23];
+z30 = (z29..z28..z3) intersectionpoint
+	(z24..z23..z22..z25);
 
 fill
-z1..z4..z5--z6--z10--z9..z8..z0--z12--z16..z20..z18--z14--z2{up}..{right}z27{right}..{down}z24..z23..z22..{right}z25{dir 160}..z28..{down}z3--z15--z19..z21..z17--z13--cycle;
+z1..z4..z5--z6--z10--z9..z8..z0--z12--z16..z20..z18--z14--z2{up}..{right}z27{right}..{down}z24..z23..{up}z22{up}..{dir 0}z30{dir 160}..z28..{down}z3--z15--z19..z21..z17--z13--cycle;
+%z1..z4..z5--z6--z10--z9..z8..z0--z12--z16..z20..z18--z14--z2{up}..{right}z27{right}..{down}z24..z23..z22..{right}z25{dir 160}..z28..{down}z3--z15--z19..z21..z17--z13--cycle;
 
 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;
@@ -322,13 +325,13 @@ z12 = z1 shifted (0,userhl);
 z13 = z3 shifted (0,-lserhl);
 z14 = (w/2,-o);
 z15 = z14 shifted (0,1.5thinl);
-z16 = (x0,h/4);
+z16 = (x0,h/3);
 z17 = 0.5[z16,z14] shifted (0,-lserwl);
 z18 = z17 shifted (3o,lserhl);
 z19 = z16 shifted (thickl,0);
 z20 = (w-ss-userwl,h-userhl);
 z21 = z20 shifted (-thickl,0);
-z22 = (x21,h/4);
+z22 = (x21,h/3);
 z23 = z22 shifted (thickl,0);
 z24 = 0.5[z23,z14] shifted (-2o,-lserwl);
 z29 = z20 shifted (0,userhl);
@@ -570,10 +573,6 @@ beginchar("m",1.1em#+2ss#,ex#,0); "The Letter m";
 
 z0 = (ss+lserwl,lserhl);
 z1 = z0 shifted (thickl,0);
-%z2 = z1 shifted (hair+2lserwl,0);
-%z3 = z2 shifted (thickl,0);
-%z4 = z3 shifted (hair+2lserwl,0);
-%z5 = z4 shifted (thickl,0);
 z2 = (w/2-thickl/2,lserhl);
 z3 = z2 shifted (thickl,0);
 z4 = (w-ss-lserwl-thickl,lserhl);
@@ -582,20 +581,20 @@ z30 = (ss+userwl,h-userhl);
 z31 = z30 shifted (thickl,0);
 z32 = z31 shifted (hair+2userwl,0);
 z33 = z32 shifted (thickl/2,0);
-z34 = z33 shifted (hair+2userwl+thickl/2,0);
-z35 = z34 shifted (thickl,-thinl);
+z34 = z33 shifted (hair+2userwl+thickl/2,-thinl);
+z35 = z34 shifted (thickl,0);
 z40 = z31 shifted (0,userhl);
 x35 := x5;
 x32 := x2;
 x34 := x4;
 z45 = 0.5[z32,z33];
-z46 = 0.5[z34,z35];
+z46 = 0.5[z34,z35] shifted (0,thinl);
 z41 = 0.5[z40,z45];
 z42 = 0.5[z45,z46] shifted (0,userhl);
 z43 = z41 shifted (0,-thinl);
 z44 = z42 shifted (0,-thinl);
 z47 = 0.5[z31,z33] shifted (0,userhl+o);
-z48 = 0.5[z55,z34] shifted (0,userhl+o);
+z48 = 0.5[z55,(x34,y34+thinl)] shifted (0,userhl+o);
 z49 = z33 shifted (0,-thinl);
 z50 = z31 shifted (0,-thinl);
 looph = y47-y41;
@@ -606,6 +605,7 @@ z54 = z49 shifted (-thickl/2,hair);
 z55 = z33 shifted (thickl/2,0);
 x54 := x2;
 x55 := x3;
+y31 := y31 + thinl/2;
 
 llserif(0,6,7,8,9)(1);
 lrserif(1,10,11,12,13)(1);
@@ -616,7 +616,8 @@ lrserif(5,26,27,28,29)(1);
 ulserif(30,36,37,38,39)(1);
 
 fill
-z1..z10..z11--z12--z8--z7..z6..z0--z30..z36..z37--z38--z40--z31{up}..{right}z47{right}..z55--z32..{right}z48{right}..{down}z35--z5..z26..z27--z28--z24--z23..z22..z4--z34..{left}z51{left}..z55--z3..z18..z19--z20--z16--z15..z14..z2--z54..z41..z50--cycle;
+z1..z10..z11--z12--z8--z7..z6..z0--z30..z36..z37--z38--z40--z31{dir
+60}..{right}z47{right}..z55--z32..{right}z48{right}..{down}z35--z5..z26..z27--z28--z24--z23..z22..z4--z34{up}..{left}z51{left}..z55--z3..z18..z19--z20--z16--z15..z14..z2--z54..z41..z50--cycle;
 
 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,52,53,54,55,56);
 endchar;
@@ -643,6 +644,7 @@ lrserif(1,8,9,10,11)(1);
 llserif(2,12,13,14,15)(1);
 lrserif(3,16,17,18,19)(1);
 ulserif(20,25,26,27,28)(1);
+y21 := y23 := (y21 - thinl);
 
 fill
 z6--z5..z4..z0--z20..z25..z26--z27--z28--z33--z20..{right}z31{right}..{down}z24--z3..z16..z17--z18--z14--z13..z12..z2--z23..z32..z21--z1..z8..z9--z10--z6--cycle;
@@ -657,19 +659,16 @@ beginchar("r",exw#+2ss#,ex#,0); "The Letter r";
 z0 = (ss+lserwl,lserhl);
 z1 = z0 shifted (thickl,0);
 z10 = (ss+userwl,h-userhl);
-z11 = z10 shifted (thickl,0);
-z16 = 0.5[z11,z10];
+z11 = z10 shifted (thickl,-thinl);
+z16 = 0.5[(x11,y10),z10];
 llserif(0,2,3,4,5)(1);
 lrserif(1,6,7,8,9)(1);
 ulserif(10,12,13,14,15)(1);
-%z15 = z16 shifted (0,userh);
-%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 = 0.5[z17,z20];
 z25 = z16 shifted (thickl/2,-thinl);
 z26 = (z11..z23..z24) intersectionpoint (z21..z17..z19..z20);
diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsc10.mf b/Master/texmf-dist/fonts/source/public/drm/drmsc10.mf
index 682305f00ed..3a2c9cc4eb8 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmsc10.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/drmsc10.mf
@@ -17,12 +17,12 @@ asch#=12cap#/12;
 digwid#=1ex#;
 slant=0;
 font_slant 0u#;
-font_normal_space 1u#;
-font_normal_stretch 1u#;
-font_normal_shrink 1u#;
+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 2u#;
+font_extra_space 0.5u#;
 
 penwidth#=0.01pt#;
 
diff --git a/Master/texmf-dist/fonts/source/public/drm/drmsc17.mf b/Master/texmf-dist/fonts/source/public/drm/drmsc17.mf
index b5cfff00ba5..2b9e1bd3a06 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmsc17.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/drmsc17.mf
@@ -1,6 +1,6 @@
 % +AMDG
 
-font_identifier:="drmsc"; font_size:=17pt#; font_coding_scheme "T1";
+font_identifier:="drm"; font_size:=17pt#; font_coding_scheme "T1";
 pixels_per_inch:=1200;
 mode_setup;
 
diff --git a/Master/texmf-dist/fonts/source/public/drm/drmscap.mf b/Master/texmf-dist/fonts/source/public/drm/drmscap.mf
index 00a4faaa532..a023651c3d0 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmscap.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/drmscap.mf
@@ -566,9 +566,9 @@ z4 = z3 shifted (thickstroke,0);
 z5 = (w-ss-userw,h-userh);
 z6 = z5 shifted (-thinstroke,0);
 z7 = (w/3+thinstroke/2,0);
-z8 = (2w/3+thinstroke/2,0);
+z8 = (2w/3-thinstroke/2,0);
 z33=(w/2,3h/4);
-z34=z8+(.4thinstroke,2.0thickstroke);
+z34=z8+(thinstroke,1.8thickstroke);
 z35=z7+(0.4thinstroke,2.0thickstroke);
 z36=0.96[z8,z3];
 
diff --git a/Master/texmf-dist/fonts/source/public/drm/drmtc10.mf b/Master/texmf-dist/fonts/source/public/drm/drmtc10.mf
index 7758139276c..59039bfe748 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmtc10.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/drmtc10.mf
@@ -17,12 +17,11 @@ asch#=12cap#/12;
 digwid#=1ex#;
 slant = 0;
 font_slant 0u#;
-font_normal_space 1u#;
-font_normal_stretch 1u#;
-font_normal_shrink 1u#;
+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 2u#;
 
 penwidth#=0.01pt#;
 
diff --git a/Master/texmf-dist/fonts/source/public/drm/drmtc17.mf b/Master/texmf-dist/fonts/source/public/drm/drmtc17.mf
index 622fee616c3..7ce884a5525 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmtc17.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/drmtc17.mf
@@ -1,6 +1,6 @@
 % +AMDG
 
-font_identifier:="drmsc"; font_size:=17pt#; font_coding_scheme "T1";
+font_identifier:="drm"; font_size:=17pt#; font_coding_scheme "T1";
 pixels_per_inch:=1200;
 mode_setup;
 
diff --git a/Master/texmf-dist/fonts/source/public/drm/drmtcap.mf b/Master/texmf-dist/fonts/source/public/drm/drmtcap.mf
index 2980c9e3301..ecd1970eef8 100644
--- a/Master/texmf-dist/fonts/source/public/drm/drmtcap.mf
+++ b/Master/texmf-dist/fonts/source/public/drm/drmtcap.mf
@@ -566,9 +566,9 @@ z4 = z3 shifted (thickstroke,0);
 z5 = (w-ss-userw,h-userh);
 z6 = z5 shifted (-thinstroke,0);
 z7 = (w/3+thinstroke/2,0);
-z8 = (2w/3+thinstroke/2,0);
+z8 = (2w/3-thinstroke/2,0);
 z33=(w/2,3h/4);
-z34=z8+(.4thinstroke,2.0thickstroke);
+z34=z8+(thinstroke,1.8thickstroke);
 z35=z7+(0.4thinstroke,2.0thickstroke);
 z36=0.96[z8,z3];