diff options
author | Karl Berry <karl@freefriends.org> | 2019-10-03 21:08:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-10-03 21:08:13 +0000 |
commit | 60669062009ed05b97100119976a8b09313c3c0f (patch) | |
tree | c88a0eb09e8f895c06994658d512342fc51ba48f | |
parent | 43bc44a80a5a5cef22f1b49d6bd0b08fffed147c (diff) |
xindex (3oct19)
git-svn-id: svn://tug.org/texlive/trunk@52268 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/xindex/xindex.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/CHANGELOG | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf | bin | 375260 -> 375317 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex | 2 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/xindex/xindex.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua | 25 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua | 15 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua | 3 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua | 2 |
15 files changed, 29 insertions, 53 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua index ee891e052fa..fb48a3d7486 100755 --- a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua +++ b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------- xindex = xindex or { } - local version = 0.14 + local version = 0.16 xindex.version = version --xindex.self = "xindex" diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG index 157585bc5b5..d2a227efbec 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG +++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG @@ -1,3 +1,4 @@ +0.16 2019-10-02 - fixes in the documentation 0.15 2019-09-21 - fixed the corrupt file xindex-lib.lua 0.14 2019-09-01 - added variable idxnewletter 0.13 2019-06-07 - fix for minCompress < 2 diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf Binary files differindex daa8bdfe0ca..f7ecf1e9119 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf +++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex index 0df28b2f707..c5762e25592 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex +++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex @@ -79,7 +79,7 @@ \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} -\setVersion{version = 0.14}% can be autimatically changed by perl +\setVersion{version = 0.16}% can be autimatically changed by perl \title{Program and package \texttt{xindex} \\--\\ \normalsize \xIndexVersion\ (\today)} \author{Herbert Voß\thanks{hvoss@tug.org}} diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua index ee891e052fa..fb48a3d7486 100755 --- a/Master/texmf-dist/scripts/xindex/xindex.lua +++ b/Master/texmf-dist/scripts/xindex/xindex.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------- xindex = xindex or { } - local version = 0.14 + local version = 0.16 xindex.version = version --xindex.self = "xindex" diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua index 66737899551..4a055efd9a2 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.13, + version = 0.16, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -15,10 +15,12 @@ if not modules then modules = { } end modules ['xindex-cfg'] = { } escape_chars = { -- by default " is the escape char - {'""', "\\escapedquote", "\"{}" }, - {'"@', "\\escapedat", "@" }, - {'"|', "\\escapedvert", "|" }, - {'"!', "\\escapedexcl", "!" } + {'""', "\\escapedquote", '\"{}' }, + {'"@', "\\escapedat", "@" }, + {'"|', "\\escapedvert", "|" }, + {'"!', "\\escapedexcl", "!" }, + {'"(', "\\escapedparenleft", "(" }, + {'")', "\\escapedparenright", ")" } } itemPageDelimiter = "," -- Hello, 14 @@ -30,6 +32,7 @@ sublabels = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-item pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" indexOpening = "" -- commands after \begin{theindex} rangeSymbol = "--" +idxnewletter = "\\textbf" -- Only valid if -n is not set --[[ @@ -101,15 +104,3 @@ alphabet_upper = { -- for sorting { 'Z', 'Ž' } } -, - { 'S', 'Š' }, - { 'T' }, - { 'U', 'Ú', 'Ù' }, - { 'UE', 'Ü' }, - { 'V' }, - { 'W' }, - { 'X' }, - { 'Y', 'Ý', 'Ÿ' }, - { 'Z', 'Ž' } -} - 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 6918536e925..2b5fd10dfa8 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.13, + version = 0.16, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -27,6 +27,7 @@ sublabels = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-item pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" indexOpening = "" -- commands after \begin{theindex} rangeSymbol = "--" +idxnewletter = "\\textbf" -- Only valid if -n is not set case_sensitive = false -- speeds up running @@ -315,12 +316,3 @@ function specialGetPageList(v,hyperpage) end -end - end - return pageNo - else - return "" - end -end - - diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua index 7827106f719..d736f67b7dd 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.13 } +local info = { version = 0.16 } -- check config if pageNoPrefixDel ~= "" then @@ -175,7 +175,7 @@ for k=1,#NewIndex do if firstSLine then firstSLine = false if not no_headings then - outFile:write("\\par\\textbf{"..index_header[1].."}") + outFile:write("\\par"..idxnewletter.."{"..index_header[1].."}") if (labelPrefix == "") then outFile:write("\\label{xindex-"..index_header[1].."}\n\\nopagebreak[4]\n") else @@ -197,7 +197,7 @@ for k=1,#NewIndex do firstNLine = false outFile:write("\n\\indexspace\n") if not no_headings then - outFile:write("\\textbf{"..index_header[2].."}") + outFile:write(idxnewletter.."{"..index_header[2].."}") if (labelPrefix == "") then outFile:write("\\label{xindex-"..index_header[2].."}\n\\nopagebreak[4]\n") else @@ -218,7 +218,7 @@ for k=1,#NewIndex do if (currentChar ~= oldChar) and (charType == 2) then outFile:write("\n\\indexspace\n") if not no_headings then - outFile:write("\\textbf{"..currentChar.."}") + outFile:write(idxnewletter.."{"..currentChar.."}") if (labelPrefix == '""') then outFile:write("\\label{xindex-"..currentChar.."}\n\\nopagebreak[4]\n") else @@ -241,5 +241,3 @@ outFile:close() writeLog(2,"\ndone! closing program\n",0) -losing 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 d98adb6b926..7b84b348a37 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.13, + version = 0.16, 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 c43d62dc7ff..7c055f1c3b9 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.13, + version = 0.16, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -23,7 +23,7 @@ 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 !!! indexOpening = "" -- commands after \begin{theindex} - +idxnewletter = "\\textbf" -- Only valid if -n is not set --[[ Each character's position in this array-like table determines its 'priority'. @@ -45,7 +45,7 @@ alphabet_lower = { -- for sorting { 'l' }, { 'm' }, { 'n', 'ñ' }, - { 'o', 'ó', 'ò', 'ö', 'ø', 'œ'}, + { 'o', 'ó', 'ò', 'ö', 'ø', 'œ', 'ø'}, { 'p' }, { 'q' }, { 'r' }, @@ -74,7 +74,7 @@ alphabet_upper = { -- for sorting { 'L' }, { 'M' }, { 'N', 'Ñ' }, - { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ' }, + { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø' }, { 'P' }, { 'Q' }, { 'R' }, @@ -88,10 +88,3 @@ alphabet_upper = { -- for sorting { 'Z', 'Ž' } } -, - { '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 cb38541fa27..746b4287d30 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.13, + version = 0.16, 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 3912740ef78..ff4cb80a672 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.13, + version = 0.16, 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 90e50668962..8720d3db1b2 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.15, + version = 0.16, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -978,3 +978,4 @@ function stripLeadingSpaces(str) return str:gsub("^%s*(.-)%s*$", "%1") end + diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua index 569974ecfa8..67e5508c5a9 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.13, + version = 0.16, 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 2de146626d1..8d54d82e3eb 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.14, + version = 0.16, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", |