summaryrefslogtreecommitdiff
path: root/Build/source/utils/xindy/TLpatches/patch-01-xindy-script
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/utils/xindy/TLpatches/patch-01-xindy-script')
-rw-r--r--Build/source/utils/xindy/TLpatches/patch-01-xindy-script133
1 files changed, 0 insertions, 133 deletions
diff --git a/Build/source/utils/xindy/TLpatches/patch-01-xindy-script b/Build/source/utils/xindy/TLpatches/patch-01-xindy-script
deleted file mode 100644
index 226395213df..00000000000
--- a/Build/source/utils/xindy/TLpatches/patch-01-xindy-script
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -ur xindy-2.5.1.orig/user-commands/xindy.1 xindy-2.5.1/user-commands/xindy.1
---- xindy-2.5.1.orig/user-commands/xindy.1 Fri May 30 05:26:05 2014
-+++ xindy-2.5.1/user-commands/xindy.1 Fri Apr 14 06:50:56 2017
-@@ -1,4 +1,4 @@
--.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
-+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
- .\"
- .\" Standard preamble:
- .\" ========================================================================
-@@ -133,7 +133,7 @@
- .\" ========================================================================
- .\"
- .IX Title "xindy 1"
--.TH xindy 1 "2014-05-29" "Release 2.5.1" "xindy"
-+.TH xindy 1 "2015-08-15" "Release 2.5.1" "xindy"
- .\" For nroff, turn off justification. Always turn off hyphenation; it makes
- .\" way too many mistakes in technical documents.
- .if n .ad l
-@@ -165,7 +165,7 @@
- .Ve
- .SH "DESCRIPTION"
- .IX Header "DESCRIPTION"
--\&\fBxindy\fR is the formatter-indepedent command of xindy, the flexible
-+\&\fBxindy\fR is the formatter-independent command of xindy, the flexible
- indexing system. It takes a raw index as input, and produces a merged,
- sorted and tagged index. Merging, sorting, and tagging is controlled
- by xindy style files.
-@@ -432,7 +432,7 @@
- Joachim Schrod
- .SH "LEGALESE"
- .IX Header "LEGALESE"
--Copyright (c) 2004\-2014 by Joachim Schrod.
-+Copyright (C) 2004\-2014 by Joachim Schrod.
- .PP
- \&\fBxindy\fR is free software; you can redistribute it and/or modify it
- under the terms of the \s-1GNU\s0 General Public License as published by the
-diff -ur xindy-2.5.1.orig/user-commands/xindy.in xindy-2.5.1/user-commands/xindy.in
---- xindy-2.5.1.orig/user-commands/xindy.in Sun May 11 22:45:44 2014
-+++ xindy-2.5.1/user-commands/xindy.in Mon Mar 27 15:19:32 2017
-@@ -353,6 +353,7 @@
-
- use Cwd;
- use File::Basename;
-+use File::Glob qw(bsd_glob);
- use File::Spec;
- use File::Temp qw(tempfile tmpnam);
- use Getopt::Long qw(:config bundling);
-@@ -394,7 +395,7 @@
- # FIXME: In standalone installations, modules are still placed in lib
- # directory. This is not conformant to FHS.
-
--if ( $is_TL ) { # TeX Live and MikTeX
-+if ( $is_TL ) { # TeX Live, MiKTeX, or W32TeX
-
- $modules_dir = Cwd::realpath("$cmd_dir/../../xindy/modules");
- die "$cmd: Cannot locate xindy modules directory" unless -d $modules_dir;
-@@ -402,8 +403,12 @@
- if ( $is_w32 ) {
- if ( -d "$cmd_dir/../../../bin/win32" ) { # TeX Live
- $cmd_dir = "$cmd_dir/../../../bin/win32";
-- } elsif ( -d "$cmd_dir/../../miktex/bin" ) { # MikTeX
-- $cmd_dir = "$cmd_dir/../../miktex/bin";
-+ } elsif ( -d "$cmd_dir/../../miktex/bin/x64/internal" ) { # MiKTeX 64-bit
-+ $cmd_dir = "$cmd_dir/../../miktex/bin/x64/internal";
-+ } elsif ( -d "$cmd_dir/../../miktex/bin/internal" ) { # MiKTeX 32-bit
-+ $cmd_dir = "$cmd_dir/../../miktex/bin/internal";
-+ } elsif ( -d "$cmd_dir/../../../../bin" ) { # W32TeX
-+ $cmd_dir = "$cmd_dir/../../../../bin";
- } else {
- die "$cmd: Cannot locate bin directory";
- }
-@@ -626,7 +631,11 @@
- usage(1);
- }
- my ($name, $path, $suffix) = fileparse ($ARGV[0], '\.[^\.]+');
-+ if ($path eq ".\\") {
-+ $outfile = "$name.ind";
-+ } else {
- $outfile = "$path$name.ind";
-+ }
- }
-
- # FIXME: xindy wants a log file. Really?
-@@ -706,6 +715,7 @@
- my $output = tmpnam();
- push (@temp_files, $output);
- $output=quotify($output);
-+ $filter=quotify($filter);
- print "Running filter: $filter <$input >$output\n" if $verbose;
- system "$filter <$input >$output";
- print "filtered xindy input file: $output\n" if $debug{script};
-@@ -732,6 +742,9 @@
- #
- # FIXME: I didn't see all languages. What's on with gypsy and
- # hausa?
-+ if ( !$language ) {
-+ $language = "general";
-+ }
- if ( $language ) {
- # If there is no language directory, this might be a variant.
- # Language names and variants are separated by hyphens. The
-@@ -762,7 +775,7 @@
- @codepages = qw(latin cp iso8859 ascii utf8) unless @codepages;
- my @styles;
- foreach my $cp ( @codepages ) {
-- @styles = glob("$lang_dir/$variant$cp*-lang.xdy");
-+ @styles = bsd_glob("$lang_dir/$variant$cp*-lang.xdy");
- last if @styles;
- }
- unless ( @styles ) {
-@@ -790,7 +803,21 @@
- push (@temp_files, $style_file);
- $style_file=quotify($style_file);
- foreach my $module ( @modules ) {
-- print $sf "(require \"$module\")\n";
-+ if (($module =~ /\//) || ($module =~ /\\/)) {
-+ # If $module contains directory separators, the module must be a system
-+ # module. So we don't call kpsewhich.
-+ print $sf "(require \"$module\")\n";
-+ } else {
-+ # Here we call kpsewhich to search for a module. Thus modules can be under
-+ # (anytexmf)/xindy/modules/
-+ my $fnmodule=`kpsewhich -progname=xindy -format=othertext $module`;
-+ if ($fnmodule) {
-+ chomp($fnmodule);
-+ print $sf "(require \"$fnmodule\")\n";
-+ } else {
-+ print $sf "(require \"$module\")\n";
-+ }
-+ }
- }
- close ($sf);
- }