From ca9c16763dbe0a51c42572ae08fec76a9f4caba2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 12 Nov 2017 23:30:50 +0000 Subject: must use \{ in regexp to placate current perl git-svn-id: svn://tug.org/texlive/trunk@45768 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/xindy/ChangeLog | 13 +++++++++---- Build/source/utils/xindy/TLpatches/ChangeLog | 4 ++++ Build/source/utils/xindy/TLpatches/patch-02-lbrace | 11 +++++++++++ .../xindy/xindy-src/make-rules/inputenc/make-inp-rules.pl | 2 +- 4 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 Build/source/utils/xindy/TLpatches/patch-02-lbrace diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog index ed0a831b941..5c2e7743844 100644 --- a/Build/source/utils/xindy/ChangeLog +++ b/Build/source/utils/xindy/ChangeLog @@ -1,3 +1,9 @@ +2017-11-13 Karl Berry + + * xindy-src/make-rules/inputenc/make-inp-rules.pl: must use \{ + to placate current Perl. + Report from Josua Stingelin on tex-k, 12 Nov 2017 11:21:27. + 2017-03-27 Akira Kakuto * xindy-src/user-commands/xindy.in: If a module name cantains directory @@ -6,9 +12,9 @@ 2016-06-08 Akira Kakuto - * xindy-src/user-commands/xindy.in: Use kpsewhich to search for modules. - Performance is lost. However user modules specified by the -M option - can be under /xindy/modules/. + * xindy-src/user-commands/xindy.in: Use kpsewhich to search for + modules. Performance is lost. However user modules specified by + the -M option can be under /xindy/modules/. 2016-02-22 Akira Kakuto @@ -174,7 +180,6 @@ * configure.ac (AC_CONFIG_AUX_DIR): Use auxiliary files from ../../build-aux in TeX Live tree. - 2009-05-07 Peter Breitenlohner Adapt to TL2009 build system. diff --git a/Build/source/utils/xindy/TLpatches/ChangeLog b/Build/source/utils/xindy/TLpatches/ChangeLog index 996a8430c27..5757aed845f 100644 --- a/Build/source/utils/xindy/TLpatches/ChangeLog +++ b/Build/source/utils/xindy/TLpatches/ChangeLog @@ -1,3 +1,7 @@ +2017-11-13 Karl Berry + + * patch-02-lbrace: new file. + 2016-07-07 Akira Kakuto * patch-01-xindy-needs-language, patch-02-win32-paths-with-spaces: diff --git a/Build/source/utils/xindy/TLpatches/patch-02-lbrace b/Build/source/utils/xindy/TLpatches/patch-02-lbrace new file mode 100644 index 00000000000..d638bcd6904 --- /dev/null +++ b/Build/source/utils/xindy/TLpatches/patch-02-lbrace @@ -0,0 +1,11 @@ +--- make-inp-rules.pl (revision 45762) ++++ make-inp-rules.pl (working copy) +@@ -8,7 +8,7 @@ + + + while () { +- if (/\\indexentry{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) { ++ if (/\\indexentry\{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) { + if (!($1 =~ /inputenc Error|\@inpenc\@undefined/)) { + $i = hex($2); + $macro = $1; diff --git a/Build/source/utils/xindy/xindy-src/make-rules/inputenc/make-inp-rules.pl b/Build/source/utils/xindy/xindy-src/make-rules/inputenc/make-inp-rules.pl index 9a4d5a86b47..437684a1711 100755 --- a/Build/source/utils/xindy/xindy-src/make-rules/inputenc/make-inp-rules.pl +++ b/Build/source/utils/xindy/xindy-src/make-rules/inputenc/make-inp-rules.pl @@ -8,7 +8,7 @@ EOF while () { - if (/\\indexentry{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) { + if (/\\indexentry\{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) { if (!($1 =~ /inputenc Error|\@inpenc\@undefined/)) { $i = hex($2); $macro = $1; -- cgit v1.2.3