diff options
author | Norbert Preining <norbert@preining.info> | 2021-08-15 03:00:39 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-08-15 03:00:39 +0000 |
commit | 8e38006fd2e220c3a27208477dab7abbf7256370 (patch) | |
tree | d63fa0168a10601bb6a10a1e3684ed25e52a68c9 /indexing/xindex/doc | |
parent | 769e7ba80785adf6ccb03041b687fcd0253e9371 (diff) |
CTAN sync 202108150300
Diffstat (limited to 'indexing/xindex/doc')
19 files changed, 121 insertions, 20 deletions
diff --git a/indexing/xindex/doc/tests/HADW.pdf b/indexing/xindex/doc/tests/HADW.pdf Binary files differindex 239f431bc9..44577111ea 100644 --- a/indexing/xindex/doc/tests/HADW.pdf +++ b/indexing/xindex/doc/tests/HADW.pdf diff --git a/indexing/xindex/doc/tests/HADW.tex b/indexing/xindex/doc/tests/HADW.tex index 1a837fd93b..0ce50d0b10 100644 --- a/indexing/xindex/doc/tests/HADW.tex +++ b/indexing/xindex/doc/tests/HADW.tex @@ -4,7 +4,7 @@ \usepackage{libertinus-otf} \usepackage{babel} \usepackage{makeidx} -\usepackage{dtk-logos} +\usepackage{hvlogos} \usepackage[table]{xcolor} \makeatletter \def\theindex{% only for demonstration diff --git a/indexing/xindex/doc/tests/Umlaute.pdf b/indexing/xindex/doc/tests/Umlaute.pdf Binary files differindex d91d9f10ec..2c353bfa29 100644 --- a/indexing/xindex/doc/tests/Umlaute.pdf +++ b/indexing/xindex/doc/tests/Umlaute.pdf diff --git a/indexing/xindex/doc/tests/Umlaute2.pdf b/indexing/xindex/doc/tests/Umlaute2.pdf Binary files differindex c2b78f3f18..5803dc5eb7 100644 --- a/indexing/xindex/doc/tests/Umlaute2.pdf +++ b/indexing/xindex/doc/tests/Umlaute2.pdf diff --git a/indexing/xindex/doc/tests/buch.ind b/indexing/xindex/doc/tests/buch.ind index 57a3d139cf..d03eb1dbc9 100644 --- a/indexing/xindex/doc/tests/buch.ind +++ b/indexing/xindex/doc/tests/buch.ind @@ -1,15 +1,15 @@ \begin{theindex} -\par\textbf{Symbols}\label{L-xindex-Symbols} +\par\textbf{Symbols}\label{L-xindex-symbols} \nopagebreak[4] - \item \texttt{\"{}\"{}}, {79} - \item \texttt{\"{}=}, {79} - \item \texttt{\"{}\textasciitilde}, {79} + \item \texttt{""}, {79} + \item \texttt{"=}, {79} + \item \texttt{"\textasciitilde}, {79} \item \euro {}, {67} \item \textacutedbl , {78} \indexspace -\textbf{Numbers}\label{L-xindex-Numbers} +\textbf{Numbers}\label{L-xindex-numbers} \nopagebreak[4] \item 3D, {752} \item 4:3, {621} @@ -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} @@ -548,6 +547,7 @@ \item Tabellenüberschrift \subitem -\,\nxLPack {longtable}, {259} \item Tabellenunterschrift + \subitem -\,\nxLPack {longtable}, {259} \item Tabellenverzeichnis, {310}, {475} \item {\ttfamily tabular} Env., \idxbf{0--218} \end{theindex} diff --git a/indexing/xindex/doc/tests/buch.pdf b/indexing/xindex/doc/tests/buch.pdf Binary files differindex 5975dd18f7..02c8d5b81b 100644 --- a/indexing/xindex/doc/tests/buch.pdf +++ b/indexing/xindex/doc/tests/buch.pdf diff --git a/indexing/xindex/doc/tests/buch.tex b/indexing/xindex/doc/tests/buch.tex index 8369a1fc63..923618fe9d 100644 --- a/indexing/xindex/doc/tests/buch.tex +++ b/indexing/xindex/doc/tests/buch.tex @@ -4,7 +4,7 @@ \usepackage{libertinus-otf} \usepackage{babel} \usepackage{makeidx} -\usepackage{dtk-logos} +\usepackage{hvlogos} %\newcommand\doublequote{"{}} \let\nxLnotation\texttt diff --git a/indexing/xindex/doc/tests/demo-hyperref.ind b/indexing/xindex/doc/tests/demo-hyperref.ind index 854bf91870..639cedcaab 100644 --- a/indexing/xindex/doc/tests/demo-hyperref.ind +++ b/indexing/xindex/doc/tests/demo-hyperref.ind @@ -36,7 +36,7 @@ \item demnach, \hyperpage{35}, \hyperpage{38} \item Demonstration, \hyperpage{29}, \hyperpage{35} \item den, \hyperpage{46} - \item der, \hyperpage{9--31}, \hyperpage{34}, \hyperpage{37}, \hyperpage{41} + \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} diff --git a/indexing/xindex/doc/tests/demo-hyperref.pdf b/indexing/xindex/doc/tests/demo-hyperref.pdf Binary files differindex dfe9b33aaa..0317664d46 100644 --- a/indexing/xindex/doc/tests/demo-hyperref.pdf +++ b/indexing/xindex/doc/tests/demo-hyperref.pdf diff --git a/indexing/xindex/doc/tests/demo.ind b/indexing/xindex/doc/tests/demo.ind index 91c44b327d..ff3bc67f4e 100644 --- a/indexing/xindex/doc/tests/demo.ind +++ b/indexing/xindex/doc/tests/demo.ind @@ -1,11 +1,11 @@ \begin{theindex} -\par\textbf{Symbole}\label{L-xindex-Symbole} +\par\textbf{Symbols}\label{L-xindex-symbols} \nopagebreak[4] \item \textbackslash , {1} \indexspace -\textbf{Zahlen}\label{L-xindex-Zahlen} +\textbf{Numbers}\label{L-xindex-numbers} \nopagebreak[4] \item 4711, {1} @@ -48,7 +48,7 @@ \item demnach, {35}, {38} \item Demonstration, {29}, {35} \item den, {46} - \item der, {9--31}, {34}, {37}, {41} + \item der, {34}, {37}, {41} \item Deshalb, {14} \item Deutschland, {8}, {27} \item die, {21}, {39}, {41} @@ -85,6 +85,7 @@ \item Festakt, {19} \item Flaggen, {36} \item Flüchtlinge, {11} + \item foo, {1}, \textit{1f}, \see{bar}{2}, {2}, \textbf{3}, {3f} \item Frust, {17} \item für, {10}, {26} diff --git a/indexing/xindex/doc/tests/demo.pdf b/indexing/xindex/doc/tests/demo.pdf Binary files differindex 0df7056864..4aa6b007df 100644 --- a/indexing/xindex/doc/tests/demo.pdf +++ b/indexing/xindex/doc/tests/demo.pdf diff --git a/indexing/xindex/doc/tests/demo3.pdf b/indexing/xindex/doc/tests/demo3.pdf Binary files differindex b9718a4e31..76466c1cfa 100644 --- a/indexing/xindex/doc/tests/demo3.pdf +++ b/indexing/xindex/doc/tests/demo3.pdf diff --git a/indexing/xindex/doc/tests/demo4.idx b/indexing/xindex/doc/tests/demo4.idx new file mode 100644 index 0000000000..a97595107e --- /dev/null +++ b/indexing/xindex/doc/tests/demo4.idx @@ -0,0 +1,14 @@ +\indexentry {Lamport@{Lamport}, Leslie}{xxxvi} +\indexentry {Downes@{Downes}, Michael}{xxxvi} +\indexentry {Gordon@{Gordon}, Peter}{xxxvi} +\indexentry {Ryan@{Ryan}, Elizabeth}{xxxvi} +\indexentry {Beeton@{Beeton}, Barbara}{xxxvi} +\indexentry {Rhead@{Rhead}, David}{xxxvi} +\indexentry {Vulis@{Vulis}, Michael}{xxxvii} +\indexentry {Rowley@{Rowley}, Chris}{xxxvii} +\indexentry {Wong@{Wong}, Wai}{xxxvii} +\indexentry {Downes@{Downes}, Michael}{xxxvii} +\indexentry {Wetmore@{Wetmore}, Alan}{xxxvii} +\indexentry {Knuth@{Knuth}, Donald}{1} +\indexentry {Knuth@{Knuth}, Donald}{2} +\indexentry {Lamport@{Lamport}, Leslie}{2} diff --git a/indexing/xindex/doc/tests/demo4.ind b/indexing/xindex/doc/tests/demo4.ind new file mode 100644 index 0000000000..e2bf40975c --- /dev/null +++ b/indexing/xindex/doc/tests/demo4.ind @@ -0,0 +1,46 @@ + +\begin{theindex} + +\indexspace +\textbf{B}\label{L-xindex-B} +\nopagebreak[4] + \item {Beeton}, Barbara, {xxxvi} + +\indexspace +\textbf{D}\label{L-xindex-D} +\nopagebreak[4] + \item {Downes}, Michael, {xxxvi}, {xxxvii} + +\indexspace +\textbf{G}\label{L-xindex-G} +\nopagebreak[4] + \item {Gordon}, Peter, {xxxvi} + +\indexspace +\textbf{K}\label{L-xindex-K} +\nopagebreak[4] + \item {Knuth}, Donald, {1f} + +\indexspace +\textbf{L}\label{L-xindex-L} +\nopagebreak[4] + \item {Lamport}, Leslie, {xxxvi}, {2} + +\indexspace +\textbf{R}\label{L-xindex-R} +\nopagebreak[4] + \item {Rhead}, David, {xxxvi} + \item {Rowley}, Chris, {xxxvii} + \item {Ryan}, Elizabeth, {xxxvi} + +\indexspace +\textbf{V}\label{L-xindex-V} +\nopagebreak[4] + \item {Vulis}, Michael, {xxxvii} + +\indexspace +\textbf{W}\label{L-xindex-W} +\nopagebreak[4] + \item {Wetmore}, Alan, {xxxvii} + \item {Wong}, Wai, {xxxvii} +\end{theindex} diff --git a/indexing/xindex/doc/tests/demo4.pdf b/indexing/xindex/doc/tests/demo4.pdf Binary files differnew file mode 100644 index 0000000000..066fba3294 --- /dev/null +++ b/indexing/xindex/doc/tests/demo4.pdf diff --git a/indexing/xindex/doc/tests/demo4.tex b/indexing/xindex/doc/tests/demo4.tex new file mode 100644 index 0000000000..b8fdfc2e71 --- /dev/null +++ b/indexing/xindex/doc/tests/demo4.tex @@ -0,0 +1,12 @@ +\documentclass[paper=a4,parskip=half-,ngerman]{scrartcl} +\usepackage{fontspec} +\usepackage{libertinus-otf} +\usepackage{babel} + +\usepackage{makeidx} +\begin{document} + +\printindex + + +\end{document} diff --git a/indexing/xindex/doc/tests/runTests.sh b/indexing/xindex/doc/tests/runTests.sh index 678bfa40e7..d0c5961407 100755 --- a/indexing/xindex/doc/tests/runTests.sh +++ b/indexing/xindex/doc/tests/runTests.sh @@ -16,6 +16,10 @@ lualatex demo3 > /dev/null xindex -l de demo3 > /dev/null lualatex demo3 > /dev/null +echo "demo4" +xindex demo4 > /dev/null +lualatex demo4 > /dev/null + echo "demo-hyperref" xindex demo-hyperref > /dev/null lualatex demo-hyperref > /dev/null diff --git a/indexing/xindex/doc/xindex-doc.pdf b/indexing/xindex/doc/xindex-doc.pdf Binary files differindex 0e0af19097..f182c409f4 100644 --- a/indexing/xindex/doc/xindex-doc.pdf +++ b/indexing/xindex/doc/xindex-doc.pdf diff --git a/indexing/xindex/doc/xindex-doc.tex b/indexing/xindex/doc/xindex-doc.tex index 8adac4c59c..25c8c052ca 100644 --- a/indexing/xindex/doc/xindex-doc.tex +++ b/indexing/xindex/doc/xindex-doc.tex @@ -36,10 +36,9 @@ \gdef\DoubleperCent{%%} } - \usepackage{xcolor,fancyvrb,varioref} \usepackage{xltabular} -\usepackage{dtk-logos} % for Wikipedia W +\usepackage{hvlogos} % for Wikipedia W \usepackage{listings} \usepackage{dtk-extern} % for Wikipedia W \lstset{basicstyle=\ttfamily\small,language=[LaTeX]TeX} @@ -81,7 +80,7 @@ \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} -\setVersion{version = 0.30}% can be automatically changed by perl +\setVersion{version = 0.31}% can be automatically changed by perl \setkeys{dtk}{cleanup=true,force} @@ -101,8 +100,9 @@ Mark Baudoin; Denis Bitouzé; Brian Dunn; Michal Hoftich; +Frank Mittelbach; Heiko Oberdiek; -Matteo Paolini;\\ +Matteo Paolini; Florent Rougon; Martin Sievers; Simon Spiegel @@ -157,7 +157,7 @@ EntryList[2] = { \subsection{Syntax} -The \Index{syntax} is \verb|xindex [...] <file>| where \verb|[...]| are optional \Index{argument}s, either in short or +The \Index{syntax} is \verb|xindex [...] <file(s)>| where \verb|[...]| are optional \Index{argument}s, either in short or long form which, of course, can be mixed: \begin{verbatim} @@ -174,15 +174,38 @@ xindex [-l,--language ] default is en [-p,--prefix] default L [-u,--use_UCA ] default is false - <input file> + [-s,--use_stdin ] default is false + <files...> (default stdin) file(s)[.idx] one or more files \end{verbatim} For example: \begin{verbatim} xindex -q -l fr -b myDoc +xindex -l de -c DIN2 demo1 demo2 demo3 +xindex -c norsk -o index.ind demo1 demo2.bdx demo3.adx +\end{verbatim} + +\begin{enumerate} +\item \texttt{-q}: quiet; \texttt{-l fr}: french language setting; \texttt{-b}: no labels; \texttt{myDoc}: input data \texttt{myDoc} or \texttt{myDoc.idx)\newline + output data will be \texttt{myDoc.ind} and logfile \texttt{myDoc.ilg} +\item \texttt{-l de}: german language setting; \texttt{-c DIN2}: config file \texttt{xindex-DIN2.lua}; \texttt{demo1 demo2 demo3}: input data files with or without + extension \texttt{.idx} \newline + output data will be \texttt{demo1.ind} and logfile \texttt{xindex.ilg}} +\item \texttt{-c norsk}: config file \texttt{xindex-norsk.lua}; \texttt{-o index.ind}: output file; \texttt{demo1 demo2.bdx demo3.adx}: input data files with or without + extension \texttt{.idx} \newline + output data will be \texttt{xindex.ind} and logfile \texttt{xindex.ilg} +\end{enumerate} + +It is also possible to use standard input for the index data, which needs the \verb|-s| parameter: + +\begin{verbatim} +cat myDoc.idx | xindex -q -l fr -b -s +xindex -l de -c DIN2 < myDoc.idx \end{verbatim} + + \iffalse local args = require ('xindex-lapp') [[ parameter handling @@ -198,7 +221,8 @@ local args = require ('xindex-lapp') [[ -l,--language (default en) -p,--prefix (default L) -u,--use_UCA - <input> (string) + -s,--use_stdin + <files...> (default stdin) [.idx] file(s) ]] \fi |