diff options
Diffstat (limited to 'Master')
26 files changed, 190 insertions, 2 deletions
diff --git a/Master/texmf-dist/metafont/misc/3test.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/3test.mf index 8a62fb1fdd3..8a62fb1fdd3 100644 --- a/Master/texmf-dist/metafont/misc/3test.mf +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/3test.mf diff --git a/Master/texmf-dist/metafont/misc/6test.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/6test.mf index 9c66d556fd7..9c66d556fd7 100644 --- a/Master/texmf-dist/metafont/misc/6test.mf +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/6test.mf diff --git a/Master/texmf-dist/metafont/base/expr.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/expr.mf index fe05a01322f..fe05a01322f 100644 --- a/Master/texmf-dist/metafont/base/expr.mf +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/expr.mf diff --git a/Master/texmf-dist/metafont/base/io.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/io.mf index 58a8be68db2..58a8be68db2 100644 --- a/Master/texmf-dist/metafont/base/io.mf +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/io.mf diff --git a/Master/texmf-dist/fonts/source/public/knuth-lib/logo.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/logo.mf new file mode 100644 index 00000000000..2a308ab917b --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/logo.mf @@ -0,0 +1,127 @@ +% Routines for the METAFONT logo, as found in The METAFONTbook +% Extended to characters P and S for John Hobby's METAPOST +% (logo10.mf is a typical parameter file) + +mode_setup; +if unknown slant: slant:=0 else: currenttransform:= + identity slanted slant yscaled aspect_ratio fi; + +ygap#:=(ht#/13.5u#)*xgap#; % vertical adjustment +ho#:=o#; % horizontal overshoot +leftstemloc#:=2.5u#+s#; % position of left stem +barheight#:=.45ht#; % height of bar lines +py#:=.9px#; % vertical pen thickness + +define_pixels(s,u); +define_whole_pixels(xgap); +define_whole_vertical_pixels(ygap); +define_blacker_pixels(px,py); +pickup pencircle xscaled px yscaled py; +logo_pen:=savepen; +define_good_x_pixels(leftstemloc); +define_good_y_pixels(barheight); +define_corrected_pixels(o); +define_horizontal_corrected_pixels(ho); + +def beginlogochar(expr code, unit_width) = + beginchar(code,unit_width*u#+2s#,ht#,0); + pickup logo_pen enddef; + +def super_half(suffix i,j,k) = + draw z.i{0,y.j-y.i} + ... (.8[x.j,x.i],.8[y.i,y.j]){z.j-z.i} + ... z.j{x.k-x.i,0} + ... (.8[x.j,x.k],.8[y.k,y.j]){z.k-z.j} + ... z.k{0,y.k-y.j} enddef; + +def super_crescent(suffix i,j,k) = + draw z.i{x.j-x.i,0} + ... (.8[x.i,x.j],.8[y.j,y.i]){z.j-z.i} + ... z.j{0,y.k-y.i} + ... (.8[x.k,x.j],.8[y.j,y.k]){z.k-z.j} + ... z.k{x.k-x.j,0} enddef; + +beginlogochar("M",18); +x1=x2=leftstemloc; x4=x5=w-x1; x3=w-x3; +y1=y5; y2=y4; bot y1=-o; +top y2=h+o; y3=y1+ygap; +draw z1--z2--z3--z4--z5; +labels(1,2,3,4,5); endchar; + +beginlogochar("E",14); +x1=x2=x3=leftstemloc; +x4=x6=w-x1+ho; x5=x4-xgap; +y1=y6; y2=y5; y3=y4; +bot y1=0; top y3=h; y2=barheight; +draw z6--z1--z3--z4; draw z2--z5; +labels(1,2,3,4,5,6); endchar; + +beginlogochar("T",13); +italcorr ht#*slant + .5u#; +if .5w<>good.x .5w: change_width; fi +lft x1=-eps; x2=w-x1; x3=x4=.5w; +y1=y2=y3; top y1=h; bot y4=-o; +draw z1--z2; draw z3--z4; +labels(1,2,3,4); endchar; + +beginlogochar("A",15); +x1=.5w; x2=x4=leftstemloc; x3=x5=w-x2; +top y1=h+o; y2=y3=barheight; +bot y4=bot y5=-o; +draw z4--z2--z3--z5; super_half(2,1,3); +labels(1,2,3,4,5); endchar; + +beginlogochar("F",14); +x1=x2=x3=leftstemloc; +x4=w-x1+ho; x5=x4-xgap; +y2=y5; y3=y4; bot y1=-o; +top y3=h; y2=barheight; +draw z1--z3--z4; draw z2--z5; +labels(1,2,3,4,5); endchar; + +beginlogochar("P",14); +x1=x2=x3=leftstemloc; +x4=x5=.618[x1,w-x1]; +y2=y5; y3=y4; bot y1=-o; +top y3=h; y2=barheight; +draw z1--z3--z4; draw z2--z5; +x6=.5[w-x1,lft w]; y6=.5[y4,y5]; +super_crescent(4,6,5); +labels(1,2,3,4,5,6); endchar; + +beginlogochar("S",14); +x3=x8=leftstemloc; +x1=w-x3; +x2=x4=.382[x3,x1]; +x5=x7=.9[x3,x1]; +x6=.5[x1,w]; +top y1=h; y4=barheight; bot y8=0; +y1=y2; y3=.6[y2,y4]; y4=y5; y6=.3[y5,y7]; y7=y8; +draw z1--z2; draw z4--z5; draw z7--z8; +super_crescent(2,3,4); +super_crescent(5,6,7); +labels(1,2,3,4,5,6,7,8); endchar; + +beginlogochar("O",15); +x1=x4=.5w; top y1=h+o; bot y4=-o; +x2=w-x3=good.x(1.5u+s); y2=y3=barheight; +super_half(2,1,3); super_half(2,4,3); +labels(1,2,3,4); endchar; + +beginlogochar("N",15); +x1=x2=leftstemloc; x3=x4=x5=w-x1; +bot y1=bot y4=-o; +top y2=top y5=h+o; y3=y4+ygap; +draw z1--z2--z3; draw z4--z5; +labels(1,2,3,4,5); endchar; + +ligtable "T": "A" kern -.5u#; +ligtable "F": "O" kern -u#; +ligtable "P": "O" kern u#; + +font_quad:=18u#+2s#; +font_normal_space:=6u#+2s#; +font_normal_stretch:=3u#; +font_normal_shrink:=2u#; +font_identifier:="MFLOGO" if slant<>0: & "SL" fi; +font_coding_scheme:="AEFMNOPST only"; diff --git a/Master/texmf-dist/fonts/source/public/knuth-lib/logo10.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/logo10.mf new file mode 100644 index 00000000000..2b89c710d10 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/logo10.mf @@ -0,0 +1,10 @@ +% 10-point METAFONT logo +font_size 10pt#; % the "design size" of this font +ht#:=6pt#; % height of characters +xgap#:=0.6pt#; % horizontal adjustment +u#:=4/9pt#; % unit width +s#:=0; % extra space at the left and the right +o#:=1/9pt#; % overshoot +px#:=2/3pt#; % horizontal thickness of pen +input logo % now generate the font +bye % and stop. diff --git a/Master/texmf-dist/fonts/source/public/knuth-lib/logo8.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/logo8.mf new file mode 100644 index 00000000000..59b37c072bc --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/logo8.mf @@ -0,0 +1,10 @@ +% 8-point METAFONT logo +font_size 8pt#; % the "design size" of this font +ht#:=.8*6pt#; % height of characters +xgap#:=.8*0.6pt#; % horizontal adjustment +u#:=.82*4/9pt#; % unit width +s#:=.2pt#; % extra space at the left and the right +o#:=1/12pt#; % overshoot +px#:=.8*2/3pt#; % horizontal thickness of pen +input logo % now generate the font +bye % and stop. diff --git a/Master/texmf-dist/fonts/source/public/knuth-lib/logo9.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/logo9.mf new file mode 100644 index 00000000000..49ea7e99f75 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/logo9.mf @@ -0,0 +1,10 @@ +% 9-point METAFONT logo +font_size 9pt#; % the "design size" of this font +ht#:=.9*6pt#; % height of characters +xgap#:=.9*0.6pt#; % horizontal adjustment +u#:=.91*4/9pt#; % unit width +s#:=.08pt#; % extra space at the left and the right +o#:=1/10pt#; % overshoot +px#:=.9*2/3pt#; % horizontal thickness of pen +input logo % now generate the font +bye % and stop. diff --git a/Master/texmf-dist/fonts/source/public/knuth-lib/logobf10.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/logobf10.mf new file mode 100644 index 00000000000..f943053ff5a --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/logobf10.mf @@ -0,0 +1,10 @@ +% 10-point boldface METAFONT logo +font_size 10pt#; % the "design size" of this font +ht#:=6pt#; % height of characters +xgap#:=23/20*0.6pt#; % horizontal adjustment +u#:=23/20*4/9pt#; % unit width +s#:=.1pt#; % extra space at the left and the right +o#:=1/9pt#; % overshoot +px#:=44/36pt#; % horizontal thickness of pen +input logo % now generate the font +bye % and stop. diff --git a/Master/texmf-dist/fonts/source/public/knuth-lib/logosl10.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/logosl10.mf new file mode 100644 index 00000000000..741fdb9fa2e --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/logosl10.mf @@ -0,0 +1,3 @@ +% 10-point slanted METAFONT logo +slant := 1/4; +input logo10 diff --git a/Master/texmf-dist/metafont/base/null.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/null.mf index 9828fbb16f7..9828fbb16f7 100644 --- a/Master/texmf-dist/metafont/base/null.mf +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/null.mf diff --git a/Master/texmf-dist/metafont/misc/rtest.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/rtest.mf index f5e449aa7db..f5e449aa7db 100644 --- a/Master/texmf-dist/metafont/misc/rtest.mf +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/rtest.mf diff --git a/Master/texmf-dist/metafont/misc/test.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/test.mf index c2d81f03023..c2d81f03023 100644 --- a/Master/texmf-dist/metafont/misc/test.mf +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/test.mf diff --git a/Master/texmf-dist/metafont/misc/waits.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/waits.mf index 4d23e0a00d5..4d23e0a00d5 100644 --- a/Master/texmf-dist/metafont/misc/waits.mf +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/waits.mf diff --git a/Master/texmf-dist/metafont/misc/ztest.mf b/Master/texmf-dist/fonts/source/public/knuth-lib/ztest.mf index 35d1489e275..35d1489e275 100644 --- a/Master/texmf-dist/metafont/misc/ztest.mf +++ b/Master/texmf-dist/fonts/source/public/knuth-lib/ztest.mf diff --git a/Master/texmf-dist/fonts/tfm/public/knuth-lib/logo10.tfm b/Master/texmf-dist/fonts/tfm/public/knuth-lib/logo10.tfm Binary files differnew file mode 100644 index 00000000000..73004a610d9 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/knuth-lib/logo10.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knuth-lib/logo8.tfm b/Master/texmf-dist/fonts/tfm/public/knuth-lib/logo8.tfm Binary files differnew file mode 100644 index 00000000000..b7ca930caf3 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/knuth-lib/logo8.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knuth-lib/logo9.tfm b/Master/texmf-dist/fonts/tfm/public/knuth-lib/logo9.tfm Binary files differnew file mode 100644 index 00000000000..1c2bcbb403e --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/knuth-lib/logo9.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knuth-lib/logobf10.tfm b/Master/texmf-dist/fonts/tfm/public/knuth-lib/logobf10.tfm Binary files differnew file mode 100644 index 00000000000..e61fb866dfb --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/knuth-lib/logobf10.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knuth-lib/logosl10.tfm b/Master/texmf-dist/fonts/tfm/public/knuth-lib/logosl10.tfm Binary files differnew file mode 100644 index 00000000000..d13fa5c97ba --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/knuth-lib/logosl10.tfm diff --git a/Master/texmf-dist/tex/plain/base/manmac.tex b/Master/texmf-dist/tex/plain/knuth-lib/manmac.tex index 63c064d1290..ac0c3756124 100644 --- a/Master/texmf-dist/tex/plain/base/manmac.tex +++ b/Master/texmf-dist/tex/plain/knuth-lib/manmac.tex @@ -247,13 +247,13 @@ \xdef\rhead{#1 #2#3: #4\unskip} {\def\TeX{T\kern-.2em\lower.5ex\hbox{E}\kern-.06em X} \def\MF{{\vbox to30pt{}\manual ()*+,-.*}} - \def\\{#3} + \def\\{#3} \advance\hsize by -18mm \ifx\empty\\ \rightline{\inchhigh #2\kern-.04em} \else\rightline{\inchhigh #2\kern-.06em#3\kern-.04em}\fi \vskip 1.75pc \baselineskip 36pt \lineskiplimit \titlelsl \lineskip 12pt \let\\=\cr % now the \\'s are line dividers - \halign{\line{\titlefont\hfil##}\\#4\unskip\\} + \halign{\line{\titlefont\hss##}\\#4\unskip\\} \vfill\eject} % output the chapter title page \tenpoint \noindent\ignorespaces} % the first paragraph of a chapter is not indented diff --git a/Master/texmf-dist/tex/plain/base/mftmac.tex b/Master/texmf-dist/tex/plain/knuth-lib/mftmac.tex index 3243e74d68d..3243e74d68d 100644 --- a/Master/texmf-dist/tex/plain/base/mftmac.tex +++ b/Master/texmf-dist/tex/plain/knuth-lib/mftmac.tex diff --git a/Master/texmf-dist/tex/plain/base/story.tex b/Master/texmf-dist/tex/plain/knuth-lib/story.tex index fcbaa4151af..fcbaa4151af 100644 --- a/Master/texmf-dist/tex/plain/base/story.tex +++ b/Master/texmf-dist/tex/plain/knuth-lib/story.tex diff --git a/Master/texmf-dist/tex/plain/base/testfont.tex b/Master/texmf-dist/tex/plain/knuth-lib/testfont.tex index f7d146f8671..f7d146f8671 100644 --- a/Master/texmf-dist/tex/plain/base/testfont.tex +++ b/Master/texmf-dist/tex/plain/knuth-lib/testfont.tex diff --git a/Master/texmf-dist/tex/plain/base/webmac.tex b/Master/texmf-dist/tex/plain/knuth-lib/webmac.tex index 5ca707bb9b2..5ca707bb9b2 100644 --- a/Master/texmf-dist/tex/plain/base/webmac.tex +++ b/Master/texmf-dist/tex/plain/knuth-lib/webmac.tex diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index a399010b5c7..ca50e98f3f2 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1191,6 +1191,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'jfontmaps' => '&POSTjfontmaps', 'knitting' => '&POSTknitting', 'knuth' => '&POSTknuth', + 'knuth-lib' => '&POSTknuth_lib', 'koma-script' => '&POST_rmsymlink', 'kotex-oblivoir' => '&POSTkotex_oblivoir', 'kotex-utf' => '&POSTkotex_utf', @@ -1285,6 +1286,7 @@ $standarddest = "texmf-dist"; 'jadetex', 'jadetex', 'japanese', 'platex', 'jsclasses', 'platex', + 'knuth-lib', 'plain', 'knuth-local', 'plain', 'kotex-plain', 'plain', 'levy', 'generic', # one .sty, one .tex @@ -1483,6 +1485,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$'; 'karnaugh', 'kvmacros.tex', 'kastrup', 'binhex.tex|' . $standardtex, 'keystroke', 'keystroke_.*|\.sty', + 'knuth-lib', '\.tex', 'knuth-local', '\.tex', 'koma-script-sfs', '\.lco', 'kotex-plain', '\.tex', @@ -2368,6 +2371,7 @@ $standardmf='[0-9]\.mf'; 'ifsym', '\.mf|\.gen', # no point in making tfm without pk for (black|gray|slant), is there? # doesn't seem worth it. + 'knuth-lib', 'manfnt\.mf|' . $standardmf, 'knuth-local', '(domino|mfman|random|snfont)\.mf', 'logic', 'milstd\.mf', 'mfpic', 'grafbase\.mf', @@ -5504,6 +5508,20 @@ sub POSTknuth { &SYSTEM ("rm -rf etc mf mfware tex/tex.web tex/trip* texware web/*.web"); } +sub POSTknuth_lib { + print "POST$package - removing some base files\n"; + &SYSTEM ("rm -rf $DEST/doc/*/knuth-lib/*.mft"); + # + # somehow it seems like plain.tex, plain.mf, etc. should remain in base/. + &SYSTEM ("rm -f $DEST/fonts/source/public/knuth-lib/plain.mf"); + # + &xchdir ("$DEST/tex/plain/knuth-lib"); + &SYSTEM ("rm -f hyphen.tex plain.tex"); + # + # null.tex, and only null.tex, should be in generic. + &mv_with_mkdir ("null.tex", "$DEST/tex/generic/$package"); +} + sub POSTkotex_oblivoir { print "POST$package - memhangul subdirs in runtime\n"; &mv_with_mkdir ("memhangul-*", "$DEST/tex/latex/$package"); |