From 9202c6b515b0543a66b6d74a31631c6e1a3d63f2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 31 Jan 2014 17:07:04 +0000 Subject: new knuth-local fonts cmntt10, diam12, etc. git-svn-id: svn://tug.org/texlive/trunk@32831 c570f23f-e606-0410-a88d-b1316a301751 --- .../fonts/source/public/cmextra/bible12.mf | 75 ++ .../fonts/source/public/cmextra/cmman.mf | 855 +++++++++++++++++++++ .../fonts/source/public/cmextra/cmntex10.mf | 78 ++ .../fonts/source/public/cmextra/cmntt10.mf | 78 ++ .../fonts/source/public/cmextra/cmsytt10.mf | 97 +++ .../fonts/source/public/cmextra/cmtim.mf | 78 ++ .../fonts/source/public/cmextra/diam12.mf | 18 + .../texmf-dist/fonts/source/public/cmextra/gen.mf | 91 +++ .../fonts/source/public/cmextra/gen10.mf | 14 + .../texmf-dist/fonts/source/public/cmextra/gen8.mf | 13 + .../texmf-dist/fonts/source/public/cmextra/gen9.mf | 13 + .../texmf-dist/fonts/source/public/misc/cmman.mf | 511 ------------ .../fonts/tfm/public/cmextra/bible12.tfm | Bin 0 -> 1412 bytes .../fonts/tfm/public/cmextra/cmbxcd10.tfm | Bin 520 -> 456 bytes .../fonts/tfm/public/cmextra/cmbxti12.tfm | Bin 1528 -> 1464 bytes .../fonts/tfm/public/cmextra/cmbxti7.tfm | Bin 1516 -> 1452 bytes .../fonts/tfm/public/cmextra/cmcscsl10.tfm | Bin 1508 -> 1444 bytes .../fonts/tfm/public/cmextra/cmfibs8.tfm | Bin 1496 -> 1432 bytes .../fonts/tfm/public/cmextra/cmitt12.tfm | Bin 772 -> 708 bytes .../texmf-dist/fonts/tfm/public/cmextra/cmitt9.tfm | Bin 764 -> 700 bytes .../texmf-dist/fonts/tfm/public/cmextra/cmman.tfm | Bin 0 -> 616 bytes .../fonts/tfm/public/cmextra/cmntex10.tfm | Bin 0 -> 704 bytes .../fonts/tfm/public/cmextra/cmntt10.tfm | Bin 0 -> 704 bytes .../texmf-dist/fonts/tfm/public/cmextra/cmsl6.tfm | Bin 1508 -> 1444 bytes .../fonts/tfm/public/cmextra/cmsltt9.tfm | Bin 768 -> 704 bytes .../fonts/tfm/public/cmextra/cmssbxo10.tfm | Bin 1464 -> 1400 bytes .../fonts/tfm/public/cmextra/cmsslu30.tfm | Bin 1292 -> 1228 bytes .../fonts/tfm/public/cmextra/cmssu30.tfm | Bin 1304 -> 1240 bytes .../fonts/tfm/public/cmextra/cmsytt10.tfm | Bin 0 -> 772 bytes .../texmf-dist/fonts/tfm/public/cmextra/cmtim.tfm | Bin 0 -> 1240 bytes .../fonts/tfm/public/cmextra/cmvtti10.tfm | Bin 1396 -> 1332 bytes .../texmf-dist/fonts/tfm/public/cmextra/diam12.tfm | Bin 0 -> 64 bytes .../texmf-dist/fonts/tfm/public/cmextra/gen10.tfm | Bin 0 -> 344 bytes .../texmf-dist/fonts/tfm/public/cmextra/gen8.tfm | Bin 0 -> 344 bytes .../texmf-dist/fonts/tfm/public/cmextra/gen9.tfm | Bin 0 -> 344 bytes Master/texmf-dist/fonts/tfm/public/misc/cmman.tfm | Bin 600 -> 0 bytes Master/tlpkg/bin/tlpkg-ctan-check | 2 +- Master/tlpkg/libexec/ctan2tds | 65 +- Master/tlpkg/tlpsrc/cmextra.tlpsrc | 1 + 39 files changed, 1451 insertions(+), 538 deletions(-) create mode 100644 Master/texmf-dist/fonts/source/public/cmextra/bible12.mf create mode 100644 Master/texmf-dist/fonts/source/public/cmextra/cmman.mf create mode 100644 Master/texmf-dist/fonts/source/public/cmextra/cmntex10.mf create mode 100644 Master/texmf-dist/fonts/source/public/cmextra/cmntt10.mf create mode 100644 Master/texmf-dist/fonts/source/public/cmextra/cmsytt10.mf create mode 100644 Master/texmf-dist/fonts/source/public/cmextra/cmtim.mf create mode 100644 Master/texmf-dist/fonts/source/public/cmextra/diam12.mf create mode 100644 Master/texmf-dist/fonts/source/public/cmextra/gen.mf create mode 100644 Master/texmf-dist/fonts/source/public/cmextra/gen10.mf create mode 100644 Master/texmf-dist/fonts/source/public/cmextra/gen8.mf create mode 100644 Master/texmf-dist/fonts/source/public/cmextra/gen9.mf delete mode 100644 Master/texmf-dist/fonts/source/public/misc/cmman.mf create mode 100644 Master/texmf-dist/fonts/tfm/public/cmextra/bible12.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/cmextra/cmman.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/cmextra/cmntex10.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/cmextra/cmntt10.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/cmextra/cmsytt10.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/cmextra/cmtim.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/cmextra/diam12.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/cmextra/gen10.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/cmextra/gen8.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/cmextra/gen9.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/misc/cmman.tfm (limited to 'Master') diff --git a/Master/texmf-dist/fonts/source/public/cmextra/bible12.mf b/Master/texmf-dist/fonts/source/public/cmextra/bible12.mf new file mode 100644 index 00000000000..ce74383a7c3 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/cmextra/bible12.mf @@ -0,0 +1,75 @@ +% Computer Modern Bold Extended Text Italic Halfslanted 12 point +if unknown cmbase: input cmbase fi + +font_identifier:="CMBIBL"; font_size 12pt#; + +u#:=25/36pt#; % unit width +width_adj#:=13/36pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=8/36pt#; % extra sidebar near uppercase serifs +letter_fit#:=13/36pt#; % extra space added to all sidebars + +body_height#:=324/36pt#; % height of tallest characters +asc_height#:=300/36pt#; % height of lowercase ascenders +cap_height#:=296.4/36pt#; % height of caps +fig_height#:=278.4/36pt#; % height of numerals +x_height#:=192/36pt#; % height of lowercase without ascenders +math_axis#:=108/36pt#; % axis of symmetry for math symbols +bar_height#:=102/36pt#; % height of crossbar in lowercase e +comma_depth#:=84/36pt#; % depth of comma below baseline +desc_depth#:=84/36pt#; % depth of lowercase descenders + +crisp#:=15/36pt#; % diameter of serif corners +tiny#:=15/36pt#; % diameter of rounded corners +fine#:=10/36pt#; % diameter of sharply rounded corners +thin_join#:=11/36pt#; % width of extrafine details +hair#:=23/36pt#; % lowercase hairline breadth +stem#:=44/36pt#; % lowercase stem breadth +curve#:=48/36pt#; % lowercase curve breadth +ess#:=41/36pt#; % breadth in middle of lowercase s +flare#:=45/36pt#; % diameter of bulbs or breadth of terminals +dot_size#:=57/36pt#; % diameter of dots +cap_hair#:=24/36pt#; % uppercase hairline breadth +cap_stem#:=53/36pt#; % uppercase stem breadth +cap_curve#:=56/36pt#; % uppercase curve breadth +cap_ess#:=54/36pt#; % breadth in middle of uppercase s +rule_thickness#:=.66pt#; % thickness of lines in math symbols + +dish#:=1/36pt#; % amount erased at top or bottom of serifs +bracket#:=12/36pt#; % vertical distance from serif base to tangent +jut#:=33/36pt#; % protrusion of lowercase serifs +cap_jut#:=46/36pt#; % protrusion of uppercase serifs +beak_jut#:=12/36pt#; % horizontal protrusion of beak serifs +beak#:=84/36pt#; % vertical protrusion of beak serifs +vair#:=16/36pt#; % vertical diameter of hairlines +notch_cut#:=12pt#; % maximum breadth above or below notches +bar#:=18.5/36pt#; % lowercase bar thickness +slab#:=18.5/36pt#; % serif and arm thickness +cap_bar#:=18.5/36pt#; % uppercase bar thickness +cap_band#:=18.5/36pt#; % uppercase thickness above/below lobes +cap_notch_cut#:=12pt#; % max breadth above/below uppercase notches +serif_drop#:=3.6/36pt#; % vertical drop of sloped serifs +stem_corr#:=2/36pt#; % for small refinements of stem breadth +vair_corr#:=1.5/36pt#; % for small refinements of hairline height +apex_corr#:=0pt#; % extra width at diagonal junctions + +o#:=6/36pt#; % amount of overshoot for curves +apex_o#:=6/36pt#; % amount of overshoot for diagonal junctions + +slant:=1/8; % tilt ratio $(\Delta x/\Delta y)$ +fudge:=1; % factor applied to weights of heavy characters +math_spread:=.4; % extra openness of math symbols +superness:=8/11; % parameter for superellipses +superpull:=1/8; % extra openness inside bowls +beak_darkness:=.4; % fraction of triangle inside beak serifs +ligs:=2; % level of ligatures to be included + +square_dots:=false; % should dots be square? +hefty:=false; % should we try hard not to be overweight? +serifs:=true; % should serifs and bulbs be attached? +monospace:=false; % should all characters have the same width? +variant_g:=true; % should an italic-style g be used? +low_asterisk:=false; % should the asterisk be centered at the axis? +math_fitting:=false; % should math-mode spacing be used? + +generate textit % switch to the driver file diff --git a/Master/texmf-dist/fonts/source/public/cmextra/cmman.mf b/Master/texmf-dist/fonts/source/public/cmextra/cmman.mf new file mode 100644 index 00000000000..8cd476f6226 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/cmextra/cmman.mf @@ -0,0 +1,855 @@ +% Variants of Computer Modern, specially for the TeX/METAFONT manuals + +if unknown cmbase: input cmbase fi +mode_setup; + +def generate suffix t= enddef; + +inner cmchar; + +font_size 10pt#; +font_identifier "CMMAN"; +font_coding_scheme "PI"; + +input cmtt10; font_setup; + +cmchar "Cross between 0 and O"; +beginchar("0",9u#,fig_height#,0); +italcorr fig_height#*slant-.5u#; +adjust_fit(0,0); +penpos1(vair,90); penpos3(vair,-90); penpos2(curve,180); penpos4(curve,0); +superness:=.77; +x2r=round max(.7u,1.45u-.5curve); x4r=w-x2r; x1=x3=.5w; +y1r=h+o; y3r=-o; y2=y4=.5h-vair_corr; y2l:=y4l:=.52h; +penstroke pulled_arc.e(1,2) & pulled_arc.e(2,3) + & pulled_arc.e(3,4) & pulled_arc.e(4,1) & cycle; % bowl +penlabels(1,2,3,4); endchar; + +input cmssq8; slant:=sind 12/cosd 12; font_setup; + +cmchar "Lowercase Greek beta"; +beginchar(oct"014",9.5u#,asc_height#,desc_depth#); +italcorr .5[x_height#,asc_height#]*slant-u#; +adjust_fit(0,0); pickup fine.nib; +pos0(hair,180); pos1(hair,180); pos2(vair,90); +pos3(stem,0); pos4(vair,-90); pos5(hair,-180); +pos6(vair,-270); pos7(curve,-360); pos8(vair,-450); pos9(hair,-540); +x0=x1=x9; lft x0l=hround(1.5u-.5hair); x2=x4=x6=x8=.5w+.25u; +rt x3r=hround(w-1.5u); rt x7r=hround(w-1.5u+.5curve); rt x5l=hround(x4-u); +bot y0=-d; y1=top y6r=x_height; top y2r=h+oo; y3=.5[y2,y4]; +y5=.5[y4,y6]; top y6r-bot y4r=vstem+eps; bot y8=-oo; y7=y9=.5[y6,y8]; +if y6l '&PREHOOK_cals', 'chess' => '&PREHOOK_chess', 'cm-super' => '&PREHOOK_cm_super', + 'cmextra' => '&PREHOOK_cmextra', 'concrete' => '&PREHOOK_concrete', 'download' => '&PREHOOK_savepdf', 'dynblocks' => '&PREHOOK_flatten1', @@ -1995,6 +1996,7 @@ $standardsource='\.(bat|c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh'; 'burmese', '\.pl', 'carlisle', '\.dtx|\.ins|ltxtable\.tex', 'chemarrow', '\.mp|\.vfb', + 'cmextra', 'NULL', 'concmath-fonts', 'NULL', 'crossword', $standardsource . '|AcrossLite', 'cyrplain', 'NULL', # all in tex @@ -2274,6 +2276,7 @@ $standardmf='[0-9]\.mf'; 'cirth', 'cir.*\.mf', 'clock', 'clock.mf', 'cmcyr', 'NULL', # already made + 'cmextra', 'cm(man|tim)|' . $standardmf, 'cookingsymbols', 'cookingsymbols\.mf', 'cmpica', 'cmpic.*\.mf', 'dancers', 'dancers\.mf', @@ -3339,6 +3342,20 @@ sub domf { &install ($mfdir, $mf_inst_patt); } +sub runmf { + my ($mfpatt) = @_; + print "\t doing runmf for $package ($mfpatt)\n"; + print " from filenames: @filenames\n"; + for my $file (grep (/$mfpatt/, @filenames)) { + ($FileBase,$Filepath,$Filesuffix) = fileparse ($file, "\.[A-z]*"); + if (! -e "$FileBase.tfm") { + print "\t\t Make TFM from $file\n"; + &runjob ("mktextfm --destdir=`pwd` $FileBase.tfm"); + &SYSTEM ("$RM *pk"); # not worth the space + } + } +} + sub rundvi { local($thispatt) = @_; $TEX = $specialTEX{$package}; @@ -3490,19 +3507,6 @@ sub buildfilelist { closedir (DIR); } -sub runmf { - my ($mfpatt) = @_; - print "\t doing runmf for $package ($mfpatt)\n"; - for my $file (grep (/$mfpatt/, @filenames)) { - ($FileBase,$Filepath,$Filesuffix) = fileparse ($file, "\.[A-z]*"); - if (! -e "$FileBase.tfm") { - print "\t\t Make TFM from $file\n"; - &runjob ("mktextfm --destdir=`pwd` $FileBase.tfm"); - &SYSTEM ("$RM *pk"); # not worth the space - } - } -} - sub runfonts { $Foundry = $specialfoundry{$package} || $standardfoundry; for (grep(/\.vf$/, @filenames)) { @@ -4718,6 +4722,16 @@ sub PREHOOK_cm_super { &SYSTEM ("$RM -rf dvipdfm"); } +sub PREHOOK_cmextra { + print "PREHOOK_$package - knuth/local/cm is our cmextra\n"; + # + # remove concrete since we have always had that separately. + &SYSTEM ("rm cm/cc* cm/odigs.mf"); + &SYSTEM ("rm cm/ebigop.mf"); # ditto old cmex for euler + &SYSTEM ("rm -rf [^c]*"); # ditto everything non-cm + &SYSTEM ("$MV cm/* ."); # flatten for normal setup +} + sub PREHOOK_concrete { print "PREHOOK_$package - instantiate symlinks from symlink\n"; # would be better done in tlpkginfo --prepare. @@ -5330,7 +5344,7 @@ sub POSTinteractiveworkbook { } sub POSTjfontmaps { - print "\t POST$package - move directories around\n"; + print "POST$package - move directories around\n"; # dir "src" content -> run files # dir "no_runtime" content -> source files # dir "tool" as a whole -> source files @@ -5396,12 +5410,12 @@ sub POSTlatex2html { } sub POSTlatex2e_help_texinfo { - print "\t POST$package - remove translation subdir\n"; + print "POST$package - remove translation subdir\n"; &SYSTEM ("$RM -rf spanish"); } sub POSTlhcyr { - print "\t POST$package - move to source, avoid dups\n"; + print "POST$package - move to source, avoid dups\n"; &xchdir ("$DEST/tex/latex/$package"); # Sebastian moved tex files to the top level, removed from other dirs. # We just follow what he did, years ago. @@ -5423,29 +5437,28 @@ sub POSTlhcyr { } sub POSTlilyglyphs { - print "\t POST$package - move directories around\n"; + print "POST$package - move directories around\n"; &rename_with_mkdir ("fonts", "$DEST/fonts/opentype/public/$package"); &rename_with_mkdir ("source", "$DEST/source/luatex/$package"); &rename_with_mkdir ("tex", "$DEST/tex/lualatex/$package"); } sub POSTlistbib { - print "\t POST$package - move .doc to .bst\n"; + print "POST$package - move .doc to .bst\n"; my $dest = "$DEST/bibtex/bst/$package"; &xmkdir ($dest); &SYSTEM ("$MV $package.doc $dest/$package.bst"); } sub POSTlithuanian { - print "\t POST$package - remove old language support\n"; + print "POST$package - remove old language support, fix .dfu location\n"; # these files are no longer used in TL. &SYSTEM ("$RM language.lt.dat $DEST/tex/latex/lithuanian/language.lt.def"); - print "\t POST$package - fix location of .dfu file\n"; &SYSTEM ("$MV $DEST/doc/latex/lithuanian/l7xenc.dfu $DEST/tex/latex/lithuanian/"); } sub POSTluatexja { - print "\t POST$package - runins, move directories\n"; + print "POST$package - runins, move directories\n"; &xchdir ("src"); { local @filenames = glob ("*"); # dynamic redef for runins call. @@ -5473,7 +5486,7 @@ sub POSTluatexja { } sub POSTmathdesign { - print "PREHOOK_$package - mv files\n"; + print "POST$package - mv files\n"; &SYSTEM ("$RM non-free/enc/tex*.enc"); # dup of standard enc files &SYSTEM ("$RM non-free/enc/7t.enc"); # one way of merging dirtree A into dirtree B. @@ -5498,18 +5511,18 @@ sub POSTmusixtex { } sub POSTmontex { - print "\t POST$package - avoid 00readme case clash\n"; + print "POST$package - avoid 00readme case clash\n"; # these files are no longer used in TL. &SYSTEM ("$MV 00readme 00readme.mfinput.km"); } sub POSTnumericplots { - print "\t POST$package - mv latex subdir\n"; + print "POST$package - mv latex subdir\n"; &SYSTEM ("$MV latex $DEST/tex/latex/$package"); } sub POSTpas_vc { - print "\t POST$package - mv latex subdir, doc files\n"; + print "POST$package - mv latex subdir, doc files\n"; &SYSTEM ("$MV latex $DEST/tex/latex/$package"); &SYSTEM ("$MV $DEST/tex/latex/$package/photo.png ."); &SYSTEM ("$MV doc/* ."); diff --git a/Master/tlpkg/tlpsrc/cmextra.tlpsrc b/Master/tlpkg/tlpsrc/cmextra.tlpsrc index 1ea7c75a3d3..95575f5aebe 100644 --- a/Master/tlpkg/tlpsrc/cmextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/cmextra.tlpsrc @@ -1,3 +1,4 @@ +catalogue knuth-local runpattern +!d texmf-dist/fonts/afm/public/amsfonts/cmextra runpattern +!d texmf-dist/fonts/source/public/amsfonts/cmextra runpattern +!d texmf-dist/fonts/tfm/public/amsfonts/cmextra -- cgit v1.2.3