sync with changes in CVS repo

git-svn-id: svn://tug.org/texlive/trunk@12483 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 47 insertions, 26 deletions

diff --git a/Master/texmf/scripts/xindy/texindy.pl b/Master/texmf/scripts/xindy/texindy.pl
index 2664b6fcd54..64dfbd71d46 100755
--- a/Master/texmf/scripts/xindy/texindy.pl
+++ b/Master/texmf/scripts/xindy/texindy.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: texindy,v 1.5 2006/07/30 10:30:42 jschrod Exp $
+# $Id: texindy,v 1.8 2009/03/22 11:08:18 jschrod Exp $
 #------------------------------------------------------------
 # (history at end)
 
@@ -70,7 +70,7 @@ output usage message with options explanation.
 
 Don't output progress messages. Output only error messages.
 
-=item C<--version> / B<-v>
+=item C<--verbose> / B<-v>
 
 Output verbose progress messages.
 
@@ -296,7 +296,7 @@ use strict;
 
 BEGIN {
     use vars qw($Revision $VERSION);
-    q$Revision: 1.5 $ =~ /: (\d+)\.(\d+)/ ;	# q wg. Emacs indent!
+    q$Revision: 1.8 $ =~ /: (\d+)\.(\d+)/ ;	# q wg. Emacs indent!
     my ($major, $minor) = ($1, $2);
     $VERSION = "$major." . ($minor<10 ? '0' : '') . $minor;
 }
@@ -379,27 +379,28 @@ output_version()  if $output_version;	# will not return
 usage()  if ( ! $stdin && @ARGV == 0 );	# brain damaged, but like makeindex
 
 
-# Reconstruct xindy options, and eventually switch to it.
+# Construct xindy options, and eventually switch to it.
 
-unshift (@ARGV, '-q')  if $quiet;
-unshift (@ARGV, '-v')  if $verbose;
-unshift (@ARGV, map { ('-d', $_) } @debug)  if @debug;
-unshift (@ARGV, '-o', $outfile)  if $outfile;
-unshift (@ARGV, '-t', $logfile)  if $logfile;
-unshift (@ARGV, '-L', $language);
-unshift (@ARGV, '-C', $codepage)  if $codepage;
-unshift (@ARGV, '-M', "tex/inputenc/$codepage")  if $codepage;
-unshift (@ARGV, map { ('-M', $_) } ($ENV{TEXINDY_AUTO_MODULE} || 'texindy',
-				    @modules));
-unshift (@ARGV, '-I', $input_markup);
+my @opt;
+push (@opt, '-q')  if $quiet;
+push (@opt, '-v')  if $verbose;
+push (@opt, map { ('-d', $_) } @debug)  if @debug;
+push (@opt, '-o', $outfile)  if $outfile;
+push (@opt, '-t', $logfile)  if $logfile;
+push (@opt, '-L', $language);
+push (@opt, '-C', $codepage)  if $codepage;
+push (@opt, '-M', "tex/inputenc/$codepage")  if $codepage;
+push (@opt, map { ('-M', $_) } ($ENV{TEXINDY_AUTO_MODULE} || 'texindy',
+				@modules));
+push (@opt, '-I', $input_markup);
 
-print "Calling xindy as: $xindy @ARGV\n"  if (grep /^script$/, @debug);
+print "Calling xindy as: $cmd_dir/xindy @opt @ARGV\n"  if (grep /^script$/, @debug);
 
 if ($xindy =~ m,\.bat$,) {
-  system($xindy, @ARGV);
+  system($xindy, @opt, @ARGV);
   exit $? if $? != -1;
 } else {
-  exec $xindy, @ARGV;
+  exec $xindy, @opt, @ARGV;
 }
 die "$cmd: could not execute $xindy: $!\n";
 
