From 56c3fd006c01ef00ef9d6befa48b1377528f894b Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sun, 11 May 2014 14:28:56 +0000 Subject: Update xindy: Add support for "-I xelatex" (from Joachim Schrod) git-svn-id: svn://tug.org/texlive/trunk@33975 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/man/man1/texindy.1 | 80 +++++++++++++--------- Master/texmf-dist/doc/man/man1/texindy.man1.pdf | Bin 17647 -> 18894 bytes Master/texmf-dist/doc/man/man1/xindy.1 | 39 ++++++----- Master/texmf-dist/doc/man/man1/xindy.man1.pdf | Bin 17009 -> 17311 bytes Master/texmf-dist/doc/xindy/texindy.pdf | Bin 17113 -> 17556 bytes Master/texmf-dist/doc/xindy/xindy.pdf | Bin 15706 -> 15917 bytes Master/texmf-dist/scripts/xindy/texindy.pl | 87 +++++++++++++++--------- Master/texmf-dist/scripts/xindy/xindy.pl | 47 +++++++------ 8 files changed, 152 insertions(+), 101 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/man/man1/texindy.1 b/Master/texmf-dist/doc/man/man1/texindy.1 index b873d713b74..bbd5dcfb096 100644 --- a/Master/texmf-dist/doc/man/man1/texindy.1 +++ b/Master/texmf-dist/doc/man/man1/texindy.1 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "texindy 1" -.TH texindy 1 "2014-04-19" "Release 2.5" "texindy" +.TH texindy 1 "2014-05-11" "Release 2.5.0" "xindy" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -154,7 +154,7 @@ texindy \- create sorted and tagged index from raw LaTeX index \& \-L / \-\-language \& \-C / \-\-codepage \& \-M / \-\-module (multiple times) -\& \-I / \-\-input\-markup (supported: latex, omega) +\& \-I / \-\-input\-markup (supported: latex, xelatex, omega) .Ve .SH "DESCRIPTION" .IX Header "DESCRIPTION" @@ -166,9 +166,6 @@ 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. .PP -\&\fBDo not use texindy with XeLaTeX or LuaLaTeX!\fR When you use these -LaTeX engines, you must use \fBxindy \-C utf8 \-M texindy \-M page-ranges\fR instead. -.PP A good introductionary description of \fBtexindy\fR appears in the indexing chapter of the LaTeX Companion (2nd ed.) .PP @@ -229,28 +226,42 @@ independent from the progress messages that you can influence with The index is sorted according to the rules of language \fIlang\fR. These rules are encoded in a xindy module created by \fImake-rules\fR. .Sp -If no input encoding is specified via \f(CW\*(C`\-\-codepage\*(C'\fR, a xindy module -for that language is searched with a latin, a cp, an iso, or ascii -encoding, in that order. -.ie n .IP """\-\-codepage"" \fIenc\fR / B <\-C> \fIenc\fR" 4 -.el .IP "\f(CW\-\-codepage\fR \fIenc\fR / B <\-C> \fIenc\fR" 4 -.IX Item "--codepage enc / B <-C> enc" -\&\fBtexindy\fR's raw input is always assumed to be encoded in LaTeX -Internal Character Representation (\s-1LICR\s0). I.e., non-ASCII characters -are encoded as command sequences. This option tells xindy the encoding -it shall use internally for sorting. +If no input encoding is specified via \f(CW\*(C`\-\-codepage\*(C'\fR or enforced by +input markup, a xindy module for that language is searched with a +latin, a cp, an iso, ascii, or utf8 encoding, in that order. +.ie n .IP """\-\-codepage"" \fIenc\fR / \fB\-C\fR \fIenc\fR" 4 +.el .IP "\f(CW\-\-codepage\fR \fIenc\fR / \fB\-C\fR \fIenc\fR" 4 +.IX Item "--codepage enc / -C enc" +There are two different situations and use cases for this option. +.RS 4 +.IP "1." 4 +Input markup is \f(CW\*(C`latex\*(C'\fR (the default). +.Sp +Then \fBtexindy\fR's raw input is assumed to be encoded in LaTeX Internal +Character Representation (\s-1LICR\s0). I.e., non-ASCII characters are +encoded as command sequences. This option tells xindy the encoding it +shall use for letter group headings. (Additionally it specifies the +encoding used internally for sorting \*(-- but that doesn't matter for +the result.) +.Sp +Only \s-1LICR\s0 encodings for Latin script alphabets are supported; more +precisely characters that are in LaTeX latin1, latin2, and latin3 \s-1LICR\s0 +encodings. .Sp -Effectively, you need this option to specify the encoding of letter -group headings. +Even when you specify \f(CW\*(C`utf8\*(C'\fR as codepage, only these characters will +be known. But if you use non-Latin alphabets, you probably use (or +should use) XeLaTeX or LuaLaTeX and then you have a different input +markup. +.IP "2." 4 +Input markup is \f(CW\*(C`xelatex\*(C'\fR or \f(CW\*(C`omega\*(C'\fR. .Sp -Encoding \f(CW\*(C`utf8\*(C'\fR is only supported for Latin alphabets. But if you use -non-Latin alphabets, you probably use XeLaTeX or LuaLaTeX and then you -must not use \fBtexindy\fR anyhow. Then direct usage of \fBxindy\fR is -appropriate. +Then this option is ignored; codepage \f(CW\*(C`utf8\*(C'\fR is enforced. .Sp -When \f(CW\*(C`omega\*(C'\fR input markup is used, \f(CW\*(C`utf8\*(C'\fR is always used as the sort -codepage and no inputenc module is loaded. Then this option is -ignored. +\&\fBtexindy\fR's raw input is assumed to be \s-1UTF\-8\s0 encoded, \s-1LICR\s0 is not +used. +.RE +.RS 4 +.RE .ie n .IP """\-\-module"" \fImodule\fR / \fB\-M\fR \fImodule\fR" 4 .el .IP "\f(CW\-\-module\fR \fImodule\fR / \fB\-M\fR \fImodule\fR" 4 .IX Item "--module module / -M module" @@ -261,17 +272,22 @@ can be changed with the environment variable \f(CW\*(C`XINDY_SEARCHPATH\*(C'\fR. .el .IP "\f(CW\-\-input\-markup\fR \fIinput\fR / \fB\-I\fR \fIinput\fR" 4 .IX Item "--input-markup input / -I input" Specifies the input markup of the raw index. Supported values for -\&\fIinput\fR are \f(CW\*(C`latex\*(C'\fR and \f(CW\*(C`omega\*(C'\fR. +\&\fIinput\fR are \f(CW\*(C`latex\*(C'\fR, \f(CW\*(C`xelatex\*(C'\fR, and \f(CW\*(C`omega\*(C'\fR. .Sp \&\f(CW\*(C`latex\*(C'\fR input markup is the one that is emitted by default from the -LaTeX kernel, or by the \f(CW\*(C`index\*(C'\fR macro package of David Jones. -^^\-notation of single byte characters is supported. Usage of LaTeX's -\&\fIinputenc\fR package is assumed as well. +LaTeX kernel, or by the \f(CW\*(C`index\*(C'\fR macro package of David Jones, when +used with standard LaTeX or pdfLaTeX. ^^\-notation of single byte +characters is supported. Usage of LaTeX's \fIinputenc\fR package is +assumed as well, i.e., raw input is encoded in \s-1LICR\s0. +.Sp +\&\f(CW\*(C`xelatex\*(C'\fR input markup is like \f(CW\*(C`latex\*(C'\fR, but without \fIinputenc\fR +usage. Raw input is encoded in \s-1UTF\-8\s0. LuaLaTeX has the same input +markup, there's no special option value for it. .Sp \&\f(CW\*(C`omega\*(C'\fR input markup is like \f(CW\*(C`latex\*(C'\fR input markup, but with Omega's -^^\-notation as encoding for non-ASCII characters. LaTeX \fIinputenc\fR -encoding is not used then, and \f(CW\*(C`utf8\*(C'\fR is enforced to be the codepage -for sorting. +^^\-notation as encoding for non-ASCII characters. \s-1LICR\s0 encoding is not +used then, and \f(CW\*(C`utf8\*(C'\fR is enforced to be the codepage for sorting and +for output of letter group headings. .SH "SUPPORTED LANGUAGES / CODEPAGES" .IX Header "SUPPORTED LANGUAGES / CODEPAGES" The following languages are supported: @@ -451,6 +467,8 @@ modules. The default is \f(CW\*(C`texindy\*(C'\fR. Joachim Schrod .SH "LEGALESE" .IX Header "LEGALESE" +Copyright (c) 2004\-2014 by Joachim Schrod. +.PP \&\fBtexindy\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 Free Software Foundation; either version 2 of the License, or (at your diff --git a/Master/texmf-dist/doc/man/man1/texindy.man1.pdf b/Master/texmf-dist/doc/man/man1/texindy.man1.pdf index e356a63f598..1a899384fe5 100644 Binary files a/Master/texmf-dist/doc/man/man1/texindy.man1.pdf and b/Master/texmf-dist/doc/man/man1/texindy.man1.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/xindy.1 b/Master/texmf-dist/doc/man/man1/xindy.1 index 45b8e60529e..5ce70eaac1f 100644 --- a/Master/texmf-dist/doc/man/man1/xindy.1 +++ b/Master/texmf-dist/doc/man/man1/xindy.1 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "xindy 1" -.TH xindy 1 "2014-04-19" "Release 2.5" "xindy" +.TH xindy 1 "2014-05-11" "Release 2.5.0" "xindy" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -152,7 +152,7 @@ xindy \- create sorted and tagged index from raw index \& \-L / \-\-language \& \-C / \-\-codepage \& \-M / \-\-module (multiple times) -\& \-I / \-\-input\-markup (supported: latex, omega, xindy) +\& \-I / \-\-input\-markup (supported: latex, xelatex, omega, xindy) .Ve .SH "DESCRIPTION" .IX Header "DESCRIPTION" @@ -222,9 +222,9 @@ independent from the progress messages that you can influence with The index is sorted according to the rules of language \fIlang\fR. These rules are encoded in a xindy module created by \fImake-rules\fR. .Sp -If no input encoding is specified via \f(CW\*(C`\-\-codepage\*(C'\fR, a xindy module -for that language is searched with a latin, a cp, an iso, ascii, or utf8 -encoding, in that order. +If no input encoding is specified via \f(CW\*(C`\-\-codepage\*(C'\fR or enforced by +input markup, a xindy module for that language is searched with a +latin, a cp, an iso, ascii, or utf8 encoding, in that order. .Sp Language modules are either placed in the \fIlang\fR or in the \&\fIcontrib/lang\fR sub-directory of the modules base directory. @@ -232,11 +232,15 @@ Language modules are either placed in the \fIlang\fR or in the .el .IP "\f(CW\-\-codepage\fR \fIenc\fR / \fB\-C\fR \fIenc\fR" 4 .IX Item "--codepage enc / -C enc" The raw input is in input encoding \fIenc\fR. This information is used to -select the correct xindy sort module and also the \fIinputenc\fR target -encoding for \f(CW\*(C`latex\*(C'\fR input markup. +select the correct xindy sort module and output encoding of letter +group headings. .Sp -When \f(CW\*(C`omega\*(C'\fR input markup is used, \f(CW\*(C`utf8\*(C'\fR is always used as -codepage, this option is then ignored. +When \f(CW\*(C`xelatex\*(C'\fR or \f(CW\*(C`omega\*(C'\fR input markup is used, \f(CW\*(C`utf8\*(C'\fR is always +used as codepage, then this option is ignored. +.Sp +If raw input is in \s-1LICR\s0, \fItexindy\fR\|(1) should be used instead of +\&\fIxindy\fR\|(1). It will activate a mapping of \fIinputenc\fR encoding for +\&\f(CW\*(C`latex\*(C'\fR input markup to the chosen raw input codepage. .ie n .IP """\-\-module"" \fImodule\fR / \fB\-M\fR \fImodule\fR" 4 .el .IP "\f(CW\-\-module\fR \fImodule\fR / \fB\-M\fR \fImodule\fR" 4 .IX Item "--module module / -M module" @@ -247,16 +251,17 @@ can be changed with the environment variable \f(CW\*(C`XINDY_SEARCHPATH\*(C'\fR. .el .IP "\f(CW\-\-input\-markup\fR \fIinput\fR / \fB\-I\fR \fIinput\fR" 4 .IX Item "--input-markup input / -I input" Specifies the input markup of the raw index. Supported values for -\&\fIinput\fR are \f(CW\*(C`latex\*(C'\fR, \f(CW\*(C`omega\*(C'\fR, and \f(CW\*(C`xindy\*(C'\fR. +\&\fIinput\fR are \f(CW\*(C`latex\*(C'\fR, \f(CW\*(C`xelatex\*(C'\fR, \f(CW\*(C`omega\*(C'\fR, and \f(CW\*(C`xindy\*(C'\fR. .Sp -\&\f(CW\*(C`latex\*(C'\fR input markup is the one that is emitted by default from the -LaTeX kernel, or by the \f(CW\*(C`index\*(C'\fR macro package of David Jones. -^^\-notation of single byte characters is supported. Usage of LaTeX's -\&\fIinputenc\fR package is assumed as well. +\&\f(CW\*(C`latex\*(C'\fR and \f(CW\*(C`xelatex\*(C'\fR input markup is the one that is emitted by +default from the LaTeX kernel, or by the \f(CW\*(C`index\*(C'\fR macro package of +David Jones. ^^\-notation of single byte characters is supported. +Remapping of LICR-encoded characters is not done; use \fItexindy\fR\|(1) for +that. Use input markup \f(CW\*(C`latex\*(C'\fR if you use standard LaTeX or pdfLaTeX +and use input markup \f(CW\*(C`xelatex\*(C'\fR if you use XeLaTeX or LuaLaTeX. .Sp \&\f(CW\*(C`omega\*(C'\fR input markup is like \f(CW\*(C`latex\*(C'\fR input markup, but with Omega's -^^\-notation as encoding for non-ASCII characters. LaTeX \fIinputenc\fR -encoding is not used then, and \f(CW\*(C`utf8\*(C'\fR is enforced to be the codepage. +^^\-notation as encoding for non-ASCII characters. .Sp \&\f(CW\*(C`xindy\*(C'\fR input markup is specified in the xindy manual. .ie n .IP """\-\-interactive""" 4 @@ -418,7 +423,7 @@ used as internal codepage for LaTeX inputenc re-encoding. Joachim Schrod .SH "LEGALESE" .IX Header "LEGALESE" -Copyright (c) 2004\-2010 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 --git a/Master/texmf-dist/doc/man/man1/xindy.man1.pdf b/Master/texmf-dist/doc/man/man1/xindy.man1.pdf index 923249f282d..044fa497d76 100644 Binary files a/Master/texmf-dist/doc/man/man1/xindy.man1.pdf and b/Master/texmf-dist/doc/man/man1/xindy.man1.pdf differ diff --git a/Master/texmf-dist/doc/xindy/texindy.pdf b/Master/texmf-dist/doc/xindy/texindy.pdf index 333d5192128..b1966300d81 100644 Binary files a/Master/texmf-dist/doc/xindy/texindy.pdf and b/Master/texmf-dist/doc/xindy/texindy.pdf differ diff --git a/Master/texmf-dist/doc/xindy/xindy.pdf b/Master/texmf-dist/doc/xindy/xindy.pdf index 9c119aecc30..dbf00ad76e4 100644 Binary files a/Master/texmf-dist/doc/xindy/xindy.pdf and b/Master/texmf-dist/doc/xindy/xindy.pdf differ diff --git a/Master/texmf-dist/scripts/xindy/texindy.pl b/Master/texmf-dist/scripts/xindy/texindy.pl index 7a62a9f241a..5cfba08d699 100755 --- a/Master/texmf-dist/scripts/xindy/texindy.pl +++ b/Master/texmf-dist/scripts/xindy/texindy.pl @@ -28,7 +28,7 @@ texindy - create sorted and tagged index from raw LaTeX index -L / --language -C / --codepage -M / --module (multiple times) - -I / --input-markup (supported: latex, omega) + -I / --input-markup (supported: latex, xelatex, omega) =head1 DESCRIPTION @@ -41,9 +41,6 @@ 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. -B When you use these -LaTeX engines, you must use B instead. - A good introductionary description of B appears in the indexing chapter of the LaTeX Companion (2nd ed.) @@ -105,28 +102,46 @@ C<--debug> or C<--verbose>. 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. +If no input encoding is specified via C<--codepage> or enforced by +input markup, a xindy module for that language is searched with a +latin, a cp, an iso, ascii, or utf8 encoding, in that order. + +=item C<--codepage> I / B<-C> I + +There are two different situations and use cases for this option. -=item C<--codepage> I / B <-C> I +=over + +=item 1. -B's raw input is always assumed to be encoded in LaTeX -Internal Character Representation (LICR). I.e., non-ASCII characters -are encoded as command sequences. This option tells xindy the encoding -it shall use internally for sorting. +Input markup is C (the default). -Effectively, you need this option to specify the encoding of letter -group headings. +Then B's raw input is assumed to be encoded in LaTeX Internal +Character Representation (LICR). I.e., non-ASCII characters are +encoded as command sequences. This option tells xindy the encoding it +shall use for letter group headings. (Additionally it specifies the +encoding used internally for sorting -- but that doesn't matter for +the result.) -Encoding C is only supported for Latin alphabets. But if you use -non-Latin alphabets, you probably use XeLaTeX or LuaLaTeX and then you -must not use B anyhow. Then direct usage of B is -appropriate. +Only LICR encodings for Latin script alphabets are supported; more +precisely characters that are in LaTeX latin1, latin2, and latin3 LICR +encodings. + +Even when you specify C as codepage, only these characters will +be known. But if you use non-Latin alphabets, you probably use (or +should use) XeLaTeX or LuaLaTeX and then you have a different 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 2. + +Input markup is C or C. + +Then this option is ignored; codepage C is enforced. + +B's raw input is assumed to be UTF-8 encoded, LICR is not +used. + +=back =item C<--module> I / B<-M> I @@ -137,17 +152,22 @@ 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. +I are C, 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. +LaTeX kernel, or by the C macro package of David Jones, when +used with standard LaTeX or pdfLaTeX. ^^-notation of single byte +characters is supported. Usage of LaTeX's I package is +assumed as well, i.e., raw input is encoded in LICR. + +C input markup is like C, but without I +usage. Raw input is encoded in UTF-8. LuaLaTeX has the same input +markup, there's no special option value for it. 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. +^^-notation as encoding for non-ASCII characters. LICR encoding is not +used then, and C is enforced to be the codepage for sorting and +for output of letter group headings. =back @@ -346,6 +366,8 @@ Joachim Schrod =head1 LEGALESE +Copyright (c) 2004-2014 by Joachim Schrod. + 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 @@ -553,15 +575,16 @@ sub parse_options() { 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 + # Check that the input markup is known. xelatex and 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' ) { + # to utf8 for sort encoding is done by the xindy script. + if ( $input_markup ne 'latex' && $input_markup ne 'xelatex' && + $input_markup ne 'omega' ) { print STDERR "Unsupported input markup $input_markup.\n"; usage(1); } - if ( $input_markup eq 'omega' ) { + if ( $input_markup eq 'xelatex' || $input_markup eq 'omega' ) { $codepage = undef; } diff --git a/Master/texmf-dist/scripts/xindy/xindy.pl b/Master/texmf-dist/scripts/xindy/xindy.pl index 80eaafe6d59..f2810fc8396 100755 --- a/Master/texmf-dist/scripts/xindy/xindy.pl +++ b/Master/texmf-dist/scripts/xindy/xindy.pl @@ -26,7 +26,7 @@ xindy - create sorted and tagged index from raw index -L / --language -C / --codepage -M / --module (multiple times) - -I / --input-markup (supported: latex, omega, xindy) + -I / --input-markup (supported: latex, xelatex, omega, xindy) =head1 DESCRIPTION @@ -98,9 +98,9 @@ C<--debug> or C<--verbose>. 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, ascii, or utf8 -encoding, in that order. +If no input encoding is specified via C<--codepage> or enforced by +input markup, a xindy module for that language is searched with a +latin, a cp, an iso, ascii, or utf8 encoding, in that order. Language modules are either placed in the F or in the F sub-directory of the modules base directory. @@ -108,11 +108,15 @@ F sub-directory of the modules base directory. =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. +select the correct xindy sort module and output encoding of letter +group headings. -When C input markup is used, C is always used as -codepage, this option is then ignored. +When C or C input markup is used, C is always +used as codepage, then this option is ignored. + +If raw input is in LICR, texindy(1) should be used instead of +xindy(1). It will activate a mapping of I encoding for +C input markup to the chosen raw input codepage. =item C<--module> I / B<-M> I @@ -123,16 +127,17 @@ 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, C, and C. +I are C, C, 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 and 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. +Remapping of LICR-encoded characters is not done; use texindy(1) for +that. Use input markup C if you use standard LaTeX or pdfLaTeX +and use input markup C if you use XeLaTeX or LuaLaTeX. 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. +^^-notation as encoding for non-ASCII characters. C input markup is specified in the xindy manual. @@ -320,7 +325,7 @@ Joachim Schrod =head1 LEGALESE -Copyright (c) 2004-2010 by Joachim Schrod. +Copyright (c) 2004-2014 by Joachim Schrod. 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 @@ -484,7 +489,7 @@ GNU-STYLE LONG OPTIONS FOR SHORT OPTIONS: -L / --language -C / --codepage -M / --module (multiple times) - -I / --input-markup (supported: latex, omega, xindy) + -I / --input-markup (supported: latex, xelatex, omega, xindy) _EOT_ ; @@ -538,7 +543,7 @@ unless ( $interactive ) { } $raw_index = create_raw_index(); # processes @ARGV my $filter_cmd = ''; - if ( $input_markup eq 'latex' ) { + if ( $input_markup =~ /latex$/ ) { $filter_cmd = "$cmd_dir/tex2xindy"; } elsif ( $input_markup eq 'omega' ) { $filter_cmd = "$cmd_dir/tex2xindy -o"; @@ -633,12 +638,12 @@ sub parse_options() { # Check that the input markup is known. # omega markup implies codepage utf8. if ( $input_markup && - $input_markup ne 'latex' && $input_markup ne 'omega' && - $input_markup ne 'xindy' ) { + $input_markup ne 'latex' && $input_markup ne 'xelatex' && + $input_markup ne 'omega' && $input_markup ne 'xindy' ) { print STDERR "Unsupported input markup $input_markup.\n"; usage(1); } - if ( $input_markup eq 'omega' ) { + if ( $input_markup eq 'xelatex' || $input_markup eq 'omega' ) { @codepages = qw(utf8); } -- cgit v1.2.3