texlive[43616] Build/source/utils/xindy: xindy.in: sync

commits+kakuto at tug.org commits+kakuto at tug.org
Mon Mar 27 08:27:30 CEST 2017


Revision: 43616
          http://tug.org/svn/texlive?view=revision&revision=43616
Author:   kakuto
Date:     2017-03-27 08:27:30 +0200 (Mon, 27 Mar 2017)
Log Message:
-----------
xindy.in: sync

Modified Paths:
--------------
    trunk/Build/source/utils/xindy/ChangeLog
    trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in

Modified: trunk/Build/source/utils/xindy/ChangeLog
===================================================================
--- trunk/Build/source/utils/xindy/ChangeLog	2017-03-27 06:10:31 UTC (rev 43615)
+++ trunk/Build/source/utils/xindy/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
@@ -1,3 +1,9 @@
+2017-03-27  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* xindy-src/user-commands/xindy.in: If a module name cantains directory
+	separators, the module must certainly be a system module. In this case,
+	we don't call kpsewhich to obtain relatively better performance.
+
 2016-06-08  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* xindy-src/user-commands/xindy.in: Use kpsewhich to search for modules.

Modified: trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in
===================================================================
--- trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in	2017-03-27 06:10:31 UTC (rev 43615)
+++ trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in	2017-03-27 06:27:30 UTC (rev 43616)
@@ -803,12 +803,20 @@
 	push (@temp_files, $style_file);
 	$style_file=quotify($style_file);
 	foreach my $module ( @modules ) {
-	    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);



More information about the tex-live-commits mailing list