From 282b205252b84c03241bf105856617f4fff26303 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 31 Oct 2019 22:21:29 +0000 Subject: xindex (31oct19) git-svn-id: svn://tug.org/texlive/trunk@52587 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua | 2 +- Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua | 4 ++-- Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua | 2 +- Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua | 2 +- Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua | 13 ++++++------- Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua | 2 +- Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua | 2 +- Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua | 10 +++++++++- Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua | 2 +- Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua | 2 +- 10 files changed, 24 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/lualatex') diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua index 48231b1d834..ec5826316b9 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.18, + version = 0.19, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua index 7b2dba332cf..0b588ff74eb 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua @@ -9,7 +9,7 @@ -- configuration for index files of the Heidelberger Akademie der Wissenschaften if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = { - version = 0.18, + version = 0.19, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -62,7 +62,7 @@ alphabet_lower = { -- for sorting { 'p' }, { 'q' }, { 'r' }, - { 's', 'ß' }, + { 's' }, { 't' }, { 'u', 'ú', 'ù', 'ü' }, { 'v' }, diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua index f4155054605..a110a41b00e 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua @@ -6,7 +6,7 @@ -- LICENSE: LPPL1.3 ----------------------------------------------------------------------- -local info = { version = 0.18 } +local info = { version = 0.19 } -- check config if pageNoPrefixDel ~= "" then diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua index f44967f63c1..17ce7d27944 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-common'] = { - version = 0.18, + version = 0.19, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua index 89de044ca1e..952aa90169a 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.18, + version = 0.19, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -60,31 +60,30 @@ alphabet_lower = { -- for sorting } alphabet_upper = { -- for sorting { ' ' }, - { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ'}, + { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ', 'Â' }, { 'B' }, { 'C', 'Ç' }, { 'D' }, - { 'E', 'È', 'É', 'Ë' }, + { 'E', 'È', 'É', 'Ë', 'Ê' }, { 'F' }, { 'G' }, { 'H' }, - { 'I', 'Í', 'Ì', 'Ï' }, + { 'I', 'Í', 'Ì', 'Ï', 'Î' }, { 'J' }, { 'K' }, { 'L' }, { 'M' }, { 'N', 'Ñ' }, - { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø' }, + { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø', 'Ô'}, { 'P' }, { 'Q' }, { 'R' }, { 'S', 'Š' }, { 'T' }, - { 'U', 'Ú', 'Ù', 'Ü' }, + { 'U', 'Ú', 'Ù', 'Ü', 'Û' }, { 'V' }, { 'W' }, { 'X' }, { 'Y', 'Ý', 'Ÿ' }, { 'Z', 'Ž' } } - diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua index 6c918cc28a4..b363f627aa1 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.18, + version = 0.19, comment = "DTK configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua index 02dea0358bc..5d8dfb9b60f 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua @@ -28,7 +28,7 @@ --~ n 2 -------------------------------- if not modules then modules = { } end modules ['xindex-lapp'] = { - version = 0.18, + version = 0.19, comment = "read parameter for xindex.lua", author = "Steve Donovan", copyright = "Steve Donovan", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua index 59193f1d28a..fd36c1560c4 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-lib'] = { - version = 0.18, + version = 0.19, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -272,6 +272,14 @@ function replaceVerticalChar(v) end end +--local ignore = "'`'" + +function ignoreLetters( c ) + return (c:gsub("["..ignore.."]+", ""):match("^%s*(.-)%s*$")) +end +-- somestring:match("^%s*(.-)%s*$") --trim function + + function getEntryAndPage(w, nextW, EntryList) -- \indexentry{Aachen, Johann von}{VII/1-215} -- \indexentry {Document@\idxtextClasses !IEEEtran@{\sfffffamily IEEEtran}}{185} diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua index 1165b6a6248..16fea2c99f3 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua @@ -5,7 +5,7 @@ -- if not modules then modules = { } end modules ['xindex-pretty'] = { - version = 0.18, + version = 0.19, comment = "dump a Lua table for debugging", author = "Steve Donovan", copyright = "Steve Donovan", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua index 99b8642293e..c77270b16e9 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-yannis'] = { - version = 0.18, + version = 0.19, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", -- cgit v1.2.3