From 109a435244c29109322bcd46386301f6c62d4061 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 6 Jul 2021 03:00:52 +0000 Subject: CTAN sync 202107060300 --- indexing/xindex/lualatex/xindex-DIN2.lua | 2 +- indexing/xindex/lualatex/xindex-HAdW-eKO.lua | 2 +- indexing/xindex/lualatex/xindex-base.lua | 14 +++++++++----- indexing/xindex/lualatex/xindex-cfg-common.lua | 2 +- indexing/xindex/lualatex/xindex-cfg-uca.lua | 2 +- indexing/xindex/lualatex/xindex-cfg.lua | 2 +- indexing/xindex/lualatex/xindex-dtk.lua | 2 +- indexing/xindex/lualatex/xindex-lapp.lua | 2 +- indexing/xindex/lualatex/xindex-lib.lua | 10 +++++----- indexing/xindex/lualatex/xindex-norsk.lua | 2 +- indexing/xindex/lualatex/xindex-pretty.lua | 4 ++-- 11 files changed, 24 insertions(+), 20 deletions(-) (limited to 'indexing/xindex/lualatex') diff --git a/indexing/xindex/lualatex/xindex-DIN2.lua b/indexing/xindex/lualatex/xindex-DIN2.lua index 91422306ce..dc782726fe 100644 --- a/indexing/xindex/lualatex/xindex-DIN2.lua +++ b/indexing/xindex/lualatex/xindex-DIN2.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.28, + version = 0.29, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-HAdW-eKO.lua b/indexing/xindex/lualatex/xindex-HAdW-eKO.lua index 9091ac6b37..6b9e3c65a9 100644 --- a/indexing/xindex/lualatex/xindex-HAdW-eKO.lua +++ b/indexing/xindex/lualatex/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.28, + version = 0.29, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-base.lua b/indexing/xindex/lualatex/xindex-base.lua index fb11f3539e..ae77fe93fb 100644 --- a/indexing/xindex/lualatex/xindex-base.lua +++ b/indexing/xindex/lualatex/xindex-base.lua @@ -6,7 +6,7 @@ -- LICENSE: LPPL1.3 ----------------------------------------------------------------------- -local info = { version = 0.28 } +local info = { version = 0.29 } -- check config if pageNoPrefixDel ~= "" then @@ -209,9 +209,11 @@ for k=1,#NewIndex do if not no_headings then outFile:write("\\par"..idxnewletter.."{"..index_header[1].."}") if (labelPrefix == "") then - outFile:write("\\label{xindex-"..index_header[1].."}\n\\nopagebreak[4]\n") + outFile:write("\\label{xindex-symbols}\n\\nopagebreak[4]\n") +-- outFile:write("\\label{xindex-"..index_header[1].."}\n\\nopagebreak[4]\n") else - outFile:write("\\label{"..labelPrefix.."-xindex-"..index_header[1].."}\n\\nopagebreak[4]\n") + outFile:write("\\label{"..labelPrefix.."-xindex-symbols}\n\\nopagebreak[4]\n") +-- outFile:write("\\label{"..labelPrefix.."-xindex-"..index_header[1].."}\n\\nopagebreak[4]\n") end end end @@ -231,9 +233,11 @@ for k=1,#NewIndex do if not no_headings then outFile:write(idxnewletter.."{"..index_header[2].."}") if (labelPrefix == "") then - outFile:write("\\label{xindex-"..index_header[2].."}\n\\nopagebreak[4]\n") + outFile:write("\\label{xindex-numbers}\n\\nopagebreak[4]\n") +-- outFile:write("\\label{xindex-"..index_header[2].."}\n\\nopagebreak[4]\n") else - outFile:write("\\label{"..labelPrefix.."-xindex-"..index_header[2].."}\n\\nopagebreak[4]\n") + outFile:write("\\label{"..labelPrefix.."-xindex-numbers}\n\\nopagebreak[4]\n") +-- outFile:write("\\label{"..labelPrefix.."-xindex-"..index_header[2].."}\n\\nopagebreak[4]\n") end end end diff --git a/indexing/xindex/lualatex/xindex-cfg-common.lua b/indexing/xindex/lualatex/xindex-cfg-common.lua index e3d462ef22..c66c70c716 100644 --- a/indexing/xindex/lualatex/xindex-cfg-common.lua +++ b/indexing/xindex/lualatex/xindex-cfg-common.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-common'] = { - version = 0.28, + version = 0.29, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-cfg-uca.lua b/indexing/xindex/lualatex/xindex-cfg-uca.lua index 50fdeb8463..22a5669e11 100644 --- a/indexing/xindex/lualatex/xindex-cfg-uca.lua +++ b/indexing/xindex/lualatex/xindex-cfg-uca.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-lua'] = { - version = 0.28, + version = 0.29, comment = "configuration to xindex-cfg-uca.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-cfg.lua b/indexing/xindex/lualatex/xindex-cfg.lua index c82544f402..e088360fdf 100644 --- a/indexing/xindex/lualatex/xindex-cfg.lua +++ b/indexing/xindex/lualatex/xindex-cfg.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.28, + version = 0.29, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-dtk.lua b/indexing/xindex/lualatex/xindex-dtk.lua index 9ac0b9a26a..d479fa0235 100644 --- a/indexing/xindex/lualatex/xindex-dtk.lua +++ b/indexing/xindex/lualatex/xindex-dtk.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.28, + version = 0.29, comment = "DTK configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-lapp.lua b/indexing/xindex/lualatex/xindex-lapp.lua index 4eed37024a..a9a982c2df 100644 --- a/indexing/xindex/lualatex/xindex-lapp.lua +++ b/indexing/xindex/lualatex/xindex-lapp.lua @@ -28,7 +28,7 @@ --~ n 2 -------------------------------- if not modules then modules = { } end modules ['xindex-lapp'] = { - version = 0.28, + version = 0.29, comment = "read parameter for xindex.lua", author = "Steve Donovan", copyright = "Steve Donovan", diff --git a/indexing/xindex/lualatex/xindex-lib.lua b/indexing/xindex/lualatex/xindex-lib.lua index 31e4d23426..193758deef 100644 --- a/indexing/xindex/lualatex/xindex-lib.lua +++ b/indexing/xindex/lualatex/xindex-lib.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-lib'] = { - version = 0.28, + version = 0.29, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -621,11 +621,11 @@ function checkFF(p) -- for hyperref: replace \hyperpage{1\,ff} -> \hyperpage{1\nohyperpage{\,ff}} if not p then return p end local P = tostring(p) - if P:find("ff") then - local str = P:gsub(page_folium[2],'').."\\nohyperpage{"..page_folium[2].."}" + if P:find(page_folium[2]) then + local str = P:gsub(page_folium[2],'').."\\nohyperpage{"..page_folium[2].."}" -- eg ff return str - elseif P:find("f") then - local str = P:gsub(page_folium[1],'').."\\nohyperpage{"..page_folium[1].."}" + elseif P:find(page_folium[1]) then + local str = P:gsub(page_folium[1],'').."\\nohyperpage{"..page_folium[1].."}" -- eg f return str else return P diff --git a/indexing/xindex/lualatex/xindex-norsk.lua b/indexing/xindex/lualatex/xindex-norsk.lua index 769f91a7a1..a92f4823f6 100644 --- a/indexing/xindex/lualatex/xindex-norsk.lua +++ b/indexing/xindex/lualatex/xindex-norsk.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-no'] = { - version = 0.28, + version = 0.29, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-pretty.lua b/indexing/xindex/lualatex/xindex-pretty.lua index 793a434a79..8f2155c803 100644 --- a/indexing/xindex/lualatex/xindex-pretty.lua +++ b/indexing/xindex/lualatex/xindex-pretty.lua @@ -5,7 +5,7 @@ -- if not modules then modules = { } end modules ['xindex-pretty'] = { - version = 0.28, + version = 0.29, comment = "dump a Lua table for debugging", author = "Steve Donovan", copyright = "Steve Donovan", @@ -31,7 +31,7 @@ local function has_lquote(s) repeat _, finish, _, new_equals = s:find(lstring_pat, finish) if new_equals then - equals = max(equals or 0, #new_equals) + equals = math.max(equals or 0, #new_equals) end until not new_equals -- cgit v1.2.3