diff options
Diffstat (limited to 'Master/texmf-dist/tex/lualatex')
14 files changed, 46 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua index 5fa7dbfd3dd..19044b88c33 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-AU'] = { - version = 0.49, + version = 0.51, 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 d08942fb9a0..bb1155ac631 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua @@ -11,7 +11,7 @@ -- configuration for index files of the Heidelberger Akademie der Wissenschaften if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = { - version = 0.49, + version = 0.51, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua index e9adda19358..8c52732d942 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-RU'] = { - version = 0.49, + version = 0.51, comment = "configuration to xindex.lua", author = "Alexey Kuznetzov", copyright = "Herbert Voß", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua index 336142e30c8..0999421e4de 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua @@ -8,7 +8,7 @@ -- $Id: xindex-base.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- -local info = { version = 0.49 } +local info = { version = 0.51 } -- check config if pageNoPrefixDel ~= "" then @@ -47,19 +47,23 @@ if #lines == 0 then os.exit() end +writeLog(1,"check for hyperpages ... ",0) +hyperpage, lines = checkHyperpage(lines) -- hyperref used? +writeLog(1,"done \n",0) +if hyperpage then writeLog(1,"We have hyperpages.\n",1) end + print("Presort of \\indexentry lines") -for _,l in pairs(lines) do print (l) end +-- for _,l in pairs(lines) do print (l) end table.sort(lines) if vlevel > 1 then print("Pre-Sorted index list:") for _,l in pairs(lines) do print (l) end end - if vlevel > 1 then - writeLog(1,"--------------- Input data -----------------\n",2) + writeLog(1,"--------------- Input data (presorted) -----------------\n",2) for _,l in pairs(lines) do writeLog(1,l.."\n",2) end - writeLog(1,"--------------- end Input data -----------------\n",2) + writeLog(1,"--------------- end Input data -------------------------\n",2) end local Index = {} -- Entry = "Seitenzahl(en)" @@ -67,10 +71,6 @@ local pages = {} local noEntryfound local noPagefound -hyperpage, lines = checkHyperpage(lines) -- hyperref used? -if hyperpage then writeLog(1,"We have hyperpages ... \n",1) end - ---for _,l in pairs(lines) do print (l) end writeLog(1,"Change escape chars with macros ... \n",0) for k,v in ipairs(lines) do @@ -178,8 +178,8 @@ if use_UCA then else for i=1, #NewIndex do v = NewIndex[i] - if findStr(v["SortKey"],"\\parenLeft") < 2 then v["SortKey"] = '{' v["sortChar"] = '{'end - if findStr(v["SortKey"],"\\parenRight") < 2 then v["SortKey"] = '}' end + if findStr(v["SortKey"],"\\braceLeft") < 2 then v["SortKey"] = '{' v["sortChar"] = '{'end + if findStr(v["SortKey"],"\\braceRight") < 2 then v["SortKey"] = '}' end if findStr(v["SortKey"],"//escapedexcl//") < 2 then v["SortKey"] = '!' end if findStr(v["SortKey"],"//escapedquote//") < 2 then v["SortKey"] = '"' end if findStr(v["SortKey"],"//escapedat//") < 2 then v["SortKey"] = '@' end @@ -256,7 +256,7 @@ for k=1,#NewIndex do else charType = getCharType(firstChar) end --- print(">>"..v["sortChar"].." "..firstChar.." "..tostring(charType)) + --print(">>"..v["sortChar"].." "..firstChar.." "..tostring(charType)) if charType == 0 then numbers = false symbols = true diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua index 9d7c9188eb4..645e0a9c2e6 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-baselib'] = { - version = 0.49, + version = 0.51, comment = "base library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", 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 4793d1758dd..76a1cead18d 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-common'] = { - version = 0.49, + version = 0.51, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua index 014d3719d23..c55ffde2693 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-lua'] = { - version = 0.49, + version = 0.51, comment = "configuration to xindex-cfg-uca.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 24098c5272e..f713d0c2462 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.49, + version = 0.51, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua index f7d2d09b5fe..61fad4027a1 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.49, + version = 0.51, comment = "configuration file for the DANTE Edition", 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 74de071b0a3..b50cc1f10a1 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.49, + version = 0.51, comment = "DTK configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua index f321765c64c..86b103823b8 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-lib'] = { - version = 0.49, + version = 0.51, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -558,20 +558,22 @@ function GenerateSortKey(a) end end -- s:gsub("%s+", "") strip spaces - if findStr(a["SortKey"],"\\parenLeft") < 2 then a["SortKey"] = '{ '..Apage end - if findStr(a["SortKey"],"\\parenRight") < 2 then a["SortKey"] = '} '..Apage end + if findStr(a["SortKey"],"\\braceLeft") < 2 then a["SortKey"] = '{ '..Apage end + if findStr(a["SortKey"],"\\braceRight") < 2 then a["SortKey"] = '} '..Apage end if findStr(a["SortKey"],"//escapedexcl//") < 2 then a["SortKey"] = '! '..Apage end if findStr(a["SortKey"],"//escapedquote//") < 2 then a["SortKey"] = '" '..Apage end if findStr(a["SortKey"],"//escapedat//") < 2 then a["SortKey"] = '@ '..Apage end if findStr(a["SortKey"],"//escapedvert//") < 2 then a["SortKey"] = '| '..Apage end +-- if findStr(a["SortKey"],"\\textbar") < 2 then a["SortKey"] = '| '..Apage end -- a["SortKey"] = a["SortKey"]:gsub("%s+", "") - -- print("Sortkey: " .. a["SortKey"]) if not use_UCA then -- test if it is a symbol after 9 and before A or after Z if (a["SortKey"]:byte() > 57 and a["SortKey"]:byte() < 65) or + (a["SortKey"]:byte() > 90 and a["SortKey"]:byte() < 97) or (a["SortKey"]:byte() > 122 and a["SortKey"]:byte() < 128) then -- symbol above digits a["SortKey"] = "/"..a["SortKey"] -- sort it after / end end + -- print("Sortkey: " .. a["SortKey"]) end function GenerateSortKeys(Index) @@ -781,14 +783,27 @@ function checkHyperpage(lines) end end if hyperpage then + if fix_hyperref then + writeLog(1,"fix vertical bar with hyperref ... ",0) + -- hyperref ignores the vertical bar in "| and also other escape chars + end + local sub_str = esc_char..'|hyperpage' for i=1,#lines do + if fix_hyperref then + s = lines[i]:find(sub_str) + print(i,lines[i],s) + if s == nil then s = 0 end + if s == 2 then + lines[i] = lines[i]:gsub(sub_str, '\\textbar|hyperpage') -- "| -> \textbar + end + end lines[i] = string.gsub(lines[i],'|?hyperpage}{','}{') - end + end -- for + writeLog(1,"done\n",0) return true, lines - else + else -- no hyperpage return false, lines end - return end function itemOutput(last, v, hyperpage) diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua index 19289ee0861..a1ba73c4364 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua @@ -10,7 +10,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-no'] = { - version = 0.49, + version = 0.51, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua index ec6139e324d..087e2eb16b0 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-pretty'] = { - version = 0.49, + version = 0.51, 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 dbf6c60e772..6ea612d779c 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-yannis'] = { - version = 0.49, + version = 0.51, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", |