diff options
Diffstat (limited to 'Master/texmf-dist/tex/lualatex')
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua (renamed from Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua) | 43 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua | 20 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua | 20 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua | 7 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua | 7 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua | 13 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua | 4 |
13 files changed, 75 insertions, 65 deletions
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua index d8950e3a40e..b1adc53813b 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua @@ -1,41 +1,44 @@ ----------------------------------------------------------------------- --- FILE: xindex-cfg.lua +-- FILE: xindex-AU.lua -- DESCRIPTION: configuration file for xindex.lua -- REQUIREMENTS: -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-danteedition.lua 15 2021-08-20 19:01:56Z hvoss $ +-- $Id: xindex-DIN2.lua 13 2021-08-15 10:49:40Z hvoss $ ----------------------------------------------------------------------- -if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.34, - comment = "main configuration to xindex.lua", +if not modules then modules = { } end modules ['xindex-AU'] = { + version = 0.33, + comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", license = "LPPL 1.3" } itemPageDelimiter = "," -- Hello, 14 -compressPages = true -- something like 12--15, instead of 12,13,14,15. the |( ... |) syntax is still valid +compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid fCompress = true -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5 minCompress = 3 -- 14--17 or -rangeSymbol = "--" numericPage = true -- for non numerical pagenumbers, like "VI-17" sublabels = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-items first one is for item -pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" -- not used !!! +pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" indexOpening = "" -- commands after \begin{theindex} -idxnewletter = "\\idxnewletter" -- Only valid if -n is not set +rangeSymbol = "--" +idxnewletter = "\\textbf" -- Only valid if -n is not set envStart = "\\begin{theindex}" envStop = "\\end{theindex}" + --[[ Each character's position in this array-like table determines its 'priority'. Several characters in the same slot have the same 'priority'. ]] + alphabet_lower = { -- for sorting { ' ' }, -- only for internal tests - { 'a', 'á', 'à', 'ä', 'â', 'å', 'æ', }, + { 'a', 'á', 'à', 'å', 'æ', }, + { 'ä'}, { 'b' }, { 'c', 'ç' }, { 'd' }, @@ -49,13 +52,17 @@ alphabet_lower = { -- for sorting { 'l' }, { 'm' }, { 'n', 'ñ' }, - { 'o', 'ó', 'ò', 'ö', 'ô', 'ø', 'œ', 'ø'}, + { 'o', 'ó', 'ò', 'ô', 'ø', 'œ', 'ø'}, + { 'ö' }, { 'p' }, { 'q' }, { 'r' }, - { 's', 'š', 'ß' }, + { 's', 'š' }, + { 'ss'}, + { 'ß' }, { 't' }, - { 'u', 'ú', 'ù', 'ü' , 'û'}, + { 'u', 'ú', 'ù', 'û'}, + { 'ü' }, { 'v' }, { 'w' }, { 'x' }, @@ -64,7 +71,8 @@ alphabet_lower = { -- for sorting } alphabet_upper = { -- for sorting { ' ' }, - { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ', 'Â' }, + { 'A', 'Á', 'À', 'Å', 'Æ', 'Â'}, + { 'Ä'}, { 'B' }, { 'C', 'Ç' }, { 'D' }, @@ -78,16 +86,19 @@ alphabet_upper = { -- for sorting { '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-DIN2.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua index b325346d0e8..35ec8ab4625 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua @@ -1,30 +1,21 @@ ----------------------------------------------------------------------- --- FILE: xindex-cfg.lua +-- FILE: xindex-DIN2.lua -- DESCRIPTION: configuration file for xindex.lua -- REQUIREMENTS: -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-DIN2.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-DIN2.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- -if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.34, +if not modules then modules = { } end modules ['xindex-DIN2'] = { + version = 0.33, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", license = "LPPL 1.3" } -escape_chars = { -- by default " is the escape char - {'""', "\\escapedquote", '\"{}' }, - {'"@', "\\escapedat", "@" }, - {'"|', "\\escapedvert", "|" }, - {'"!', "\\escapedexcl", "!" }, - {'"(', "\\escapedparenleft", "(" }, - {'")', "\\escapedparenright", ")" } -} - itemPageDelimiter = "," -- Hello, 14 compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid fCompress = true -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5 @@ -66,7 +57,8 @@ alphabet_lower = { -- for sorting { 'p' }, { 'q' }, { 'r' }, - { 's', 'š', 'ß' }, + { 'ss', 'ß' }, + { 's', 'š' }, { 't' }, { 'u', 'ú', 'ù', 'û'}, { 'ue', 'ü' }, 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 ac152ba7f97..2244992db41 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua @@ -5,13 +5,13 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-HAdW-eKO.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-HAdW-eKO.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- -- -- configuration for index files of the Heidelberger Akademie der Wissenschaften if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = { - version = 0.34, + version = 0.35, 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 2bc1fad8d37..20fa9a494d7 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua @@ -5,10 +5,10 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-base.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-base.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- -local info = { version = 0.34 } +local info = { version = 0.35 } -- check config if pageNoPrefixDel ~= "" then @@ -49,10 +49,12 @@ 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 pairs(lines) do +for k,v in ipairs(lines) do if not commandEntry(v) then - for i, str0 in ipairs(escape_chars) do - v = v:gsub(str0[1],str0[2]) + for i, str0 in ipairs(escape_chars) do -- str0: esc-char, coded, char +-- print(str0[1],str0[2],v) + v = string.gsub(v,str0[1],str0[2]) +-- print("==> "..v) end if k < #lines then if commandEntry(lines[k+1]) then -- is the next line not a \indexentry ? @@ -222,6 +224,7 @@ for k=1,#NewIndex do firstSLine = false if not no_headings then outFile:write(idxnewletter.."{"..index_header[1].."}") + indLines = indLines + 1 -- outFile:write("\\par"..idxnewletter.."{"..index_header[1].."}") if no_labels then outFile:write("\n\\nopagebreak[4]\n") @@ -247,16 +250,20 @@ for k=1,#NewIndex do if firstNLine then firstNLine = false outFile:write("\n\\indexspace\n") + indLines = indLines + 1 if not no_headings then outFile:write(idxnewletter.."{"..index_header[2].."}") + indLines = indLines + 1 if no_labels then outFile:write("\n\\nopagebreak[4]\n") + indLines = indLines + 1 else if (labelPrefix == "") then outFile:write("\\label{xindex-numbers}\n\\nopagebreak[4]\n") else outFile:write("\\label{"..labelPrefix.."-xindex-numbers}\n\\nopagebreak[4]\n") end + indLines = indLines + 1 end end end @@ -272,8 +279,10 @@ for k=1,#NewIndex do writeLog(1,"We have letters to print ...\n",3) if (currentChar ~= oldChar) and (charType == 2) then outFile:write("\n\\indexspace\n") + indLines = indLines + 1 if not no_headings then outFile:write(idxnewletter.."{"..currentChar.."}") + indLines = indLines + 1 if no_labels then outFile:write("\n\\nopagebreak[4]\n") else @@ -282,6 +291,7 @@ for k=1,#NewIndex do else outFile:write("\\label{"..labelPrefix.."-xindex-"..currentChar.."}\n\\nopagebreak[4]\n") end + indLines = indLines + 1 end end oldChar = currentChar diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua index 6508bf17a4d..0ff33a591e1 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-baselib.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-baselib.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-baselib'] = { - version = 0.34, + version = 0.35, 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 cf563b353ad..21267039d5e 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-cfg-common.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-cfg-common.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-common'] = { - version = 0.34, + version = 0.35, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -21,6 +21,7 @@ indexheader = { da = {"Symboler", "Tal"}, de = {"Symbole", "Zahlen"}, en = {"Symbols", "Numbers"}, + es = {"Símbolos", "Números"}, fr = {"Symboles","Nombres"}, it = {"Simboli", "Numeri"}, jp = {"シンボル","番号"}, @@ -32,6 +33,7 @@ folium = { da = {"f", "ff"}, de = {"f", "ff"}, en = {"f", "ff"}, + es = {"f", "ff"}, fr = {"\\,sq.","\\,sqq."}, it = {"f", "ff"}, jp = {"シンボル","番号"}, 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 43cc6e82a50..098e314e3e9 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-cfg-uca.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-cfg-uca.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-lua'] = { - version = 0.34, + version = 0.35, 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 2860dbe50df..0adba23737f 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-cfg.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-cfg.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.34, + version = 0.35, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -53,7 +53,8 @@ alphabet_lower = { -- for sorting { 'p' }, { 'q' }, { 'r' }, - { 's', 'š', 'ß' }, + { 's', 'š' }, + { 'ss', 'ß' }, { 't' }, { 'u', 'ú', 'ù', 'ü' , 'û'}, { 'v' }, diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua index d71a0f8f175..945094663f5 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-dtk.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-dtk.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.34, + version = 0.35, comment = "DTK configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -30,6 +30,9 @@ indexOpening = "" --[[\providecommand*\lettergroupDefault[1]{} \nopagebreak } ]] +idxnewletter = "\\textbf" -- Only valid if -n is not set +envStart = "\\begin{theindex}" +envStop = "\\end{theindex}" --[[ diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua index 717eec69f78..dedf476ac2c 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-lib.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-lib.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-lib'] = { - version = 0.34, + version = 0.35, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua index c58ebf0499d..6d6853dd03b 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua @@ -6,11 +6,11 @@ -- MODIFIED: Sveinung Heggen (2020-01-02) -- LICENSE: LPPL1.3 -- --- $Id: xindex-norsk.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-norsk.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-no'] = { - version = 0.34, + version = 0.35, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -31,15 +31,6 @@ idxnewletter = "\\textbf" -- Only valid if -n is not set envStart = "\\begin{theindex}" envStop = "\\end{theindex}" -escape_chars = { -- by default " is the escape char - {'""', "\\escapedquote", '\"{}' }, - {'"@', "\\escapedat", "@" }, - {'"|', "\\escapedvert", "|" }, - {'"!', "\\escapedexcl", "!" }, - {'"(', "\\escapedparenleft", "(" }, - {'")', "\\escapedparenright", ")" } -} - alphabet_lower = { -- for sorting { ' ' }, -- only for internal tests { 'a', 'á', 'à', }, diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua index 02d95ff5966..80699a0313b 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua @@ -3,11 +3,11 @@ -- Also provides a sandboxed Lua table reader and -- a function to present large numbers in human-friendly format. -- --- $Id: xindex-pretty.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-pretty.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-pretty'] = { - version = 0.34, + version = 0.35, 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 62030ad2479..93757ea4132 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-yannis.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-yannis.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-yannis'] = { - version = 0.34, + version = 0.35, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", |