diff options
author | Karl Berry <karl@freefriends.org> | 2013-05-05 22:52:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-05-05 22:52:10 +0000 |
commit | 5f9dd2add16775cc6aece96e2695c7e475ee1834 (patch) | |
tree | fba8f32362b01a41db0125ab430fd1962b290b4f /Master/tlpkg | |
parent | c275a5f0b045f10e93c6a557f2499f3cf7709efc (diff) |
lualibs (5may13)
git-svn-id: svn://tug.org/texlive/trunk@30238 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-x | Master/tlpkg/bin/tlpkginfo | 2 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 108 |
2 files changed, 41 insertions, 69 deletions
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index ac9131bbca6..e8034c22625 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -83,8 +83,8 @@ sub find_ctan_dir { my $ctan_dir = &catalogue_find_ctan_path ($me); if (! $ctan_dir) { # fall back on many special cases + (my $me_wo_babel = $me) =~ s,^babel-,,; # remove when Catalogue ready (my $me_wo_bin = $me) =~ s,^bin-,,; - (my $me_wo_babel = $me) =~ s,^babel-,,; (my $me_wo_powerdot = $me) =~ s,^powerdot-,,; (my $me_wo_type1 = $me) =~ s,-type1$,,; diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 6c9b5249fd8..b173e8d0d31 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1963,83 +1963,54 @@ $standardsource='\.(bat|c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh'; # special cases of which .ins files to run; used to remove # normal choices, and get the most general. %specialins = ( - 'aastex', 'NULL', # everything is pregenerated - 'apa6', 'apa6.dtx', + 'aastex', 'NULL', # everything is pregenerated 'base', 'NULL', - 'bbold', 'bbold.dtx', 'booktabs-de', 'NULL', # doc, no need to build - 'blacklettert1','NULL', # don't try to do fontinst - 'bosisio', '.*\.dtx', - 'bropd', "$package.dtx", - 'calculator', "$package.dtx", - 'canoniclayout','.*\.dtx', + 'blacklettert1','NULL', # don't try to do fontinst 'carlisle', '\.ins|ltxtable.tex', - 'ccfonts', 'ccfonts.ins', - 'chickenize', "$package.dtx", - 'chronology', 'chronology.dtx', 'cmbright', 'NULL', - 'codicefiscaleitaliano', 'codicefiscaleitaliano.dtx', - 'contracard', "$package.dtx", - 'cprotect', "$package.dtx", - 'curve2e', 'curve2e.dtx', - 'dotseqn', 'dotseqn.dtx', - 'download', "$package.tex", - 'ecclesiastic',"$package.dtx", - 'etextools', 'etextools.dtx', - 'feynmf', 'feynmf.ins', - 'fixltxhyph', 'fixltxhyph.dtx', - 'floatrow', 'floatrow.ins', - 'fullblck', 'fullblck.dtx$', - 'geometry', 'geometry.dtx', 'geometry-de', 'NULL', # doc, no need to build 'geschichtsfrkl', 'NULL', # provided - 'hausarbeit-jura', 'hausarbeit-jura.dtx', - 'hf-tikz', "$package.dtx", - 'imakeidx', 'imakeidx.dtx', - 'lastpage', 'lastpage.dtx', 'lettre', 'NULL', - 'localloc', 'localloc.dtx', - 'luaindex', 'luaindex.dtx', - 'makecell', 'makecell.dtx', - 'mycv', "$package.dtx", - 'mylatexformat', 'mylatexformat.dtx', - 'namespc', 'namespc.dtx', - 'uothesis', 'uothesis.dtx', - 'pageslts', 'pagesLTS.dtx', 'paper', 'install', - 'papermas', "$package.dtx", - 'parrun', 'parrun.ins', - 'poetrytex', "$package.dtx", - 'ran_toks', "$package.dtx", - 'seuthesis', 'NULL', # don't want to run iconv, etc. - 'skdoc', "$package.dtx", - 'skmath', "$package.tex", - 'skrapport', "$package.tex", - 'statrep', "$package.dtx", - 'stmaryrd', 'stmaryrd.dtx', - 'tablists', 'tablists.dtx', + 'seuthesis', 'NULL', # don't want to run iconv, etc. 'thesis', 'install.01|install.ndx', - 'termlist', 'termlist.dtx', - 'teubner', 'teubner.dtx', - 'toptesi', 'toptesi.dtx', - 'translation-filecontents-de', 'NULL', # doc package - 'turnstile', 'turnstile-en.ins', # skip pt - 'ulqda', 'ulqda.dtx', - 'undolabl', 'undolabl.dtx', - 'xecjk', 'xeCJK.dtx', - 'xpicture', "$package.dtx", + 'translation-filecontents-de', 'NULL', # doc + 'turnstile', 'turnstile-en.ins', # skip pt since it changes the sty ); -$standardins='\.ins$'; +$standardins = '\.ins$'; -# if no .ins is present, but a .dtx is present, return a pattern for it -# (or them); else return the empty string. +# if no .ins is present, but a .dtx is present, return a pattern for +# that extension; else return the empty string. This is only called if +# there was no $specialins for the package. We do this because more and +# more packages omit the .ins and just put everything in the .dtx, so +# it's nice to recognize that case automatically. # sub specialins { - return ""; - my ($package) = $_; - my @ins = `find $RAW_DIR/$packagedir -name $standardins -type f`; - warn "specialins: found ins @ins"; + + if (exists $specialins{$package}) { + # sanity check + warn "\t SPECIALINS called for $package, " + . "but have specialins=$specialins{$package}\n"; + return ""; + } + + my $raw_dir = "$RAW_DIR/$packagedir"; + my @ins = `find $raw_dir -regex ".*$standardins" -type f -print`; + if (@ins) { + print "\t SPECIALINS found normal ins: @ins"; + return ""; + } + + my @dtx = `find $raw_dir -regex '.*\\.dtx\$' -type f -print`; + if (@dtx) { + print "\t SPECIALINS no .ins, but found .dtx: @dtx"; + return '\.dtx$'; + } + + # No .dtx's, either. Presumably this package has no .ins-like file. + return ""; } # ltxtable.tex in carlisle uses the {filecontents} environment to write @@ -2567,12 +2538,12 @@ for (@ARGV) { $whichformat = $specialfmt{$package} || $standardfmt; $whichdocformat = $specialdocfmt{$package} || $standarddocfmt; + print "pkg=$package (fmt=$whichformat docfmt=$whichdocformat) -> $DEST\n"; $inspatt = $specialins{$package} || &specialins($package) || $standardins; $insrunner = $specialinsrunner{$package} || $standardinsrunner; $Foundry = $specialfoundry{$package} || $standardfoundry; - print "pkg=$package (fmt=$whichformat docfmt=$whichdocformat) -> $DEST\n"; if (exists $special{$package}) { if ($special{$package} =~ s/^die //) { # avoid repeating the die message. @@ -2634,6 +2605,10 @@ sub set_dir_defaults { $standarddocfmt = $standardsourcefmt = "support"; $guess = "$standarddocfmt for docfmt/srcfmt"; + } elsif ($ctan_dir =~ m!/contrib/babel-contrib/!) { + # this can be removed when Catalogue is complete. + $standarddocfmt = $standardsourcefmt = $standardfmt = "generic"; + $guess = "$standarddocfmt for fmt/docfmt/srcfmt (babel)"; } print "\t guessed $guess (based on $ctan_dir)\n" if $guess; @@ -2834,8 +2809,6 @@ sub donormal { &buildfilelist; # run the .ins files (if any) supplied - $inspatt = $specialins{$package} || $standardins; - $Foundry = $specialfoundry{$package} || $standardfoundry; &runins($inspatt); &killfiles ($moreclean{$package}, "more") if $moreclean{$package}; @@ -4527,8 +4500,7 @@ sub MAKEbeebe { # pstricks packages usually support both plain and latex. # -sub MAKEpst -{ +sub MAKEpst { print "\t SPECIAL pst $package starts\n"; # pst-laboObj.tex and pst-fp.sty need special cases: $standardtex = qq!^(($package(Obj)?)|pst-fp)\.(tex|sty)!; |