From 7ed3e3cef667acbe993cecd7f7c1f0a5df758982 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 12 Dec 2014 18:08:38 +0000 Subject: manfnt-font (the type1) split from manfnt (the latex support) git-svn-id: svn://tug.org/texlive/trunk@35799 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tlpkg-ctan-check | 2 +- Master/tlpkg/libexec/ctan2tds | 13 ++++++++----- Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc | 2 ++ Master/tlpkg/tlpsrc/context.tlpsrc | 4 +++- Master/tlpkg/tlpsrc/manfnt-font.tlpsrc | 2 ++ Master/tlpkg/tlpsrc/manfnt.tlpsrc | 5 ++++- Master/tlpkg/tlpsrc/mflogo.tlpsrc | 9 ++++++++- Master/tlpkg/tlpsrc/scheme-context.tlpsrc | 10 ++++------ 8 files changed, 32 insertions(+), 15 deletions(-) create mode 100644 Master/tlpkg/tlpsrc/manfnt-font.tlpsrc (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 57a8b800713..6d334dedcc0 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -320,7 +320,7 @@ my @TLP_working = qw( lxfonts ly1 m-tx macros2e macroswap mafr magaz mailing mailmerge makebarcode makebox makecell makecirc makecmds makedtx makeglos makeplot - makeshape mandi manfnt manuscript margbib + makeshape mandi manfnt manfnt-font manuscript margbib marginfix marginnote marvosym matc3 matc3mem match_parens math-e mathabx mathabx-type1 mathalfa mathastext diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 06faa0d213f..0b8102cc1da 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -637,6 +637,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'manfnt-font', "&MAKEflatten", 'manjutex', "die 'skipping, obsolete on CTAN'", #"&MAKEflatten", 'manpage', "die 'skipping, nonfree license'", + 'manual', "die 'skipping, in knuth-lib knuth-local cmextra'", 'mapcodes', "die 'skipping, nosell (old latex) license'", 'maple', "die 'skipping, noinfo license'", 'marigold', "die 'skipping, nonfree font'", @@ -2379,11 +2380,13 @@ $standardmf='[0-9]\.mf'; %specialfoundry = ( - 'berenisadf' => 'arkandis', - 'charter', => 'bitstrea', - 'fc', => 'jknappen', - 'mfpic', => 'metafont', - 'sourcesanspro' => 'adobe', + 'berenisadf' => 'arkandis', + 'charter' => 'bitstrea', + 'fc' => 'jknappen', + 'manfnt-font' => 'hoekwater', + 'mflogo-font' => 'hoekwater', + 'mfpic' => 'metafont', + 'sourcesanspro'=> 'adobe', ); $standardfoundry='public'; diff --git a/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc index 63a3b438b04..17e5a213b3e 100644 --- a/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc @@ -22,6 +22,8 @@ depend lm depend lm-math depend marvosym depend mathpazo +depend manfnt-font +depend mflogo-font depend ncntrsbk depend palatino depend pxfonts diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc index 7406be2a960..504c3f97fd0 100644 --- a/Master/tlpkg/tlpsrc/context.tlpsrc +++ b/Master/tlpkg/tlpsrc/context.tlpsrc @@ -11,8 +11,10 @@ depend luatex # plus a few more font dependencies (amsfonts are only needed for advanced math) depend lm depend lm-math -depend stmaryrd depend amsfonts +depend manfnt-font +depend mflogo-font +depend stmaryrd # execute AddFormat name=cont-en engine=pdftex \ patterns=cont-usr.tex options="-8bit *cont-en.mkii" diff --git a/Master/tlpkg/tlpsrc/manfnt-font.tlpsrc b/Master/tlpkg/tlpsrc/manfnt-font.tlpsrc new file mode 100644 index 00000000000..2657d1db35e --- /dev/null +++ b/Master/tlpkg/tlpsrc/manfnt-font.tlpsrc @@ -0,0 +1,2 @@ +execute addMixedMap manfnt.map + diff --git a/Master/tlpkg/tlpsrc/manfnt.tlpsrc b/Master/tlpkg/tlpsrc/manfnt.tlpsrc index b20434246f7..878a257e2c2 100644 --- a/Master/tlpkg/tlpsrc/manfnt.tlpsrc +++ b/Master/tlpkg/tlpsrc/manfnt.tlpsrc @@ -1 +1,4 @@ -execute addMixedMap manfnt.map +# this is the latex package; the actual font is in manfnt-font. +runpattern +!d texmf-dist/fonts/afm/hoekwater/manfnt-font +runpattern +!d texmf-dist/fonts/type1/hoekwater/manfnt-font + diff --git a/Master/tlpkg/tlpsrc/mflogo.tlpsrc b/Master/tlpkg/tlpsrc/mflogo.tlpsrc index 6fe3b5b3137..efa168f72c4 100644 --- a/Master/tlpkg/tlpsrc/mflogo.tlpsrc +++ b/Master/tlpkg/tlpsrc/mflogo.tlpsrc @@ -1 +1,8 @@ -execute addMixedMap mflogo.map +# this is the latex package; the actual font is in mflogo-font. +runpattern +!d texmf-dist/fonts/afm/hoekwater/mflogo-font +runpattern +!d texmf-dist/fonts/type1/hoekwater/mflogo-font +runpattern +!d texmf-dist/fonts/map/dvips/mflogo-font +# +docpattern +!d texmf-dist/doc/fonts/mflogo-font + + diff --git a/Master/tlpkg/tlpsrc/scheme-context.tlpsrc b/Master/tlpkg/tlpsrc/scheme-context.tlpsrc index d3a086aa8c4..ec352081704 100644 --- a/Master/tlpkg/tlpsrc/scheme-context.tlpsrc +++ b/Master/tlpkg/tlpsrc/scheme-context.tlpsrc @@ -5,7 +5,6 @@ depend collection-context depend collection-metapost # # Polish and OpenType Math fonts are nice to have -# depend tex-gyre depend tex-gyre-math depend antt @@ -17,17 +16,16 @@ depend Asana-Math depend gentium-tug # # These are needed for TeX Gyre Math -# -depend txfonts depend pxfonts +depend txfonts # # Fonts used in different scenarios -# +depend ccicons depend eulervm +depend manfnt-font depend marvosym +depend mflogo-font depend wasy -depend ccicons # # just for texnansi.enc -# depend ly1 -- cgit v1.2.3