summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/ctan2tl3
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check3
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo24
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds13
-rw-r--r--Master/tlpkg/tlpsrc/bxdpx-beamer.tlpsrc0
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc1
6 files changed, 30 insertions, 14 deletions
diff --git a/Master/tlpkg/bin/ctan2tl b/Master/tlpkg/bin/ctan2tl
index e685d4ba9c9..7eceea51f1d 100755
--- a/Master/tlpkg/bin/ctan2tl
+++ b/Master/tlpkg/bin/ctan2tl
@@ -129,7 +129,8 @@ cd $cooked || exit 1
printf "\n\f cooked\n"
find $pkg -name TDS_READY -exec rm '{}' \; # remove sentinel file
find -depth -type d | xargs rmdir 2>/dev/null # remove empty directories
-find $pkg \! -type d -printf "%TY%Tm%Td.%TH%TM %p\n" | sort -k2
+find $pkg \! -type d -printf "%TY%Tm%Td.%TH%TM %p\n" | sort -k2 \
+| tee ${TMPDIR-/tmp}/ctan2tl.files
printf "\n$0: calling place $place_chicken $pkg\n"
rm -rf $pkg.done
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 4a530fc7960..349fbd15cd4 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -78,7 +78,8 @@ my @TLP_working = qw(
borceux bosisio
boxedminipage boxhandler bpchem bpolynomial
bracketkey braids braille braket breakcites breakurl bropd brushscr
- bullcntr bundledoc burmese bussproofs bxbase bxjscls bxpict2e bytefield
+ bullcntr bundledoc burmese bussproofs
+ bxbase bxdpx-beamer bxjscls bxpict2e bytefield
c-pascal cabin cachepic calcage calctab calculator
calligra calligra-type1 calrsfs cals calxxxx-yyyy cancel
canoniclayout cantarell
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index e19bc87b1ef..ac9131bbca6 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -83,17 +83,19 @@ sub find_ctan_dir {
my $ctan_dir = &catalogue_find_ctan_path ($me);
if (! $ctan_dir) {
# fall back on many special cases
- (my $menobin = $me) =~ s,^bin-,,;
- (my $menopowerdot = $me) =~ s,^powerdot-,,;
- (my $menotype1 = $me) =~ s,-type1$,,;
+ (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$,,;
for my $dir (
"macros/latex/contrib/$me", # most everything
- "macros/latex/contrib/biblatex/$me", # authoryear-icomp-tt
+ "macros/latex/contrib/babel-contrib/$me_wo_babel", # babel-*
+ "macros/latex/contrib/biblatex/$me", # authoryear-icomp-tt
"macros/latex/contrib/biblatex-contrib/$me", # biblatex-*
"macros/latex/contrib/gene/$me", # eqname
"macros/latex/contrib/\L$me", # HA-prosper
- "macros/latex/contrib/powerdot/contrib/$menopowerdot", # powerdot-doc-vn
+ "macros/latex/contrib/powerdot/contrib/$me_wo_powerdot", # powerdot-doc-vn
"macros/latex/exptl/$me", # semioneside
"macros/latex/required/$me", # babel
"macros/plain/$me", # plnfss
@@ -105,7 +107,7 @@ sub find_ctan_dir {
"macros/generic/diagrams/$me", # circ
"macros/$me", # eplain
"support/$me", # thumbpdf
- "support/$menobin", # bin-thumbpdf
+ "support/$me_wo_bin", # bin-thumbpdf
"language/vietnamese/$me/unpacked", # vntex
"language/polish/$me", # cc-pl
"language/hyphenation/$me", # bghyphen
@@ -131,11 +133,11 @@ sub find_ctan_dir {
"fonts/$me", # MnSymbol
"fonts/utilities/$me", # accfonts
"fonts/ps-type1/$me", # cm-super
- "fonts/ps-type1/$menotype1", # esint-type1
- "fonts/greek/$me", # lfb
- "fonts/gothic/$me", # blacklettert1
- "fonts/cyrillic/$me/texmf", # lh
- "fonts/chess/$me", # skaknew
+ "fonts/ps-type1/$me_wo_type1", # esint-type1
+ "fonts/greek/$me", # lfb
+ "fonts/gothic/$me", # blacklettert1
+ "fonts/cyrillic/$me/texmf", # lh
+ "fonts/chess/$me", # skaknew
"biblio/bibtex/contrib/$me", # dk-bib
) {
if (-d "$CTAN/$dir") {
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 40c5377a45f..6c9b5249fd8 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2031,6 +2031,17 @@ $standardsource='\.(bat|c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
);
$standardins='\.ins$';
+# if no .ins is present, but a .dtx is present, return a pattern for it
+# (or them); else return the empty string.
+#
+sub specialins {
+ return "";
+
+ my ($package) = $_;
+ my @ins = `find $RAW_DIR/$packagedir -name $standardins -type f`;
+ warn "specialins: found ins @ins";
+}
+
# ltxtable.tex in carlisle uses the {filecontents} environment to write
# ltxtable.sty. Unfortunately if the file exists anywhere in the input
# tree, it won't be written, and of course TL already has it installed.
@@ -2557,7 +2568,7 @@ for (@ARGV) {
$whichformat = $specialfmt{$package} || $standardfmt;
$whichdocformat = $specialdocfmt{$package} || $standarddocfmt;
- $inspatt = $specialins{$package} || $standardins;
+ $inspatt = $specialins{$package} || &specialins($package) || $standardins;
$insrunner = $specialinsrunner{$package} || $standardinsrunner;
$Foundry = $specialfoundry{$package} || $standardfoundry;
diff --git a/Master/tlpkg/tlpsrc/bxdpx-beamer.tlpsrc b/Master/tlpkg/tlpsrc/bxdpx-beamer.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/bxdpx-beamer.tlpsrc
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 15930d9c32a..def7b0728bf 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -79,6 +79,7 @@ depend braket
depend breakurl
depend bullcntr
depend bussproofs
+depend bxdpx-beamer
depend calcage
depend calctab
depend calculator