summaryrefslogtreecommitdiff
path: root/indexing
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-11-01 03:00:46 +0000
committerNorbert Preining <norbert@preining.info>2019-11-01 03:00:46 +0000
commit61b8d58232b999b6cc966aee9152fb86bbb759cd (patch)
tree61c65799f06cec526c81cc517c0ee68bc4323021 /indexing
parent038f3d26e9b2f40210a14133c33f1d2dfb5261bf (diff)
CTAN sync 201911010300
Diffstat (limited to 'indexing')
-rw-r--r--indexing/xindex/CHANGELOG1
-rw-r--r--indexing/xindex/README.md1
-rw-r--r--indexing/xindex/doc/Makefile2
-rw-r--r--indexing/xindex/doc/xindex-doc.pdfbin377152 -> 375486 bytes
-rw-r--r--indexing/xindex/doc/xindex-doc.tex41
-rw-r--r--indexing/xindex/lualatex/xindex-DIN2.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-HAdW-eKO.lua4
-rw-r--r--indexing/xindex/lualatex/xindex-base.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-cfg-common.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-cfg.lua13
-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.lua10
-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
16 files changed, 47 insertions, 41 deletions
diff --git a/indexing/xindex/CHANGELOG b/indexing/xindex/CHANGELOG
index 0a40bef916..eb66c0c369 100644
--- a/indexing/xindex/CHANGELOG
+++ b/indexing/xindex/CHANGELOG
@@ -1,3 +1,4 @@
+0.19 2019-10-31 - add again missing accented characters
0.18 2019-10-27 - speed up sorting by modifying the code
0.17 2019-10-15 - fixes in cfg file for missing circum
0.16 2019-10-02 - fixes in the documentation
diff --git a/indexing/xindex/README.md b/indexing/xindex/README.md
index e47187276a..ec8963c0da 100644
--- a/indexing/xindex/README.md
+++ b/indexing/xindex/README.md
@@ -43,4 +43,3 @@ buch.tex: run
./xindex.lua buch.idx
lualatex buch
-
diff --git a/indexing/xindex/doc/Makefile b/indexing/xindex/doc/Makefile
index 10d8c8a58f..7e5529f499 100644
--- a/indexing/xindex/doc/Makefile
+++ b/indexing/xindex/doc/Makefile
@@ -1,7 +1,7 @@
.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
-PACKAGE = xhfill
+PACKAGE = xindex
MAIN = xindex-doc
diff --git a/indexing/xindex/doc/xindex-doc.pdf b/indexing/xindex/doc/xindex-doc.pdf
index 8d2a22e4be..7ac6e88ac2 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 c4d41aca5e..0f57fd61f8 100644
--- a/indexing/xindex/doc/xindex-doc.tex
+++ b/indexing/xindex/doc/xindex-doc.tex
@@ -80,7 +80,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\xIndexVersion{#2}}
-\setVersion{version = 0.18}% can be autimatically changed by perl
+\setVersion{version = 0.19}% can be autimatically changed by perl
\setkeys{dtk}{cleanup=true,force=false}
@@ -93,7 +93,7 @@
\vfill
Thanks to: \\
-Mark Baudin;
+Mark Baudoin;
Heiko Oberdiek
\clearpage
@@ -362,34 +362,33 @@ The default sorting is unicode aware and uses a translation table for accented c
\begin{verbatim}
alphabet_lower = { -- for sorting
{ ' ' }, -- only for internal tests
- { 'a', 'á', 'à', 'ä', 'â', 'å', 'æ', },
+ { 'a', 'á', 'à', 'ä'},
{ 'b' },
- { 'c', 'ç' },
+ { 'c' },
{ 'd' },
- { 'e', 'é', 'è', 'ë', 'ê' },
+ { 'e', 'é', 'è', 'ë' },
{ 'f' },
{ 'g' },
{ 'h' },
- { 'i', 'í', 'ì', 'î', 'ï' },
+ { 'i', 'í', 'ì', 'ï' },
{ 'j' },
{ 'k' },
{ 'l' },
{ 'm' },
{ 'n', 'ñ' },
- { 'o', 'ó', 'ò', 'ö', 'ô', 'ø', 'œ', 'ø'},
+ { 'o', 'ó', 'ò', 'ö' },
{ 'p' },
{ 'q' },
{ 'r' },
- { 's', 'š', 'ß' },
+ { 's' },
{ 't' },
- { 'u', 'ú', 'ù', 'ü' , 'û'},
+ { 'u', 'ú', 'ù', 'ü' },
{ 'v' },
{ 'w' },
{ 'x' },
- { 'y', 'ý', 'ÿ' },
- { 'z', 'ž' }
+ { 'y' },
+ { 'z' }
}
-
\end{verbatim}
There is also a table for the uppercase letters. If it should be edited or extended then copy first the
@@ -402,32 +401,32 @@ the umlauts like ö$\rightarrow$oe:
\begin{verbatim}
alphabet_upper = { -- for sorting
{ ' ' },
- { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ'},
+ { 'A', 'Á', 'À', 'Ä'},
{ 'B' },
- { 'C', 'Ç' },
+ { 'C' },
{ 'D' },
- { 'E', 'È', 'É', 'Ë' },
+ { 'E', 'È', 'È', 'ë' },
{ 'F' },
{ 'G' },
{ 'H' },
- { 'I', 'Í', 'Ì', 'Ï' },
+ { 'I', 'Í', 'Ì', 'ï' },
{ 'J' },
{ 'K' },
{ 'L' },
{ 'M' },
{ 'N', 'Ñ' },
- { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø' },
+ { 'O', 'Ó', 'Ò', 'Ö' },
{ 'P' },
{ 'Q' },
{ 'R' },
- { 'S', 'Š' },
+ { 'S' },
{ 'T' },
{ 'U', 'Ú', 'Ù', 'Ü' },
{ 'V' },
{ 'W' },
{ 'X' },
- { 'Y', 'Ý', 'Ÿ' },
- { 'Z', 'Ž' }
+ { 'Y' },
+ { 'Z' }
}
\end{verbatim}
@@ -1266,7 +1265,7 @@ In the documents preamble there is the definition:
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-header'] = {
- version = 0.18,
+ version = 0.19,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
diff --git a/indexing/xindex/lualatex/xindex-DIN2.lua b/indexing/xindex/lualatex/xindex-DIN2.lua
index 48231b1d83..ec5826316b 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.18,
+ version = 0.19,
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 7b2dba332c..0b588ff74e 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.18,
+ version = 0.19,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -62,7 +62,7 @@ alphabet_lower = { -- for sorting
{ 'p' },
{ 'q' },
{ 'r' },
- { 's', 'ß' },
+ { 's' },
{ 't' },
{ 'u', 'ú', 'ù', 'ü' },
{ 'v' },
diff --git a/indexing/xindex/lualatex/xindex-base.lua b/indexing/xindex/lualatex/xindex-base.lua
index f415505460..a110a41b00 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.18 }
+local info = { version = 0.19 }
-- check config
if pageNoPrefixDel ~= "" then
diff --git a/indexing/xindex/lualatex/xindex-cfg-common.lua b/indexing/xindex/lualatex/xindex-cfg-common.lua
index f44967f63c..17ce7d2794 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.18,
+ version = 0.19,
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 89de044ca1..952aa90169 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.18,
+ version = 0.19,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -60,31 +60,30 @@ alphabet_lower = { -- for sorting
}
alphabet_upper = { -- for sorting
{ ' ' },
- { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ'},
+ { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ', 'Â' },
{ 'B' },
{ 'C', 'Ç' },
{ 'D' },
- { 'E', 'È', 'É', 'Ë' },
+ { 'E', 'È', 'É', 'Ë', 'Ê' },
{ 'F' },
{ 'G' },
{ 'H' },
- { 'I', 'Í', 'Ì', 'Ï' },
+ { 'I', 'Í', 'Ì', 'Ï', 'Î' },
{ 'J' },
{ 'K' },
{ 'L' },
{ 'M' },
{ 'N', 'Ñ' },
- { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø' },
+ { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø', 'Ô'},
{ 'P' },
{ 'Q' },
{ 'R' },
{ 'S', 'Š' },
{ 'T' },
- { 'U', 'Ú', 'Ù', 'Ü' },
+ { 'U', 'Ú', 'Ù', 'Ü', 'Û' },
{ 'V' },
{ 'W' },
{ 'X' },
{ 'Y', 'Ý', 'Ÿ' },
{ 'Z', 'Ž' }
}
-
diff --git a/indexing/xindex/lualatex/xindex-dtk.lua b/indexing/xindex/lualatex/xindex-dtk.lua
index 6c918cc28a..b363f627aa 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.18,
+ version = 0.19,
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 02dea0358b..5d8dfb9b60 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.18,
+ version = 0.19,
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 59193f1d28..fd36c1560c 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.18,
+ version = 0.19,
comment = "main library to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -272,6 +272,14 @@ function replaceVerticalChar(v)
end
end
+--local ignore = "'`'"
+
+function ignoreLetters( c )
+ return (c:gsub("["..ignore.."]+", ""):match("^%s*(.-)%s*$"))
+end
+-- somestring:match("^%s*(.-)%s*$") --trim function
+
+
function getEntryAndPage(w, nextW, EntryList)
-- \indexentry{Aachen, Johann von}{VII/1-215}
-- \indexentry {Document@\idxtextClasses !IEEEtran@{\sfffffamily IEEEtran}}{185}
diff --git a/indexing/xindex/lualatex/xindex-pretty.lua b/indexing/xindex/lualatex/xindex-pretty.lua
index 1165b6a624..16fea2c99f 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.18,
+ version = 0.19,
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 99b8642293..c77270b16e 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.18,
+ version = 0.19,
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 8183b32bb5..8ab76b494d 100755
--- a/indexing/xindex/scripts/xindex.lua
+++ b/indexing/xindex/scripts/xindex.lua
@@ -8,7 +8,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.18
+ local version = 0.19
xindex.version = version
--xindex.self = "xindex"