From bb3a18a8791a2f32a6c8a3e0c9ee15a643aefd89 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 7 Apr 2019 21:21:59 +0000 Subject: xindex (7apr19) git-svn-id: svn://tug.org/texlive/trunk@50842 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/xindex/xindex.lua | 12 +- Master/texmf-dist/doc/lualatex/xindex/CHANGELOG | 1 + Master/texmf-dist/doc/lualatex/xindex/Makefile | 2 +- .../texmf-dist/doc/lualatex/xindex/tests/buch.ind | 678 --------------------- .../texmf-dist/doc/lualatex/xindex/xindex-doc.pdf | Bin 332489 -> 330090 bytes .../texmf-dist/doc/lualatex/xindex/xindex-doc.tex | 30 +- Master/texmf-dist/scripts/xindex/xindex.lua | 12 +- .../texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua | 2 +- .../tex/lualatex/xindex/xindex-HAdW-eKO.lua | 4 +- .../texmf-dist/tex/lualatex/xindex/xindex-base.lua | 7 +- .../tex/lualatex/xindex/xindex-cfg-common.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-cfg.lua | 4 +- .../texmf-dist/tex/lualatex/xindex/xindex-dtk.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-lapp.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-lib.lua | 34 +- .../tex/lualatex/xindex/xindex-pretty.lua | 2 +- 16 files changed, 84 insertions(+), 710 deletions(-) delete mode 100644 Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind diff --git a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua index 77804a94dad..633dc753bd4 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.09 + local version = 0.10 xindex.version = version --xindex.self = "xindex" @@ -43,9 +43,10 @@ local args = require ('xindex-lapp') [[ -c,--config (default cfg) -e,--escapechar (default ") -n,--noheadings + -a,--no_casesensitive -o,--output (default "") -l,--language (default en) - -p,--prefix (default "") + -p,--prefix (default L) (string) ]] @@ -171,6 +172,13 @@ if vlevel > 0 then for i=1,#index_header do writeLog(2,index_header[i].."\n",1) page_folium = folium[language] +no_caseSensitive = args["no_casesensitive"] +if no_caseSensitive then + writeLog(1,"Sorting will be no case sensitive\n",1) +else + writeLog(1,"Sorting will be case sensitive\n",1) +end + no_headings = args["noheadings"] if no_headings then writeLog(1,"Output with NO headings between different first letter\n",1) diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG index 2dc03455b30..f40f2d532ca 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG +++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG @@ -1,3 +1,4 @@ +0.10 2019-04-07 - fix for case sensitive sorting 0.09 2019-03-25 - fix for HAdW config file 0.08 2019-03-06 - fix for config file HAdW 0.07 2019-02-05 - fix for wrong version number diff --git a/Master/texmf-dist/doc/lualatex/xindex/Makefile b/Master/texmf-dist/doc/lualatex/xindex/Makefile index d0e8fd6fd72..8b199ac06f7 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/Makefile +++ b/Master/texmf-dist/doc/lualatex/xindex/Makefile @@ -27,7 +27,7 @@ doc: # $(LATEX) --shell-escape $(MAIN) clean : - $(RM) *.dvi *.aux *.log *.xml xindex-?.tex xindex-??.tex *.ind *.idx *.toc *.out *.ilg *.adx + $(RM) *.dvi *.aux *.log *.xml xindex-?.tex xindex-??.tex *.ind *.idx *.toc *.out *.ilg veryclean : clean $(RM) *.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind deleted file mode 100644 index 844d38123f4..00000000000 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind +++ /dev/null @@ -1,678 +0,0 @@ - -\begin{theindex} -\textbf{Symbols} -\nopagebreak[4] - \item \texttt{\"{}\"{}}, {79} - \item \texttt{\"{}=}, {79} - \item \texttt{\"{}\textasciitilde}, {79} - \item \euro {}, {67} - \item \textacutedbl , {78} - -\indexspace -\textbf{Numbers} -\nopagebreak[4] - \item 3D, {752} - \item 4:3, {621} - -\indexspace -\textbf{A} -\nopagebreak[4] - \item Abbildung, {309} - \item Abbildungsverzeichnis, {310}, {475} - \item Absatz, {7}, {381} - \item Absatzabstand, {62} - \item Absatzbox, {174} - \item Absatzeinzug, {62} - \item Abschnittsnummer, {433} - \item Abstand, {414} - \item Achse, {439} - \item Adobe Reader, {22}, {55}, {380}, {639} - \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 AUC\TeX , {29} - \item Autor, {54} - \item Autor"=Jahr"=Schema, {544} - \item Autor-Stil, {586} - -\indexspace -\textbf{B} -\nopagebreak[4] - \item Backslash, {65}, {394} - \item Bad math, {869} - \item Baseline, {224}, {264} - \item Basislinie, {224}, {397} - \item Batchmode, {39}, {883} - \item Batchmodus, {34} - \item Beamer-Template - \subitem -\,\texttt {logo}, {659} - \subitem -\,\texttt {navigation symbols}, {659} - \item Befehlssyntax, {6} - \item Begrenzer, {430}, {450}, {455} - \item Benutzerwörterbuch, {35} - \item Beschriftung, {324} - \item Betriebswirtschaftslehre, {571} - \item Bezeichner, {324} - \item Bézierkurve, {715}, {721} - \item Bibliografie, {32}, {537--592} - \item Bildschirm, {619} - \item Bildschirmausgabe, {31} - \item Bildunterschrift, {62} - \item Bindekorrektur, {61f}, {103} - \item Binom, {429}, {431} - \item Bitmap, {70} - \item Bitmapschrift, {71} - \item Blocksatz, {271} - \item bookauthor, {557} - \item Bookmark, {189} - \item Bounding Box, {165f}, {730}, {825} - \item bp, {859} - \item Briefklasse, {61} - \item Bruch, {378}, {404}, {429f} - -\indexspace -\textbf{C} -\nopagebreak[4] - \item cc, {859} - \item class option, {386} - \item Clipping, {247} - \item Clippingpfad, {771} - \item Clown, {256} - \item Cluster, {248} - \item cm, {859} - \item CMYK, {671} - \item continued fraction, {430} - \item Con\TeX t, {879} - \item Cork-Kodierung, {72} - \item Corporate Design, {642} - \item Counter, {862} - -\indexspace -\textbf{D} -\nopagebreak[4] - \item Dänisch, {67}, {76} - \item Dateilinks, {188} - \item Datum, {54} - \item Datumsformat, {77} - \item dd, {859} - \item Dehnungspunkte, {9} - \item delimiter, {229} - \item Delimiter, {394} - \item Determinante, {406} - \item Deutsch, {67}, {76}, {80} - \item Devnagari, {76} - \item Dezimalkomma, {247} - \item Dezimalpunkt, {247} - \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 amsart}, {415} - \subitem -\,{\sffamily amsbook}, {415} - \subitem -\,{\sffamily article}, {52f}, {59f}, {93}, {128}, {150}, {383}, {474} - \subitem -\,{\sffamily beamer}, {615}, {617f}, {622}, {660} - \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} - \subitem -\,{\sffamily report}, {59f}, {93}, {128}, {150} - \subitem -\,{\sffamily scrartcl}, {61}, {128f}, {834} - \subitem -\,{\sffamily scrbook}, {61}, {128f} - \subitem -\,{\sffamily scrlettr2}, {61} - \subitem -\,{\sffamily scrlttr2}, {837} - \subitem -\,{\sffamily scrreprt}, {61}, {128} - \item Dokumentenklasse, {9}, {59}, {386}, {405} - \item Dokumentenkörper, {53} - \item Dokumentenpräambel, {228} - \item Doppelpfeil, {444} - \item Doppelseite, {103} - \item Dots, {405} - \item Druckseiten, {62} - \item Durchschuss, {56} - \item Durchstreichen, {453} - \item dynamische Länge, {400} - -\indexspace -\textbf{E} -\nopagebreak[4] - \item Eingabekodierung, {9}, {54}, {67} - \item Ellipse, {770} - \item em, {860} - \item Emacs, {29} - \item Encodingtabelle, {70} - \item Endlosschleife, {32} - \item Englisch, {67}, {76}, {80} - \item Entity-Relationship, {798} - \item Esperanto, {67} - \item Estländisch, {76} - \item Estnisch, {67} - \item e\TeX , {11} - \item Eurozeichen, {67f} - \item ex, {860} - \item Expansion, {868} - \item Exponent, {405}, {408f} - -\indexspace -\textbf{F} -\nopagebreak[4] - \item Fallunterscheidung, {392}, {425} - \item Farbe, {236}, {669} - \item Farbe - \subitem -\,konvertieren, {680} - \subitem -\,Modell, {680} - \item Farbmodell, {236}, {669} - \item Farbmodell - \subitem -\,CMYK, {673} - \subitem -\,HSB, {673} - \subitem -\,RGB, {673} - \item Farbserie, {672}, {680} - \item Farbwert, {680} - \item Faröisch, {67} - \item Fehlersuche, {29}, {33}, {39} - \item Feinjustierung, {270} - \item Fettschrift, {220} - \item Finnisch, {67}, {76}, {80} - \item Flattersatz, {142f}, {223}, {358}, {538f}, {640} - \item Float, {309} - \item float box, {337} - \item FNDB, {872} - \item Folie, {621} - \item Folienübergänge, {639} - \item Fontfamilie, {661} - \item Fontserie, {661} - \item Fontshape, {661} - \item Format, {13} - \item fp\TeX , {13} - \item Französisch, {67}, {76}, {80} - \item Funktionsgraph, {244} - \item Fußlinie, {62} - \item Fußnote, {230}, {260} - \item Fußnotenzähler, {213} - \item Fußnotenzählung, {260} - \item Fußzeile, {119} - -\indexspace -\textbf{G} -\nopagebreak[4] - \item Galizisch, {67} - \item Gaußscher Algorithmus, {448} - \item GenericError, {869} - \item Gleichungsnummer, {383}, {389}, {433f} - \item Gleichungsnummerierung, {384}, {435} - \item Gleitumgebung, {200}, {240}, {309}, {634}, {885} - \item Gliederungsebene, {128} - \item global, {864} - \item Glossar, {32}, {523} - \item glue, {400} - \item Glyph, {70}, {87} - \item Gnome, {36} - \item Grenzen, {438} - \item Griechisch, {76}, {80} - \item Grundlinie, {224}, {264} - \item Gruppe, {252}, {864} - \item GUI, {9}, {29} - \item Guillemets, {82} - -\indexspace -\textbf{H} -\nopagebreak[4] - \item Hebräisch, {76} - \item Hintergrundfarbe, {389}, {658}, {679} - \item Hochformat, {96} - \item Homograph, {529} - \item Hurenkind, {102} - -\indexspace -\textbf{I} -\nopagebreak[4] - \item IDE, {29} - \item in, {859} - \item indent, {476} - \item Index, {32}, {405}, {408f}, {432}, {699} - \item Inhaltsverzeichnis, {32}, {63}, {76}, {128} - \item inline mode, {404} - \item Inlinemodus, {221} - \item Integral, {438} - \item Integralsymbol, {448} - \item Integrationsvariable, {414} - \item interline spacing, {405} - \item Internetadresse, {84} - \item IPA, {72} - \item Irisch, {67} - \item Isländisch, {67}, {76} - \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 italic, {86} - \item Italic-Korrektur, {88} - \item Italienisch, {76}, {80} - \item Items, {413} - \item IUPAC, {814} - -\indexspace -\textbf{K} -\nopagebreak[4] - \item Kapitel, {62}, {76} - \item Kapitelanfang, {62} - \item Katalanisch, {67} - \item Kettenbruch, {430} - \item Kile, {36} - \item Klammer, {394} - \item Klammerhöhe, {452} - \item Klammerpaar, {427} - \item Klammersymbole, {394} - \item Knoten, {775} - \item Kochsche Schneeflocke, {778} - \item Kodierung, {38}, {67} - \item Kodierung - \subitem -\,ascii, {67} - \item Kolumnentitel, {121}, {126} - \item \KOMAScript , {59ff}, {93} - \item Komma, {248} - \item Kommutative Diagramme, {448} - \item Konventionen, {213} - \item Kopfzeile, {62}, {119}, {222} - \item Kopf\/linie, {62} - \item kritische Edition, {208} - \item Kroatisch, {67}, {76}, {80} - \item Kursivkorrektur, {88} - -\indexspace -\textbf{L} -\nopagebreak[4] - \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} - \item Leerzeichen, {866} - \item Legende, {350} - \item Leibniz Universität Hannover, {583} - \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 Linksbündig, {223} - \item Linux, {13} - \item list of tables, {256} - \item Litauisch, {67} - \item Logdatei, {59}, {880} - \item Logfile, {883} - \item lokal, {864} - \item \nxLPack {longtable} - \subitem -\,Tabellenüberschrift, {259} - \subitem -\,Tabellenunterschrift, {259} - \item lot, {256} - \item LR-Box, {173} - -\indexspace -\textbf{M} -\nopagebreak[4] - \item Mac OS~X, {13}, {67} - \item Mac\TeX , {13} - \item Makefile, {9} - \item Makro, {848} - \item Makronamen, {414} - \item Maltesisch, {67} - \item Marginalie, {157} - \item Marke, {387} - \item math shift, {869} - \item Mathematikmodus, {411} - \item Mathematiksatz, {85} - \item Mathopen-Symbol, {396} - \item Matrix, {227}, {383}, {405f}, {426}, {449} - \item Maßeinheit, {711}, {859f} - \item Maßzahl, {859} - \item Mediävalziffern, {595} - \item Metronyme, {564} - \item Mikrotypografie, {7} - \item MiK\TeX , {13}, {21}, {23} - \item MiK\TeX - \subitem -\,Paketmanager, {21} - \item Minimalbeispiel, {888} - \item Minuskelziffern, {595} - \item MLA, {586} - \item mm, {859} - \item Modulo, {433} - \item Monospaceschrift, {64} - \item moving argument, {321} - \item \texttt {mu}, {399} - \item mu, {432}, {444}, {860} - \item multiply defined labels, {258} - \item \nxLenv {multirow}-Zelle, {268} - -\indexspace -\textbf{N} -\nopagebreak[4] - \item Navigationsleiste, {33}, {616}, {619} - \item Navigator, {33} - \item NEJM, {585} - \item Neunerteilung, {103} - \item Niederländisch, {67}, {76}, {80} - \item Niedersorbisch, {76} - \item Norwegisch, {67}, {76} - \item Null, {247} - \item Nummerierung, {63} - \item numwidth, {476} - -\indexspace -\textbf{O} -\nopagebreak[4] - \item Onlinequelle, {561} - \item OpenOffice, {35} - \item OpenType, {12}, {72}, {601} - \item Operator, {378}, {400}, {408}, {414}, {449} - \item Operator-Symbol, {408} - \item Operatorname, {408} - \item option clash, {871} - \item optischer Randausgleich, {163} - \item Overfull box, {883} - \item Overlay, {621} - \item Overlays, {631} - \item Overlayspezifikation, {627} - -\indexspace -\textbf{P} -\nopagebreak[4] - \item \protect \nxLnotation {p}-Spalte, {271} - \item p-Spalte, {268} - \item Page Coded Language, {750} - \item Paginierung, {115} - \item Papierbreite, {96} - \item Papierformat, {62}, {91}, {96} - \item Papiergröße, {96} - \item Papierhöhe, {96} - \item Parabel, {770} - \item Patronyme, {564} - \item pc, {860} - \item PDF/A, {189} - \item pdfe\TeX , {11} - \item pdf\TeX , {11}, {13} - \item Pfade, {31} - \item Pfeil, {443} - \item Phantom, {389} - \item Polnisch, {67}, {76}, {80} - \item Portugiesisch, {67}, {76}, {80} - \item PostScript, {750} - \item Präambel, {51}, {53f}, {210}, {871} - \item Produkt, {393}, {438} - \item programmiert, {6} - \item Projekt, {32}, {38}, {210} - \item pro\TeX t, {22} - \item pt, {860} - \item Punkt, {248} - \item Punkte, {405}, {428} - \item px, {860} - -\indexspace -\textbf{Q} -\nopagebreak[4] - \item Quadratwurzel, {393} - \item Querformat, {96} - \item Querverweis, {212} - -\indexspace -\textbf{R} -\nopagebreak[4] - \item \protect \nxLnotation {r}-Spalte, {271} - \item Radikand, {432} - \item Rahmenfarbe, {389} - \item Randbemerkung, {157} - \item Rechtsbündig, {223} - \item Rechtschreibprüfung, {35}, {40}, {47} - \item Referenz, {387}, {437} - \item Referenzieren, {245} - \item Rekursion, {865} - \item Relationssymbol, {380} - \item RGB, {674} - \item robust, {377f} - \item Roman-Zeichensatz, {399} - \item root, {14} - \item rubber length, {860} - \item Rücksetzbefehl, {385} - \item Rücksetzschalter, {385} - \item Rumänisch, {67}, {76} - \item Russisch, {76}, {80} - -\indexspace -\textbf{S} -\nopagebreak[4] - \item Satzprogramm, {6} - \item Satzspiegel, {91}, {94}, {103} - \item Satzspiegelberechnung, {103} - \item Schmutztitel, {115} - \item Schneidemarken, {60} - \item Schnittmarken, {110} - \item Schnittpunkt, {722} - \item Schreibmaschinenschrift, {64} - \item Schrift - \subitem -\,Breite, {64} - \subitem -\,fett, {411}, {451} - \subitem -\,Gewicht, {87} - \subitem -\,Größe, {412} - \subitem -\,Höhe, {64} - \subitem -\,Laufweite, {87} - \subitem -\,Serifen, {85} - \subitem -\,Stil, {378} - \subitem -\,Tiefe, {64} - \subitem -\,Warnung, {883} - \item Schriftattribut, {660} - \item Schrifteinbindung, {9} - \item Schriftfamilie, {85}, {442}, {595} - \item Schriftgröße, {63}, {87}, {404} - \item Schriftkodierung, {9}, {54}, {70} - \item Schriftstärke, {87} - \item Schriftstil, {404} - \item Schrittweite, {428} - \item Schusterjunge, {103} - \item Schwedisch, {67}, {76}, {80} - \item scriptwriting, {459} - \item Seitenbeschreibungssprache, {750} - \item Seitenstil, {117}, {122} - \item Seitenumbruch, {252} - \item Seitenverhältnis, {621} - \item Seitenvorschub, {62} - \item Serbisch, {76}, {80} - \item Serienattribut, {596} - \item Serifenschrift, {85} - \item shape, {86} - \item shorthand, {78} - \item sidebar, {619} - \item Sigel, {561} - \item Silbentrennung, {149} - \item skip, {58}, {860} - \item skip register, {860f} - \item Skriptsprache, {13} - \item slanted, {86} - \item Slowakisch, {67}, {80} - \item Slowenisch, {67}, {80} - \item Solaris, {13} - \item Sortierung, {247}, {489} - \item sp, {860} - \item Spalten, {62}, {428} - \item Spaltenabstand, {215}, {274} - \item Spaltenanzahl, {428} - \item Spaltenbreite, {290} - \item Spaltendefinition, {214}, {217}, {222}, {228} - \item Spaltendeklaration, {224} - \item Spaltenfarbe, {236} - \item Spaltentyp, {222}, {229}, {268}, {274}, {290} - \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 Syntax, {214} - \item Systemadministrator, {14} - \item Systemmeldung, {883} - -\indexspace -\textbf{T} -\nopagebreak[4] - \item Tabelle, {309f} - \item Tabelle - \subitem -\,Breite, {214}, {289} - \subitem -\,Farbe, {273} - \subitem -\,gerahmt, {224} - \subitem -\,geschachtelt, {268} - \subitem -\,Kopf, {222} - \item Tabellenbeschriftung, {62} - \item Tabellenbreite, {215} - \item Tabellenkalkulation, {282} - \item Tabellenüberschrift - \subitem -\,\nxLPack {longtable}, {259} - \item Tabellenunterschrift - \item Tabellenverzeichnis, {310}, {475} - \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"~1, {12} - \item Type-3, {70} - \item Typewriterschrift, {64} - \item Typografie, {213} - -\indexspace -\textbf{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} -\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} -\nopagebreak[4] - \item Waisenkind, {103} - \item Warnung, {883} - \item Wickelfalz, {832} - \item Wiederholungsfaktor, {215} - \item Windows, {13}, {21} - \item Windows 1250, {67} - \item Windows 1252, {67} - \item Windows 1257, {67} - \item Witwe, {102} - \item Wörterbuch, {40} - \item Worttrennung, {143}, {223} - \item Wortzwischenraum, {165} - \item Wurzel, {431} - \item Wurzelexponent, {432} - -\indexspace -\textbf{X} -\nopagebreak[4] - \item X-Spalte, {290} - \item Xem\TeX , {13} - -\indexspace -\textbf{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/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf index 21f94fd67d0..790ba84ba98 100644 Binary files a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf and b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex index 7c852354725..034e16120a9 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex +++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex @@ -79,7 +79,7 @@ \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} -\setVersion{version = 0.09}% can be autimatically changed by perl +\setVersion{version = 0.10}% can be autimatically changed by perl \title{Program and package \texttt{xindex} \\--\\ \normalsize \xIndexVersion\ (\today)} \author{Herbert Voß\thanks{hvoss@tug.org}} @@ -192,7 +192,7 @@ are alphabetized. compiler=lualatex, crop, xindex, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -253,7 +253,7 @@ are converted into the internal strings and later back to the origin meaning. crop, xindex, xindexOptions=-e ">", - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -313,7 +313,7 @@ The following example was run with \verb|xindex -l de .idx|: crop, xindex, xindexOptions=-l de -e ">", - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -434,7 +434,7 @@ alphabet_upper = { -- for sorting crop, xindex, xindexOptions=-l de, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -492,7 +492,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, @@ -572,7 +572,7 @@ The following runs with \verb|xindex -l jp |: crop, xindex, xindexOptions=-l jp, - force=false, + force=true, runs=2, code=false, docType=latex, @@ -651,7 +651,7 @@ folium = { crop, xindex, xindexOptions=-l fr, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -758,7 +758,7 @@ of the same type, so we get \texttt{1f} in the output. crop, xindex, xindexOptions=-l de, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -1066,7 +1066,7 @@ no limit for \Lprog{xindex}. crop, xindex, % xindexOptions=, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -1075,13 +1075,14 @@ no limit for \Lprog{xindex}. \makeatletter \def\theindex{% only for demonstration \section*{\indexname} + \pagestyle{empty}% \parskip\z@ \@plus .3\p@\relax \parindent\z@ \let\item\@idxitem} \makeatother +\pagestyle{empty}% %StartVisiblePreamble \makeatletter \g@addto@macro{\theindex}{% - \pagestyle{empty}% \def\subsubsubitem{\@idxitem\hspace*{35\p@}} \def\subsubsubsubitem{\@idxitem\hspace*{40\p@}} } @@ -1151,8 +1152,13 @@ such commands are ignored. In the following example we put an horizontal line af \usepackage{xindex} \makeindex %StopVisiblePreamble +\pagestyle{empty} \makeatletter -\let\ps@plain\ps@empty +\def\theindex{% only for demonstration + \newpage + \section*{\indexname} + \parskip\z@ \@plus .3\p@\relax \parindent\z@ + \let\item\@idxitem} \makeatother \begin{document} \index{foo}foo and diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua index 77804a94dad..633dc753bd4 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.09 + local version = 0.10 xindex.version = version --xindex.self = "xindex" @@ -43,9 +43,10 @@ local args = require ('xindex-lapp') [[ -c,--config (default cfg) -e,--escapechar (default ") -n,--noheadings + -a,--no_casesensitive -o,--output (default "") -l,--language (default en) - -p,--prefix (default "") + -p,--prefix (default L) (string) ]] @@ -171,6 +172,13 @@ if vlevel > 0 then for i=1,#index_header do writeLog(2,index_header[i].."\n",1) page_folium = folium[language] +no_caseSensitive = args["no_casesensitive"] +if no_caseSensitive then + writeLog(1,"Sorting will be no case sensitive\n",1) +else + writeLog(1,"Sorting will be case sensitive\n",1) +end + no_headings = args["noheadings"] if no_headings then writeLog(1,"Output with NO headings between different first letter\n",1) diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua index dae45fa7fb7..cbf9dd6bc03 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.09, + version = 0.10, 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 1ceade22381..38ffcccab96 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.09, + version = 0.10, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -27,7 +27,7 @@ sublabels = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-item pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" indexOpening = "" -- commands after \begin{theindex} - +case_sensitive = false -- speeds up running --[[ Each character's position in this array-like table determines its 'priority'. diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua index 0588651541e..1a8919c1149 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.09} +local info = { version = 0.10} -- check config if pageNoPrefixDel ~= "" then @@ -135,6 +135,7 @@ writeLog(2,"Start writing .ind file ... \n",0) writeLog(1,"---------- Start list to write the ind file --------------\n",1) writeLog(1,require 'xindex-pretty'.dump(NewIndex),3) -- only for internal dump + for k=1,#NewIndex do -- require 'xindex-pretty'.dump(NewIndex[k]) -- only for internal dump if NewIndex[k]["Entry"] then @@ -147,7 +148,7 @@ for k=1,#NewIndex do -- if utf8.codepoint(c) < 12288 then -- Japanese starts at hex 3000 -- firstChar = v["sortChar"] -- else - firstChar = utf.sub(v["sortChar"],1,1) -- catch a translatet Ö->OE + firstChar = utf.sub(v["sortChar"],1,1) -- catch a translatet Ö->OE -- end currentChar = firstChar charType = getCharType(firstChar) @@ -213,7 +214,7 @@ for k=1,#NewIndex do outFile:write("\n\\indexspace\n") if not no_headings then outFile:write("\\textbf{"..currentChar.."}") - if (labelPrefix == "") then + if (labelPrefix == '""') then outFile:write("\\label{xindex-"..currentChar.."}\n\\nopagebreak[4]\n") else outFile:write("\\label{"..labelPrefix.."-xindex-"..currentChar.."}\n\\nopagebreak[4]\n") 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 db8c81f6ade..6446cee0a62 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.09, + version = 0.10, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua index 3ceea684e8e..f4a72a9ffcb 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.09, + version = 0.10, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -50,7 +50,7 @@ alphabet_lower = { -- for sorting { 'r' }, { 's', 'š', 'ß' }, { 't' }, - { 'u', 'ú', 'ù', 'ü' }, + { 'u', 'ú', 'ù', 'ü' , 'û'}, { 'v' }, { 'w' }, { 'x' }, diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua index f04c359c663..82327ed597b 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.09, + version = 0.10, 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 5c7c8cd7715..f470fcb1e59 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.09, + version = 0.10, 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 b9464eb1f5f..a52b44cbbb0 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.09, + version = 0.10, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -68,6 +68,25 @@ function NormalizedUpper(strOrig) -- return normalized UTF string.upper (ä -> return str end +function NormalizedChars(strOrig) -- return normalized UTF string (ä -> a) with first as upper case + local c = string.upper(get_normalized_char(alphabet_lower,utf.sub(strOrig,1,1))) + local str = c + for i=2, utf.len(strOrig) do + c = get_normalized_char(alphabet_lower,utf.sub(strOrig,i,i)) + str = str..c + end + local strOrigTrue = strOrig + strOrig = str + c = string.upper(get_normalized_char(alphabet_upper,utf.sub(strOrig,1,1))) + str = c + for i=2, utf.len(strOrig) do + c = get_normalized_char(alphabet_upper,utf.sub(strOrig,i,i)) + str = str..c + end +-- print(strOrigTrue.." -> "..str) + return str +end + function checkVert(str) -- get the | part local vert = string.find(str,"|",1,true) if (vert) then @@ -510,8 +529,10 @@ function UTFCompare(a,b) Apage = string.format("%09s",a["pages"][1]["number"]) Bpage = string.format("%09s",b["pages"][1]["number"]) end - A = NormalizedUpper(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!','')) -- replace! by empty - B = NormalizedUpper(getSortString(b["Entry"].." "..Bpage..b["pages"][1]["special"]):gsub('!','')) + A = NormalizedChars(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!','')) -- replace! by empty + B = NormalizedChars(getSortString(b["Entry"].." "..Bpage..b["pages"][1]["special"]):gsub('!','')) +-- A = NormalizedUpper(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!','')) -- replace! by empty +-- B = NormalizedUpper(getSortString(b["Entry"].." "..Bpage..b["pages"][1]["special"]):gsub('!','')) writeLog(1,"UTFCompare: A--B "..A.."--"..B.."\n",2) -- print(A,B) --[[ @@ -572,6 +593,13 @@ function pageCompare(a,b) -- a = {{number=...,special=..},{...,...}} end end +function charCompare(a,b) -- compare only first char + local A,B + A = string.upper(utf.sub(a["sortChar"],1,1)) + B = string.upper(utf.sub(b["sortChar"],1,1)) + return A < B +end + function checkFF(p) if not p then return p end local P = tostring(p) diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua index 84754c18ce1..588f2d842a1 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.09, + version = 0.10, comment = "dump a Lua table for debugging", author = "Steve Donovan", copyright = "Steve Donovan", -- cgit v1.2.3