summaryrefslogtreecommitdiff
path: root/indexing
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-10-03 03:00:57 +0000
committerNorbert Preining <norbert@preining.info>2019-10-03 03:00:57 +0000
commit93c3758895674cc9ea3e8aaeeb3cf5d1bdc0e3be (patch)
tree5150bfff26491c4e57ddff629e62b4066295a925 /indexing
parentd94b7a8c132734a1bc4046d54a75c7882c4c2619 (diff)
CTAN sync 201910030300
Diffstat (limited to 'indexing')
-rw-r--r--indexing/xindex/CHANGELOG1
-rw-r--r--indexing/xindex/doc/xindex-doc.pdfbin375260 -> 375317 bytes
-rw-r--r--indexing/xindex/doc/xindex-doc.tex2
-rw-r--r--indexing/xindex/lualatex/xindex-DIN2.lua25
-rw-r--r--indexing/xindex/lualatex/xindex-HAdW-eKO.lua12
-rw-r--r--indexing/xindex/lualatex/xindex-base.lua10
-rw-r--r--indexing/xindex/lualatex/xindex-cfg-common.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-cfg.lua15
-rw-r--r--indexing/xindex/lualatex/xindex-dtk.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-lapp.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-lib.lua3
-rw-r--r--indexing/xindex/lualatex/xindex-pretty.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-yannis.lua2
-rwxr-xr-xindexing/xindex/scripts/xindex.lua2
14 files changed, 28 insertions, 52 deletions
diff --git a/indexing/xindex/CHANGELOG b/indexing/xindex/CHANGELOG
index 157585bc5b..d2a227efbe 100644
--- a/indexing/xindex/CHANGELOG
+++ b/indexing/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/indexing/xindex/doc/xindex-doc.pdf b/indexing/xindex/doc/xindex-doc.pdf
index daa8bdfe0c..f7ecf1e911 100644
--- a/indexing/xindex/doc/xindex-doc.pdf
+++ b/indexing/xindex/doc/xindex-doc.pdf
Binary files differ
diff --git a/indexing/xindex/doc/xindex-doc.tex b/indexing/xindex/doc/xindex-doc.tex
index 0df28b2f70..c5762e2559 100644
--- a/indexing/xindex/doc/xindex-doc.tex
+++ b/indexing/xindex/doc/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/indexing/xindex/lualatex/xindex-DIN2.lua b/indexing/xindex/lualatex/xindex-DIN2.lua
index 6673789955..4a055efd9a 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.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/indexing/xindex/lualatex/xindex-HAdW-eKO.lua b/indexing/xindex/lualatex/xindex-HAdW-eKO.lua
index 6918536e92..2b5fd10dfa 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.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/indexing/xindex/lualatex/xindex-base.lua b/indexing/xindex/lualatex/xindex-base.lua
index 7827106f71..d736f67b7d 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.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/indexing/xindex/lualatex/xindex-cfg-common.lua b/indexing/xindex/lualatex/xindex-cfg-common.lua
index d98adb6b92..7b84b348a3 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.13,
+ version = 0.16,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
diff --git a/indexing/xindex/lualatex/xindex-cfg.lua b/indexing/xindex/lualatex/xindex-cfg.lua
index c43d62dc7f..7c055f1c3b 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.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/indexing/xindex/lualatex/xindex-dtk.lua b/indexing/xindex/lualatex/xindex-dtk.lua
index cb38541fa2..746b4287d3 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.13,
+ version = 0.16,
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 3912740ef7..ff4cb80a67 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.13,
+ version = 0.16,
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 90e5066896..8720d3db1b 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.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/indexing/xindex/lualatex/xindex-pretty.lua b/indexing/xindex/lualatex/xindex-pretty.lua
index 569974ecfa..67e5508c5a 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.13,
+ version = 0.16,
comment = "dump a Lua table for debugging",
author = "Steve Donovan",
copyright = "Steve Donovan",
diff --git a/indexing/xindex/lualatex/xindex-yannis.lua b/indexing/xindex/lualatex/xindex-yannis.lua
index 2de146626d..8d54d82e3e 100644
--- a/indexing/xindex/lualatex/xindex-yannis.lua
+++ b/indexing/xindex/lualatex/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",
diff --git a/indexing/xindex/scripts/xindex.lua b/indexing/xindex/scripts/xindex.lua
index ee891e052f..fb48a3d748 100755
--- a/indexing/xindex/scripts/xindex.lua
+++ b/indexing/xindex/scripts/xindex.lua
@@ -8,7 +8,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.14
+ local version = 0.16
xindex.version = version
--xindex.self = "xindex"