From 22795003e66903d4206e43046c1d414a111ee5e3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 22 Nov 2019 22:19:47 +0000 Subject: xindex (22nov19) git-svn-id: svn://tug.org/texlive/trunk@52892 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/xindex/xindex.lua | 3 +- Master/texmf-dist/doc/lualatex/xindex/CHANGELOG | 1 + .../texmf-dist/doc/lualatex/xindex/xindex-doc.pdf | Bin 375486 -> 375591 bytes .../texmf-dist/doc/lualatex/xindex/xindex-doc.tex | 4 +-- Master/texmf-dist/scripts/xindex/xindex.lua | 3 +- .../texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua | 13 ++++--- .../tex/lualatex/xindex/xindex-HAdW-eKO.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-base.lua | 5 +-- .../tex/lualatex/xindex/xindex-cfg-common.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-cfg.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-dtk.lua | 39 ++++++++++----------- .../texmf-dist/tex/lualatex/xindex/xindex-lapp.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-lib.lua | 15 ++++---- .../tex/lualatex/xindex/xindex-pretty.lua | 2 +- .../tex/lualatex/xindex/xindex-yannis.lua | 2 +- 15 files changed, 46 insertions(+), 49 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua index 8ab76b494d3..7abb9850869 100755 --- a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua +++ b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua @@ -30,7 +30,7 @@ Report bugs to kpse.set_program_name("luatex") local f = kpse.find_file("lualibs.lua") -print ("Dateiname "..f) +print ("filename "..f) require("lualibs") -- all part of LuaTeX require('unicode') require('string') @@ -206,4 +206,3 @@ dofile(BaseRunFile) logFile:close() - diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG index eb66c0c3694..9eefa010524 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG +++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG @@ -1,3 +1,4 @@ +0.20 2019-1^221 - fix for |see{foo bar} 0.19 2019-10-31 - add again missing accented characters 0.18 2019-10-27 - speed up sorting by modifying the code 0.17 2019-10-15 - fixes in cfg file for missing circum diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf index 7ac6e88ac20..93ea17158d0 100644 Binary files a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf and b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex index 0f57fd61f84..63902cdeec9 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex +++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex @@ -1,4 +1,4 @@ -%% $Id: xltabular-doc.tex 635 2017-10-24 18:22:59Z herbert $ +%% $Id: xindex-doc.tex 635 2017-10-24 18:22:59Z herbert $ % \listfiles\setcounter{errorcontextlines}{100} \documentclass[paper=a4,fontsize=11pt,DIV=13,parskip=half-, @@ -80,7 +80,7 @@ \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} -\setVersion{version = 0.19}% can be autimatically changed by perl +\setVersion{version = 0.20}% can be autimatically changed by perl \setkeys{dtk}{cleanup=true,force=false} diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua index 8ab76b494d3..7abb9850869 100755 --- a/Master/texmf-dist/scripts/xindex/xindex.lua +++ b/Master/texmf-dist/scripts/xindex/xindex.lua @@ -30,7 +30,7 @@ Report bugs to kpse.set_program_name("luatex") local f = kpse.find_file("lualibs.lua") -print ("Dateiname "..f) +print ("filename "..f) require("lualibs") -- all part of LuaTeX require('unicode') require('string') @@ -206,4 +206,3 @@ dofile(BaseRunFile) logFile:close() - diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua index ec5826316b9..46d74b8bfb8 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.19, + version = 0.20, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -40,7 +40,6 @@ idxnewletter = "\\textbf" -- Only valid if -n is not set Several characters in the same slot have the same 'priority'. ]] - alphabet_lower = { -- for sorting { ' ' }, -- only for internal tests { 'a', 'á', 'à', 'å', 'æ', }, @@ -75,29 +74,29 @@ alphabet_lower = { -- for sorting } alphabet_upper = { -- for sorting { ' ' }, - { 'A', 'Á', 'À', 'Å', 'Æ'}, + { 'A', 'Á', 'À', 'Å', 'Æ', 'Â'}, { 'AE', 'Ä'}, { 'B' }, { 'C', 'Ç' }, { 'D' }, - { 'E', 'È', 'É', 'Ë' }, + { 'E', 'È', 'É', 'Ë', 'Ê' }, { 'F' }, { 'G' }, { 'H' }, - { 'I', 'Í', 'Ì', 'Ï' }, + { 'I', 'Í', 'Ì', 'Ï', 'Î' }, { 'J' }, { 'K' }, { 'L' }, { 'M' }, { 'N', 'Ñ' }, - { 'O', 'Ó', 'Ò', 'Ø','Œ', 'Ø' }, + { 'O', 'Ó', 'Ò', 'Ø','Œ', 'Ø', 'Ô' }, { 'OE', 'Ö' }, { 'P' }, { 'Q' }, { 'R' }, { 'S', 'Š' }, { 'T' }, - { 'U', 'Ú', 'Ù' }, + { 'U', 'Ú', 'Ù', 'Û' }, { 'UE', 'Ü' }, { 'V' }, { 'W' }, 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 0b588ff74eb..81f00dd2b0e 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.19, + version = 0.20, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua index a110a41b00e..4f16a9214d7 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.19 } +local info = { version = 0.20 } -- check config if pageNoPrefixDel ~= "" then @@ -145,7 +145,7 @@ local currentCharType = 0 -- assume Symbol; 1 number; 2 letter local oldChar = "" local excl = 0 -- number of ! symbols in one entry local lastItems = {"","",""} - +indLines = 0 writeLog(2,"Start writing .ind file ... \n",0) -- first the special cases for symbols and numbers: @@ -251,6 +251,7 @@ for k=1,#NewIndex do end end outFile:write("\\end{theindex}\n") +writeLog(2,indLines.." lines of data wrote into the .ind file\n",0) outFile:close() writeLog(2,"\ndone! closing program\n",0) 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 17ce7d27944..8a7e33addb3 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.19, + version = 0.20, 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 952aa90169a..48c6f43a0b1 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.19, + version = 0.20, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua index b363f627aa1..386304a185e 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.19, + version = 0.20, comment = "DTK configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -36,64 +36,63 @@ indexOpening = "" --[[\providecommand*\lettergroupDefault[1]{} ]] alphabet_lower = { -- for sorting { ' ' }, -- only for internal tests - { 'a', 'á', 'à', 'ä'}, + { 'a', 'á', 'à', 'ä', 'â', 'å', 'æ', }, { 'b' }, - { 'c' }, + { 'c', 'ç' }, { 'd' }, - { 'e', 'é', 'è', 'ë' }, + { 'e', 'é', 'è', 'ë', 'ê' }, { 'f' }, { 'g' }, { 'h' }, - { 'i', 'í', 'ì', 'ï' }, + { 'i', 'í', 'ì', 'î', 'ï' }, { 'j' }, { 'k' }, { 'l' }, { 'm' }, { 'n', 'ñ' }, - { 'o', 'ó', 'ò', 'ö' }, + { 'o', 'ó', 'ò', 'ö', 'ô', 'ø', 'œ', 'ø'}, { 'p' }, { 'q' }, { 'r' }, - { 's' }, + { 's', 'š', 'ß' }, { 't' }, - { 'u', 'ú', 'ù', 'ü' }, + { 'u', 'ú', 'ù', 'ü' , 'û'}, { 'v' }, { 'w' }, { 'x' }, - { 'y' }, - { 'z' } + { 'y', 'ý', 'ÿ' }, + { 'z', 'ž' } } alphabet_upper = { -- for sorting { ' ' }, - { 'A', 'Á', 'À', 'Ä'}, + { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ', 'Â' }, { 'B' }, - { 'C' }, + { 'C', 'Ç' }, { 'D' }, - { 'E', 'È', 'È', 'ë' }, + { 'E', 'È', 'É', 'Ë', 'Ê' }, { 'F' }, { 'G' }, { 'H' }, - { 'I', 'Í', 'Ì', 'ï' }, + { 'I', 'Í', 'Ì', 'Ï', 'Î' }, { 'J' }, { 'K' }, { 'L' }, { 'M' }, { 'N', 'Ñ' }, - { 'O', 'Ó', 'Ò', 'Ö' }, + { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø', 'Ô'}, { 'P' }, { 'Q' }, { 'R' }, - { 'S' }, + { 'S', 'Š' }, { 'T' }, - { 'U', 'Ú', 'Ù', 'Ü' }, + { 'U', 'Ú', 'Ù', 'Ü', 'Û' }, { 'V' }, { 'W' }, { 'X' }, - { 'Y' }, - { 'Z' } + { 'Y', 'Ý', 'Ÿ' }, + { 'Z', 'Ž' } } - function specialGetPageList(v,hyperpage) local Pages = {} if v["pages"] then diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua index 5d8dfb9b60f..fd976f5a7ec 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.19, + version = 0.20, 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 fd36c1560c4..5cc397b799b 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.19, + version = 0.20, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -115,6 +115,7 @@ function checkVert(str) -- get the | part if (vert) then vertStr = string.sub(str,vert+1) str = string.sub(str,1,vert-1) +print(vertStr) return (vertStr) else return ("") @@ -263,12 +264,10 @@ function checkParenthesis(Entries) -- search for |( ... |) entries end function replaceVerticalChar(v) --- res, _ = string.gsub(v:gsub('|[()]$', ''), '|[()]?', ' \\') --- return res if not v:match('|') then return v,"" else - return v:gsub('|.*',''), v:match('|.*'):gsub('|','\\'):gsub("%s+", "") -- part before, part after | without spaces + return v:gsub('|.*',''), v:match('|.*'):gsub('|','\\')--:gsub("%s+", "") -- part before, part after | without spaces end end @@ -555,10 +554,10 @@ function GenerateSortKey(a) Apage = string.format("%09s",a["pages"][1]["number"]) end if no_caseSensitive then - A = NormalizedUpper(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!','')) -- replace! by empty + A = NormalizedUpper(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!',' ')) -- replace! by empty a["SortKey"] = A else - A = NormalizedChars(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!','')) -- replace! by empty + A = NormalizedChars(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!',' ')) -- replace! by empty a["SortKey"] = A end -- return A @@ -882,7 +881,7 @@ function itemOutput(last, v, hyperpage) for i, str0 in ipairs(escape_chars) do -- undo the escape char setting str = str:gsub(str0[2],str0[3]) end - outFile:write(str) + outFile:write(str); indLines=indLines+1 lastItems = {} lastItems[1] = Entry else @@ -906,7 +905,7 @@ function itemOutput(last, v, hyperpage) for i, str0 in ipairs(escape_chars) do -- undo the escape char setting str = string.gsub(str,str0[2],str0[3]) end - outFile:write(str) + outFile:write(str); indLines=indLines+1 lastItems[i] = currentItems[i] else writeLog(1,"itemOutput: currentItems[i]: "..currentItems[i].."= lastItems[i]: "..lastItems[i].."\n",2) diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua index 16fea2c99f3..74393defb95 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.19, + version = 0.20, 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 c77270b16e9..164fb1f284a 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.19, + version = 0.20, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", -- cgit v1.2.3