summaryrefslogtreecommitdiff
path: root/Build/source/utils/xindy
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-11-13 02:36:32 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-11-13 02:36:32 +0000
commit9d8183c6a0c2f0e9c90e5e5eb32e0e08b8d7ff58 (patch)
tree1d19c2c33603f4a5ffad7f6b1924650a2d6fd478 /Build/source/utils/xindy
parentf8079faa2cf49dc8d23cf180ee4551507a4dab3b (diff)
xindy: forgot to update patch-01-xindy-script
git-svn-id: svn://tug.org/texlive/trunk@45772 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/xindy')
-rw-r--r--Build/source/utils/xindy/TLpatches/patch-01-xindy-script46
1 files changed, 36 insertions, 10 deletions
diff --git a/Build/source/utils/xindy/TLpatches/patch-01-xindy-script b/Build/source/utils/xindy/TLpatches/patch-01-xindy-script
index 3a82b5269e8..226395213df 100644
--- a/Build/source/utils/xindy/TLpatches/patch-01-xindy-script
+++ b/Build/source/utils/xindy/TLpatches/patch-01-xindy-script
@@ -1,6 +1,6 @@
-diff -ur xindy-2.5.1.orig/user-commands/xindy.1 xindy-src/user-commands/xindy.1
+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-src/user-commands/xindy.1 Tue Feb 23 00:06:15 2016
++++ 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)
@@ -16,9 +16,27 @@ diff -ur xindy-2.5.1.orig/user-commands/xindy.1 xindy-src/user-commands/xindy.1
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
-diff -ur xindy-2.5.1.orig/user-commands/xindy.in xindy-src/user-commands/xindy.in
+@@ -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-src/user-commands/xindy.in Wed Jun 08 09:30:20 2016
++++ xindy-2.5.1/user-commands/xindy.in Mon Mar 27 15:19:32 2017
@@ -353,6 +353,7 @@
use Cwd;
@@ -90,17 +108,25 @@ diff -ur xindy-2.5.1.orig/user-commands/xindy.in xindy-src/user-commands/xindy.i
last if @styles;
}
unless ( @styles ) {
-@@ -790,7 +803,13 @@
+@@ -790,7 +803,21 @@
push (@temp_files, $style_file);
$style_file=quotify($style_file);
foreach my $module ( @modules ) {
- print $sf "(require \"$module\")\n";
-+ my $fnmodule=`kpsewhich -progname=xindy -format=othertext $module`;
-+ if ($fnmodule) {
-+ chomp($fnmodule);
-+ print $sf "(require \"$fnmodule\")\n";
-+ } else {
++ 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);