summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-05-29 21:12:24 +0000
committerKarl Berry <karl@freefriends.org>2020-05-29 21:12:24 +0000
commitbf1dd2cd335015e26e2858c7f7f8ef588fd36af1 (patch)
treeb5a2a51d168599f5c6fcb53bf4c316e02783ef37
parentcd9cc8075fb5769a93e80e78b526e8fc0cf1a427 (diff)
xindex (29may20)
git-svn-id: svn://tug.org/texlive/trunk@55335 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/xindex/xindex.lua2
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/CHANGELOG3
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/Makefile7
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/README.md6
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/tests/HADW.ind38
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdfbin18924 -> 6979 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/tests/HADW.tex3
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdfbin15832 -> 15834 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdfbin19533 -> 19743 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind3
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdfbin40170 -> 40385 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdfbin29389 -> 29388 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdfbin35447 -> 35457 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdfbin9494 -> 9503 bytes
-rwxr-xr-xMaster/texmf-dist/doc/lualatex/xindex/tests/runTests.sh2
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdfbin375591 -> 378005 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex28
-rwxr-xr-xMaster/texmf-dist/scripts/xindex/xindex.lua2
-rw-r--r--Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua2
-rw-r--r--Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua2
-rw-r--r--Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua2
-rw-r--r--Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua6
-rw-r--r--Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua4
-rw-r--r--Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua2
-rw-r--r--Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua2
-rw-r--r--Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua2
-rw-r--r--Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua2
-rw-r--r--Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua260
28 files changed, 40 insertions, 338 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
index 7abb9850869..1c126985d68 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.19
+ local version = 0.21
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 9eefa010524..59a4bed43db 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
+++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
@@ -1,4 +1,5 @@
-0.20 2019-1^221 - fix for |see{foo bar}
+0.21 2020-05-29 - added support for italian language
+0.20 2019-11-22 - fix for |see{foo bar}
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
diff --git a/Master/texmf-dist/doc/lualatex/xindex/Makefile b/Master/texmf-dist/doc/lualatex/xindex/Makefile
index 7e5529f499b..d0e8fd6fd72 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/Makefile
+++ b/Master/texmf-dist/doc/lualatex/xindex/Makefile
@@ -1,7 +1,8 @@
+# `Makefile' for `pst-grad.pdf', hv, 2008/08/11
.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
-PACKAGE = xindex
+PACKAGE = xhfill
MAIN = xindex-doc
@@ -20,13 +21,13 @@ doc:
# if ! test -f $(MAIN).glo ; then touch $(MAIN).glo; fi
if ! test -f $(MAIN).idx ; then touch $(MAIN).idx; fi
# makeindex -s gglo.ist -t $(MAIN).glg -o $(MAIN).gls $(MAIN).glo
- xindex -a $(MAIN).idx
+ xindex $(MAIN).idx
# bibtex $(MAIN)
$(LATEX) --shell-escape $(MAIN)
# $(LATEX) --shell-escape $(MAIN)
clean :
- $(RM) *.dvi *.aux *.log *.xml xindex-?.tex xindex-??.tex *.ind *.idx *.toc *.out *.ilg
+ $(RM) *.dvi *.aux *.log *.xml xindex-?.tex xindex-??.tex *.ind *.idx *.toc *.out *.ilg *.adx
veryclean : clean
$(RM) *.pdf
diff --git a/Master/texmf-dist/doc/lualatex/xindex/README.md b/Master/texmf-dist/doc/lualatex/xindex/README.md
index ec8963c0dae..c4356291996 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/README.md
+++ b/Master/texmf-dist/doc/lualatex/xindex/README.md
@@ -17,16 +17,15 @@ The syntax of `xindex`
xindex [options] <inputfile>[.idx]
possible options are (short,long):
+
-q,--quiet
-h,--help
- -v... Verbosity level; can be -v, -vv, -vvv
+ -v
-c,--config (default cfg)
-e,--escapechar (default ")
-n,--noheadings
- -a,--no_casesensitive
-o,--output (default "")
-l,--language (default en)
- -p,--prefix (default L)
<input> (string)
Testfiles:
@@ -43,3 +42,4 @@ buch.tex: run
./xindex.lua buch.idx
lualatex buch
+
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.ind
index 6cf4e5b449d..e69de29bb2d 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.ind
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.ind
@@ -1,38 +0,0 @@
-
-\begin{theindex}
-
-\indexspace
-\textbf{A}\label{L-xindex-A}
-\nopagebreak[4]
- \item Aachen, Johannes von \dotfill {\colorbox{black!15}{VII/1}:~215}
- \item Aarones \dotfill {\colorbox{black!15}{VII/2/1}:~1003}, {1012}
- \item Abrahamson \dotfill {\colorbox{black!15}{VII/2/1}:~864}, {991}, {1048}, {1067}, {1156}
- \item Adamson \dotfill {\colorbox{black!15}{VII/2/1}:~1223}, {\colorbox{black!15}{IX/1}:~1228}
- \item Adrian
- \subitem -\,Hauster \dotfill {\colorbox{black!15}{VII/1}:~514}, {\colorbox{black!15}{XI/1}:~515}
- \item Alting
- \subitem -\,Mensa \dotfill {\colorbox{black!15}{VII/1}:~426}, {434}, {453}, {455}, {466f.}
-
-\indexspace
-\textbf{B}\label{L-xindex-B}
-\nopagebreak[4]
- \item Bremen
- \subitem -\,Heinz von, Erzbischof \dotfill \see{Sachsen-Lauenburg}{ }
-
-\indexspace
-\textbf{O}\label{L-xindex-O}
-\nopagebreak[4]
- \item Osnabrück
- \subitem -\,Heinz von, Bischof \dotfill \see{Sachsen-Lauenburg}{ }
-
-\indexspace
-\textbf{S}\label{L-xindex-S}
-\nopagebreak[4]
- \item Schleswig-Holstein
- \subitem -\,Rudolf von, Herzog \dotfill {\colorbox{black!15}{VII/2/1}:~758--761}, {765}
-
-\indexspace
-\textbf{Z}\label{L-xindex-Z}
-\nopagebreak[4]
- \item Zwingl, Haldrich \dotfill {\colorbox{black!15}{IX}:~479}, {692}
-\end{theindex}
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf
index 239f431bc92..001aa105929 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.tex b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.tex
index 1a837fd93b5..2c26732da25 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.tex
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.tex
@@ -5,7 +5,6 @@
\usepackage{babel}
\usepackage{makeidx}
\usepackage{dtk-logos}
-\usepackage[table]{xcolor}
\makeatletter
\def\theindex{% only for demonstration
\section*{\indexname}
@@ -14,7 +13,7 @@
\makeatother
\begin{document}
-Run with \verb|xindex --config HAdW-eKO|
+Run with \verb|xindex --config HAdW|
\printindex
\end{document}
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf
index d91d9f10ec6..08b3a5f0031 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf
index c2b78f3f185..6e0d33f3342 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind
index 57a3d139cff..0ce99318594 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind
@@ -473,11 +473,10 @@
\subitem -\,Stil, {378}
\subitem -\,Tiefe, {64}
\subitem -\,Warnung, {883}
+ \subitem -\,fett, {411}, {451}
\item Schriftattribut, {660}
\item Schrifteinbindung, {9}
\item Schriftfamilie, {85}, {442}, {595}
- \item Schrift
- \subitem -\,fett, {411}, {451}
\item Schriftgröße, {63}, {87}, {404}
\item Schriftkodierung, {9}, {54}, {70}
\item Schriftstärke, {87}
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf
index 5975dd18f7a..da01fabb6f2 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf
index dfe9b33aaa9..80305115265 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf
index 0df70568641..5447c661eda 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf
index b9718a4e31f..053a9853cb5 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh b/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh
index 678bfa40e78..68f6c7850a8 100755
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh
@@ -21,7 +21,7 @@ xindex demo-hyperref > /dev/null
lualatex demo-hyperref > /dev/null
echo "HADW"
-xindex -l de -c HAdW-eKO HADW > /dev/null
+xindex -l de -c HAdW HADW > /dev/null
lualatex HADW > /dev/null
echo "Umlaute"
diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
index 93ea17158d0..2de67ba7388 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
index 63902cdeec9..1a2c4dc4c1d 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
+++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
@@ -80,7 +80,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\xIndexVersion{#2}}
-\setVersion{version = 0.20}% can be autimatically changed by perl
+\setVersion{version = 0.21}% can be autimatically changed by perl
\setkeys{dtk}{cleanup=true,force=false}
@@ -94,7 +94,8 @@
\vfill
Thanks to: \\
Mark Baudoin;
-Heiko Oberdiek
+Heiko Oberdiek;
+Matteo Paolini
\clearpage
@@ -308,12 +309,13 @@ indexheader = {
de = {"Symbole", "Zahlen"},
en = {"Symbols", "Numbers"},
fr = {"Symboles","Chiffre"},
+ it = {"Simboli", "Numeri"},
\Japanese jp = {"シンボル","番号"},
}
\end{Verbatim}
}
-The following example was run with \verb|xindex -l de <file>.idx|:
+The following example was run with \verb|xindex -l it <file>.idx|:
\begin{externalDocument}[
% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule},
@@ -322,8 +324,8 @@ The following example was run with \verb|xindex -l de <file>.idx|:
compiler=lualatex,
crop,
xindex,
- xindexOptions=-l de -e ">",
- force=false,
+ xindexOptions=-l it -e ">",
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -348,7 +350,7 @@ The following example was run with \verb|xindex -l de <file>.idx|:
\item Double doublequote \verb|""| \index{>">"}
\item At character @ \index{At (>@)}
\end{itemize}
-Run \texttt{xindex} with \texttt{xindex -l de -e ">"}\index{123}
+Run \texttt{xindex} with \texttt{xindex -l it -e ">"}\index{123}
\newpage
\printindex
\end{document}
@@ -644,6 +646,8 @@ folium = {
de = {"f", "ff"},
en = {"f", "ff"},
fr = {"\,sq","\,sqq"},
+ it = {"f", "ff"},
+ no = {"\\,f.","\\,ff."},
jp = {"シンボル","番号"},
}
\end{Verbatim}
@@ -813,7 +817,7 @@ default config file: the translation tables and
\begin{verbatim}
itemPageDelimiter = "," -- Hello, 14
compressPages = true
- -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid
+ -- 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 = "--"
@@ -1265,7 +1269,7 @@ In the documents preamble there is the definition:
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-header'] = {
- version = 0.19,
+ version = 0.20,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -1574,11 +1578,3 @@ in the argument of \Lcs{indexentry}.
\printindex
\end{document}
-
-
-
-folium = {
- de = {"f", "ff"},
- en = {"f", "ff"},
- fr = {"sq","sqq"},
-}
diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua
index 7abb9850869..1c126985d68 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.19
+ local version = 0.21
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 46d74b8bfb8..91856b5bdf5 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.20,
+ version = 0.21,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
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 81f00dd2b0e..9f463da2051 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.20,
+ version = 0.21,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
index 4f16a9214d7..4a8ffffa35a 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.20 }
+local info = { version = 0.21 }
-- check config
if pageNoPrefixDel ~= "" then
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 8a7e33addb3..75febfb1dac 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.20,
+ version = 0.21,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -18,6 +18,7 @@ indexheader = {
de = {"Symbole", "Zahlen"},
en = {"Symbols", "Numbers"},
fr = {"Symboles","Chiffre"},
+ it = {"Simboli", "Numeri"},
jp = {"シンボル","番号"},
}
@@ -25,6 +26,9 @@ folium = {
de = {"f", "ff"},
en = {"f", "ff"},
fr = {"\\,sq","\\,sqq"},
+ it = {"f", "ff"},
+ no = {"\\,f.","\\,ff."},
+ jp = {"シンボル","番号"},
}
alphabet_uppercase = {
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
index 48c6f43a0b1..6c3724fff9f 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.20,
+ version = 0.21,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -15,7 +15,7 @@ if not modules then modules = { } end modules ['xindex-cfg'] = {
}
itemPageDelimiter = "," -- Hello, 14
-compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid
+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 = "--"
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
index 386304a185e..dec7ffe82b6 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.20,
+ version = 0.21,
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 fd976f5a7ec..a427274dd85 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.20,
+ version = 0.21,
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 5cc397b799b..0bb3d2c4fdc 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.20,
+ version = 0.21,
comment = "main library to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
index 74393defb95..95838f807ec 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.20,
+ version = 0.21,
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
deleted file mode 100644
index 164fb1f284a..00000000000
--- a/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua
+++ /dev/null
@@ -1,260 +0,0 @@
------------------------------------------------------------------------
--- FILE: xindex-yannis.lua
--- DESCRIPTION: configuration file for xindex.lua
--- REQUIREMENTS:
--- AUTHOR: Herbert Voß
--- LICENSE: LPPL1.3
------------------------------------------------------------------------
-
-if not modules then modules = { } end modules ['xindex-yannis'] = {
- version = 0.20,
- 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, instaead of 12,13,14,15. the |( ... |) syntax is still valid
-fCompress = false -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5
-minCompress = 2 -- 14--17 or
-rangeSymbol = "-" -- 14-17 instead of --
-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'.
- Several characters in the same slot have the same 'priority'.
-]]
-alphabet_lower = { -- 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', 'ž' },
- { 'а' },
- { 'б' },
- { 'в' },
- { 'г', 'ѓ' },
- { 'д' },
- { 'е', 'ё' },
- { 'ж' },
- { 'з' },
- { 'и', 'і' },
- { 'й' },
- { 'к' },
- { 'л' },
- { 'м' },
- { 'н' },
- { 'о' },
- { 'п' },
- { 'р' },
- { 'с' },
- { 'т' },
- { 'у' },
- { 'ф' },
- { 'х' },
- { 'ц' },
- { 'ч' },
- { 'ш' },
- { 'щ' },
- { 'ъ' },
- { 'ы' },
- { 'ь' },
- { 'э' },
- { 'ю' },
- { 'я' },
-}
-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', 'Ž' },
- { 'А' },
- { 'Б' },
- { 'В' },
- { 'Г', 'Ѓ' },
- { 'Д' },
- { 'Е', 'Ё' },
- { 'Ж' },
- { 'З' },
- { 'И', 'І' },
- { 'Й' },
- { 'К' },
- { 'Л' },
- { 'М' },
- { 'Н' },
- { 'О' },
- { 'П' },
- { 'Р' },
- { 'С' },
- { 'Т' },
- { 'У' },
- { 'Ф' },
- { 'Х' },
- { 'Ц' },
- { 'Ч' },
- { 'Ш' },
- { 'Щ' },
- { 'Ъ' },
- { 'Ы' },
- { 'Ь' },
- { 'Э' },
- { 'Ю' },
- { 'Я' },
-}
-
-
-function SORTendhook(list)
- print ("We have "..#list.." total list entries")
- local greek = {}
- local latin = {}
- local cyrillic = {}
- local symbols = {}
- local numbers = {}
- local others = {}
- local firstChar, charType
- local firstCharNumber
- local v
- for i=1,#list do
- v = list[i]
- firstChar = NormalizedUppercase(utf.sub(v["sortChar"],1,1))
- v["sortChar"] = firstChar -- to be sure it is an uppercase unicode char
- firstCharNumber = string.utfvalue(firstChar)
- charType = getCharType(firstChar)
--- print (utf.sub(v["sortChar"],1,1).."->"..firstChar.." ("..firstCharNumber..") ".." ("..charType..")")
- if charType == 0 then
- symbols[#symbols+1] = v
- elseif charType == 1 then
- numbers[#numbers+1] = v
- elseif firstCharNumber > 0x052F then -- 0x052F is last cyrillic character
- others[#others+1] = v
- elseif firstCharNumber >= 0x0400 then -- 0x0400-0x052F cyrillic characters
- cyrillic[#cyrillic+1] = v
- elseif firstCharNumber <= 0x03FF then -- 0x03FF is last greek character
- if firstCharNumber >= 0x0370 then
- greek[#greek+1] = v -- 0x0370-0x03FF greek characters
- elseif firstCharNumber <= 0x024F then
- if firstCharNumber >= 0x041 then -- 0x041-0x024F latin character
- latin[#latin+1] = v
- else
- others[#others+1] = v -- everything else
- end
- end
- end
- end
- print ("We have "..#greek.." Greek entries")
- print ("We have "..#latin.." Latin entries")
- print ("We have "..#cyrillic.." Cyrillic entries")
- print ("We have "..#symbols.." Symbol entries")
- print ("We have "..#numbers.." Number entries")
- print ("We have "..#others.." other entries")
- list = {}
- for i = 1,#greek do list[#list+1] = greek[i] end
- list[#list]["Macro"] = "\\vspace{1cm}"
- for i = 1,#latin do list[#list+1] = latin[i] end
- list[#list]["Macro"] = "\\vspace{1cm}"
- for i = 1,#cyrillic do list[#list+1] = cyrillic[i] end
- list[#list]["Macro"] = "\\vspace{1cm}"
- for i = 1,#symbols do list[#list+1] = symbols[i] end
- for i = 1,#numbers do list[#list+1] = numbers[i] end
- for i = 1,#others do list[#list+1] = others[i] end
- print ("Sorted "..#list.." entries")
- return list
-end
-