From a4c89b884f734bc236f87f891d64d8ec1b5eb757 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 1 Sep 2015 21:40:47 +0000 Subject: gothic since cmfrabase.mf name fix git-svn-id: svn://tug.org/texlive/trunk@38263 c570f23f-e606-0410-a88d-b1316a301751 --- .../fonts/source/public/gothic/cmfrabas.mf | 231 --------------------- .../fonts/source/public/gothic/cmfrabase.mf | 231 +++++++++++++++++++++ .../fonts/source/public/gothic/cmfraknum.mf | 1 - Master/tlpkg/bin/tlpkg-ctan-check | 8 - Master/tlpkg/libexec/ctan2tds | 3 +- 5 files changed, 232 insertions(+), 242 deletions(-) delete mode 100644 Master/texmf-dist/fonts/source/public/gothic/cmfrabas.mf create mode 100644 Master/texmf-dist/fonts/source/public/gothic/cmfrabase.mf diff --git a/Master/texmf-dist/fonts/source/public/gothic/cmfrabas.mf b/Master/texmf-dist/fonts/source/public/gothic/cmfrabas.mf deleted file mode 100644 index b91f6006ef9..00000000000 --- a/Master/texmf-dist/fonts/source/public/gothic/cmfrabas.mf +++ /dev/null @@ -1,231 +0,0 @@ -def n_foot(suffix $) = -w':=7.806u; penpos$.1(hair,90); penpos$.2(hair,0); -penpos$.3(hair,-90); -y$.1=y$.3=0.5foot; y$.2=-apex_o; -x$.1=x$l-1/20w'; x$.3=x$r+1/20w'; -x$.2=x$; -filldraw z$.2r{dir75}..z$.3r{dir15}-- -z$.3l{dir165}..z$r{up}--z$l{down}.. -z$.1r{dir195}--z$.1l{dir-15}..z$.2l{dir-65} ---z$.2r & cycle; -enddef; - -def o_umlaut(suffix $) = -pickup pensquare yscaled 0.5hair xscaled 0.3[hair,stem] rotated 30; -z$.1=z$+(0,0.1x_height); -z$.2=z$.1+(stem,0.1x_height); -x$.3=x$.2; y$.3=y$.2+0.1x_height; -x$.4=x$.1; y$.4-y$.3=y$.2-y$.1; -x$.5+x$.3=2x$.4; y$.5=y$.3; -x$.6+x$.2=2x$.1; y$.6=y$.2; -draw z$.1--z$.2--z$.3--z$.4--z$.5--z$.6--z$.1; -penlabels(z$.1,z$.2,z$.3,z$.4,z$.5,z$.6); -enddef; - -def e_umlaut(suffix $) = -penpos$.1(2u,45); z$.1=z$; -pickup pensquare yscaled 0.5hair xscaled 0.3[hair,stem] rotated 30; -z$.2=z$.1r; z$.3=z$.1l; rt x$.4=rt x$.2; top y$.4=y$; -draw z$.3--z$.2..z$.3..z$.4; -enddef; - -def cap_e_umlaut(suffix $) = -penpos$.1(2u,45); z$.1=z$; -pickup pensquare yscaled 0.5hair xscaled 0.3[hair,stem] rotated 30; -z$.2=z$.1r; z$.3=z$.1l; rt x$.4=rt x$.2; top y$.4=y$; -draw z$.3--z$.2..z$.3..z$.4; -enddef; - -def pointpoint = -penpos1(0.23570*(x_height+2apex_o),45); -penpos2(0.23570*(x_height+2apex_o),45); -penpos3(0.23570*(x_height+2apex_o),45); -penpos4(0.23570*(x_height+2apex_o),45); -penpos5(0.23570*(x_height+2apex_o),45); -penpos6(0.23570*(x_height+2apex_o),45); -x1l=x3l=x5l=0.5w; -z2r=z3l; z4r=z5l; -z2-z1=whatever*dir135; -z4-z3=whatever*dir135; -z6-z5=whatever*dir135; -y1l=-apex_o; y6r=x_height+apex_o; -penstroke z1e--z2e; -enddef; - - - -def pointaccent(suffix $) = -penpos1(0.23570*(x_height+2apex_o),45); -penpos2(0.23570*(x_height+2apex_o),45); -penpos3(0.23570*(x_height+2apex_o),45); -penpos4(0.23570*(x_height+2apex_o),45); -penpos5(0.23570*(x_height+2apex_o),45); -penpos6(0.23570*(x_height+2apex_o),45); -x1l=x3l=x5l=x$; -z2r=z3l; z4r=z5l; -z2-z1=whatever*dir135; -z4-z3=whatever*dir135; -z6-z5=whatever*dir135; -y1l=-apex_o+y$+0.1x_height; y6r=1.1x_height+apex_o+y$; -penstroke z1e--z2e; -enddef; - - - - -def old_e_umlaut(suffix $) = -numeric ww; -ww:=2u; penpos$.1(hair,147); -penpos$.2(1.5hair,90); penpos$.3(2.5hair,0); -penpos$.4(1.2hair,-90); -penpos$.5(hair,-147); -penpos$.6(hair,-57); penpos$.7(hair,-57); -z$.1=z$+(0.4ww,-0.2ww); -z$.2l=z$-(0.111ww,0.556ww); -z$.3l=z$-(0.5ww,apex_o); -z$.4l=(x$,y$+0.556ww); -z$.6-z$=whatever*dir33; x$.6r=x$+0.5ww; -z$.5l=z$.6l; z$.7=whatever[z$,z$.6]; -x$.7=x$.3; -penstroke z$.1e..z$.2e{left}..z$.3e{up} -..z$.4e{right}..z$.5e; -penstroke z$.7e--z$.6e -enddef; - -def umlaut (suffix $) = -y0=0; 0.5[x0,x0']=x$-2u; -z0'=z0+(2.5u,0); -penpos60(hair,145); -z60=(x0+stem,y$+0.090x_height); -z61=(x0+1.522stem,y$+0.387x_height); -z62=(x0+1.956stem,y$+0.324x_height); -z60'=(x0'+stem,y$+0.090x_height); -z61'=(x0'+1.522stem,y$+0.387x_height); -z62'=(x0'+1.956stem,y$+0.324x_height); -filldraw z60l{dir34}..z62{up}..z61{left} -..z60r{dir259}--z60l & cycle; -penpos60'(hair,145); -filldraw z60'l{dir34}..z62'{up}..z61'{left} -..z60'r{dir259}--z60'l & cycle -enddef; - - -def hat (suffix $) = -z60=(x$-2.5u,0.090x_height+y$); -z61=(x$+0.3u,0.387x_height+y$); -x62=x$-0.3u; y62=0.3333*(2y60+y61); -y60'=y60; x60'+x60=2x$; -filldraw z60--z61--z60'{left}..z62..{left}cycle; -enddef; - - - -def hungarum (suffix $) = -z60=(x$-2.5u-0.25stem,0.090x_height+y$); -z63=z60+(0.5stem,0); -z61=(x$,0.387x_height+y$); -z62=z61+(stem,0); -filldraw z60--z61--z62--z63--cycle; -filldraw z60--z61--z62--z63--cycle shifted (2.5u,0); -enddef; - -def ellbar (suffix $) = -z60=(x$,y$-0.5u); -z61=(x$+3.5u,0.5u+y$); -pickup pensquare scaled 2hair; -draw z60--z61; -enddef; - -def hacek (suffix $) = -z60=(x$-2.5u,0.387x_height+y$); -z61=(x$-0.3u,0.090x_height+y$); -x62=x$+0.3u; y62=0.3333*(2y60+y61); -y60'=y60; x60'+x60=2x$; -filldraw z60--z61--z60'{left}..z62..{left}cycle; -enddef; - -def breve (suffix $) = -z60=(x$-2.5u,0.387x_height+y$); -z61=(x$-0.3u,0.090x_height+y$); -x62=x$+0.3u; y62=0.3333*(2y60+y61); -y63=y60; x63+x60=2x$; -z60'=z60+(0,hair); -z63'=z63+(0,hair); -filldraw z60..{right}z61{right}..z63--z63'..{left}z62{left}..z60'--cycle; -enddef; - -def tilde (suffix $) = -z60=(x$-2.1u,0.090x_height+y$); -z61=(x$-u,0.387x_height+y$); -z62=(x$+u,0.090x_height+y$); -z63=(x$+2.1u,0.387x_height+y$); -pickup pensquare xscaled stem yscaled hair rotated 30; -draw z60...{right}z61..z62{right}...z63; -enddef; - - -def cedilla (suffix $) = -pickup pensquare scaled hair; -z60=z$; -z61=(x$+u+0.16w,y$-0.18x_height); -x62=x$; y62=y61-0.12x_height; -penpos60(stem,30); penpos61(stem,30); penpos62(stem,-30); -penstroke z60e{dir-30}..{down}z61e..{left}z62e; -enddef; - - -def ogonek (suffix $) = -pickup pensquare scaled hair; -z60=z$; -z61=(x$-u-0.16w,y$-0.18x_height); -x62=x$; y62=y61-0.12x_height; -penpos60(stem,-30); penpos61(stem,30); penpos62(stem,40); -penstroke z60e{dir-135}..{down+0.25right}z61e..{right+0.3up}z62e; -enddef; - -def acute (suffix $) = -y0=0; 0.5[x0,x0']=x$-2u; -z0'=z0+(2.5u,0); -penpos60(hair,145); -z60=(x0+stem,y$+0.090x_height); -z61=(x0+1.522stem,y$+0.387x_height); -z62=(x0+1.956stem,y$+0.324x_height); -z60'=(x0'+stem,y$+0.090x_height); -z61'=(x0'+1.522stem,y$+0.387x_height); -z62'=(x0'+1.956stem,y$+0.324x_height); -penpos60'(hair,145); -filldraw z60l{dir34}..z62'{up}..z61'{left} -..z60r{dir259}--z60l & cycle -enddef; - -def grave (suffix $) = -y0=0; 0.5[x0,x0']=x$-2u; -z0'=z0+(2.5u,0); -penpos60(hair,145); -z60=(x0+stem,y$+0.090x_height); -z61=(x0+1.522stem,y$+0.387x_height); -z62=(x0+1.956stem,y$+0.324x_height); -z60'=(x0'+stem,y$+0.090x_height); -z61'=(x0'+1.522stem,y$+0.387x_height); -z62'=(x0'+1.956stem,y$+0.324x_height); -penpos60'(hair,145); -filldraw (z60l{dir34}..z62'{up}..z61'{left} -..z60r{dir259}--z60l & cycle) reflectedabout ((x$,x_height),(x$,0)); -enddef; - - -def cap_grave (suffix $) = -y0=0; 0.5[x0,x0']=x$-2u; -z0'=z0+(2.5u,0); -penpos60(hair,145); -z60=(x0+stem,1.090x_height-x_height+y$); -z61=(x0+1.522stem,1.387x_height-x_height+y$); -z62=(x0+1.956stem,1.324x_height-x_height+y$); -z60'=(x0'+stem,1.090x_height-x_height+y$); -z61'=(x0'+1.522stem,1.387x_height-x_height+y$); -z62'=(x0'+1.956stem,1.324x_height-x_height+y$); -filldraw (z60l{dir34}..z62'{up}..z61'{left} -..z60r{dir259}--z60l & cycle) reflectedabout ((x$,x_height),(x$,0)); -enddef; - -picture last_char; diff --git a/Master/texmf-dist/fonts/source/public/gothic/cmfrabase.mf b/Master/texmf-dist/fonts/source/public/gothic/cmfrabase.mf new file mode 100644 index 00000000000..b91f6006ef9 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/gothic/cmfrabase.mf @@ -0,0 +1,231 @@ +def n_foot(suffix $) = +w':=7.806u; penpos$.1(hair,90); penpos$.2(hair,0); +penpos$.3(hair,-90); +y$.1=y$.3=0.5foot; y$.2=-apex_o; +x$.1=x$l-1/20w'; x$.3=x$r+1/20w'; +x$.2=x$; +filldraw z$.2r{dir75}..z$.3r{dir15}-- +z$.3l{dir165}..z$r{up}--z$l{down}.. +z$.1r{dir195}--z$.1l{dir-15}..z$.2l{dir-65} +--z$.2r & cycle; +enddef; + +def o_umlaut(suffix $) = +pickup pensquare yscaled 0.5hair xscaled 0.3[hair,stem] rotated 30; +z$.1=z$+(0,0.1x_height); +z$.2=z$.1+(stem,0.1x_height); +x$.3=x$.2; y$.3=y$.2+0.1x_height; +x$.4=x$.1; y$.4-y$.3=y$.2-y$.1; +x$.5+x$.3=2x$.4; y$.5=y$.3; +x$.6+x$.2=2x$.1; y$.6=y$.2; +draw z$.1--z$.2--z$.3--z$.4--z$.5--z$.6--z$.1; +penlabels(z$.1,z$.2,z$.3,z$.4,z$.5,z$.6); +enddef; + +def e_umlaut(suffix $) = +penpos$.1(2u,45); z$.1=z$; +pickup pensquare yscaled 0.5hair xscaled 0.3[hair,stem] rotated 30; +z$.2=z$.1r; z$.3=z$.1l; rt x$.4=rt x$.2; top y$.4=y$; +draw z$.3--z$.2..z$.3..z$.4; +enddef; + +def cap_e_umlaut(suffix $) = +penpos$.1(2u,45); z$.1=z$; +pickup pensquare yscaled 0.5hair xscaled 0.3[hair,stem] rotated 30; +z$.2=z$.1r; z$.3=z$.1l; rt x$.4=rt x$.2; top y$.4=y$; +draw z$.3--z$.2..z$.3..z$.4; +enddef; + +def pointpoint = +penpos1(0.23570*(x_height+2apex_o),45); +penpos2(0.23570*(x_height+2apex_o),45); +penpos3(0.23570*(x_height+2apex_o),45); +penpos4(0.23570*(x_height+2apex_o),45); +penpos5(0.23570*(x_height+2apex_o),45); +penpos6(0.23570*(x_height+2apex_o),45); +x1l=x3l=x5l=0.5w; +z2r=z3l; z4r=z5l; +z2-z1=whatever*dir135; +z4-z3=whatever*dir135; +z6-z5=whatever*dir135; +y1l=-apex_o; y6r=x_height+apex_o; +penstroke z1e--z2e; +enddef; + + + +def pointaccent(suffix $) = +penpos1(0.23570*(x_height+2apex_o),45); +penpos2(0.23570*(x_height+2apex_o),45); +penpos3(0.23570*(x_height+2apex_o),45); +penpos4(0.23570*(x_height+2apex_o),45); +penpos5(0.23570*(x_height+2apex_o),45); +penpos6(0.23570*(x_height+2apex_o),45); +x1l=x3l=x5l=x$; +z2r=z3l; z4r=z5l; +z2-z1=whatever*dir135; +z4-z3=whatever*dir135; +z6-z5=whatever*dir135; +y1l=-apex_o+y$+0.1x_height; y6r=1.1x_height+apex_o+y$; +penstroke z1e--z2e; +enddef; + + + + +def old_e_umlaut(suffix $) = +numeric ww; +ww:=2u; penpos$.1(hair,147); +penpos$.2(1.5hair,90); penpos$.3(2.5hair,0); +penpos$.4(1.2hair,-90); +penpos$.5(hair,-147); +penpos$.6(hair,-57); penpos$.7(hair,-57); +z$.1=z$+(0.4ww,-0.2ww); +z$.2l=z$-(0.111ww,0.556ww); +z$.3l=z$-(0.5ww,apex_o); +z$.4l=(x$,y$+0.556ww); +z$.6-z$=whatever*dir33; x$.6r=x$+0.5ww; +z$.5l=z$.6l; z$.7=whatever[z$,z$.6]; +x$.7=x$.3; +penstroke z$.1e..z$.2e{left}..z$.3e{up} +..z$.4e{right}..z$.5e; +penstroke z$.7e--z$.6e +enddef; + +def umlaut (suffix $) = +y0=0; 0.5[x0,x0']=x$-2u; +z0'=z0+(2.5u,0); +penpos60(hair,145); +z60=(x0+stem,y$+0.090x_height); +z61=(x0+1.522stem,y$+0.387x_height); +z62=(x0+1.956stem,y$+0.324x_height); +z60'=(x0'+stem,y$+0.090x_height); +z61'=(x0'+1.522stem,y$+0.387x_height); +z62'=(x0'+1.956stem,y$+0.324x_height); +filldraw z60l{dir34}..z62{up}..z61{left} +..z60r{dir259}--z60l & cycle; +penpos60'(hair,145); +filldraw z60'l{dir34}..z62'{up}..z61'{left} +..z60'r{dir259}--z60'l & cycle +enddef; + + +def hat (suffix $) = +z60=(x$-2.5u,0.090x_height+y$); +z61=(x$+0.3u,0.387x_height+y$); +x62=x$-0.3u; y62=0.3333*(2y60+y61); +y60'=y60; x60'+x60=2x$; +filldraw z60--z61--z60'{left}..z62..{left}cycle; +enddef; + + + +def hungarum (suffix $) = +z60=(x$-2.5u-0.25stem,0.090x_height+y$); +z63=z60+(0.5stem,0); +z61=(x$,0.387x_height+y$); +z62=z61+(stem,0); +filldraw z60--z61--z62--z63--cycle; +filldraw z60--z61--z62--z63--cycle shifted (2.5u,0); +enddef; + +def ellbar (suffix $) = +z60=(x$,y$-0.5u); +z61=(x$+3.5u,0.5u+y$); +pickup pensquare scaled 2hair; +draw z60--z61; +enddef; + +def hacek (suffix $) = +z60=(x$-2.5u,0.387x_height+y$); +z61=(x$-0.3u,0.090x_height+y$); +x62=x$+0.3u; y62=0.3333*(2y60+y61); +y60'=y60; x60'+x60=2x$; +filldraw z60--z61--z60'{left}..z62..{left}cycle; +enddef; + +def breve (suffix $) = +z60=(x$-2.5u,0.387x_height+y$); +z61=(x$-0.3u,0.090x_height+y$); +x62=x$+0.3u; y62=0.3333*(2y60+y61); +y63=y60; x63+x60=2x$; +z60'=z60+(0,hair); +z63'=z63+(0,hair); +filldraw z60..{right}z61{right}..z63--z63'..{left}z62{left}..z60'--cycle; +enddef; + +def tilde (suffix $) = +z60=(x$-2.1u,0.090x_height+y$); +z61=(x$-u,0.387x_height+y$); +z62=(x$+u,0.090x_height+y$); +z63=(x$+2.1u,0.387x_height+y$); +pickup pensquare xscaled stem yscaled hair rotated 30; +draw z60...{right}z61..z62{right}...z63; +enddef; + + +def cedilla (suffix $) = +pickup pensquare scaled hair; +z60=z$; +z61=(x$+u+0.16w,y$-0.18x_height); +x62=x$; y62=y61-0.12x_height; +penpos60(stem,30); penpos61(stem,30); penpos62(stem,-30); +penstroke z60e{dir-30}..{down}z61e..{left}z62e; +enddef; + + +def ogonek (suffix $) = +pickup pensquare scaled hair; +z60=z$; +z61=(x$-u-0.16w,y$-0.18x_height); +x62=x$; y62=y61-0.12x_height; +penpos60(stem,-30); penpos61(stem,30); penpos62(stem,40); +penstroke z60e{dir-135}..{down+0.25right}z61e..{right+0.3up}z62e; +enddef; + +def acute (suffix $) = +y0=0; 0.5[x0,x0']=x$-2u; +z0'=z0+(2.5u,0); +penpos60(hair,145); +z60=(x0+stem,y$+0.090x_height); +z61=(x0+1.522stem,y$+0.387x_height); +z62=(x0+1.956stem,y$+0.324x_height); +z60'=(x0'+stem,y$+0.090x_height); +z61'=(x0'+1.522stem,y$+0.387x_height); +z62'=(x0'+1.956stem,y$+0.324x_height); +penpos60'(hair,145); +filldraw z60l{dir34}..z62'{up}..z61'{left} +..z60r{dir259}--z60l & cycle +enddef; + +def grave (suffix $) = +y0=0; 0.5[x0,x0']=x$-2u; +z0'=z0+(2.5u,0); +penpos60(hair,145); +z60=(x0+stem,y$+0.090x_height); +z61=(x0+1.522stem,y$+0.387x_height); +z62=(x0+1.956stem,y$+0.324x_height); +z60'=(x0'+stem,y$+0.090x_height); +z61'=(x0'+1.522stem,y$+0.387x_height); +z62'=(x0'+1.956stem,y$+0.324x_height); +penpos60'(hair,145); +filldraw (z60l{dir34}..z62'{up}..z61'{left} +..z60r{dir259}--z60l & cycle) reflectedabout ((x$,x_height),(x$,0)); +enddef; + + +def cap_grave (suffix $) = +y0=0; 0.5[x0,x0']=x$-2u; +z0'=z0+(2.5u,0); +penpos60(hair,145); +z60=(x0+stem,1.090x_height-x_height+y$); +z61=(x0+1.522stem,1.387x_height-x_height+y$); +z62=(x0+1.956stem,1.324x_height-x_height+y$); +z60'=(x0'+stem,1.090x_height-x_height+y$); +z61'=(x0'+1.522stem,1.387x_height-x_height+y$); +z62'=(x0'+1.956stem,1.324x_height-x_height+y$); +filldraw (z60l{dir34}..z62'{up}..z61'{left} +..z60r{dir259}--z60l & cycle) reflectedabout ((x$,x_height),(x$,0)); +enddef; + +picture last_char; diff --git a/Master/texmf-dist/fonts/source/public/gothic/cmfraknum.mf b/Master/texmf-dist/fonts/source/public/gothic/cmfraknum.mf index c3fbb874f5f..56ef6327e95 100644 --- a/Master/texmf-dist/fonts/source/public/gothic/cmfraknum.mf +++ b/Master/texmf-dist/fonts/source/public/gothic/cmfraknum.mf @@ -192,4 +192,3 @@ penstroke z6e{z1r-z1l}..z3e{down}.. z4e{dir-31}; .endchar; - diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 9542e2a1bf4..df2be36bc1e 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -856,14 +856,6 @@ sub do_tlp { # originals, which we installed by hand. Don't check them until fixes. next if $file =~ m,/(mf84.bug|tex82.bug|errorlog.tex)$,; - # cmfraknum.mf was corrected on CTAN to remove a bogus trailing - # CTRL-Z from Yannis's original DOS development. But then - # cmfrak.tfm cannot be regenerated because the source inputs - # cmfrabase.mf but the file is named cmfrabas.mf, from the same - # era. So sigh. The font is not changing so let's just ignore the - # differing file instead of going to the trouble of regenerating it. - next if $basefile eq "cmfraknum.mf"; - # We install our own stub, not ConTeXt's. I guess. next if $basefile eq "mptopdf.exe"; diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 9f3863ed714..1934f9864b6 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -477,8 +477,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'gmeometric', "die 'skipping, obsolete'", 'gnu-freefont',"&MAKEgnu_freefont", 'go', "&MAKEflatten", - 'gothic', "die 'skipping, must fix cmfrabas[e].mf, see tlpkg-ctan-check", - #'gothic', "&MAKEflatten", + 'gothic', "&MAKEflatten", 'gradback', "die 'skipping, ca.2002, await request'", 'graphicp', "die 'skipping, experimental ca.2003'", 'graphicxsp', "die 'skipping, requires adobe distiller'", -- cgit v1.2.3