diff options
author | Karl Berry <karl@freefriends.org> | 2022-01-22 21:03:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-01-22 21:03:20 +0000 |
commit | cdf946a4c2d4105eba2a5bec9a9608a3c2e178c3 (patch) | |
tree | 4537c299eafae52df1691ca9656c352563c3917f /Master/texmf-dist/doc/lualatex/xindex | |
parent | 84657de6b123a17eb3af55b3ed14ee47c671d7c8 (diff) |
xindex (22jan22)
git-svn-id: svn://tug.org/texlive/trunk@61696 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/lualatex/xindex')
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/CHANGELOG | 3 | ||||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf | bin | 18346 -> 18342 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf | bin | 15201 -> 15194 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf | bin | 18890 -> 18884 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf | bin | 39089 -> 39021 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf | bin | 28627 -> 28624 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf | bin | 34619 -> 34606 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf | bin | 9223 -> 9216 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf | bin | 11885 -> 11883 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf | bin | 396390 -> 412603 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex | 72 |
12 files changed, 40 insertions, 37 deletions
diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG index eb16ed08813..8a951d6ba53 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG +++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG @@ -1,3 +1,6 @@ +0.35 2022-01-22 - fix for escape character + - added language spain for folium pages and header + - added config AU for austrian sorting (experimental) 0.34 2021-11-07 - added the enddor for sq. and sqq. 0.33 2021-08-15 - fix for filename->outfilename 0.32 2021-08-15 - fix for multiple input files 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 909517a46fd..43e7014edcc 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.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf Binary files differindex dca73ca414d..83a38ef56d8 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.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf Binary files differindex f63a171c110..1ae2761ab5f 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 048cf758351..19b401d948f 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind +++ b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind @@ -37,8 +37,8 @@ \item Anhang, {62} \item Atom, {400f} \item Autor, {54} + \item Autor"=Jahr"=Schema, {544} \item Autor-Stil, {586} - \item Autor(=Jahr(=Schema, {544} \indexspace \textbf{B}\label{L-xindex-B} 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 b7bbc6a9504..8f7695f8035 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.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf Binary files differindex 680acbc892c..07b47f5c4b0 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.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf Binary files differindex 1b1b2888f0d..bd5bd8371cb 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/demo3.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf Binary files differindex 91cfbb71343..28ac172fd15 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 f17c7cdf92a..06202ce455c 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/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf Binary files differindex 48ed436ef44..63522357bf5 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 bfdb23dc436..4fe8374b3d4 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex +++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex @@ -1,4 +1,4 @@ -%% $Id: xindex-doc.tex 16 2021-11-07 19:42:57Z hvoss $ +%% $Id: xindex-doc.tex 20 2022-01-22 10:37:29Z hvoss $ % \listfiles\setcounter{errorcontextlines}{100} \documentclass[paper=a4,fontsize=11pt,DIV=14,parskip=half-, @@ -20,6 +20,7 @@ RawFeature = -rlig, ] \setmonofont{DejaVu Sans Mono}[Scale=MatchLowercase,FakeStretch=0.9] +\newfontfamily\DejaVuMono[Scale=MatchLowercase,FakeStretch=0.9]{DejaVu Sans Mono} %\setmonofont{Anonymous Pro}[Scale=MatchLowercase,FakeStretch=0.9] \newfontfamily\Japanese[Scale=MatchUppercase]{SourceHanSans} @@ -80,7 +81,7 @@ \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} -\setVersion{version = 0.34}% can be automatically changed by perl +\setVersion{version = 0.35}% can be automatically changed by perl \setkeys{dtk}{cleanup=true,force} @@ -99,6 +100,7 @@ Thanks to: \\ Mark Baudoin; Denis Bitouzé; Brian Dunn; +Gonzalo Pesquero Serrano; Michal Hoftich; Frank Mittelbach; Heiko Oberdiek; @@ -266,7 +268,7 @@ are alphabetized. compiler=lualatex, crop, xindex, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -313,9 +315,7 @@ escape_chars = { -- by default " is the escape char {esc_char..'"', '//escapedquote//', '"' }, {esc_char..'@', '//escapedat//', '@' }, {esc_char..'|', '//escapedvert//', '|' }, - {esc_char..'!', '//scapedexcl//', '!' }, - {esc_char..'(', '//escapedparenleft//', '(' }, - {esc_char..')', '//escapedparenright//',')' } + {esc_char..'!', '//scapedexcl//', '!' } } \end{verbatim} @@ -331,7 +331,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, @@ -377,9 +377,11 @@ indexheader = { da = {"Symboler", "Tal"}, de = {"Symbole", "Zahlen"}, en = {"Symbols", "Numbers"}, + es = {"Símbolos", "Números"}, fr = {"Symboles","Nombres"}, it = {"Simboli", "Numeri"}, \Japanese jp = {"シンボル","番号"}, + \DejaVuMono no = {"Symboler","Tall"}, } \end{Verbatim} @@ -393,7 +395,7 @@ The following example was run with \verb|xindex -l it <file>.idx|: crop, xindex, xindexOptions=-l it -e ">", - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -512,7 +514,7 @@ alphabet_upper = { -- for sorting crop, xindex, xindexOptions=-l de, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -652,7 +654,7 @@ The following runs with \verb|xindex -l jp <file>|: crop, xindex, xindexOptions=-l jp, - force=false, + force=true, runs=2, code=false, docType=latex, @@ -710,7 +712,7 @@ by Michal Hoftich's Lua package \texttt{LUA-UCA}, which should be part of any \T crop, xindex, xindexOptions=-u -l cs, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -768,6 +770,7 @@ folium = { da = {"f", "ff"}, de = {"f", "ff"}, en = {"f", "ff"}, + es = {"f", "ff"}, fr = {"\\,sq.","\\,sqq."}, it = {"f", "ff"}, jp = {"シンボル","番号"}, @@ -833,7 +836,7 @@ Using the package \Lpack{hyperref} is no problem: crop, xindex, xindexOptions=-l de, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -894,7 +897,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, @@ -1011,14 +1014,13 @@ Internally exists a function \verb|compressPageList| which is used if no crop, xindex, xindexOptions=-c HAdW-eKO, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, lstOptions={columns=fixed}]{xindex} %! lualatex -\RequirePackage{filecontents} -\begin{filecontents*}{\jobname.idx} +\begin{filecontents}[force,noheader]{\jobname.idx} \indexentry{Aachen, Johannes von}{VII/1-215} \indexentry{Aarones}{VII/2/1-1003} \indexentry{Aarones}{VII/2/1-1012} @@ -1071,7 +1073,7 @@ Internally exists a function \verb|compressPageList| which is used if no \indexentry{Karl!IV., Kaiser}{VII/1-147} \indexentry{Karl!X., Kaiser}{VII/1-149} \indexentry{Karl!IX., Kaiser}{VII/1-296} -\end{filecontents*} +\end{filecontents} \documentclass[a4paper]{article} \usepackage[margin=1cm]{geometry} \usepackage{xcolor} @@ -1139,8 +1141,7 @@ The following example runs \verb|xindex -c dtk -l de -n <input>| align=\centering, lstOptions={columns=fixed}]{xindex} %! lualatex -\RequirePackage{filecontents} -\begin{filecontents*}{\jobname.idx} +\begin{filecontents}[force,noheader]{\jobname.idx} \indexentry{VoßHerbert@Herbert Voß!Wasgensteig 12\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{3} \indexentry{SeversMarkus@Markus Severs!siehe Seite~\protect \pageref {president}}{4} \indexentry{VoßHerbert@Herbert Voß!Wasgensteig 12\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{5} @@ -1151,7 +1152,7 @@ The following example runs \verb|xindex -c dtk -l de -n <input>| \indexentry{KoonMartin@Martin Koon!Freiherr-Links-Weg~16\protect \\ 15525~Neckar\protect \\ \Email {koo"@xyz.org}}{31} \indexentry{SchusterEike@Eike Schulter!Haussteig~15\protect \\ 36396~Stuttgart\protect \\ \Email {eike.schulter"@kabel.de}}{40} \indexentry{FanntHorst@Horst Fannt!Friedrichallee 74\protect \\13233 Neu-Isenburg\protect \\\Email {horst.fannt"@gmxnet.de}}{48} -\end{filecontents*} +\end{filecontents} \documentclass{article} \usepackage{url} \DeclareUrlCommand\Email{% @@ -1207,7 +1208,7 @@ no limit for \Lprog{xindex}. crop, xindex, % xindexOptions=, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -1283,7 +1284,7 @@ such commands are ignored. In the following example we put an horizontal line af crop, xindex, xindexOptions=-l de, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -1331,7 +1332,7 @@ the vertical space between different first letters: crop, xindex, xindexOptions=-n, - force=false,, + force=true,, runs=2,code,docType=latex, showFilename, align=\centering, @@ -1383,15 +1384,14 @@ In the documents preamble there is the definition: crop, xindex, xindexOptions=-c header, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, lstOptions={columns=fixed}]{xindex} %! lualatex \documentclass{scrartcl} -\usepackage{filecontents} -\begin{filecontents*}{xindex-header.lua} +\begin{filecontents}[force,noheader]{xindex-header.lua} ----------------------------------------------------------------------- -- FILE: xindex-header.lua -- DESCRIPTION: configuration file for xindex.lua @@ -1418,6 +1418,8 @@ sublabels = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-item pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" -- not used !!! indexOpening = "" -- commands after \begin{theindex} idxnewletter = "\\idxnewletter" +envStart = "\\begin{theindex}" +envStop = "\\end{theindex}" --[[ Each character's position in this array-like table determines its 'priority'. @@ -1481,7 +1483,7 @@ alphabet_upper = { -- for sorting { 'Y', 'Ý', 'Ÿ' }, { 'Z', 'Ž' } } -\end{filecontents*} +\end{filecontents} \makeatletter \def\theindex{% only for demonstration \section*{\indexname} @@ -1527,7 +1529,7 @@ the \verb|xindex-???| series because uppercase letters are sorted before lowerca crop, xindex, % xindexOptions=, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -1541,8 +1543,7 @@ the \verb|xindex-???| series because uppercase letters are sorted before lowerca \parskip\z@ \@plus .3\p@\relax \parindent\z@ \let\item\@idxitem} \makeatother -\usepackage{filecontents} -\begin{filecontents*}{\jobname.idx} +\begin{filecontents}[force,noheader]{\jobname.idx} \indexentry{xindex package@\texttt {xindex} package|hyperpage}{2} \indexentry{xindex program@\texttt {xindex} program|hyperpage}{4} \indexentry{xindex-cfg.lua file@\texttt {xindex-cfg.lua} file|hyperpage}{6} @@ -1556,7 +1557,7 @@ the \verb|xindex-???| series because uppercase letters are sorted before lowerca \indexentry{xindex program@\texttt {xindex} program|hyperpage}{14} \indexentry{xindex-cfg-common.lua file@\texttt {xindex-cfg-common.lua} file|hyperpage}{14} \indexentry{xindex package@\texttt {xindex} package|hyperpage}{15} -\end{filecontents*} +\end{filecontents} %StartVisiblePreamble \usepackage{makeidx} \usepackage{hyperref} @@ -1582,7 +1583,7 @@ The same example sorted with the \verb|-a| or \verb|--nocasesensitive| has anoth crop, xindex, xindexOptions=-a, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -1596,8 +1597,7 @@ The same example sorted with the \verb|-a| or \verb|--nocasesensitive| has anoth \parskip\z@ \@plus .3\p@\relax \parindent\z@ \let\item\@idxitem} \makeatother -\usepackage{filecontents} -\begin{filecontents*}{\jobname.idx} +\begin{filecontents}[force,noheader]{\jobname.idx} \indexentry{xindex package@\texttt {xindex} package|hyperpage}{2} \indexentry{xindex program@\texttt {xindex} program|hyperpage}{4} \indexentry{xindex-cfg.lua file@\texttt {xindex-cfg.lua} file|hyperpage}{6} @@ -1611,7 +1611,7 @@ The same example sorted with the \verb|-a| or \verb|--nocasesensitive| has anoth \indexentry{xindex program@\texttt {xindex} program|hyperpage}{14} \indexentry{xindex-cfg-common.lua file@\texttt {xindex-cfg-common.lua} file|hyperpage}{14} \indexentry{xindex package@\texttt {xindex} package|hyperpage}{15} -\end{filecontents*} +\end{filecontents} %StartVisiblePreamble \usepackage{makeidx} \usepackage{hyperref} @@ -1640,7 +1640,7 @@ and adds the program \Lprog{xindex} as the default program to \Lpack{imakeidx}. crop, xindex, xindexOptions=-l de, - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, |