From c970c7a71b932db2126f7e23ee447c74de7d6d81 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 17 Aug 2015 22:15:43 +0000 Subject: drm (17aug15) git-svn-id: svn://tug.org/texlive/trunk@38136 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/fonts/source/public/drm/drmpunct.mf | 38 +++++----------------- 1 file changed, 8 insertions(+), 30 deletions(-) (limited to 'Master/texmf-dist/fonts/source') diff --git a/Master/texmf-dist/fonts/source/public/drm/drmpunct.mf b/Master/texmf-dist/fonts/source/public/drm/drmpunct.mf index 14ad2b81521..71d0556b007 100644 --- a/Master/texmf-dist/fonts/source/public/drm/drmpunct.mf +++ b/Master/texmf-dist/fonts/source/public/drm/drmpunct.mf @@ -3,7 +3,7 @@ % her and the Immaculate Heart of Mary for their prayers, % and to the Sacred Heart of Jesus for His mercy. -picture hyphen; +path hyphenpath; picture paren; picture period; picture opendoublequote; @@ -61,50 +61,28 @@ define_pixels(thinwid); beginchar("-",2pwid#,ex#,0); "The hyphen, -"; -z0 = (ss,3h/4); +z0 = (ss,h/2); z1 = (w-ss,y0); z2 = z0 shifted (thinwid/2,thinwid/2); z3 = z2 shifted (0,-thinwid); z4 = z1 shifted (-thinwid/2,thinwid/2); z5 = z4 shifted (0,-thinwid); -fill z2..z0..z3--z5..z1..z4--cycle; - -hyphen := currentpicture; - +hyphenpath = z2..z0..z3--z5..z1..z4--cycle; +fill hyphenpath; 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(oct"177",2pwid#,ex#,0); "The break hyphen, -"; -currentpicture := hyphen; +beginchar(oct"177",1.5pwid#,ex#,0); "The break hyphen, -"; +fill hyphenpath xscaled 0.75; endchar; beginchar(oct"025",3pwid#,ex#,0); "The en-dash, --"; - -z0 = (ss,3h/4); -z1 = (w-ss,y0); -z2 = z0 shifted (thinwid/2,thinwid/2); -z3 = z2 shifted (0,-thinwid); -z4 = z1 shifted (-thinwid/2,thinwid/2); -z5 = z4 shifted (0,-thinwid); - -fill z2..z0..z3--z5..z1..z4--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); +fill hyphenpath xscaled 1.5; endchar; beginchar(oct"026",em#+2ss#,ex#,0); "The em-dash, ---"; - -z0 = (ss,3h/4); -z1 = (w-ss,y0); -z2 = z0 shifted (thinwid/2,thinwid/2); -z3 = z2 shifted (0,-thinwid); -z4 = z1 shifted (-thinwid/2,thinwid/2); -z5 = z4 shifted (0,-thinwid); - -fill z2..z0..z3--z5..z1..z4--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); +fill hyphenpath xscaled 2; endchar; beginchar("(",1.5pwid#,cap#,dep#); "The open parenthesis, ("; -- cgit v1.2.3