summaryrefslogtreecommitdiff
path: root/indexing
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-11-08 03:02:49 +0000
committerNorbert Preining <norbert@preining.info>2021-11-08 03:02:49 +0000
commitf3bd7117b5dfa4a51d51c4e416c8a656651f1ce2 (patch)
tree5053c95dab175775cc85badf7990ffa535676f23 /indexing
parent8389f0bb8e6af2c5dcbfe3cdad746a9c170d1157 (diff)
CTAN sync 202111080302
Diffstat (limited to 'indexing')
-rw-r--r--indexing/xindex/CHANGELOG1
-rw-r--r--indexing/xindex/doc/tests/HADW.pdfbin18345 -> 18346 bytes
-rw-r--r--indexing/xindex/doc/tests/Umlaute.pdfbin15198 -> 15201 bytes
-rw-r--r--indexing/xindex/doc/tests/Umlaute2.pdfbin18887 -> 18890 bytes
-rw-r--r--indexing/xindex/doc/tests/buch.pdfbin39090 -> 39089 bytes
-rw-r--r--indexing/xindex/doc/tests/demo-hyperref.pdfbin28627 -> 28627 bytes
-rw-r--r--indexing/xindex/doc/tests/demo.pdfbin34621 -> 34619 bytes
-rw-r--r--indexing/xindex/doc/tests/demo3.pdfbin9220 -> 9223 bytes
-rw-r--r--indexing/xindex/doc/tests/demo4.pdfbin11887 -> 11885 bytes
-rw-r--r--indexing/xindex/doc/xindex-doc.pdfbin396230 -> 396390 bytes
-rw-r--r--indexing/xindex/doc/xindex-doc.tex31
-rw-r--r--indexing/xindex/latex/xindex.sty2
-rw-r--r--indexing/xindex/lualatex/xindex-DIN2.lua4
-rw-r--r--indexing/xindex/lualatex/xindex-HAdW-eKO.lua6
-rw-r--r--indexing/xindex/lualatex/xindex-base.lua4
-rw-r--r--indexing/xindex/lualatex/xindex-baselib.lua4
-rw-r--r--indexing/xindex/lualatex/xindex-cfg-common.lua6
-rw-r--r--indexing/xindex/lualatex/xindex-cfg-uca.lua4
-rw-r--r--indexing/xindex/lualatex/xindex-cfg.lua4
-rw-r--r--indexing/xindex/lualatex/xindex-danteedition.lua93
-rw-r--r--indexing/xindex/lualatex/xindex-dtk.lua4
-rw-r--r--indexing/xindex/lualatex/xindex-lib.lua7
-rw-r--r--indexing/xindex/lualatex/xindex-norsk.lua4
-rw-r--r--indexing/xindex/lualatex/xindex-pretty.lua4
-rw-r--r--indexing/xindex/lualatex/xindex-yannis.lua4
-rwxr-xr-xindexing/xindex/scripts/xindex.lua2
26 files changed, 140 insertions, 44 deletions
diff --git a/indexing/xindex/CHANGELOG b/indexing/xindex/CHANGELOG
index 5af214405d..eb16ed0881 100644
--- a/indexing/xindex/CHANGELOG
+++ b/indexing/xindex/CHANGELOG
@@ -1,3 +1,4 @@
+0.34 2021-11-07 - added the enddor for sq. and sqq.
0.33 2021-08-15 - fix for filename->outfilename
0.32 2021-08-15 - fix for multiple input files
0.31 2021-08-13 - fix introduced bug for roman page numbers
diff --git a/indexing/xindex/doc/tests/HADW.pdf b/indexing/xindex/doc/tests/HADW.pdf
index f3f41d3381..909517a46f 100644
--- a/indexing/xindex/doc/tests/HADW.pdf
+++ b/indexing/xindex/doc/tests/HADW.pdf
Binary files differ
diff --git a/indexing/xindex/doc/tests/Umlaute.pdf b/indexing/xindex/doc/tests/Umlaute.pdf
index 572ba0c959..dca73ca414 100644
--- a/indexing/xindex/doc/tests/Umlaute.pdf
+++ b/indexing/xindex/doc/tests/Umlaute.pdf
Binary files differ
diff --git a/indexing/xindex/doc/tests/Umlaute2.pdf b/indexing/xindex/doc/tests/Umlaute2.pdf
index d600be96f2..f63a171c11 100644
--- a/indexing/xindex/doc/tests/Umlaute2.pdf
+++ b/indexing/xindex/doc/tests/Umlaute2.pdf
Binary files differ
diff --git a/indexing/xindex/doc/tests/buch.pdf b/indexing/xindex/doc/tests/buch.pdf
index d0d2969adf..b7bbc6a950 100644
--- a/indexing/xindex/doc/tests/buch.pdf
+++ b/indexing/xindex/doc/tests/buch.pdf
Binary files differ
diff --git a/indexing/xindex/doc/tests/demo-hyperref.pdf b/indexing/xindex/doc/tests/demo-hyperref.pdf
index 8d070a27a0..680acbc892 100644
--- a/indexing/xindex/doc/tests/demo-hyperref.pdf
+++ b/indexing/xindex/doc/tests/demo-hyperref.pdf
Binary files differ
diff --git a/indexing/xindex/doc/tests/demo.pdf b/indexing/xindex/doc/tests/demo.pdf
index db949abf94..1b1b2888f0 100644
--- a/indexing/xindex/doc/tests/demo.pdf
+++ b/indexing/xindex/doc/tests/demo.pdf
Binary files differ
diff --git a/indexing/xindex/doc/tests/demo3.pdf b/indexing/xindex/doc/tests/demo3.pdf
index cf5e5dc1ae..91cfbb7134 100644
--- a/indexing/xindex/doc/tests/demo3.pdf
+++ b/indexing/xindex/doc/tests/demo3.pdf
Binary files differ
diff --git a/indexing/xindex/doc/tests/demo4.pdf b/indexing/xindex/doc/tests/demo4.pdf
index 637852a00e..f17c7cdf92 100644
--- a/indexing/xindex/doc/tests/demo4.pdf
+++ b/indexing/xindex/doc/tests/demo4.pdf
Binary files differ
diff --git a/indexing/xindex/doc/xindex-doc.pdf b/indexing/xindex/doc/xindex-doc.pdf
index 110ff02973..48ed436ef4 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 70a8ada370..bfdb23dc43 100644
--- a/indexing/xindex/doc/xindex-doc.tex
+++ b/indexing/xindex/doc/xindex-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: xindex-doc.tex 635 2017-10-24 18:22:59Z herbert $
+%% $Id: xindex-doc.tex 16 2021-11-07 19:42:57Z hvoss $
%
\listfiles\setcounter{errorcontextlines}{100}
\documentclass[paper=a4,fontsize=11pt,DIV=14,parskip=half-,
@@ -80,7 +80,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\xIndexVersion{#2}}
-\setVersion{version = 0.33}% can be automatically changed by perl
+\setVersion{version = 0.34}% can be automatically changed by perl
\setkeys{dtk}{cleanup=true,force}
@@ -103,6 +103,7 @@ Michal Hoftich;
Frank Mittelbach;
Heiko Oberdiek;
Matteo Paolini;
+Stefan Pinnow;
Florent Rougon;
Martin Sievers;
Simon Spiegel
@@ -189,7 +190,7 @@ xindex -c norsk -o index.ind demo1 demo2.bdx demo3.adx
\begin{enumerate}
\item \texttt{-q}: quiet; \texttt{-l fr}: french language setting; \texttt{-b}: no labels; \texttt{myDoc}: input data \texttt{myDoc} or \texttt{myDoc.idx)\newline
output data will be \texttt{myDoc.ind} and logfile \texttt{myDoc.ilg}
-\item \texttt{-l de}: german language setting; \texttt{-c DIN2}: config file \texttt{xindex-DIN2.lua}; \texttt{demo1 demo2 demo3}: input data files with or without
+\item \texttt{-l de}: German language setting; \texttt{-c DIN2}: config file \texttt{xindex-DIN2.lua}; \texttt{demo1 demo2 demo3}: input data files with or without
extension \texttt{.idx} \newline
output data will be \texttt{demo1.ind} and logfile \texttt{xindex.ilg}}
\item \texttt{-c norsk}: config file \texttt{xindex-norsk.lua}; \texttt{-o index.ind}: output file; \texttt{demo1 demo2.bdx demo3.adx}: input data files with or without
@@ -244,7 +245,7 @@ like \texttt{ö}$\rightarrow$\texttt{o}.
\subsection{The \texttt{.idx} file}
There are four characters which must be escaped if used in the command \Lcs{index}:
-\verb=!=, \verb=@=, \verb="=, or \verb=|=. These charactzers have a special meaning for
+\verb=!=, \verb=@=, \verb="=, or \verb=|=. These characters have a special meaning for
the index.\index{"!}\index{"@}\index{"|}
The default \Index{escape character} is the double quote \verb|"|:
@@ -300,7 +301,7 @@ run \texttt{xindex <file.idx>}\index{<file.idx>}\index{123}
\end{externalDocument}
-For the german language the double quote is an active character and it makes live easier
+For the German language the double quote is an active character and it makes live easier
if one chooses another character.
The escape character can be changed easily by the optional argument \verb|-e "<char>"| or
\verb|--escapechar "<char">|. The following example shows how
@@ -464,7 +465,7 @@ alphabet_lower = { -- for sorting
There is also a table for the uppercase letters. If it should be edited or extended then copy first the
base configuration file \Lfile{xindex-cfg.lua} and modify that new file. It can be used by \XI
with the optional argument \texttt{-c newfile} if it is named as \Lfile{xindex-newfile.lua}.
-For german there already exists a configuration
+For German there already exists a configuration
file \Lfile{xindex-DIN2.lua} which uses the so-called »Telefonbuchsortierung« which converts
the umlauts like ö$\rightarrow$oe:
@@ -557,9 +558,9 @@ Sorted with \verb|-l DE|
-The same sorted with the german DIN variant 2 with \verb|--config DIN2|, which
+The same sorted with the German DIN variant 2 with \verb|--config DIN2|, which
is part of the \TeX\ distribution. In this case a letter Ö is converted to Oe before sorting
-the word beginninjg with the letter Ö:
+the word beginning with the letter Ö:
\noindent
\begin{externalDocument}[
@@ -570,7 +571,7 @@ the word beginninjg with the letter Ö:
crop,
xindex,
xindexOptions=-c DIN2 -l DE,
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -740,7 +741,7 @@ Sorted with \verb|-u -l cs|
The sorting order can be easliy modified. Read the documentation of the package \texttt{LUA-UCA}
on how to do it and what languages are supported so far. Any additional code setting for
-UCA should be dont in the file \Lfile{xindex-cfg-uca.lua}, which will automatically be read
+UCA should be don't in the file \Lfile{xindex-cfg-uca.lua}, which will automatically be read
by \Lprog{xindex}.
@@ -767,7 +768,7 @@ folium = {
da = {"f", "ff"},
de = {"f", "ff"},
en = {"f", "ff"},
- fr = {"\\,sq","\\,sqq"},
+ fr = {"\\,sq.","\\,sqq."},
it = {"f", "ff"},
jp = {"シンボル","番号"},
no = {"\\,f.","\\,ff."},
@@ -784,7 +785,7 @@ folium = {
crop,
xindex,
xindexOptions=-l fr,
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -934,7 +935,7 @@ and the file extension \Lext{lua}, for example: \Lfile{xindex-HAdW-eKO.lua} whic
with \verb|--config HAdW-eKO|. The file must be saved in the documents directory or in
one which is known to \Lprog{kpsewhich}, for example\footnote{The directory \texttt{xindex} must be created
before saving the file.} \verb|$TEXMFLOCAL/tex/lualatex/xindex/| %$
-Don not forgot to update the filename database.
+Do not forget to update the filename database.
A new config file must declare at least the variables which are part of the
default config file: the translation tables and
@@ -1249,7 +1250,7 @@ baz\index{foo!bar!baz} foobar%
\section{Including \LaTeX\ commands into the \Lext{idx} file}
The command \Lcs{addtocontents} doesn't work for the index file. With the \LaTeX\ package
\Lpack{xindex} (same name as the Lua program \Lprog{xindex}) defines a macro \Lcs{writeidx}
-which writes its argument into the \Lext{idx} file. This can be usefull to insert a
+which writes its argument into the \Lext{idx} file. This can be useful to insert a
\Index{pagebreak}/""\Index{columnbreak}
before a new letter in the output of the index file:
@@ -1313,7 +1314,7 @@ such commands are ignored. In the following example we put an horizontal line af
\section{Headings}
-By default the output uses the english headings: \textit{Symbols}, \textit{Numbers}, and \textit{A} \ldots
+By default the output uses the English headings: \textit{Symbols}, \textit{Numbers}, and \textit{A} \ldots
There are three predefined languages \texttt{en}, \texttt{de}, and \texttt{fr}. The definition is in the file
\Lfile{xindex-cfg-common.lua} (see also section \vref{language}).
%
diff --git a/indexing/xindex/latex/xindex.sty b/indexing/xindex/latex/xindex.sty
index 65799577dc..0330eee8e3 100644
--- a/indexing/xindex/latex/xindex.sty
+++ b/indexing/xindex/latex/xindex.sty
@@ -1,6 +1,6 @@
%% This is file `xindex.sty',
%%
-%% Copyright (C) 2019-
+%% Copyright (C) 2018-2021
%% Herbert Voss
%%
%% It may be distributed and/or modified under the
diff --git a/indexing/xindex/lualatex/xindex-DIN2.lua b/indexing/xindex/lualatex/xindex-DIN2.lua
index 1c13afc242..b325346d0e 100644
--- a/indexing/xindex/lualatex/xindex-DIN2.lua
+++ b/indexing/xindex/lualatex/xindex-DIN2.lua
@@ -5,11 +5,11 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL1.3
--
--- $Id: xindex-DIN2.lua 12 2021-08-15 09:28:32Z hvoss $
+-- $Id: xindex-DIN2.lua 13 2021-08-15 10:49:40Z hvoss $
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.33,
+ version = 0.34,
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 49852aa89b..ac152ba7f9 100644
--- a/indexing/xindex/lualatex/xindex-HAdW-eKO.lua
+++ b/indexing/xindex/lualatex/xindex-HAdW-eKO.lua
@@ -5,13 +5,13 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL1.3
--
--- $Id: xindex-HAdW-eKO.lua 12 2021-08-15 09:28:32Z hvoss $
+-- $Id: xindex-HAdW-eKO.lua 13 2021-08-15 10:49:40Z hvoss $
-----------------------------------------------------------------------
--
-- configuration for index files of the Heidelberger Akademie der Wissenschaften
if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = {
- version = 0.33,
+ version = 0.34,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -37,7 +37,7 @@ case_sensitive = false -- speeds up running
folium = {
de = {"f.", "ff."},
en = {"f.", "ff."},
- fr = {"\\,sq","\\,sqq"},
+ fr = {"\\,sq.","\\,sqq."},
}
diff --git a/indexing/xindex/lualatex/xindex-base.lua b/indexing/xindex/lualatex/xindex-base.lua
index 13e4db70f7..2bc1fad8d3 100644
--- a/indexing/xindex/lualatex/xindex-base.lua
+++ b/indexing/xindex/lualatex/xindex-base.lua
@@ -5,10 +5,10 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL1.3
--
--- $Id: xindex-base.lua 12 2021-08-15 09:28:32Z hvoss $
+-- $Id: xindex-base.lua 13 2021-08-15 10:49:40Z hvoss $
-----------------------------------------------------------------------
-local info = { version = 0.33 }
+local info = { version = 0.34 }
-- check config
if pageNoPrefixDel ~= "" then
diff --git a/indexing/xindex/lualatex/xindex-baselib.lua b/indexing/xindex/lualatex/xindex-baselib.lua
index 5dd579a19f..6508bf17a4 100644
--- a/indexing/xindex/lualatex/xindex-baselib.lua
+++ b/indexing/xindex/lualatex/xindex-baselib.lua
@@ -5,11 +5,11 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL1.3
--
--- $Id: xindex-baselib.lua 12 2021-08-15 09:28:32Z hvoss $
+-- $Id: xindex-baselib.lua 13 2021-08-15 10:49:40Z hvoss $
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-baselib'] = {
- version = 0.33,
+ version = 0.34,
comment = "base library to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
diff --git a/indexing/xindex/lualatex/xindex-cfg-common.lua b/indexing/xindex/lualatex/xindex-cfg-common.lua
index eba315f21f..cf563b353a 100644
--- a/indexing/xindex/lualatex/xindex-cfg-common.lua
+++ b/indexing/xindex/lualatex/xindex-cfg-common.lua
@@ -5,11 +5,11 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL1.3
--
--- $Id: xindex-cfg-common.lua 12 2021-08-15 09:28:32Z hvoss $
+-- $Id: xindex-cfg-common.lua 13 2021-08-15 10:49:40Z hvoss $
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-common'] = {
- version = 0.33,
+ version = 0.34,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -32,7 +32,7 @@ folium = {
da = {"f", "ff"},
de = {"f", "ff"},
en = {"f", "ff"},
- fr = {"\\,sq","\\,sqq"},
+ fr = {"\\,sq.","\\,sqq."},
it = {"f", "ff"},
jp = {"シンボル","番号"},
no = {"\\,f.","\\,ff."},
diff --git a/indexing/xindex/lualatex/xindex-cfg-uca.lua b/indexing/xindex/lualatex/xindex-cfg-uca.lua
index b2ed04dbc9..43cc6e82a5 100644
--- a/indexing/xindex/lualatex/xindex-cfg-uca.lua
+++ b/indexing/xindex/lualatex/xindex-cfg-uca.lua
@@ -5,11 +5,11 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL1.3
--
--- $Id: xindex-cfg-uca.lua 12 2021-08-15 09:28:32Z hvoss $
+-- $Id: xindex-cfg-uca.lua 13 2021-08-15 10:49:40Z hvoss $
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-lua'] = {
- version = 0.33,
+ version = 0.34,
comment = "configuration to xindex-cfg-uca.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
diff --git a/indexing/xindex/lualatex/xindex-cfg.lua b/indexing/xindex/lualatex/xindex-cfg.lua
index 3b7bb06c25..2860dbe50d 100644
--- a/indexing/xindex/lualatex/xindex-cfg.lua
+++ b/indexing/xindex/lualatex/xindex-cfg.lua
@@ -5,11 +5,11 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL1.3
--
--- $Id: xindex-cfg.lua 12 2021-08-15 09:28:32Z hvoss $
+-- $Id: xindex-cfg.lua 13 2021-08-15 10:49:40Z hvoss $
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.33,
+ version = 0.34,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
diff --git a/indexing/xindex/lualatex/xindex-danteedition.lua b/indexing/xindex/lualatex/xindex-danteedition.lua
new file mode 100644
index 0000000000..d8950e3a40
--- /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 15 2021-08-20 19:01:56Z hvoss $
+-----------------------------------------------------------------------
+
+if not modules then modules = { } end modules ['xindex-cfg'] = {
+ version = 0.34,
+ comment = "main 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
+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/lualatex/xindex-dtk.lua b/indexing/xindex/lualatex/xindex-dtk.lua
index 446cc5bc7f..d71a0f8f17 100644
--- a/indexing/xindex/lualatex/xindex-dtk.lua
+++ b/indexing/xindex/lualatex/xindex-dtk.lua
@@ -5,11 +5,11 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL1.3
--
--- $Id: xindex-dtk.lua 12 2021-08-15 09:28:32Z hvoss $
+-- $Id: xindex-dtk.lua 13 2021-08-15 10:49:40Z hvoss $
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.33,
+ version = 0.34,
comment = "DTK configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
diff --git a/indexing/xindex/lualatex/xindex-lib.lua b/indexing/xindex/lualatex/xindex-lib.lua
index a7936ffb0f..717eec69f7 100644
--- a/indexing/xindex/lualatex/xindex-lib.lua
+++ b/indexing/xindex/lualatex/xindex-lib.lua
@@ -5,11 +5,11 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL1.3
--
--- $Id: xindex-lib.lua 12 2021-08-15 09:28:32Z hvoss $
+-- $Id: xindex-lib.lua 13 2021-08-15 10:49:40Z hvoss $
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-lib'] = {
- version = 0.33,
+ version = 0.34,
comment = "main library to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -492,7 +492,8 @@ function get_category(code_point)
end
function getCharType(c)
--- print ("getCharType c="..tostring(c).." "..type(c)..": codepoint="..utf8.codepoint(c))
+ if c=="" then return 0 end
+-- print ("getCharType c="..tostring(c).." "..type(c)..": codepoint=") --..utf8.codepoint(c))
local category = get_category(utf8.codepoint(c))
-- print ("getCharType: "..category)
if category == "Nd" then return 1
diff --git a/indexing/xindex/lualatex/xindex-norsk.lua b/indexing/xindex/lualatex/xindex-norsk.lua
index 82e443d17a..c58ebf0499 100644
--- a/indexing/xindex/lualatex/xindex-norsk.lua
+++ b/indexing/xindex/lualatex/xindex-norsk.lua
@@ -6,11 +6,11 @@
-- MODIFIED: Sveinung Heggen (2020-01-02)
-- LICENSE: LPPL1.3
--
--- $Id: xindex-norsk.lua 12 2021-08-15 09:28:32Z hvoss $
+-- $Id: xindex-norsk.lua 13 2021-08-15 10:49:40Z hvoss $
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-no'] = {
- version = 0.33,
+ version = 0.34,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
diff --git a/indexing/xindex/lualatex/xindex-pretty.lua b/indexing/xindex/lualatex/xindex-pretty.lua
index e27bedaf5a..02d95ff596 100644
--- a/indexing/xindex/lualatex/xindex-pretty.lua
+++ b/indexing/xindex/lualatex/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 12 2021-08-15 09:28:32Z hvoss $
+-- $Id: xindex-pretty.lua 13 2021-08-15 10:49:40Z hvoss $
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-pretty'] = {
- version = 0.33,
+ version = 0.34,
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 e2b69ac148..62030ad247 100644
--- a/indexing/xindex/lualatex/xindex-yannis.lua
+++ b/indexing/xindex/lualatex/xindex-yannis.lua
@@ -5,11 +5,11 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL1.3
--
--- $Id: xindex-yannis.lua 12 2021-08-15 09:28:32Z hvoss $
+-- $Id: xindex-yannis.lua 13 2021-08-15 10:49:40Z hvoss $
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-yannis'] = {
- version = 0.33,
+ version = 0.34,
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 4fb757b86c..03bc097093 100755
--- a/indexing/xindex/scripts/xindex.lua
+++ b/indexing/xindex/scripts/xindex.lua
@@ -10,7 +10,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.33
+ local version = 0.34
xindex.version = version
--xindex.self = "xindex"