summaryrefslogtreecommitdiff
path: root/Build/source/utils/xindy
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-05-12 08:15:43 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-05-12 08:15:43 +0000
commitbcfdb7667e1f71f3f92461b0bba5034494d213ad (patch)
tree0fb2524ab07671609ce8db658158248813af5e2f /Build/source/utils/xindy
parent77ca38900e11c79017d5e43970d90bae14aa2248 (diff)
utils/xindy: Allow to use also the new LaTeX2e (from Heiko Oberdiek)
git-svn-id: svn://tug.org/texlive/trunk@33993 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/xindy')
-rw-r--r--Build/source/utils/xindy/xindy-2.5.0-PATCHES/ChangeLog6
-rw-r--r--Build/source/utils/xindy/xindy-2.5.0-PATCHES/patch-03-new_LaTeX2e12
-rwxr-xr-xBuild/source/utils/xindy/xindy-2.5.0/make-rules/inputenc/make-inp-rules.pl2
3 files changed, 19 insertions, 1 deletions
diff --git a/Build/source/utils/xindy/xindy-2.5.0-PATCHES/ChangeLog b/Build/source/utils/xindy/xindy-2.5.0-PATCHES/ChangeLog
index 7921d87066b..6ce584bef79 100644
--- a/Build/source/utils/xindy/xindy-2.5.0-PATCHES/ChangeLog
+++ b/Build/source/utils/xindy/xindy-2.5.0-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-03-new_LaTeX2e (new): Allow to build utf8.xdy by using
+ also the new LaTeX2e.
+ From Heiko Oberdiek <heiko.oberdiek@googlemail.com>.
+
2014-05-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-02-xelatex (new): Add support for "-I xelatex".
diff --git a/Build/source/utils/xindy/xindy-2.5.0-PATCHES/patch-03-new_LaTeX2e b/Build/source/utils/xindy/xindy-2.5.0-PATCHES/patch-03-new_LaTeX2e
new file mode 100644
index 00000000000..b0ab32065ea
--- /dev/null
+++ b/Build/source/utils/xindy/xindy-2.5.0-PATCHES/patch-03-new_LaTeX2e
@@ -0,0 +1,12 @@
+diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.0.orig/make-rules/inputenc/make-inp-rules.pl xindy-2.5.0/make-rules/inputenc/make-inp-rules.pl
+--- xindy-2.5.0.orig/make-rules/inputenc/make-inp-rules.pl 2002-03-29 19:34:49.000000000 +0100
++++ xindy-2.5.0/make-rules/inputenc/make-inp-rules.pl 2014-05-12 10:05:16.000000000 +0200
+@@ -9,7 +9,7 @@
+
+ while (<STDIN>) {
+ if (/\\indexentry{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
+- if (!($1 =~ /inputenc Error/)) {
++ if (!($1 =~ /inputenc Error|\@inpenc\@undefined/)) {
+ $i = hex($2);
+ $macro = $1;
+ $macro =~ s/\~/~~/g;
diff --git a/Build/source/utils/xindy/xindy-2.5.0/make-rules/inputenc/make-inp-rules.pl b/Build/source/utils/xindy/xindy-2.5.0/make-rules/inputenc/make-inp-rules.pl
index af418797b38..9a4d5a86b47 100755
--- a/Build/source/utils/xindy/xindy-2.5.0/make-rules/inputenc/make-inp-rules.pl
+++ b/Build/source/utils/xindy/xindy-2.5.0/make-rules/inputenc/make-inp-rules.pl
@@ -9,7 +9,7 @@ EOF
while (<STDIN>) {
if (/\\indexentry{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
- if (!($1 =~ /inputenc Error/)) {
+ if (!($1 =~ /inputenc Error|\@inpenc\@undefined/)) {
$i = hex($2);
$macro = $1;
$macro =~ s/\~/~~/g;