From bf1dd2cd335015e26e2858c7f7f8ef588fd36af1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 29 May 2020 21:12:24 +0000 Subject: xindex (29may20) git-svn-id: svn://tug.org/texlive/trunk@55335 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/lualatex/xindex/CHANGELOG | 3 +- Master/texmf-dist/doc/lualatex/xindex/Makefile | 7 ++-- Master/texmf-dist/doc/lualatex/xindex/README.md | 6 ++-- .../texmf-dist/doc/lualatex/xindex/tests/HADW.ind | 38 --------------------- .../texmf-dist/doc/lualatex/xindex/tests/HADW.pdf | Bin 18924 -> 6979 bytes .../texmf-dist/doc/lualatex/xindex/tests/HADW.tex | 3 +- .../doc/lualatex/xindex/tests/Umlaute.pdf | Bin 15832 -> 15834 bytes .../doc/lualatex/xindex/tests/Umlaute2.pdf | Bin 19533 -> 19743 bytes .../texmf-dist/doc/lualatex/xindex/tests/buch.ind | 3 +- .../texmf-dist/doc/lualatex/xindex/tests/buch.pdf | Bin 40170 -> 40385 bytes .../doc/lualatex/xindex/tests/demo-hyperref.pdf | Bin 29389 -> 29388 bytes .../texmf-dist/doc/lualatex/xindex/tests/demo.pdf | Bin 35447 -> 35457 bytes .../texmf-dist/doc/lualatex/xindex/tests/demo3.pdf | Bin 9494 -> 9503 bytes .../doc/lualatex/xindex/tests/runTests.sh | 2 +- .../texmf-dist/doc/lualatex/xindex/xindex-doc.pdf | Bin 375591 -> 378005 bytes .../texmf-dist/doc/lualatex/xindex/xindex-doc.tex | 28 +++++++-------- 16 files changed, 24 insertions(+), 66 deletions(-) (limited to 'Master/texmf-dist/doc/lualatex') 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] [.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) (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 Binary files a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf and b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf 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 Binary files a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf and b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf 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 Binary files a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf and b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf 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 Binary files a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf and b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf 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 Binary files a/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf and b/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf 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 Binary files a/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf and b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf 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 Binary files a/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf and b/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf 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 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 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 .idx|: +The following example was run with \verb|xindex -l it .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 .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 .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"}, -} -- cgit v1.2.3