@@ -522,6 +523,16 @@ sub output_xindy_release () {
 #======================================================================
 #
 # $Log: texindy,v $
+# Revision 1.8  2009/03/22 11:08:18  jschrod
+#     man page: --v is --verbose, not --version.
+#
+# Revision 1.7  2009/03/21 16:32:06  jschrod
+#     Inputenc merge rules must be loaded before other texindy modules;
+# otherwise inputenc markup would be discarded by tex.xdy.
+#
+# Revision 1.6  2008/02/17 14:55:32  jschrod
+#     Use exitcode 0 when usage is explicitly demanded with --help et.al.
+#
 # Revision 1.5  2006/07/30 10:30:42  jschrod
 #     Check if an exec() error happened and output an error message.
 # (Ticket 1230801)
diff --git a/Master/texmf/scripts/xindy/xindy.pl b/Master/texmf/scripts/xindy/xindy.pl
index ffbf4bc4d9b..9a7b0579845 100755
--- a/Master/texmf/scripts/xindy/xindy.pl
+++ b/Master/texmf/scripts/xindy/xindy.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: xindy.pl,v 1.8 2006/07/30 10:30:42 jschrod Exp $
+# $Id: xindy.pl,v 1.11 2009/03/22 11:08:18 jschrod Exp $
 #------------------------------------------------------------
 # (history at end)
 
@@ -64,7 +64,7 @@ output usage message with options explanation.
 
 Don't output progress messages. Output only error messages.
 
-=item C<--version> / B<-v>
+=item C<--verbose> / B<-v>
 
 Output verbose progress messages.
 
@@ -276,7 +276,7 @@ use strict;
 
 BEGIN {
     use vars qw($Revision $VERSION);
-    q$Revision: 1.8 $ =~ /: (\d+)\.(\d+)/ ;	# q wg. Emacs indent!
+    q$Revision: 1.11 $ =~ /: (\d+)\.(\d+)/ ;	# q wg. Emacs indent!
     my ($major, $minor) = ($1, $2);
     $VERSION = "$major." . ($minor<10 ? '0' : '') . $minor;
 }
@@ -309,11 +309,11 @@ BEGIN {
     } elsif ( exists $ENV{"SELFAUTOLOC"} && -f "$ENV{SELFAUTOLOC}/$xindy_run" ) { # texlive woe32
 	$lib_dir = $ENV{"SELFAUTOLOC"};
 	$cmd_dir = $ENV{"SELFAUTOLOC"};
-    } elsif ( '/home/vvv/src/tex/texlive/source/utils/01/lib' ne '@libdir' . '@' ) { # GNU configure at work?
-	if ( -d '/home/vvv/src/tex/texlive/source/utils/01/lib/xindy' ) {	# /usr style
-	    $lib_dir = '/home/vvv/src/tex/texlive/source/utils/01/lib/xindy';
+    } elsif ( '@libdir@' ne '@libdir' . '@' ) { # GNU configure at work?
+	if ( -d '@libdir@/xindy' ) {	# /usr style
+	    $lib_dir = '@libdir@/xindy';
 	} else {
-	    $lib_dir = '/home/vvv/src/tex/texlive/source/utils/01/lib'; # /opt style
+	    $lib_dir = '@libdir@'; # /opt style
 	}
 	die "$cmd: Cannot locate $lib_dir/$xindy_run" if ! -f "$lib_dir/$xindy_run";
     } elsif ( -f "$cmd_dir/../lib/$xindy_run" ) { # /opt style
@@ -656,7 +656,7 @@ sub xindy_expression () {
 	    if ( $2 && -d "$ld/$1" ) { # $2 is not set if the regex didn't match
 		$language = $1;
 		$variant = "$2-"  unless ( $2 eq 'iso' );
-		$variant =~ s/din/din5007/ ;
+		$variant eq 'din'  and  $variant = 'din5007';
 	    }
 	}
 	# Let's guess the codepage. We take any that starts with
@@ -806,6 +806,16 @@ sub quotify ( $ ) {
 #======================================================================
 #
 # $Log: xindy.pl,v $
+# Revision 1.11  2009/03/22 11:08:18  jschrod
+#     man page: --v is --verbose, not --version.
+#
+# Revision 1.10  2009/03/21 18:05:11  jschrod
+#     Variant rename of din to din5007 made explicit. (Proposed by
+# Zdenek Wagner at 16 Mar 09.)
+#
+# Revision 1.9  2008/02/17 14:55:32  jschrod
+#     Use exitcode 0 when usage is explicitly demanded with --help et.al.
+#
 # Revision 1.8  2006/07/30 10:30:42  jschrod
 #     Check if an exec() error happened and output an error message.
 # (Ticket 1230801)