diff options
author | Karl Berry <karl@freefriends.org> | 2024-09-22 20:21:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-09-22 20:21:15 +0000 |
commit | c4ff09c84f44d350af451f47d4222417a048ae3e (patch) | |
tree | 0a620033ef63747374b5f502f83175598e396ac2 /Master | |
parent | 49d50341ed17959b690e6ca02e6732735eaf02a6 (diff) |
xindex (22sep24)
git-svn-id: svn://tug.org/texlive/trunk@72347 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
42 files changed, 394 insertions, 450 deletions
diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG index 5551b6f718d..3684255a78b 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG +++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG @@ -1,3 +1,4 @@ +0.61 2024-09-22 - fix for hyperref with \see and \seealso 0.60 2024-05-16 - more fixes for UCA as default mode 0.59 2024-05-13 - removed the xindex-cfg.lua 0.58 2024-05-12 - Use UCA as default diff --git a/Master/texmf-dist/doc/lualatex/xindex/Makefile b/Master/texmf-dist/doc/lualatex/xindex/Makefile index 725576594dd..4cf5b6ef78f 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/Makefile +++ b/Master/texmf-dist/doc/lualatex/xindex/Makefile @@ -13,7 +13,7 @@ ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Chan #TDS = ~/PSTricks/PSTricks-TDS -all : doc clean +all : doc # clean doc: $(LATEX) --shell-escape --interaction=nonstopmode $(MAIN) diff --git a/Master/texmf-dist/doc/lualatex/xindex/README.md b/Master/texmf-dist/doc/lualatex/xindex/README.md index 729e6766aec..b35fa536478 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/README.md +++ b/Master/texmf-dist/doc/lualatex/xindex/README.md @@ -31,18 +31,22 @@ possible options are (short,long): -q,--quiet -h,--help -v... Verbosity level; can be -v, -vv, -vvv - -c,--config (default cfg) - -e,--escapechar (default ") - -n,--noheadings + -V,--version -a,--no_casesensitive -b,--no_labels + -c,--config (default "") + -e,--escapechar (default ") + -f,--fix_hyperref + -g,--no_pagenumber + -i,--ignoreSpace + -k,--checklang + -l,--language (default en) + -n,--noheadings -o,--output (default "") - -l,--language (default en) -p,--prefix (default L) - -g,--no_pagenumber -s,--use_stdin + -u,--use_UCA no more needed -x,--no_UCA - -V,--version <files...> (default stdin) .idx file(s) Testfiles: diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf Binary files differindex b5be513894d..6adda4baa58 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.ind index 3ad13d9ff08..5367f8bbc0f 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.ind +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.ind @@ -23,8 +23,8 @@ \item Oberin, {5f} \item Obstler, {7} \item Ödem, {4} - \item oder, {8} \item Oder, \seealso{Fluss}{33}, {58} + \item oder, {8} \item Öl, {8} \item ölen, {9} \item Oligarch, {28} diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf Binary files differindex 7fdc54812ce..6060678d9c1 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.ind index 94419c09d29..5367f8bbc0f 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.ind +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.ind @@ -11,24 +11,24 @@ \textbf{G}\label{L-xindex-G} \nopagebreak[4] \item Göbel, {58} - \item Göthe, {58} \item Goethe, {58} - \item Götz, {58} \item Goldmann, {58} + \item Göthe, {58} + \item Götz, {58} \indexspace \textbf{O}\label{L-xindex-O} \nopagebreak[4] - \item Ödem, {4} - \item Öl, {8} - \item ölen, {9} - \item Öresund, {2}, {4} - \item Österreich, {1f} \item Ober, {4}, {6} \item Oberin, {5f} \item Obstler, {7} - \item oder, {8} + \item Ödem, {4} \item Oder, \seealso{Fluss}{33}, {58} + \item oder, {8} + \item Öl, {8} + \item ölen, {9} \item Oligarch, {28} + \item Öresund, {2}, {4} \item Ostern, {3f} + \item Österreich, {1f} \end{theindex} diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf Binary files differindex d19db6ea79f..a07a43df340 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind index 91f07404d0c..3567565faec 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind @@ -17,9 +17,6 @@ \indexspace \textbf{A}\label{L-xindex-A} \nopagebreak[4] - \item AMS, {376} - \item ANSI, {67} - \item AUC\TeX , {29} \item Abbildung, {309} \item Abbildungsverzeichnis, {310}, {475} \item Absatz, {7}, {381} @@ -33,12 +30,15 @@ \item Akzent, {73}, {406}, {433}, {447} \item Albanisch, {67} \item American Mathematical Society (AMS), {415} + \item AMS, {376} \item Anführungszeichen, {81} \item Anhang, {62} + \item ANSI, {67} \item Atom, {400f} - \item Autor, {54} - \item Autor"=Jahr"=Schema, {544} + \item AUC\TeX , {29} \item Autor-Stil, {586} + \item Autor"=Jahr"=Schema, {544} + \item Autor, {54} \indexspace \textbf{B}\label{L-xindex-B} @@ -78,7 +78,6 @@ \indexspace \textbf{C}\label{L-xindex-C} \nopagebreak[4] - \item CMYK, {671} \item cc, {859} \item class option, {386} \item Clipping, {247} @@ -86,6 +85,7 @@ \item Clown, {256} \item Cluster, {248} \item cm, {859} + \item CMYK, {671} \item Con\TeX t, {879} \item continued fraction, {430} \item Cork-Kodierung, {72} @@ -95,8 +95,6 @@ \indexspace \textbf{D}\label{L-xindex-D} \nopagebreak[4] - \item DIN\,5007, {512} - \item DIN~476, {91} \item Dänisch, {67}, {76} \item Dateilinks, {188} \item Datum, {54} @@ -113,11 +111,12 @@ \item Dezimalstellen, {248} \item Differentialquotient, {414} \item dimen register, {860} + \item DIN\,5007, {512} + \item DIN~476, {91} \item displaymath mode, {381} \item Distribution, {13} \item Divisior, {431} \item \idxtextClasses - \subitem -\,{\sffamily IEEEtran}, {185} \subitem -\,{\sffamily amsart}, {415} \subitem -\,{\sffamily amsbook}, {415} \subitem -\,{\sffamily article}, {52f}, {59f}, {93}, {128}, {150}, {383}, {474} @@ -125,6 +124,7 @@ \subitem -\,{\sffamily book}, {59f}, {93}, {113}, {128}, {150}, {202}, {383f}, {434}, {474f} \subitem -\,{\sffamily ctexart}, {572} \subitem -\,{\sffamily europecv}, {827f}, {830} + \subitem -\,{\sffamily IEEEtran}, {185} \subitem -\,{\sffamily letter}, {59ff} \subitem -\,{\sffamily memoir}, {59f} \subitem -\,{\sffamily powerdot}, {615} @@ -168,15 +168,16 @@ \indexspace \textbf{F}\label{L-xindex-F} \nopagebreak[4] - \item FNDB, {872} \item Fallunterscheidung, {392}, {425} - \item Farbe, {236}, {669} - \subitem -\,Modell, {680} + \item Farbe \subitem -\,konvertieren, {680} - \item Farbmodell, {236}, {669} + \subitem -\,Modell, {680} + \item Farbe, {236}, {669} + \item Farbmodell \subitem -\,CMYK, {673} \subitem -\,HSB, {673} \subitem -\,RGB, {673} + \item Farbmodell, {236}, {669} \item Farbserie, {672}, {680} \item Farbwert, {680} \item Faröisch, {67} @@ -185,8 +186,9 @@ \item Fettschrift, {220} \item Finnisch, {67}, {76}, {80} \item Flattersatz, {142f}, {223}, {358}, {538f}, {640} - \item Float, {309} \item float box, {337} + \item Float, {309} + \item FNDB, {872} \item Folie, {621} \item Folienübergänge, {639} \item Fontfamilie, {661} @@ -205,7 +207,6 @@ \indexspace \textbf{G}\label{L-xindex-G} \nopagebreak[4] - \item GUI, {9}, {29} \item Galizisch, {67} \item Gaußscher Algorithmus, {448} \item GenericError, {869} @@ -222,6 +223,7 @@ \item Griechisch, {76}, {80} \item Grundlinie, {224}, {264} \item Gruppe, {252}, {864} + \item GUI, {9}, {29} \item Guillemets, {82} \indexspace @@ -237,15 +239,6 @@ \textbf{I}\label{L-xindex-I} \nopagebreak[4] \item IDE, {29} - \item IPA, {72} - \item ISO 8859-1, {67} - \item ISO 8859-15, {67} - \item ISO 8859-2, {67} - \item ISO 8859-3, {67} - \item ISO 8859-4, {67} - \item ISO-Image, {14} - \item ISO~216, {91} - \item IUPAC, {814} \item in, {859} \item indent, {476} \item Index, {32}, {405}, {408f}, {432}, {699} @@ -257,17 +250,25 @@ \item Integrationsvariable, {414} \item interline spacing, {405} \item Internetadresse, {84} + \item IPA, {72} \item Irisch, {67} \item Isländisch, {67}, {76} - \item italic, {86} + \item ISO 8859-15, {67} + \item ISO 8859-1, {67} + \item ISO 8859-2, {67} + \item ISO 8859-3, {67} + \item ISO 8859-4, {67} + \item ISO-Image, {14} + \item ISO~216, {91} \item Italic-Korrektur, {88} + \item italic, {86} \item Italienisch, {76}, {80} \item Items, {413} + \item IUPAC, {814} \indexspace \textbf{K}\label{L-xindex-K} \nopagebreak[4] - \item \KOMAScript , {59ff}, {93} \item Kapitel, {62}, {76} \item Kapitelanfang, {62} \item Katalanisch, {67} @@ -279,9 +280,11 @@ \item Klammersymbole, {394} \item Knoten, {775} \item Kochsche Schneeflocke, {778} - \item Kodierung, {38}, {67} + \item Kodierung \subitem -\,ascii, {67} + \item Kodierung, {38}, {67} \item Kolumnentitel, {121}, {126} + \item \KOMAScript , {59ff}, {93} \item Komma, {248} \item Kommutative Diagramme, {448} \item Konventionen, {213} @@ -294,10 +297,9 @@ \indexspace \textbf{L}\label{L-xindex-L} \nopagebreak[4] - \item LR-Box, {173} - \item \LaTeX -Editor, {29} \item Label, {181}, {245}, {387}, {626} \item largesymbols, {396} + \item \LaTeX -Editor, {29} \item Latin-1, {68} \item Laufweite, {596} \item Layout, {9}, {377}, {618} @@ -307,10 +309,11 @@ \item Lettisch, {67} \item Liedtexte, {145} \item Ligaturen, {89} - \item Linie, {219}, {230} + \item Linie \subitem -\,farbig, {217} \subitem -\,horizontal, {216}, {230} \subitem -\,vertikal, {216}, {223}, {230} + \item Linie, {219}, {230} \item Linksbündig, {223} \item Linux, {13} \item list of tables, {256} @@ -322,11 +325,11 @@ \subitem -\,Tabellenüberschrift, {259} \subitem -\,Tabellenunterschrift, {259} \item lot, {256} + \item LR-Box, {173} \indexspace \textbf{M}\label{L-xindex-M} \nopagebreak[4] - \item MLA, {586} \item Mac OS~X, {13}, {67} \item Mac\TeX , {13} \item Makefile, {9} @@ -344,11 +347,13 @@ \item Matrix, {227}, {383}, {405f}, {426}, {449} \item Mediävalziffern, {595} \item Metronyme, {564} - \item MiK\TeX , {13}, {21}, {23} + \item MiK\TeX \subitem -\,Paketmanager, {21} + \item MiK\TeX , {13}, {21}, {23} \item Mikrotypografie, {7} \item Minimalbeispiel, {888} \item Minuskelziffern, {595} + \item MLA, {586} \item mm, {859} \item Modulo, {433} \item Monospaceschrift, {64} @@ -361,9 +366,9 @@ \indexspace \textbf{N}\label{L-xindex-N} \nopagebreak[4] - \item NEJM, {585} \item Navigationsleiste, {33}, {616}, {619} \item Navigator, {33} + \item NEJM, {585} \item Neunerteilung, {103} \item Niederländisch, {67}, {76}, {80} \item Niedersorbisch, {76} @@ -378,8 +383,8 @@ \item Onlinequelle, {561} \item OpenOffice, {35} \item OpenType, {12}, {72}, {601} - \item Operator, {378}, {400}, {408}, {414}, {449} \item Operator-Symbol, {408} + \item Operator, {378}, {400}, {408}, {414}, {449} \item Operatorname, {408} \item option clash, {871} \item optischer Randausgleich, {163} @@ -393,7 +398,6 @@ \nopagebreak[4] \item \protect \nxLnotation {p}-Spalte, {271} \item p-Spalte, {268} - \item PDF/A, {189} \item Page Coded Language, {750} \item Paginierung, {115} \item Papierbreite, {96} @@ -403,6 +407,7 @@ \item Parabel, {770} \item Patronyme, {564} \item pc, {860} + \item PDF/A, {189} \item pdf\TeX , {11}, {13} \item pdfe\TeX , {11} \item Pfade, {31} @@ -432,7 +437,6 @@ \textbf{R}\label{L-xindex-R} \nopagebreak[4] \item \protect \nxLnotation {r}-Spalte, {271} - \item RGB, {674} \item Radikand, {432} \item Rahmenfarbe, {389} \item Randbemerkung, {157} @@ -442,6 +446,7 @@ \item Referenzieren, {245} \item Rekursion, {865} \item Relationssymbol, {380} + \item RGB, {674} \item robust, {377f} \item Roman-Zeichensatz, {399} \item root, {14} @@ -454,7 +459,6 @@ \indexspace \textbf{S}\label{L-xindex-S} \nopagebreak[4] - \item SQL-Datenbank, {247} \item Satzprogramm, {6} \item Satzspiegel, {91}, {94}, {103} \item Satzspiegelberechnung, {103} @@ -465,6 +469,7 @@ \item Schreibmaschinenschrift, {64} \item Schrift \subitem -\,Breite, {64} + \subitem -\,fett, {411}, {451} \subitem -\,Gewicht, {87} \subitem -\,Größe, {412} \subitem -\,Höhe, {64} @@ -473,7 +478,6 @@ \subitem -\,Stil, {378} \subitem -\,Tiefe, {64} \subitem -\,Warnung, {883} - \subitem -\,fett, {411}, {451} \item Schriftattribut, {660} \item Schrifteinbindung, {9} \item Schriftfamilie, {85}, {442}, {595} @@ -498,8 +502,8 @@ \item sidebar, {619} \item Sigel, {561} \item Silbentrennung, {149} - \item skip, {58}, {860} \item skip register, {860f} + \item skip, {58}, {860} \item Skriptsprache, {13} \item slanted, {86} \item Slowakisch, {67}, {80} @@ -518,14 +522,16 @@ \item Spaltenzwischenraum, {290} \item Spanisch, {67}, {76}, {80} \item Sprachauswahl, {9} + \item SQL-Datenbank, {247} \item Standardsprache, {76} \item Sternversion, {215} \item Subscript, {378}, {393}, {409} \item Sumatra-PDF, {23} \item Summe, {393}, {438} \item Superscript, {378}, {409} - \item Symbol, {400} + \item Symbol \subitem -\,gestockt, {411} + \item Symbol, {400} \item Syntax, {214} \item Systemadministrator, {14} \item Systemmeldung, {883} @@ -533,14 +539,13 @@ \indexspace \textbf{T}\label{L-xindex-T} \nopagebreak[4] - \item TDS, {172}, {872} - \item TOC, {128} - \item Tabelle, {309f} + \item Tabelle \subitem -\,Breite, {214}, {289} \subitem -\,Farbe, {273} - \subitem -\,Kopf, {222} \subitem -\,gerahmt, {224} \subitem -\,geschachtelt, {268} + \subitem -\,Kopf, {222} + \item Tabelle, {309f} \item Tabellenbeschriftung, {62} \item Tabellenbreite, {215} \item Tabellenkalkulation, {282} @@ -549,5 +554,126 @@ \item Tabellenunterschrift \subitem -\,\nxLPack {longtable}, {259} \item Tabellenverzeichnis, {310}, {475} - \item {\ttfamily tabular} Env., \idxbf{0--218} + \item {\ttfamily tabular} Env., \idxbf{214--218} + \item Tagebuchnotation, {561} + \item Tcheschisch, {80} + \item TDS, {172}, {872} + \item Teilungsverhältnis, {62} + \item Template, {657} + \item \TeX -Collection, {13} + \item \TeXLive, {3}, {13--21}, {23}, {25f}, {31}, {512}, {542}, {590}, {610}, {766}, {855}, {870}, {872ff}, {877ff}, {890} + \item \TeX maker, {29} + \item \TeX nicCenter, {31}, {35}, {38} + \item \TeX Shop, {23} + \item \TeX Studio, {23} + \item Text, {398} + \item Textanteil, {309} + \item Textkörper, {51}, {53}, {871} + \item Textmodus, {411}, {450} + \item Textschrift, {411} + \item Textverarbeitung, {6} + \item Textverarbeitungsprogramm, {7} + \item \TeX works, {23} + \item Titel, {54}, {413} + \item Titelkopf, {658} + \item TOC, {128} + \item Tortendiagramm, {244}, {746} + \item Transparenz, {631} + \item Trennalgorithmus, {75} + \item Trennlinie, {221} + \item Trennregeln, {77} + \item Trennung, {222} + \item Tridiagonalmatrix, {428} + \item TrueType, {12}, {72}, {601} + \item Tschechisch, {67}, {76} + \item Türkisch, {67}, {76}, {80} + \item Type-3, {70} + \item Type"~1, {12} + \item Typewriterschrift, {64} + \item Typografie, {213} + +\indexspace +\textbf{U}\label{L-xindex-U} +\nopagebreak[4] + \item Überschriftenformat, {77} + \item Übersetzung, {207} + \item Ukrainisch, {76}, {80} + \item Umbruch, {7} + \item Umbruchmöglichkeit, {252} + \item Umgebung, {848} + \item Umgebungsvariable, {14} + \item Umkodierung, {38} + \item Ungarisch, {67}, {76}, {80} + \item Unicode, {11} + \item Unsichtbarkeit, {631} + \item Untergleichung, {437}, {454} + \item Unterstrich, {449} + \item Updatemanager, {18} + \item URL, {84}, {190} + \item USB-Stick, {879} + \item UTF-16, {189} + \item UTF-8, {38}, {67} + +\indexspace +\textbf{V}\label{L-xindex-V} +\nopagebreak[4] + \item Variable, {414} + \item Vektor, {407}, {448} + \item Vektorschrift, {54}, {71}, {85} + \item Verbatim-Modus, {654} + \item vertikale Linien, {223} + \item Verzeichnisse, {63} + \item Viewer, {31f} + \item Vollbildmodus, {639} + \item Vordergrundfarbe, {658} + +\indexspace +\textbf{W}\label{L-xindex-W} +\nopagebreak[4] + \item Waisenkind, {103} + \item Warnung, {883} + \item Wickelfalz, {832} + \item Wiederholungsfaktor, {215} + \item Windows 1250, {67} + \item Windows 1252, {67} + \item Windows 1257, {67} + \item Windows, {13}, {21} + \item Witwe, {102} + \item Wörterbuch, {40} + \item Worttrennung, {143}, {223} + \item Wortzwischenraum, {165} + \item Wurzel, {431} + \item Wurzelexponent, {432} + +\indexspace +\textbf{X}\label{L-xindex-X} +\nopagebreak[4] + \item X-Spalte, {290} + \item Xem\TeX , {13} + +\indexspace +\textbf{Z}\label{L-xindex-Z} +\nopagebreak[4] + \item Zahlenkolonnen, {247} + \item Zähler, {383f}, {387}, {862} + \item Zählung, {267} + \item Zeichen (aktives), {408} + \item Zeichensatzbefehle, {87} + \item Zeile + \subitem -\,Abstand, {234} + \subitem -\,Breite, {289} + \subitem -\,Farbe, {236} + \subitem -\,Höhe, {219} + \subitem -\,Tiefe, {220} + \subitem -\,Vorschub, {269} + \subitem -\,Zähler, {230} + \item Zeilenabstand, {56} + \item Zeilenhöhe, {378} + \item Zeilenmodus, {376--380}, {391}, {404} + \item Zeilenumbruch, {380} + \item Zellenfarbe, {236} + \item Zentrieren, {141} + \item Zickzackfalz, {832} + \item Zufallszahlen, {448} + \item Zusammenfassung, {63} \end{theindex} diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf Binary files differindex 15984473ac8..6ac37cb8a68 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.ind index 639cedcaab3..50054a6a7e6 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.ind +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.ind @@ -36,198 +36,5 @@ \item demnach, \hyperpage{35}, \hyperpage{38} \item Demonstration, \hyperpage{29}, \hyperpage{35} \item den, \hyperpage{46} - \item der, \hyperpage{34}, \hyperpage{37}, \hyperpage{41} - \item Deshalb, \hyperpage{14} - \item Deutschland, \hyperpage{8}, \hyperpage{27} - \item die, \hyperpage{21}, \hyperpage{39}, \hyperpage{41} - \item Diktatur, \hyperpage{16} - \item dominiere, \hyperpage{9} - \item durch, \hyperpage{31} - -\indexspace -\textbf{E}\label{L-xindex-E} -\nopagebreak[4] - \item ein, \hyperpage{36} - \item einer, \hyperpage{22} - \item einschlägige, \hyperpage{31} - \item Ende, \hyperpage{21} - \item endet, \hyperpage{15} - \item er, \hyperpage{2}, \hyperindexformat{\seealso{foo}}{4} - \item erkennen, \hyperpage{31} - \item ersten, \hyperpage{21} - \item erzählt, \hyperpage{1} - \item es, \hyperpage{8}, \hyperpage{38} - \item etwa, \hyperpage{19}, \hyperpage{21} - \item Europaplatz., \hyperpage{25} - -\indexspace -\textbf{F}\label{L-xindex-F} -\nopagebreak[4] - \item Feindbild, \hyperpage{7} - \item Festakt, \hyperpage{19} - \item Flaggen, \hyperpage{36} - \item Flüchtlinge, \hyperpage{11} - \item für, \hyperpage{10}, \hyperpage{26} - -\indexspace -\textbf{G}\label{L-xindex-G} -\nopagebreak[4] - \item gaben, \hyperpage{30} - \item gehabt, \hyperpage{36} - \item gehe, \hyperpage{9} - \item gekommen., \hyperpage{38} - \item Gelassenheit, \hyperpage{4} - \item gelästert, \hyperpage{46} - \item Gleichzeitig, \hyperpage{4} - \item gut, \hyperpage{9} - -\indexspace -\textbf{H}\label{L-xindex-H} -\nopagebreak[4] - \item haben, \hyperpage{32}, \hyperpage{35}, \hyperpage{42} - \item haben., \hyperpage{35} - \item hatte, \hyperpage{25} - \item Hilfe, \hyperpage{10} - -\indexspace -\textbf{I}\label{L-xindex-I} -\nopagebreak[4] - \item illegalen, \hyperpage{36} - \item Im, \hyperpage{43} - \item in, \hyperpage{15}, \hyperpage{19} - \item ist, \hyperpage{43} - -\indexspace -\textbf{J}\label{L-xindex-J} -\nopagebreak[4] - \item jedoch, \hyperpage{36} - \item jungen, \hyperpage{40} - -\indexspace -\textbf{K}\label{L-xindex-K} -\nopagebreak[4] - \item keine, \hyperpage{36} - \item Kilometer, \hyperpage{23} - \item Kundgebung, \hyperpage{23}, \hyperpage{42} - -\indexspace -\textbf{L}\label{L-xindex-L} -\nopagebreak[4] - \item leben., \hyperpage{14} - \item lernen, \hyperpage{14} - -\indexspace -\textbf{M}\label{L-xindex-M} -\nopagebreak[4] - \item machen., \hyperpage{8} - \item mahnte, \hyperpage{2} - \item man, \hyperpage{14} - \item Männer, \hyperpage{40} - \item Märtyrer, \hyperpage{1} - \item mehr, \hyperpage{3}, \hyperpage{32} - \item Menschen, \hyperpage{34} - \item Migranten, \hyperpage{12} - \item Minderheiten, \hyperpage{5} - \item mit, \hyperpage{14}, \hyperpage{29} - \item möglich., \hyperpage{14} - \item Motto, \hyperpage{29} - \item müsse, \hyperpage{14} - -\indexspace -\textbf{N}\label{L-xindex-N} -\nopagebreak[4] - \item N, \hyperpage{31} - \item nach, \hyperpage{19} - \item Nation., \hyperpage{30} - \item neigte, \hyperpage{21} - \item Neonazis, \hyperpage{31} - \item Netz, \hyperpage{43} - \item nicht, \hyperpage{14}, \hyperpage{38} - \item Nicht-Perfekten, \hyperpage{14} - -\indexspace -\textbf{O}\label{L-xindex-O} -\nopagebreak[4] - \item Obwohl, \hyperpage{8} - \item Osten, \hyperpage{46} - \item Östereich, \hyperpage{1} - -\indexspace -\textbf{P}\label{L-xindex-P} -\nopagebreak[4] - \item Perfekte, \hyperpage{15} - \item Pessimismus., \hyperpage{10} - \item Plakate, \hyperpage{35} - \item Polizei, \hyperpage{32}, \hyperpage{38} - -\indexspace -\textbf{R}\label{L-xindex-R} -\nopagebreak[4] - \item rechten, \hyperpage{23} - \item richtig, \hyperpage{13} - -\indexspace -\textbf{S}\label{L-xindex-S} -\nopagebreak[4] - \item sagte, \hyperpage{36} - \item sei, \hyperpage{12}, \hyperpage{38} - \item seiner, \hyperpage{1} - \item sich, \hyperpage{19}, \hyperpage{21}, \hyperpage{30}, \hyperpage{32} - \item Sie, \hyperpage{35} - \item sind, \hyperpage{42} - \item Sprecher, \hyperpage{36} - \item Staatsoper, \hyperpage{20} - \item Stunden, \hyperpage{19} - \item Symbole, \hyperpage{36} - \item Szenecodes, \hyperpage{31} - -\indexspace -\textbf{T}\label{L-xindex-T} -\nopagebreak[4] - \item Tag, \hyperpage{29} - \item tausend, \hyperpage{33} - \item teilgenommen, \hyperpage{42} - \item Teilnehmer, \hyperpage{21}, \hyperpage{30} - -\indexspace -\textbf{U}\label{L-xindex-U} -\nopagebreak[4] - \item über, \hyperpage{45} - \item Überholmanöver, \hyperpage{17} - \item überwiegend, \hyperpage{39} - \item unbegrenzt, \hyperpage{14} - \item und, \hyperpage{5}, \hyperpage{11\nohyperpage{f}}, \hyperpage{35} - \item unklar., \hyperpage{43} - -\indexspace -\textbf{V}\label{L-xindex-V} -\nopagebreak[4] - \item versammelten, \hyperpage{21} - \item verwendet, \hyperpage{36} - \item Volksvertreter, \hyperpage{6} - -\indexspace -\textbf{W}\label{L-xindex-W} -\nopagebreak[4] - \item Während, \hyperpage{17} - \item warnte, \hyperpage{4} - \item weiter, \hyperpage{24} - \item wenige, \hyperpage{23} - \item Wer, \hyperpage{14} - \item wichtig, \hyperpage{12} - \item wieder, \hyperpage{44} - \item Wir, \hyperpage{25} - \item wird, \hyperpage{43} - \item Woher, \hyperpage{38} - -\indexspace -\textbf{Z}\label{L-xindex-Z} -\nopagebreak[4] - \item zahlreiche, \hyperpage{30} - \item zeitgleich, \hyperpage{21} - \item zu, \hyperpage{3}, \hyperpage{8}, \hyperpage{14}, \hyperpage{28}, \hyperpage{31} - \item zufolge, \hyperpage{30} - \item zum, \hyperpage{7} - \item zunächst, \hyperpage{38} - \item Zwischenfällen, \hyperpage{38} + \item der, \hyperpage{15}, \hyperpage{18\nohyperpage{f}}, \hyperpage{28\nohyperpage{f}}, \hyperpage{34}, \hyperpage{37}, \hyperpage{41} \end{theindex} diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf Binary files differindex 6f8ce538063..4555bea9a5f 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.ind index d53fd6826fc..7ab85d75a43 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo.ind +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.ind @@ -48,127 +48,11 @@ \item demnach, {35}, {38} \item Demonstration, {29}, {35} \item den, {46} - \item der, {34}, {37}, {41} - \item Deshalb, {14} - \item Deutschland, {8}, {27} - \item die, {21}, {39}, {41} - \item Diktatur - \subitem -\,Afrika - \subsubitem --\,Kongo, {17} - \subsubitem --\,Nigeria, {16} - \subitem -\,Asien - \subsubitem --\,Nordvietnam, {38} - \subitem -\,Regierungsform, {29} - \item dominiere, {9} - \item durch, {31} - -\indexspace -\textbf{E}\label{L-xindex-E} -\nopagebreak[4] - \item ein, {36} - \item einer, {22} - \item einschlägige, {31} - \item Ende, {21} - \item endet, {15} - \item er, {2}, {4} - \item erkennen, {31} - \item ersten, {21} - \item erzählt, {1} - \item es, {8}, {38} - \item etwa, {19}, {21} - \item Europaplatz., {25} - -\indexspace -\textbf{F}\label{L-xindex-F} -\nopagebreak[4] - \item Feindbild, {7} - \item Festakt, {19} - \item Flaggen, {36} - \item Flüchtlinge, {11} - \item Frust, {17} - \item für, {10}, {26} - -\indexspace -\textbf{G}\label{L-xindex-G} -\nopagebreak[4] - \item gaben, {30} - \item gehabt, {36} - \item gehe, {9} - \item gekommen., {38} - \item Gelassenheit, {4} - \item gelästert, {46} - \item Gleichzeitig, {4} - \item gut, {9} - -\indexspace -\textbf{H}\label{L-xindex-H} -\nopagebreak[4] - \item haben, {32}, {35}, {42} - \item haben., {35} - \item hatte, {25} - \item Hilfe, {10} - -\indexspace -\textbf{I}\label{L-xindex-I} -\nopagebreak[4] - \item illegalen, {36} - \item Im, {43} - \item in, {15}, {19} - \item ist, {43} - -\indexspace -\textbf{J}\label{L-xindex-J} -\nopagebreak[4] - \item jedoch, {36} - \item jungen, {40} - -\indexspace -\textbf{K}\label{L-xindex-K} -\nopagebreak[4] - \item keine, {36} - \item Kilometer, {23} - \item Kundgebung, {23}, {42} - -\indexspace -\textbf{L}\label{L-xindex-L} -\nopagebreak[4] - \item leben., {14} - \item lernen, {14} - -\indexspace -\textbf{M}\label{L-xindex-M} -\nopagebreak[4] - \item machen., {8} - \item mahnte, {2} - \item man, {14} - \item Männer, {40} - \item Märtyrer, {1} - \item mehr, {3}, {32} - \item Menschen, {34} - \item Migranten, {12} - \item Minderheiten, {5} - \item mit, {14}, {29} - \item möglich., {14} - \item Motto, {29} - \item müsse, {14} - -\indexspace -\textbf{N}\label{L-xindex-N} -\nopagebreak[4] - \item nach, {19} - \item Nach, {31} - \item Nation., {30} - \item neigte, {21} - \item Neonazis, {31} - \item Netz, {43} - \item nicht, {14}, {38} - \item Nicht-Perfekten, {14} + \item der, {15}, {18f}, {28f}, {34}, {37}, {41} \indexspace \textbf{O}\label{L-xindex-O} \nopagebreak[4] - \item Obwohl, {8} - \item Osten, {46} \item Österreich, \textbf{1--38} \indexspace @@ -213,6 +97,7 @@ \nopagebreak[4] \item über, {45} \item Überholmanöver, {17} + \clearpage \item überholt, {38} \item überwiegend, {39} \item unbegrenzt, {14} diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf Binary files differindex 27a9ed59f76..20e969941c8 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind index a2bfb309fc2..00c8844d210 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind @@ -14,7 +14,7 @@ \indexspace \textbf{F}\label{L-xindex-F} \nopagebreak[4] - \item foo, {1}, \textit{1f}, \see{bar}{2}, {2}, \textbf{3}, {3f} + \item foo, {1}, \textit{1}, {2}, \textit{2}, \see{bar}{2}, \textbf{3}, {3f} \indexspace \textbf{G}\label{L-xindex-G} diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf Binary files differindex 942185026b9..0a645eabc54 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf Binary files differindex 24d7696e5b4..2a06e1fa08a 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/french.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/french.ind index 01b62fc86d2..e9a08a059bd 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/french.ind +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/french.ind @@ -25,12 +25,13 @@ \item côte, {1} \item Côte, {1} \item CÔTE, {1} - \item coté, {1\,sq.} + \item coté, {1} \item Coté, {1} \item COTÉ, {1} \item côté, {1} \item Côté, {1} \item CÔTÉ, {1} + \item coté, {2} \indexspace \textbf{E}\label{L-xindex-E} diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/french.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/french.pdf Binary files differindex b7acdcb220d..80f48893410 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/french.pdf +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/french.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh b/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh index a8a8b5fe6d1..d1a181db1c5 100755 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh @@ -25,7 +25,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-eKO HADW -x > /dev/null lualatex HADW > /dev/null echo "Umlaute" @@ -36,4 +36,14 @@ echo "Umlaute2" xindex -l de -c DIN2 Umlaute2 > /dev/null lualatex Umlaute2 > /dev/null +echo "french" +lualatex french > /dev/null +xindex -l fr french > /dev/null +lualatex Umlaute2 > /dev/null + +echo "see" +lualatex see > /dev/null +xindex see > /dev/null +lualatex see > /dev/null + rm -fr *.aux *.log *.ilg *.out
\ No newline at end of file diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/see.idx b/Master/texmf-dist/doc/lualatex/xindex/tests/see.idx new file mode 100644 index 00000000000..52326372ba9 --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/see.idx @@ -0,0 +1,15 @@ +\indexentry{usus|hyperpage}{2} +\indexentry{confarreatio|hyperpage}{2} +\indexentry{coemptio|hyperpage}{3} +\indexentry{marriage|hyperpage}{3} +\indexentry{marriage|hyperpage}{4} +\indexentry{marriage|hyperpage}{4} +\indexentry{marriage|hyperpage}{5} +\indexentry{marriage|hyperindexformat{\seealso{usus}}}{5} +\indexentry{marriage|hyperindexformat{\seealso{coemptio}}}{6} +\indexentry{marriage|hyperindexformat{\seealso{confarreatio}}}{6} +\indexentry{"|hyperpage}{7} +\indexentry{foo"|hyperpage}{8} +\indexentry{comemp|hyperindexformat{\seealso{coemptio}}}{9} +\indexentry{com"|hyperpage}{9} +\indexentry{com|hyperindexformat{\seealso{coemptio}}}{9} diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/see.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/see.ind new file mode 100644 index 00000000000..83b103c64b9 --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/see.ind @@ -0,0 +1,30 @@ + +\begin{theindex} +\textbf{Symbols}\label{L-xindex-symbols} +\nopagebreak[4] + \item ", \hyperpage{7} + +\indexspace +\textbf{C}\label{L-xindex-C} +\nopagebreak[4] + \item coemptio, \hyperpage{3} + \item com", \hyperpage{9} + \item com, \hyperindexformat{\seealso{coemptio}}{9} + \item comemp, \hyperindexformat{\seealso{coemptio}}{9} + \item confarreatio, \hyperpage{2} + +\indexspace +\textbf{F}\label{L-xindex-F} +\nopagebreak[4] + \item foo", \hyperpage{8} + +\indexspace +\textbf{M}\label{L-xindex-M} +\nopagebreak[4] + \item marriage, \hyperpage{3\nohyperpage{ff}}, \hyperindexformat{\seealso{usus}}{5}, \hyperindexformat{\seealso{confarreatio}}{6}, \hyperindexformat{\seealso{coemptio}}{6} + +\indexspace +\textbf{U}\label{L-xindex-U} +\nopagebreak[4] + \item usus, \hyperpage{2} +\end{theindex} diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/see.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/see.pdf Binary files differnew file mode 100644 index 00000000000..4f8c7596115 --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/see.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/see.tex b/Master/texmf-dist/doc/lualatex/xindex/tests/see.tex new file mode 100644 index 00000000000..5f63c68ea6a --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/see.tex @@ -0,0 +1,31 @@ +\documentclass[paper=a4,parskip=half-,ngerman]{scrartcl} +\usepackage{fontspec} +\usepackage{libertinus-otf} +\usepackage{babel} +\usepackage{makeidx} +\makeindex +\usepackage{hyperref} +\begin{document} + + +\printindex + + +Page 1 +\index{usus} +\index{confarreatio} \newpage Page 2 +\index{coemptio} +\index{marriage}\newpage Page 3 +\index{marriage} +\index{marriage}\newpage Page 4 +\index{marriage} +\index{marriage|seealso{usus}}\newpage Page 5 +\index{marriage|seealso{coemptio}} +\index{marriage|seealso{confarreatio}} \newpage Page 6 +Vert\index{"|} \newpage Page 7 +\index{foo"||see{bar}} \newpage Page 8 +\index{comemp|seealso{coemptio}} +\index{com"||seealso{coemptio}} +\index{com|seealso{coemptio}} + +\end{document} diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf Binary files differindex 6615903e343..911775ac8a7 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf +++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex index 9af878cdd7c..8508ace554b 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex +++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex @@ -81,7 +81,7 @@ \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} -\setVersion{version = 0.59}% can be automatically changed by perl +\setVersion{version = 0.61}% can be automatically changed by perl @@ -94,7 +94,6 @@ %\enlargethispage{1cm} \tableofcontents -\clearpage \begin{noteblock} \raggedright Thanks to: \\ @@ -104,6 +103,7 @@ Andreas Deininger; Brian Dunn; Daniel Flipo; Michal Hoftich; +Dohyun Kim; Mykel Kochenderfer; Alexey Kuznetsov; Frank Mittelbach; @@ -554,7 +554,6 @@ This allows to have different indexes with different language. frame, compiler=lualatex, crop, - force, xindex, xindexOptions=-l RU -c RU -n, runs=2,code,docType=latex, @@ -1000,6 +999,7 @@ Sorted with \end{externalDocument} +\clearpage%%%%%%%%%%% \subsubsection{German language with UCA} @@ -1009,7 +1009,6 @@ Sorted with pages={2}, frame=false, compiler=lualatex, - force, crop, xindex, xindexOptions=-l de, % german and UCA @@ -1056,6 +1055,7 @@ Sorted with \verb|-l DE| and using UCA\par \end{document} \end{externalDocument} + \subsubsection{German language (DIN2) with UCA} The same sorted with the German DIN variant 2. It uses also the config @@ -1992,7 +1992,6 @@ Using the package \Lpack{hyperref} is no problem: frame=false, compiler=lualatex, crop, - force, xindex, xindexOptions=-l de, runs=2,code,docType=latex, diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua index b07a551f8c6..fd510451cab 100755 --- a/Master/texmf-dist/scripts/xindex/xindex.lua +++ b/Master/texmf-dist/scripts/xindex/xindex.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- xindex = xindex or { } - local version = 0.60 + local version = 0.61 xindex.version = version --xindex.self = "xindex" @@ -331,18 +331,17 @@ else end - esc_char = args.escapechar esc_char2 = esc_char..esc_char writeLog(2,"Escapechar = "..esc_char.."\n",1) escape_chars = { -- by default " is the escape char - {esc_char2, '//escaped2//', esc_char }, - {esc_char..'@', '//escapedat//', '@' }, - {esc_char..'|', '//escapedvert//', '|' }, - {esc_char..'!', '//escapedexcl//', '!' }, - {'', '\\textbar', '|' }, - {'', '\\braceLeft', '{' }, - {'', '\\braceRight', '}' } + {esc_char2, '//escaped2//', esc_char }, + {esc_char..'@', '//escapedat//', '@' }, + {esc_char..'|', '//escapedvert//', '|' }, + {esc_char..'!', '//escapedexcl//', '!' }, + {'', '\\textbar', '|' }, + {'', '\\braceLeft', '{' }, + {'', '\\braceRight', '}' } } no_caseSensitive = args["no_casesensitive"] diff --git a/Master/texmf-dist/tex/latex/xindex/xindex.sty b/Master/texmf-dist/tex/latex/xindex/xindex.sty index 43cd71a3247..143e36b4317 100644 --- a/Master/texmf-dist/tex/latex/xindex/xindex.sty +++ b/Master/texmf-dist/tex/latex/xindex/xindex.sty @@ -13,7 +13,7 @@ % % % ------------------------------------- -\ProvidesPackage{xindex}[2024/05/16 v. 0.60 write into an idx file (hv)] +\ProvidesPackage{xindex}[2024/05/16 v. 0.61 write into an idx file (hv)] % \RequirePackage{xkeyval} diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua index be3a46360fc..845fc45c5d8 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-AU'] = { - version = 0.58, + version = 0.61, 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 6eabbf472f2..52edc98854f 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua @@ -11,7 +11,7 @@ -- configuration for index files of the Heidelberger Akademie der Wissenschaften if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = { - version = 0.58, + version = 0.61, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua index 7cfb9627b62..3d2610d9948 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-RU'] = { - version = 0.58, + version = 0.61, comment = "configuration to xindex.lua", author = "Alexey Kuznetzov", copyright = "Herbert Voß", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua index 77fc6894c9c..d06df7cb2fe 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua @@ -8,7 +8,7 @@ -- $Id: xindex-base.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- -local info = { version = 0.60 } +local info = { version = 0.61 } -- check config if pageNoPrefixDel ~= "" then @@ -53,13 +53,13 @@ hyperpage, lines = checkHyperpage(lines) -- hyperref used? if hyperpage then writeLog(1,"We have hyperpages.\n",1) else writeLog(1,"We have no hyperpages.\n",1) - end +end --print("Presort of \\indexentry lines") --table.sort(lines) -- no presort to keep macros inserted by \writeidx if vlevel > 1 then - writeLog(1,"--------------- Input data (mot sorted) ----------------\n",2) + writeLog(1,"--------------- Input data (not sorted) ----------------\n",2) for _,l in pairs(lines) do writeLog(1,l.."\n",2) end writeLog(1,"--------------- end Input data -------------------------\n",2) end @@ -95,11 +95,17 @@ for k,v in ipairs(lines) do end writeLog(1,"... done\n",0) -writeLog(1,"------------------ Start list after getEntryAndPage() ------------------------\n,",2) +writeLog(1,"------------------ Start list after getEntryAndPage() ------------------------\n",2) printList(Index,2) writeLog(1,"\n------------------ end list after getEntryAndPage() ------------------------\n",2) writeLog(2,"Sorting entries: for LARGE idx files it can take some minutes ... \n",0) +writeLog(1,"\n------------------ Start list before table.sort(Hooks and UTFCompare)------------\n",2) +printList(Index,2) +writeLog(1,require 'xindex-pretty'.dump(Index),3) -- only for internal dump +writeLog(1,"\n------------------ end list before table.sort(Hooks and UTFCompare)------------\n",2) + + if SORTprehook then writeLog(2, "PreHook begin\n", 0) Index = SORTprehook(Index) diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua index fd7326efd1c..1f278b31ad5 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-baselib'] = { - version = 0.60, + version = 0.61, comment = "base library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", 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 15c326c3bc6..e727a751131 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-common'] = { - version = 0.60, + version = 0.61, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-no_uca.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-no_uca.lua index d337047a1b7..7a013a3025a 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-no_uca.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-no_uca.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.60, + version = 0.61, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua index d7ab1f4224e..e13803f7cac 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-lua'] = { - version = 0.60, + version = 0.61, comment = "configuration to xindex-cfg-uca.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua index a17cfc77fa6..b615b2b220a 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.58, + version = 0.61, comment = "configuration file for the DANTE Edition", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua index 332813ce022..c7822591ffa 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.58, + version = 0.61, comment = "DTK configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua index 595ffc2dd7a..3f24bee3678 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-lib'] = { - version = 0.60, + version = 0.61, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -296,7 +296,8 @@ function getEntryAndPage(w, nextW, EntryList) --print("Entry:"..EntryList[#EntryList]["sortChar"]) if args_v then if Special == "" then Special = "-" end - writeLog(1,"getEntryAndPage: "..tostring(IndexString,pageNo,Special,utf.sub(IndexString,1,1),macro).."\n",2) + writeLog(1,"getEntryAndPage: ".. + tostring(IndexString,pageNo,Special,utf.sub(IndexString,1,1),macro).."\n",2) end return EntryList end @@ -305,6 +306,7 @@ function compressEntryList(EntryList) -- require 'xindex-pretty'.dump(EntryList) -- only for internal dump local newList = {} newList[1] = EntryList[1] -- at least one entry + print("----------------- start compressEntryList ----------------") local nPages = 1 for k=2,#EntryList do if EntryList[k] then -- exists? @@ -349,7 +351,6 @@ EntryList[2] = { } ]] - function deletePageDups(pages) if #pages == 1 then return pages end local newPages = {pages[1]} @@ -372,7 +373,7 @@ end function compressPageList(pages) -- called with (v["pages"]) writeLog(1,"compressPageList: we have "..#pages.." pages for this entry\n",2) --- require 'xindex-pretty'.dump(pages) -- only for internal dump + --print(require 'xindex-pretty'.dump(pages)) -- only for internal dump pages = deletePageDups(pages) -- delete duplicate page numbers with same special local str if #pages == 1 then -- only one pageno @@ -392,6 +393,26 @@ function compressPageList(pages) -- called with (v["pages"]) -- (pages[1]["special"] == pages[2]["special"]) then -- pages[2] = nil end + else -- pages are not numbers + rangeStartA,rangeEndA = pages[1]["number"]:find("-") or 0,0 + rangeStartB,rangeEndB = pages[2]["number"]:find("-") or 0,0 + if rangeStartA > 1 then + pageA = pages[1]["number"]:gmatch("([^-]+)")(1) -- split 12--44 into 12 + pageB = pages[2]["number"] + if pageA > pageB then -- change pages + local temp = pages[1]["number"] + pages[1]["number"] = pages[2]["number"] + pages[2]["number"] = temp + end + elseif rangeStartB > 1 then -- change pages + pageA = pages[1]["number"] + pageB = pages[2]["number"]:gmatch("([^-]+)")(1) -- split 12--44 into 12 + if pageA > pageB then + local temp = pages[1]["number"] + pages[1]["number"] = pages[2]["number"] + pages[2]["number"] = temp + end + end end return pages end @@ -409,7 +430,7 @@ function compressPageList(pages) -- called with (v["pages"]) series = {pages[2]} startIndex = 3 end -if args_v then print ("compressPageList: more than two pages for the entry\n") end + if args_v then print ("compressPageList: more than two pages for the entry\n") end for i=startIndex,#pages do if (toNumber(pages[i-1]["number"]) and toNumber(pages[i]["number"])) then -- do we have two arabic or two roman numbers? if ((toNumber(pages[i]["number"])-toNumber(pages[i-1]["number"])) == 1) and @@ -603,24 +624,33 @@ function GenerateSortKeys(Index) end end +-- Entry = "Johann", -- the index item foo@bar +-- pages = { -- the page number(s) and the part after | +-- { number = 111, + + function UCACompare(a,b) + local pageA = a["pages"][1]["number"] + local pageB = b["pages"][1]["number"] if ignoreSpace then - A = a["Entry"]:gsub("%s+", "") -- str = str:gsub("%s+", "") - B = b["Entry"]:gsub("%s+", "") + A = a["Entry"]:gsub("%s+", "")..tostring(pageA) -- str = str:gsub("%s+", "") + B = b["Entry"]:gsub("%s+", "")..tostring(pageB) else - A = a["Entry"] - B = b["Entry"] + A = a["Entry"]..tostring(pageA) + B = b["Entry"]..tostring(pageB) end + if A=="Abendmahl" or B=="Abendmahl" then print(A,B,A==B) end + if A==B then return True end --print(A,B) compare = collator_obj:compare_strings(A,B) - writeLog(1,"UCACompare: "..A.."<"..B.." : "..tostring(compare).."\n",2) +-- writeLog(1,"UCACompare: "..A.."<"..B.." : "..tostring(compare).."\n",2) return compare end function UTFCompare(a,b) local A = a["SortKey"] local B = b["SortKey"] - writeLog(1,"UTFCompare: "..A.."<"..B.." : "..tostring(A<B).."\n",2) +-- writeLog(1,"UTFCompare: "..A.."<"..B.." : "..tostring(A<B).."\n",2) return A<B end @@ -729,7 +759,7 @@ function getPageList(v,hyperpage) else Pages = compressPageList(v["pages"]) end --- require 'xindex-pretty'.dump(Pages) -- only for internal dump +-- print(require 'xindex-pretty'.dump(Pages)) -- only for internal dump local pageNo --[[ \indexentry{Auto|hyperindexformat{\textbf}}{1} @@ -739,18 +769,17 @@ function getPageList(v,hyperpage) \item foo, \hyperpage{1\nohyperpage{f}}, \hyperpage{4\nohyperpage{ff}}, \hyperpage{8} - ]] if hyperpage then - if string.find(v["pages"][1]["special"],"hyperindexformat") then --- pageNo = v["pages"][1]["special"].."{"..checkFF(Pages[1]["number"].."}") - pageNo = v["pages"][1]["special"].."{"..Pages[1]["number"].."}" + if string.find(Pages[1]["special"],"hyperindexformat") then +-- pageNo = Pages[1]["special"].."{"..checkFF(Pages[1]["number"].."}") + pageNo = Pages[1]["special"].."{"..Pages[1]["number"].."}" else pageNo = "\\hyperpage{"..checkFF(Pages[1]["number"]).."}" end for i=2,#Pages do - if string.find(v["pages"][i]["special"],"hyperindexformat") then - pageNo = pageNo..", "..v["pages"][i]["special"].."{"..Pages[i]["number"].."}" + if string.find(Pages[i]["special"],"hyperindexformat") then + pageNo = pageNo..", "..Pages[i]["special"].."{"..Pages[i]["number"].."}" -- pageNo = pageNo..", "..v["pages"][i]["special"].."{"..checkFF(Pages[i]["number"].."}") else pageNo = pageNo..", \\hyperpage{"..checkFF(Pages[i]["number"]).."}" @@ -804,8 +833,9 @@ end function checkHyperpage(lines) local hyperpage = false + local l for i=1,#lines do - if string.find(lines[i],'hyperpage}') then + if string.find(lines[i],'hyperpage}') or string.find(lines[i],'hyperindexformat}') then hyperpage = true break end @@ -816,49 +846,49 @@ function checkHyperpage(lines) -- hyperref ignores the vertical bar in "| and also other escape chars -- -- \index{"|} -> \indexentry{"|hyperpage}{1} -> \textbar|hyperpage - -- \index{foo"|bar} -> \indexentry{foo"|hyperindexformat{\bar}}{1} -> foo\textbar bar|hyperpage + -- \index{foo"|bar} -> \indexentry{foo"||hyperindexformat{\bar}}{1} -> foo\textbar bar|hyperpage end local sub_str0 = esc_char..'|hyperpage' local sub_str1 = esc_char..'|hyperindexformat' for i=1,#lines do - local l = lines[i] + l = lines[i] if fix_hyperref then - s0 = l:find(sub_str0) -- test for hyperpage - s1 = l:find(esc_char..sub_str0) - --print(i,l,s0,s1) + s0 = l:find(sub_str0) -- test for "|hyperpage + s1 = l:find(esc_char..sub_str0) -- test for ”"|hyperpage if s0 == nil then s0 = 0 s1 = 0 end if s1 == nil and s0 > 0 then -- no ""| - l = l:gsub(sub_str0, '\\textbar|hyperpage') -- "| -> \textbar - else - -- part 2 - s0 = l:find(sub_str1) - s1 = l:find(esc_char..sub_str1) - --print(i,l,s0,s1) - if s0 == nil then + l = l:gsub(sub_str0, '\\textbar|hyperpage') -- "|hyperpage -> \textbar|hyperpage + end + -- part 2 + s0 = l:find(sub_str1) -- look for "|hyperindexformat + s1 = l:find(esc_char..sub_str1) -- look for ""|hyperindexformat + --print(i,l,s0,s1) + if s0 == nil then s0 = 0 s1 = 0 - elseif s1 == nil then + elseif s1 == nil then s1 = 0 - end - if s1 == 0 and s0 > 0 then + end + if s1 == 0 and s0 > 0 then -- found "|hyperindexformat -- get foo and bar from {foo"|hyperindexformat{\bar}} - items = l:gmatch("%{(.-)%}") - var = {} - for item in items do + -- \indexentry{marriage|hyperindexformat{\seealso{coemptio}}}{301} + items = l:gmatch("%{(.-)%}") + var = {} + for item in items do var[#var+1] = item - end - if s0 > 2 then + end + if s0 > 2 then u1 = var[1]:split('"|')[1] -- foo - else + else u1 = '' - end - v1 = var[1]:split("\\")[2] -- bar - l = '{'..u1..'\\textbar '..v1.."|hyperpage}{"..var[2].."}" - -- l = foo"|bar -> foo\textbar bar end + v1 = var[1]:split("\\")[2] -- bar + print(u1,v1,var[1],var[2]) + l = '{'..u1..'\\textbar '..v1.."|hyperindexformat}{"..var[2].."}" + -- l = foo"|bar -> foo\textbar bar end end lines[i] = string.gsub(l,'|?hyperpage}{','}{') diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua index 4ed26641421..91d83a95a2d 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua @@ -10,7 +10,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-no'] = { - version = 0.58, + version = 0.61, comment = "configuration 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 59d96d889fc..c41ba8c8cca 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-pretty'] = { - version = 0.58, + version = 0.61, 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 index 350102aa6cb..ebf27cfb753 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-yannis'] = { - version = 0.58, + version = 0.61, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", |