summaryrefslogtreecommitdiff
path: root/Build/tools
diff options
context:
space:
mode:
Diffstat (limited to 'Build/tools')
-rw-r--r--Build/tools/Tpm.pm5
-rwxr-xr-xBuild/tools/tlpkginfo18
-rwxr-xr-xBuild/tools/tpm-ctan-check3
3 files changed, 19 insertions, 7 deletions
diff --git a/Build/tools/Tpm.pm b/Build/tools/Tpm.pm
index 2944702c230..774d0b1a162 100644
--- a/Build/tools/Tpm.pm
+++ b/Build/tools/Tpm.pm
@@ -122,9 +122,10 @@ my @engines = ("aleph", "enctex", "eomega", "metafont", "metapost", "omega", "pd
# The so called formats
my @formats = (
"alatex", "amstex", "context", "cslatex", "csplain", "enctex",
- "eplain", "fontinst", "generic", "jadetex", "lambda", "latex", "latex3",
+ "eplain", "fontinst", "generic", "jadetex", "lambda",
+ "latex", "latex3",
"mex", "physe", "phyzzx", "plain", "psizzl",
- "startex", "texinfo", "texsis", "xmltex", "ytex", );
+ "startex", "texinfo", "texsis", "xetex", "xmltex", "ytex", );
# Kind of font files
my @fonttypes = (
"afm", "misc", "ofm", "opentype", "ovf", "ovp", "pfb",
diff --git a/Build/tools/tlpkginfo b/Build/tools/tlpkginfo
index 6f7cd019d3a..b76ea86bddd 100755
--- a/Build/tools/tlpkginfo
+++ b/Build/tools/tlpkginfo
@@ -121,10 +121,20 @@ sub catalogue_find_ctan_path
my $catfile = "$CATALOGUE/$firstchar/$pkgname.xml";
return undef unless -r $catfile;
- my $ctan_path
- = `sed -n -e "s,'/>,," -e "s,' .*,," -e "s,^ *<ctan path='/,,p" $catfile`;
- return undef unless $ctan_path;
-
+ # get the raw line from the catalogue file. (let's hope it's one line.)
+ my $ctan_path = `sed -n "s,^ *<ctan path='/,,p" $catfile`;
+ return undef unless $ctan_path; # in case it's not present at all
+
+ # if it's just a single file, we aren't prepared to deal with it.
+ # ifxetex, for example, is given as a single file even though it has
+ # its own directory, so we find it with the code above. (The
+ # Catalogue maintainers do not consider this a problem for various reasons.)
+ return undef if $ctan_path =~ /file='true'/;
+
+ # ok, we will use the ctan path. chop off any options, etc.
+ $ctan_path =~ s,'/>,,;
+ $ctan_path =~ s,' .*,,;
chomp ($ctan_path);
+
return $ctan_path;
}
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index 43ec515b95b..1359fd4512c 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -44,7 +44,7 @@ sub main
"genmisc", "glossary", "gost", "graphics", "graphicx-psmin",
"hyphen-base", "hyphen-basque", "hyphen-german", "hyphen-greek",
"hyphen-norwegian", "hyphen-ukenglish", "hyphen-usorbian",
- "ibygrk", "iopart-num",
+ "ibygrk", "ifxetex", "iopart-num",
"koma-script",
"l2tabu-english",
"labelcas", "ledmac", "lewis", "lfb", "lh", "lineno", "listings",
@@ -80,6 +80,7 @@ sub main
"twoup",
"velthuis", "verse", "vhistory", "volumes",
"wrapfig",
+ "xltxtra",
"york-thesis",
"xcolor", "xkeyval"
);