texlive[45772]

[commits+kakuto at tug.org]

Revision: 45772
          http://tug.org/svn/texlive?view=revision&revision=45772
Author:   kakuto
Date:     2017-11-13 03:36:32 +0100 (Mon, 13 Nov 2017)
Log Message:
-----------
xindy: forgot to update patch-01-xindy-script

Modified Paths:
--------------
    trunk/Build/source/utils/xindy/TLpatches/patch-01-xindy-script

Modified: trunk/Build/source/utils/xindy/TLpatches/patch-01-xindy-script
===================================================================
--- trunk/Build/source/utils/xindy/TLpatches/patch-01-xindy-script	2017-11-13 01:22:13 UTC (rev 45771)
+++ trunk/Build/source/utils/xindy/TLpatches/patch-01-xindy-script	2017-11-13 02:36:32 UTC (rev 45772)
@@ -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 @@
  .\" 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 @@
  	    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";
++	    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 {
-+		print $sf "(require \"$module\")\n";
++    # 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);