summaryrefslogtreecommitdiff
path: root/indexing
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-02-08 03:01:03 +0000
committerNorbert Preining <norbert@preining.info>2022-02-08 03:01:03 +0000
commit98810f6d7d064e61186d0ce674c4ee9de47a1f55 (patch)
tree66a7f325cde31d66d1ff1955cb1ab4aa4bd51aa9 /indexing
parentf689c91581665257602a841d03f73078c3495e14 (diff)
CTAN sync 202202080301
Diffstat (limited to 'indexing')
-rw-r--r--indexing/xindex/CHANGELOG1
-rw-r--r--indexing/xindex/doc/xindex-doc.pdfbin412603 -> 412615 bytes
-rw-r--r--indexing/xindex/doc/xindex-doc.tex2
-rw-r--r--indexing/xindex/lualatex/xindex-danteedition.lua93
-rwxr-xr-xindexing/xindex/scripts/xindex.lua15
5 files changed, 105 insertions, 6 deletions
diff --git a/indexing/xindex/CHANGELOG b/indexing/xindex/CHANGELOG
index 8a951d6ba5..70cae1d354 100644
--- a/indexing/xindex/CHANGELOG
+++ b/indexing/xindex/CHANGELOG
@@ -1,3 +1,4 @@
+0.36 2022-02-07 - fix for introduced bug
0.35 2022-01-22 - fix for escape character
- added language spain for folium pages and header
- added config AU for austrian sorting (experimental)
diff --git a/indexing/xindex/doc/xindex-doc.pdf b/indexing/xindex/doc/xindex-doc.pdf
index 63522357bf..882997ed02 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 4fe8374b3d..683a906425 100644
--- a/indexing/xindex/doc/xindex-doc.tex
+++ b/indexing/xindex/doc/xindex-doc.tex
@@ -81,7 +81,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\xIndexVersion{#2}}
-\setVersion{version = 0.35}% can be automatically changed by perl
+\setVersion{version = 0.36}% can be automatically changed by perl
\setkeys{dtk}{cleanup=true,force}
diff --git a/indexing/xindex/lualatex/xindex-danteedition.lua b/indexing/xindex/lualatex/xindex-danteedition.lua
new file mode 100644
index 0000000000..c39f92d652
--- /dev/null
+++ b/indexing/xindex/lualatex/xindex-danteedition.lua
@@ -0,0 +1,93 @@
+-----------------------------------------------------------------------
+-- FILE: xindex-cfg.lua
+-- DESCRIPTION: configuration file for xindex.lua
+-- REQUIREMENTS:
+-- AUTHOR: Herbert Voß
+-- LICENSE: LPPL1.3
+--
+-- $Id: xindex-danteedition.lua 22 2022-02-07 12:18:15Z hvoss $
+-----------------------------------------------------------------------
+
+if not modules then modules = { } end modules ['xindex-cfg'] = {
+ version = 0.36,
+ comment = "configuration file for the DANTE Edition",
+ 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
+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 !!!
+indexOpening = "" -- commands after \begin{theindex}
+idxnewletter = "\\idxnewletter" -- 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', 'á', 'à', 'ä', 'â', 'å', 'æ', },
+ { 'b' },
+ { 'c', 'ç' },
+ { 'd' },
+ { 'e', 'é', 'è', 'ë', 'ê' },
+ { 'f' },
+ { 'g' },
+ { 'h' },
+ { 'i', 'í', 'ì', 'î', 'ï' },
+ { 'j' },
+ { 'k' },
+ { 'l' },
+ { 'm' },
+ { 'n', 'ñ' },
+ { 'o', 'ó', 'ò', 'ö', 'ô', 'ø', 'œ', 'ø'},
+ { 'p' },
+ { 'q' },
+ { 'r' },
+ { 's', 'š', 'ß' },
+ { 't' },
+ { 'u', 'ú', 'ù', 'ü' , 'û'},
+ { 'v' },
+ { 'w' },
+ { 'x' },
+ { 'y', 'ý', 'ÿ' },
+ { 'z', 'ž' }
+}
+alphabet_upper = { -- for sorting
+ { ' ' },
+ { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ', 'Â' },
+ { 'B' },
+ { 'C', 'Ç' },
+ { 'D' },
+ { 'E', 'È', 'É', 'Ë', 'Ê' },
+ { 'F' },
+ { 'G' },
+ { 'H' },
+ { 'I', 'Í', 'Ì', 'Ï', 'Î' },
+ { 'J' },
+ { 'K' },
+ { 'L' },
+ { 'M' },
+ { 'N', 'Ñ' },
+ { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø', 'Ô'},
+ { 'P' },
+ { 'Q' },
+ { 'R' },
+ { 'S', 'Š' },
+ { 'T' },
+ { 'U', 'Ú', 'Ù', 'Ü', 'Û' },
+ { 'V' },
+ { 'W' },
+ { 'X' },
+ { 'Y', 'Ý', 'Ÿ' },
+ { 'Z', 'Ž' }
+}
diff --git a/indexing/xindex/scripts/xindex.lua b/indexing/xindex/scripts/xindex.lua
index 73b0e0c805..984187bf38 100755
--- a/indexing/xindex/scripts/xindex.lua
+++ b/indexing/xindex/scripts/xindex.lua
@@ -6,11 +6,11 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL 1.3
--
--- $Id: xindex.lua 20 2022-01-22 10:37:29Z hvoss $
+-- $Id: xindex.lua 21 2022-01-27 17:45:10Z hvoss $
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.35
+ local version = 0.36
xindex.version = version
--xindex.self = "xindex"
@@ -179,9 +179,14 @@ writeLog(2,"Loading common config file ".."xindex-cfg-common\n",1)
Config_File_Common = kpse.find_file("xindex-cfg-common.lua")
cfg_common = require(Config_File_Common)
-local config_file = "xindex-"..args.config..".lua"
-writeLog(2,"Loading local config file "..config_file,0)
-Config_File = kpse.find_file(config_file)
+local user_config_file = "xindex-"..args["config"]..".lua"
+print("Local config file is: "..user_config_file)
+writeLog(2,"Loading local config file "..user_config_file,0)
+if kpse.find_file(user_config_file)
+ then Config_File = kpse.find_file(user_config_file)
+ else print("Cannot find config file with kpse.find_file!!")
+end
+print("\nLocal KPSE config file is: "..Config_File.."\n")
cfg = require(Config_File)
writeLog(2," ... done\n",0)