From e1040927e6fb4e4cce0a60e8fbc4dba5a0deb47f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 10 Jan 2015 00:16:56 +0000 Subject: inconsolata tds ok git-svn-id: svn://tug.org/texlive/trunk@36009 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/inconsolata/Inconsolatazi4.fontspec | 6 ------ Master/texmf-dist/tex/latex/inconsolata/Inconsolatazi4.fontspec | 6 ++++++ Master/tlpkg/bin/tlpkg-ctan-check | 2 -- Master/tlpkg/bin/tlpkginfo | 2 +- Master/tlpkg/libexec/ctan2tds | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 Master/texmf-dist/doc/fonts/inconsolata/Inconsolatazi4.fontspec create mode 100644 Master/texmf-dist/tex/latex/inconsolata/Inconsolatazi4.fontspec diff --git a/Master/texmf-dist/doc/fonts/inconsolata/Inconsolatazi4.fontspec b/Master/texmf-dist/doc/fonts/inconsolata/Inconsolatazi4.fontspec deleted file mode 100644 index 4f6c3b14873..00000000000 --- a/Master/texmf-dist/doc/fonts/inconsolata/Inconsolatazi4.fontspec +++ /dev/null @@ -1,6 +0,0 @@ -\defaultfontfeatures[inconsolata] - { - Extension = .otf , - UprightFont = Inconsolatazi4-Regular, - BoldFont = Inconsolatazi4-Bold - } diff --git a/Master/texmf-dist/tex/latex/inconsolata/Inconsolatazi4.fontspec b/Master/texmf-dist/tex/latex/inconsolata/Inconsolatazi4.fontspec new file mode 100644 index 00000000000..4f6c3b14873 --- /dev/null +++ b/Master/texmf-dist/tex/latex/inconsolata/Inconsolatazi4.fontspec @@ -0,0 +1,6 @@ +\defaultfontfeatures[inconsolata] + { + Extension = .otf , + UprightFont = Inconsolatazi4-Regular, + BoldFont = Inconsolatazi4-Bold + } diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 309e32a4126..fe31e40d025 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -639,7 +639,6 @@ my @TLP_no_check = ( "patgen", # binary "pdftex", # binary "pdftools", # binary - "pl", # gust, requested 19dec14 "pdfwin", # not on ctan, too old to worry about "plain", # mostly our .ini files, plus well-known plain.tex "powerdot", # stale generated files on ctan @@ -657,7 +656,6 @@ my @TLP_no_check = ( "tds", # stable, don't worry until next update "tetex", # we maintain "tex", # binary - "tex-virtual-academy-pl",# gust, requested 2012 "tex4ht", # binary "texconfig", # we maintain "texdoc", # binary diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index 4dd5e86671a..36272a137d9 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -18,7 +18,7 @@ sub main { # erroneous or problematic tds files (when new, tell RobinF and author) $erroneous_tds = join ("|", qw(countriesofeurope dad engpron gost hacm he-she hobby imtekda - inconsolata mathdesign spanish sttools titleps), + mathdesign spanish sttools titleps), ); # Heiko's tds files (don't propagate through CTAN fast enough). diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 1110e4a02d2..ac786f2759f 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -493,7 +493,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'ifluatex', "die 'skipping, use oberdiek'", 'ifmslide', "&MAKEflatten", 'imprintmtshadow', "die 'skipping, nonfree font support'", - 'inconsolata', "&MAKEflatten", 'indxcite', "die 'skipping, too old, license suboptimal'", 'induni-om', "die 'skipping, for omega, use of pua?'", 'interactiveanimation',"die 'skipping, acrobat only'", @@ -1363,7 +1362,7 @@ $standardfmt='latex'; # packages which need special .tex/.sty files installed -$standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$'; +$standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|fontspec|cmap|4ht)$'; %specialtex = ( '2up', '2up\.tex|' . $standardtex, 'FAQ-en', 'NULL', @@ -1882,6 +1881,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$'; 'pictex', 'generic', 'pkfix', 'support', 'pkfix-helper', 'support', + 'pl', 'fonts', 'plain-doc', 'plain', 'plnfss', 'plain', 'pmx', 'generic', -- cgit v1.2.3