From b96fcaabab7a46d76c145fb3c4c2557668e4a365 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 10 Dec 2009 13:15:11 +0000 Subject: xindy-new update git-svn-id: svn://tug.org/texlive/trunk@16343 c570f23f-e606-0410-a88d-b1316a301751 --- .../xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog | 9 +- .../xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes | 3 + .../xindy-2.4-pre2-PATCHES/patch-23-drop-v2 | 30 +- .../patch-24-TL-use-xindy_run | 53 ++ .../patch-25-subst-in-texindy | 69 +++ .../xindy-new/xindy/user-commands/Makefile.am | 23 +- .../xindy-new/xindy/user-commands/Makefile.in | 23 +- .../utils/xindy-new/xindy/user-commands/texindy | 534 --------------------- .../utils/xindy-new/xindy/user-commands/texindy.in | 534 +++++++++++++++++++++ .../utils/xindy-new/xindy/user-commands/xindy.in | 33 +- 10 files changed, 716 insertions(+), 595 deletions(-) create mode 100644 Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-24-TL-use-xindy_run create mode 100644 Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-25-subst-in-texindy delete mode 100755 Build/source/utils/xindy-new/xindy/user-commands/texindy create mode 100644 Build/source/utils/xindy-new/xindy/user-commands/texindy.in (limited to 'Build') diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog index 55aba7c13e5..c1fb3d37dfc 100644 --- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog +++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog @@ -1,10 +1,17 @@ +2009-12-10 Peter Breitenlohner + + * patch-24-TL-use-xindy_run (new): Invoke either 'xindy.run' + (actually 'lisp.run') or 'clisp'. + * patch-25-subst-in-texindy (new): Except for TL, substitute + the value of $(libdir) also in texindy and adapt Makefile.am. + 2009-12-09 Peter Breitenlohner * patch-20-TL-install-dirs: For TL, do not substitute @libdir@. * patch-22-TL-xindy_pl (new): Adapt xindy perl script for use in TL (still incomplete). Adapting code from Vladimir Volovich (TL2008/09 version) and - Tomek T . + Tomasz M. Trzeciak . * patch-23-drop-v2 (new): Completely drop xindy.v2. 2009-12-07 Peter Breitenlohner diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes index fdd3a84ed76..8c9fe42e877 100644 --- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes +++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes @@ -12,3 +12,6 @@ Removed: missing ylwrap +Moved user-commands/texindy => user-commands/texindy.in and removed + execute permissions. + diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v2 b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v2 index f64bcf93fae..88e87149858 100644 --- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v2 +++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v2 @@ -32,7 +32,19 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/Makefile.am x diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/xindy.in xindy/user-commands/xindy.in --- xindy.orig/user-commands/xindy.in 2009-12-09 11:50:09.000000000 +0100 +++ xindy/user-commands/xindy.in 2009-12-09 12:25:35.000000000 +0100 -@@ -433,10 +433,16 @@ +@@ -377,11 +377,6 @@ + + + # Check arguments, store them in proper variables. +-# +-# Do also something for backward compatibility: Check if this is an +-# old-style call. If it is, we have two arguments at the end, and the +-# second-to-last has the extension ".xdy". Then, call the old driver +-# script with the original arguments... + + sub usage ( ;$ ) + { +@@ -433,12 +428,6 @@ my @orig_argv = @ARGV; parse_options(); @@ -40,16 +52,8 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/xindy.in xind - if ( $ARGV[0] =~ /\.xdy$/ ) { - exec "$cmd_dir/xindy.v2", @orig_argv; - } -+if ( @ARGV == 2 && $ARGV[0] =~ /\.xdy$/ ) { -+ print STDERR < user-commands/texindy.in + (and remove the execute permissions). + +diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/Makefile.am xindy/user-commands/Makefile.am +--- xindy.orig/user-commands/Makefile.am 2009-12-09 14:17:56.000000000 +0100 ++++ xindy/user-commands/Makefile.am 2009-12-10 13:53:42.000000000 +0100 +@@ -25,13 +25,12 @@ + bin_SCRIPTS = + + if TEXLIVE_BUILD +-noinst_SCRIPTS = $(scripts) + scriptspath = texmf/scripts/xindy + scriptsdir = ${prefix}/$(scriptspath) +-install-exec-hook: $(scripts) ++install-exec-hook: + $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" + @for f in $(scripts); do \ +- $(INSTALL_SCRIPT) `test -f "$$f" || echo "$(srcdir)/"`$$f $(DESTDIR)$(scriptsdir)/$$f.pl; \ ++ $(INSTALL_SCRIPT) "$(srcdir)/$$f.in" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ + done + case "$(bindir)" in \ + */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \ +@@ -40,34 +39,34 @@ + exit 1;; \ + esac + install-links: +- @cd $(DESTDIR)$(bindir) && \ ++ @cd "$(DESTDIR)$(bindir)" && \ + for f in $(scripts); do \ + rm -f $$f; \ +- echo "creating link '$$f -> '$(REL)/$(scriptspath)/$$f.pl"; \ ++ echo "creating link '$$f' -> '$(REL)/$(scriptspath)/$$f.pl'"; \ + $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f; \ + done + uninstall-hook: + @for f in $(scripts); do \ +- rm -f $(DESTDIR)$(bindir)/$$f; \ +- rm -f $(DESTDIR)$(scriptsdir)/$$f.pl; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ + done +- +-xindy: xindy.in +- cat $(srcdir)/xindy.in >xindy + else !TEXLIVE_BUILD + bin_SCRIPTS += $(scripts) + ++texindy: texindy.in Makefile ++ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy ++ + xindy: xindy.in Makefile + sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy + endif !TEXLIVE_BUILD + + man_MANS = texindy.1 xindy.1 + +-EXTRA_DIST = $(man_MANS) texindy xindy.in ++EXTRA_DIST = $(man_MANS) texindy.in xindy.in + + ## Obsolete files + ## + EXTRA_DIST += xindy.v2.1 xindy.v2.in + +-CLEANFILES = xindy ++CLEANFILES = $(scripts) + diff --git a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am index 8f8e2ca2a79..502eab1cbaf 100644 --- a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am +++ b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am @@ -25,13 +25,12 @@ scripts = texindy xindy bin_SCRIPTS = if TEXLIVE_BUILD -noinst_SCRIPTS = $(scripts) scriptspath = texmf/scripts/xindy scriptsdir = ${prefix}/$(scriptspath) -install-exec-hook: $(scripts) +install-exec-hook: $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" @for f in $(scripts); do \ - $(INSTALL_SCRIPT) `test -f "$$f" || echo "$(srcdir)/"`$$f $(DESTDIR)$(scriptsdir)/$$f.pl; \ + $(INSTALL_SCRIPT) "$(srcdir)/$$f.in" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ done case "$(bindir)" in \ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \ @@ -40,34 +39,34 @@ install-exec-hook: $(scripts) exit 1;; \ esac install-links: - @cd $(DESTDIR)$(bindir) && \ + @cd "$(DESTDIR)$(bindir)" && \ for f in $(scripts); do \ rm -f $$f; \ - echo "creating link '$$f -> '$(REL)/$(scriptspath)/$$f.pl"; \ + echo "creating link '$$f' -> '$(REL)/$(scriptspath)/$$f.pl'"; \ $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f; \ done uninstall-hook: @for f in $(scripts); do \ - rm -f $(DESTDIR)$(bindir)/$$f; \ - rm -f $(DESTDIR)$(scriptsdir)/$$f.pl; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ done - -xindy: xindy.in - cat $(srcdir)/xindy.in >xindy else !TEXLIVE_BUILD bin_SCRIPTS += $(scripts) +texindy: texindy.in Makefile + sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy + xindy: xindy.in Makefile sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy endif !TEXLIVE_BUILD man_MANS = texindy.1 xindy.1 -EXTRA_DIST = $(man_MANS) texindy xindy.in +EXTRA_DIST = $(man_MANS) texindy.in xindy.in ## Obsolete files ## EXTRA_DIST += xindy.v2.1 xindy.v2.in -CLEANFILES = xindy +CLEANFILES = $(scripts) diff --git a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in index 26df0f09f91..aafa3a51ca9 100644 --- a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in +++ b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in @@ -67,7 +67,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" -SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS) +SCRIPTS = $(bin_SCRIPTS) SOURCES = DIST_SOURCES = man1dir = $(mandir)/man1 @@ -182,12 +182,11 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ scripts = texindy xindy bin_SCRIPTS = $(am__append_1) -@TEXLIVE_BUILD_TRUE@noinst_SCRIPTS = $(scripts) @TEXLIVE_BUILD_TRUE@scriptspath = texmf/scripts/xindy @TEXLIVE_BUILD_TRUE@scriptsdir = ${prefix}/$(scriptspath) man_MANS = texindy.1 xindy.1 -EXTRA_DIST = $(man_MANS) texindy xindy.in xindy.v2.1 xindy.v2.in -CLEANFILES = xindy +EXTRA_DIST = $(man_MANS) texindy.in xindy.in xindy.v2.1 xindy.v2.in +CLEANFILES = $(scripts) all: all-am .SUFFIXES: @@ -463,10 +462,10 @@ uninstall-man: uninstall-man1 uninstall-binSCRIPTS uninstall-hook uninstall-man \ uninstall-man1 -@TEXLIVE_BUILD_TRUE@install-exec-hook: $(scripts) +@TEXLIVE_BUILD_TRUE@install-exec-hook: @TEXLIVE_BUILD_TRUE@ $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" @TEXLIVE_BUILD_TRUE@ @for f in $(scripts); do \ -@TEXLIVE_BUILD_TRUE@ $(INSTALL_SCRIPT) `test -f "$$f" || echo "$(srcdir)/"`$$f $(DESTDIR)$(scriptsdir)/$$f.pl; \ +@TEXLIVE_BUILD_TRUE@ $(INSTALL_SCRIPT) "$(srcdir)/$$f.in" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ @TEXLIVE_BUILD_TRUE@ done @TEXLIVE_BUILD_TRUE@ case "$(bindir)" in \ @TEXLIVE_BUILD_TRUE@ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \ @@ -475,20 +474,20 @@ uninstall-man: uninstall-man1 @TEXLIVE_BUILD_TRUE@ exit 1;; \ @TEXLIVE_BUILD_TRUE@ esac @TEXLIVE_BUILD_TRUE@install-links: -@TEXLIVE_BUILD_TRUE@ @cd $(DESTDIR)$(bindir) && \ +@TEXLIVE_BUILD_TRUE@ @cd "$(DESTDIR)$(bindir)" && \ @TEXLIVE_BUILD_TRUE@ for f in $(scripts); do \ @TEXLIVE_BUILD_TRUE@ rm -f $$f; \ -@TEXLIVE_BUILD_TRUE@ echo "creating link '$$f -> '$(REL)/$(scriptspath)/$$f.pl"; \ +@TEXLIVE_BUILD_TRUE@ echo "creating link '$$f' -> '$(REL)/$(scriptspath)/$$f.pl'"; \ @TEXLIVE_BUILD_TRUE@ $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f; \ @TEXLIVE_BUILD_TRUE@ done @TEXLIVE_BUILD_TRUE@uninstall-hook: @TEXLIVE_BUILD_TRUE@ @for f in $(scripts); do \ -@TEXLIVE_BUILD_TRUE@ rm -f $(DESTDIR)$(bindir)/$$f; \ -@TEXLIVE_BUILD_TRUE@ rm -f $(DESTDIR)$(scriptsdir)/$$f.pl; \ +@TEXLIVE_BUILD_TRUE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \ +@TEXLIVE_BUILD_TRUE@ rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ @TEXLIVE_BUILD_TRUE@ done -@TEXLIVE_BUILD_TRUE@xindy: xindy.in -@TEXLIVE_BUILD_TRUE@ cat $(srcdir)/xindy.in >xindy +@TEXLIVE_BUILD_FALSE@texindy: texindy.in Makefile +@TEXLIVE_BUILD_FALSE@ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy @TEXLIVE_BUILD_FALSE@xindy: xindy.in Makefile @TEXLIVE_BUILD_FALSE@ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy diff --git a/Build/source/utils/xindy-new/xindy/user-commands/texindy b/Build/source/utils/xindy-new/xindy/user-commands/texindy deleted file mode 100755 index 4fd94a2c679..00000000000 --- a/Build/source/utils/xindy-new/xindy/user-commands/texindy +++ /dev/null @@ -1,534 +0,0 @@ -#! /usr/bin/env perl -# $Id: texindy,v 1.8 2009/03/22 11:08:18 jschrod Exp $ -#------------------------------------------------------------ -# (history at end) - -=head1 NAME - -texindy - create sorted and tagged index from raw LaTeX index - -=head1 SYNOPSIS - - texindy [-V?h] [-qv] [-iglr] [-d magic] [-o outfile.ind] [-t log] \ - [-L lang] [-C codepage] [-M module] [idx0 idx1 ...] - -=head2 GNU-Style Long Options for Short Options: - - -V / --version - -? / -h / --help - -q / --quiet - -v / --verbose - -i / --stdin - -g / --german - -l / --letter-ordering - -r / --no-ranges - -d / --debug (multiple times) - -o / --out-file - -t / --log-file - -L / --language - -C / --codepage - -M / --module (multiple times) - -I / --input-markup (supported: latex, omega) - - -=head1 DESCRIPTION - -B is the LaTeX-specific 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 modules, with a convenient set already preloaded. - -Files with the raw index are passed as arguments. If no arguments are -passed, the raw index will be read from standard input. - -A good introductionary description of B appears in the -indexing chapter of the LaTeX Companion (2nd ed.) - -If you want to produce an index for LaTeX documents with special index -markup, the command xindy(1) is probably more of interest for you. - -B is an approach to merge support for the I -framework, own xindy modules (e.g., for special LaTeX commands in the -index), and a reasonable level of MakeIndex compatibility. There are -other older approaches, eventually they will get a description on the -xindy Web Site, http://www.xindy.org/. - - -=head1 OPTIONS - -=over - -=item C<--version> / B<-V> - -output version numbers of all relevant components and exit. - -=item C<--help> / B<-h> / B<-?> - -output usage message with options explanation. - -=item C<--quiet> / B<-q> - -Don't output progress messages. Output only error messages. - -=item C<--verbose> / B<-v> - -Output verbose progress messages. - -=item C<--debug> I / B<-d> I - -Output debug messages, this option may be specified multiple times. -I determines what is output: - - magic remark - ------------------------------------------------------------ - script internal progress messages of driver scripts - keep_tmpfiles don't discard temporary files - markup output markup trace, as explained in xindy manual - level=n log level, n is 0 (default), 1, 2, or 3 - -=item C<--out-file> F / B<-o> F - -Output index to file F. If this option is not passed, the -name of the output file is the base name of the first argument and the -file extension F. If the raw index is read from standard input, -this option is mandatory. - -=item C<--log-file> F / B<-t> F - -Output log messages to file F. These log messages are -independent from the progress messages that you can influence with -C<--debug> or C<--verbose>. - -=item C<--language> I / B<-L> I - -The index is sorted according to the rules of language I. These -rules are encoded in a xindy module created by I. - -If no input encoding is specified via C<--codepage>, a xindy module -for that language is searched with a latin, a cp, an iso, or ascii -encoding, in that order. - -=item C<--codepage> I / B <-C> I - -The raw input is in input encoding I. This information is used to -select the correct xindy sort module and also the I target -encoding for C input markup. - -When C input markup is used, C is always used as the sort -codepage and no inputenc module is loaded. Then this option is -ignored. - -=item C<--module> I / B<-M> I - -Load the xindy module F. This option may be specified -multiple times. The modules are searched in the xindy search path that -can be changed with the environment variable C. - -=item C<--input-markup> I / B<-I> I - -Specifies the input markup of the raw index. Supported values for -I are C and C. - -C input markup is the one that is emitted by default from the -LaTeX kernel, or by the C macro package of David Jones. -^^-notation of single byte characters is supported. Usage of LaTeX's -I package is assumed as well. - -C input markup is like C input markup, but with Omega's -^^-notation as encoding for non-ASCII characters. LaTeX I -encoding is not used then, and C is enforced to be the codepage -for sorting. - -=back - - -=head1 SUPPORTED LANGUAGES / CODEPAGES - -The following languages are supported: - -=head2 Latin scripts - - albanian gypsy portuguese - croatian hausa romanian - czech hungarian russian-iso - danish icelandic slovak-small - english italian slovak-large - esperanto kurdish-bedirxan slovenian - estonian kurdish-turkish spanish-modern - finnish latin spanish-traditional - french latvian swedish - general lithuanian turkish - german-din lower-sorbian upper-sorbian - german-duden norwegian vietnamese - greek-iso polish - -German recognizes two different sorting schemes to handle umlauts: -normally, C<ä> is sorted like C, but in phone books or -dictionaries, it is sorted like C. The first scheme is known as -I, the second as I. - -C<*-iso> language names assume that the raw index entries are in ISO -8859-9 encoding. - -C is a northern Russian dialect. - -=head2 Cyrillic scripts - - belarusian mongolian serbian - bulgarian russian ukrainian - macedonian - -=head2 Other scripts - - greek klingon - -=head2 Available Codepages - -This is not yet written. You can look them up in your xindy -distribution, in the F directory (where -I is your language). They are named -F, where F is most often empty -(for german, it's C and C; for spanish, it's C -and C, etc.) - - < Describe available codepages for each language > - - < Describe relevance of codepages (as internal representation) for - LaTeX inputenc > - - -=head1 TEXINDY STANDARD MODULES - -There is a set of B standard modules that help to process -LaTeX index files. Some of them are automatically loaded. Some of them -are loaded by default, this can be turned off with a B -option. Others may be specified as C<--module> argument to achieve a -specific effect. - - xindy Module Category Description - -=head2 Sorting - - word-order Default A space comes before any letter in the - alphabet: ``index style'' is listed before - ``indexing''. Turn it off with option -l. - letter-order Add-on Spaces are ignored: ``index style'' - is sorted after ``indexing''. - keep-blanks Add-on Leading and trailing white space (blanks - and tabs) are not ignored; intermediate - white space is not changed. - ignore-hyphen Add-on Hyphens are ignored: - ``ad-hoc'' is sorted as ``adhoc''. - ignore-punctuation Add-on All kinds of punctuation characters are - ignored: hyphens, periods, commas, slashes, - parentheses, and so on. - numeric-sort Auto Numbers are sorted numerically, not like - characters: ``V64'' appears before ``V128''. - -=head2 Page Numbers - - page-ranges Default Appearances on more than two consecutive - pages are listed as a range: ``1--4''. - Turn it off with option -r. - ff-ranges Add-on Uses implicit ``ff'' notation for ranges - of three pages, and explicit ranges - thereafter: 2f, 2ff, 2--6. - ff-ranges-only Add-on Uses only implicit ranges: 2f, 2ff. - book-order Add-on Sorts page numbers with common book numbering - scheme correctly -- Roman numerals first, then - Arabic numbers, then others: i, 1, A. - -=head2 Markup and Layout - - tex Auto Handles basic TeX conventions. - latex-loc-fmts Auto Provides LaTeX formatting commands - for page number encapsulation. - latex Auto Handles LaTeX conventions, both in raw - index entries and output markup; implies - tex. - makeindex Auto Emulates the default MakeIndex input syntax - and quoting behavior. - latin-lettergroups Auto Layout contains a single Latin letter - above each group of words starting with the - same letter. - german-sty Add-on Handles umlaut markup of babel's german - and ngerman options. - - - -=head1 ENVIRONMENT - -=over - -=item C - -This is the name of the xindy module that loads all auto-loaded -modules. The default is C. - -=back - - -=head1 AUTHOR - -Joachim Schrod - - -=head1 LEGALESE - -B is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - - -=for Emacs -#' - -=cut - - -use strict; - -BEGIN { - use vars qw($Revision $VERSION); - q$Revision: 1.8 $ =~ /: (\d+)\.(\d+)/ ; # q wg. Emacs indent! - my ($major, $minor) = ($1, $2); - $VERSION = "$major." . ($minor<10 ? '0' : '') . $minor; -} - - -# Some common variables. -# Determine environment. Where is our library directory, and our modules? - -use File::Basename; -our ($cmd_dir, $cmd); -BEGIN { - $cmd_dir = dirname($0); - $cmd = basename($0); -} - - -# Used modules. - -use Getopt::Long qw(:config bundling); - - -# Check arguments, store them in proper variables. - -sub usage ( ;$ ) -{ - my $exit_code = shift; - $exit_code += 0; # turn undef into 0 - print STDERR <<_EOT_ - -usage: $cmd [-V?h] [-qv] [-iglr] [-d magic] [-o outfile.ind] [-t log] \\ - [-L lang] [-C codepage] [-M module] [-I input] [idx0 idx1 ...] - -GNU-STYLE LONG OPTIONS FOR SHORT OPTIONS: - - -V / --version - -? / -h / --help - -q / --quiet - -v / --verbose - -i / --stdin - -g / --german - -l / --letter-ordering - -r / --no-ranges - -d / --debug (multiple times) - (supported: script, keep_tmpfiles, markup, level=n) - -o / --out-file - -t / --log-file - -L / --language - -C / --codepage - -M / --module (multiple times) - -I / --input-markup (supported: latex, omega) - -_EOT_ - ; - exit ($exit_code); -} - -our ($output_version, $quiet, $verbose, $stdin, @debug, - $outfile, $logfile, $language, $codepage, @modules, $input_markup); -$language = 'general'; -$codepage = 'latin'; -$input_markup = 'latex'; - -our $xindy; -if ( -f "$cmd_dir/xindy" && -x _ ) { - $xindy = "$cmd_dir/xindy"; -} elsif ( -f "$cmd_dir/xindy.pl" && -x _ ) { - $xindy = "$cmd_dir/xindy.pl"; -} else { - die "$cmd: cannot locate xindy\n"; -} - -parse_options(); -output_version() if $output_version; # will not return -usage(1) if ( ! $stdin && @ARGV == 0 ); # brain damaged, but like makeindex - - -# Construct xindy options, and eventually switch to it. - -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: $cmd_dir/xindy @opt @ARGV\n" if (grep /^script$/, @debug); - -exec $xindy, @opt, @ARGV; -die "$cmd: could not execute xindy: $!\n"; - - -# ------------------------------------------------------------ - - -sub parse_options() { - - my ($german, $letter_ordering, $no_ranges); - GetOptions( - 'version|V' => \$output_version, - 'help|h|?' => \&usage, - 'quiet|q' => \$quiet, - 'verbose|v' => \$verbose, - 'stdin|i' => \$stdin, - 'german|g' => \$german, - 'letter-ordering|l' => \$letter_ordering, - 'no-ranges|r' => \$no_ranges, - 'debug|d=s' => \@debug, - 'out-file|o=s' => \$outfile, - 'log-file|t=s' => \$logfile, - 'language|L=s' => \$language, - 'codepage|C=s' => \$codepage, - 'module|M=s' => \@modules, - 'input-markup|I=s' => \$input_markup, - ) - or usage(1); - - if ( $german ) { - unshift (@modules, 'german-sty'); - if ( $language eq 'general' ) { - $language = 'german-din'; - } elsif ( $language !~ /^german/ ) { - print STDERR "You cannot specify -g and -L at the same time.\n"; - #print STDERR "NOTE: -g is obsolete anyhow.\n"; - exit (1); - } - } - unshift (@modules, ($letter_ordering ? 'letter-order' : 'word-order')); - unshift (@modules, 'page-ranges') unless $no_ranges; - - # Check that the input markup is known. omega markup implies - # codepage utf8 for sorting, but no inputenc. We set the codepage - # to undef to prevent loading of the inputenc module. Setting it - # to utf8 for the sort encoding is done by the xindy script. - if ( $input_markup ne 'latex' && $input_markup ne 'omega' ) { - print STDERR "Unsupported input markup $input_markup.\n"; - usage(1); - } - if ( $input_markup eq 'omega' ) { - $codepage = undef; - } - -} - - -sub output_version () { - output_xindy_release(); - print "$cmd script version: $VERSION\n"; - my @xindy_cmd = ($xindy, '--internal-version'); - push (@xindy_cmd, qw(-d script --foobar)) if grep(/^script$/, @debug); - exec @xindy_cmd; -} - - -sub output_xindy_release () { - my $version = 'unknown'; - my $version_file; - if ( -f "$cmd_dir/../VERSION" ) { - $version_file = "$cmd_dir/../VERSION"; - } else { - # Where is the library directory? - my $lib_dir; - if ( $ENV{XINDY_LIBDIR} ) { - $lib_dir = $ENV{XINDY_LIBDIR}; - } elsif ( '@libdir@' ne '@libdir' . '@' ) { # GNU configure at work? - if ( -d '@libdir@/xindy' ) { # /usr style - $lib_dir = '@libdir@/xindy'; - } else { - $lib_dir = '@libdir@'; # /opt style - } - } elsif ( -f "$cmd_dir/../lib/xindy.run" ) { # /opt style - $lib_dir = "$cmd_dir/../lib"; - } elsif ( -d "$cmd_dir/../lib/xindy" ) { # /usr style - $lib_dir = "$cmd_dir/../lib/xindy"; - } else { - die "Cannot locate xindy library directory"; - } - if ( -f "$lib_dir/VERSION" ) { - $version_file = "$lib_dir/VERSION"; - } - } - - if ( $version_file ) { - if ( open(VERSION, "<$version_file") ) { - while ( $version = ) { - chomp ($version); - $version =~ s/\#.*// ; - $version =~ s/^\s+// ; - $version =~ s/\s+$// ; - last if $version; - } - close (VERSION); - } - } - print "xindy release: $version\n"; -} - - - -#====================================================================== -# -# $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) -# -# Revision 1.4 2006/07/19 00:29:56 jschrod -# Support for omega input markup. -# -# Revision 1.3 2004/11/01 22:48:51 jschrod -# Locate xindy script. -# Terminate on option error. -# Fix up version output. -# -# Revision 1.2 2004/05/26 21:30:11 jschrod -# Added POD documentation. -# -# Revision 1.1 2004/05/24 19:47:13 jschrod -# Introduce new driver script, as part of the "Companion Release". -# diff --git a/Build/source/utils/xindy-new/xindy/user-commands/texindy.in b/Build/source/utils/xindy-new/xindy/user-commands/texindy.in new file mode 100644 index 00000000000..4fd94a2c679 --- /dev/null +++ b/Build/source/utils/xindy-new/xindy/user-commands/texindy.in @@ -0,0 +1,534 @@ +#! /usr/bin/env perl +# $Id: texindy,v 1.8 2009/03/22 11:08:18 jschrod Exp $ +#------------------------------------------------------------ +# (history at end) + +=head1 NAME + +texindy - create sorted and tagged index from raw LaTeX index + +=head1 SYNOPSIS + + texindy [-V?h] [-qv] [-iglr] [-d magic] [-o outfile.ind] [-t log] \ + [-L lang] [-C codepage] [-M module] [idx0 idx1 ...] + +=head2 GNU-Style Long Options for Short Options: + + -V / --version + -? / -h / --help + -q / --quiet + -v / --verbose + -i / --stdin + -g / --german + -l / --letter-ordering + -r / --no-ranges + -d / --debug (multiple times) + -o / --out-file + -t / --log-file + -L / --language + -C / --codepage + -M / --module (multiple times) + -I / --input-markup (supported: latex, omega) + + +=head1 DESCRIPTION + +B is the LaTeX-specific 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 modules, with a convenient set already preloaded. + +Files with the raw index are passed as arguments. If no arguments are +passed, the raw index will be read from standard input. + +A good introductionary description of B appears in the +indexing chapter of the LaTeX Companion (2nd ed.) + +If you want to produce an index for LaTeX documents with special index +markup, the command xindy(1) is probably more of interest for you. + +B is an approach to merge support for the I +framework, own xindy modules (e.g., for special LaTeX commands in the +index), and a reasonable level of MakeIndex compatibility. There are +other older approaches, eventually they will get a description on the +xindy Web Site, http://www.xindy.org/. + + +=head1 OPTIONS + +=over + +=item C<--version> / B<-V> + +output version numbers of all relevant components and exit. + +=item C<--help> / B<-h> / B<-?> + +output usage message with options explanation. + +=item C<--quiet> / B<-q> + +Don't output progress messages. Output only error messages. + +=item C<--verbose> / B<-v> + +Output verbose progress messages. + +=item C<--debug> I / B<-d> I + +Output debug messages, this option may be specified multiple times. +I determines what is output: + + magic remark + ------------------------------------------------------------ + script internal progress messages of driver scripts + keep_tmpfiles don't discard temporary files + markup output markup trace, as explained in xindy manual + level=n log level, n is 0 (default), 1, 2, or 3 + +=item C<--out-file> F / B<-o> F + +Output index to file F. If this option is not passed, the +name of the output file is the base name of the first argument and the +file extension F. If the raw index is read from standard input, +this option is mandatory. + +=item C<--log-file> F / B<-t> F + +Output log messages to file F. These log messages are +independent from the progress messages that you can influence with +C<--debug> or C<--verbose>. + +=item C<--language> I / B<-L> I + +The index is sorted according to the rules of language I. These +rules are encoded in a xindy module created by I. + +If no input encoding is specified via C<--codepage>, a xindy module +for that language is searched with a latin, a cp, an iso, or ascii +encoding, in that order. + +=item C<--codepage> I / B <-C> I + +The raw input is in input encoding I. This information is used to +select the correct xindy sort module and also the I target +encoding for C input markup. + +When C input markup is used, C is always used as the sort +codepage and no inputenc module is loaded. Then this option is +ignored. + +=item C<--module> I / B<-M> I + +Load the xindy module F. This option may be specified +multiple times. The modules are searched in the xindy search path that +can be changed with the environment variable C. + +=item C<--input-markup> I / B<-I> I + +Specifies the input markup of the raw index. Supported values for +I are C and C. + +C input markup is the one that is emitted by default from the +LaTeX kernel, or by the C macro package of David Jones. +^^-notation of single byte characters is supported. Usage of LaTeX's +I package is assumed as well. + +C input markup is like C input markup, but with Omega's +^^-notation as encoding for non-ASCII characters. LaTeX I +encoding is not used then, and C is enforced to be the codepage +for sorting. + +=back + + +=head1 SUPPORTED LANGUAGES / CODEPAGES + +The following languages are supported: + +=head2 Latin scripts + + albanian gypsy portuguese + croatian hausa romanian + czech hungarian russian-iso + danish icelandic slovak-small + english italian slovak-large + esperanto kurdish-bedirxan slovenian + estonian kurdish-turkish spanish-modern + finnish latin spanish-traditional + french latvian swedish + general lithuanian turkish + german-din lower-sorbian upper-sorbian + german-duden norwegian vietnamese + greek-iso polish + +German recognizes two different sorting schemes to handle umlauts: +normally, C<ä> is sorted like C, but in phone books or +dictionaries, it is sorted like C. The first scheme is known as +I, the second as I. + +C<*-iso> language names assume that the raw index entries are in ISO +8859-9 encoding. + +C is a northern Russian dialect. + +=head2 Cyrillic scripts + + belarusian mongolian serbian + bulgarian russian ukrainian + macedonian + +=head2 Other scripts + + greek klingon + +=head2 Available Codepages + +This is not yet written. You can look them up in your xindy +distribution, in the F directory (where +I is your language). They are named +F, where F is most often empty +(for german, it's C and C; for spanish, it's C +and C, etc.) + + < Describe available codepages for each language > + + < Describe relevance of codepages (as internal representation) for + LaTeX inputenc > + + +=head1 TEXINDY STANDARD MODULES + +There is a set of B standard modules that help to process +LaTeX index files. Some of them are automatically loaded. Some of them +are loaded by default, this can be turned off with a B +option. Others may be specified as C<--module> argument to achieve a +specific effect. + + xindy Module Category Description + +=head2 Sorting + + word-order Default A space comes before any letter in the + alphabet: ``index style'' is listed before + ``indexing''. Turn it off with option -l. + letter-order Add-on Spaces are ignored: ``index style'' + is sorted after ``indexing''. + keep-blanks Add-on Leading and trailing white space (blanks + and tabs) are not ignored; intermediate + white space is not changed. + ignore-hyphen Add-on Hyphens are ignored: + ``ad-hoc'' is sorted as ``adhoc''. + ignore-punctuation Add-on All kinds of punctuation characters are + ignored: hyphens, periods, commas, slashes, + parentheses, and so on. + numeric-sort Auto Numbers are sorted numerically, not like + characters: ``V64'' appears before ``V128''. + +=head2 Page Numbers + + page-ranges Default Appearances on more than two consecutive + pages are listed as a range: ``1--4''. + Turn it off with option -r. + ff-ranges Add-on Uses implicit ``ff'' notation for ranges + of three pages, and explicit ranges + thereafter: 2f, 2ff, 2--6. + ff-ranges-only Add-on Uses only implicit ranges: 2f, 2ff. + book-order Add-on Sorts page numbers with common book numbering + scheme correctly -- Roman numerals first, then + Arabic numbers, then others: i, 1, A. + +=head2 Markup and Layout + + tex Auto Handles basic TeX conventions. + latex-loc-fmts Auto Provides LaTeX formatting commands + for page number encapsulation. + latex Auto Handles LaTeX conventions, both in raw + index entries and output markup; implies + tex. + makeindex Auto Emulates the default MakeIndex input syntax + and quoting behavior. + latin-lettergroups Auto Layout contains a single Latin letter + above each group of words starting with the + same letter. + german-sty Add-on Handles umlaut markup of babel's german + and ngerman options. + + + +=head1 ENVIRONMENT + +=over + +=item C + +This is the name of the xindy module that loads all auto-loaded +modules. The default is C. + +=back + + +=head1 AUTHOR + +Joachim Schrod + + +=head1 LEGALESE + +B is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + + +=for Emacs +#' + +=cut + + +use strict; + +BEGIN { + use vars qw($Revision $VERSION); + q$Revision: 1.8 $ =~ /: (\d+)\.(\d+)/ ; # q wg. Emacs indent! + my ($major, $minor) = ($1, $2); + $VERSION = "$major." . ($minor<10 ? '0' : '') . $minor; +} + + +# Some common variables. +# Determine environment. Where is our library directory, and our modules? + +use File::Basename; +our ($cmd_dir, $cmd); +BEGIN { + $cmd_dir = dirname($0); + $cmd = basename($0); +} + + +# Used modules. + +use Getopt::Long qw(:config bundling); + + +# Check arguments, store them in proper variables. + +sub usage ( ;$ ) +{ + my $exit_code = shift; + $exit_code += 0; # turn undef into 0 + print STDERR <<_EOT_ + +usage: $cmd [-V?h] [-qv] [-iglr] [-d magic] [-o outfile.ind] [-t log] \\ + [-L lang] [-C codepage] [-M module] [-I input] [idx0 idx1 ...] + +GNU-STYLE LONG OPTIONS FOR SHORT OPTIONS: + + -V / --version + -? / -h / --help + -q / --quiet + -v / --verbose + -i / --stdin + -g / --german + -l / --letter-ordering + -r / --no-ranges + -d / --debug (multiple times) + (supported: script, keep_tmpfiles, markup, level=n) + -o / --out-file + -t / --log-file + -L / --language + -C / --codepage + -M / --module (multiple times) + -I / --input-markup (supported: latex, omega) + +_EOT_ + ; + exit ($exit_code); +} + +our ($output_version, $quiet, $verbose, $stdin, @debug, + $outfile, $logfile, $language, $codepage, @modules, $input_markup); +$language = 'general'; +$codepage = 'latin'; +$input_markup = 'latex'; + +our $xindy; +if ( -f "$cmd_dir/xindy" && -x _ ) { + $xindy = "$cmd_dir/xindy"; +} elsif ( -f "$cmd_dir/xindy.pl" && -x _ ) { + $xindy = "$cmd_dir/xindy.pl"; +} else { + die "$cmd: cannot locate xindy\n"; +} + +parse_options(); +output_version() if $output_version; # will not return +usage(1) if ( ! $stdin && @ARGV == 0 ); # brain damaged, but like makeindex + + +# Construct xindy options, and eventually switch to it. + +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: $cmd_dir/xindy @opt @ARGV\n" if (grep /^script$/, @debug); + +exec $xindy, @opt, @ARGV; +die "$cmd: could not execute xindy: $!\n"; + + +# ------------------------------------------------------------ + + +sub parse_options() { + + my ($german, $letter_ordering, $no_ranges); + GetOptions( + 'version|V' => \$output_version, + 'help|h|?' => \&usage, + 'quiet|q' => \$quiet, + 'verbose|v' => \$verbose, + 'stdin|i' => \$stdin, + 'german|g' => \$german, + 'letter-ordering|l' => \$letter_ordering, + 'no-ranges|r' => \$no_ranges, + 'debug|d=s' => \@debug, + 'out-file|o=s' => \$outfile, + 'log-file|t=s' => \$logfile, + 'language|L=s' => \$language, + 'codepage|C=s' => \$codepage, + 'module|M=s' => \@modules, + 'input-markup|I=s' => \$input_markup, + ) + or usage(1); + + if ( $german ) { + unshift (@modules, 'german-sty'); + if ( $language eq 'general' ) { + $language = 'german-din'; + } elsif ( $language !~ /^german/ ) { + print STDERR "You cannot specify -g and -L at the same time.\n"; + #print STDERR "NOTE: -g is obsolete anyhow.\n"; + exit (1); + } + } + unshift (@modules, ($letter_ordering ? 'letter-order' : 'word-order')); + unshift (@modules, 'page-ranges') unless $no_ranges; + + # Check that the input markup is known. omega markup implies + # codepage utf8 for sorting, but no inputenc. We set the codepage + # to undef to prevent loading of the inputenc module. Setting it + # to utf8 for the sort encoding is done by the xindy script. + if ( $input_markup ne 'latex' && $input_markup ne 'omega' ) { + print STDERR "Unsupported input markup $input_markup.\n"; + usage(1); + } + if ( $input_markup eq 'omega' ) { + $codepage = undef; + } + +} + + +sub output_version () { + output_xindy_release(); + print "$cmd script version: $VERSION\n"; + my @xindy_cmd = ($xindy, '--internal-version'); + push (@xindy_cmd, qw(-d script --foobar)) if grep(/^script$/, @debug); + exec @xindy_cmd; +} + + +sub output_xindy_release () { + my $version = 'unknown'; + my $version_file; + if ( -f "$cmd_dir/../VERSION" ) { + $version_file = "$cmd_dir/../VERSION"; + } else { + # Where is the library directory? + my $lib_dir; + if ( $ENV{XINDY_LIBDIR} ) { + $lib_dir = $ENV{XINDY_LIBDIR}; + } elsif ( '@libdir@' ne '@libdir' . '@' ) { # GNU configure at work? + if ( -d '@libdir@/xindy' ) { # /usr style + $lib_dir = '@libdir@/xindy'; + } else { + $lib_dir = '@libdir@'; # /opt style + } + } elsif ( -f "$cmd_dir/../lib/xindy.run" ) { # /opt style + $lib_dir = "$cmd_dir/../lib"; + } elsif ( -d "$cmd_dir/../lib/xindy" ) { # /usr style + $lib_dir = "$cmd_dir/../lib/xindy"; + } else { + die "Cannot locate xindy library directory"; + } + if ( -f "$lib_dir/VERSION" ) { + $version_file = "$lib_dir/VERSION"; + } + } + + if ( $version_file ) { + if ( open(VERSION, "<$version_file") ) { + while ( $version = ) { + chomp ($version); + $version =~ s/\#.*// ; + $version =~ s/^\s+// ; + $version =~ s/\s+$// ; + last if $version; + } + close (VERSION); + } + } + print "xindy release: $version\n"; +} + + + +#====================================================================== +# +# $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) +# +# Revision 1.4 2006/07/19 00:29:56 jschrod +# Support for omega input markup. +# +# Revision 1.3 2004/11/01 22:48:51 jschrod +# Locate xindy script. +# Terminate on option error. +# Fix up version output. +# +# Revision 1.2 2004/05/26 21:30:11 jschrod +# Added POD documentation. +# +# Revision 1.1 2004/05/24 19:47:13 jschrod +# Introduce new driver script, as part of the "Companion Release". +# diff --git a/Build/source/utils/xindy-new/xindy/user-commands/xindy.in b/Build/source/utils/xindy-new/xindy/user-commands/xindy.in index f6c34b56f41..1d5f31f7f53 100644 --- a/Build/source/utils/xindy-new/xindy/user-commands/xindy.in +++ b/Build/source/utils/xindy-new/xindy/user-commands/xindy.in @@ -287,13 +287,19 @@ BEGIN { use File::Basename; use Cwd; -our ($isW32, $r0, $xindy_run); +our ($isW32, $r0, $clisp); our ($cmd_dir, $cmd, $lib_dir, $modules_dir); BEGIN { $isW32 = ($^O =~ /^MSWin/i) ? 1 : 0; $r0 = Cwd::realpath($0); $cmd = basename($r0); + if ($isW32 || $^O eq "cygwin") { + $clisp = "clisp.exe"; + } else { + $clisp = "clisp"; + } + # FIXME: make two subroutines for TL2010 and !TL2010 part if ($cmd eq "xindy.pl") { # TL2010 @@ -325,15 +331,13 @@ BEGIN { $lib_dir = $cmd_dir; + my $xindy_run; if ($isW32 || $^O eq "cygwin") { $xindy_run = "$lib_dir/xindy-lisp.exe"; } else { $xindy_run = "$lib_dir/xindy.run"; } - # FIXME: what I really want to do is 'undefine' or 'delete' - $xindy_run = "" unless -e $xindy_run; - - # FIXME: modify call_xindy() to use "$xindy_run" if it exists + $clisp = $xindy_run if -e $xindy_run; } else { # !TL2010 @@ -377,11 +381,6 @@ use POSIX qw(uname); # Check arguments, store them in proper variables. -# -# Do also something for backward compatibility: Check if this is an -# old-style call. If it is, we have two arguments at the end, and the -# second-to-last has the extension ".xdy". Then, call the old driver -# script with the original arguments... sub usage ( ;$ ) { @@ -433,18 +432,6 @@ die "$cmd: Cannot locate $mem_file" unless -e $mem_file; my @orig_argv = @ARGV; parse_options(); -if ( @ARGV == 2 && $ARGV[0] =~ /\.xdy$/ ) { - print STDERR <