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 | |
| parent | 84657de6b123a17eb3af55b3ed14ee47c671d7c8 (diff) | |
xindex (22jan22)
git-svn-id: svn://tug.org/texlive/trunk@61696 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
27 files changed, 123 insertions, 108 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, diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua index 03bc0970937..73b0e0c8054 100755 --- a/Master/texmf-dist/scripts/xindex/xindex.lua +++ b/Master/texmf-dist/scripts/xindex/xindex.lua @@ -6,11 +6,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL 1.3 -- --- $Id: xindex.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex.lua 20 2022-01-22 10:37:29Z hvoss $ ----------------------------------------------------------------------- xindex = xindex or { } - local version = 0.34 + local version = 0.35 xindex.version = version --xindex.self = "xindex" @@ -196,11 +196,13 @@ 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..'!', '//escapedexcl//', '!' } +-- {esc_char..'%(', '//escapedparenleft//', '(' }, -- ( must beescaped +-- {esc_char..'%)', '//escapedparenright//',')' } -- ) " " } +-- esc_char..'%( is not needed because it can only appear after | + language = "en" -- default language language = string.lower(args["language"]):sub(1, 2) diff --git a/Master/texmf-dist/tex/latex/xindex/xindex.sty b/Master/texmf-dist/tex/latex/xindex/xindex.sty index 0330eee8e39..65799577dc9 100644 --- a/Master/texmf-dist/tex/latex/xindex/xindex.sty +++ b/Master/texmf-dist/tex/latex/xindex/xindex.sty @@ -1,6 +1,6 @@ %% This is file `xindex.sty', %% -%% Copyright (C) 2018-2021 +%% Copyright (C) 2019- %% Herbert Voss %% %% It may be distributed and/or modified under the diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua index d8950e3a40e..b1adc53813b 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua @@ -1,41 +1,44 @@ ----------------------------------------------------------------------- --- FILE: xindex-cfg.lua +-- FILE: xindex-AU.lua -- DESCRIPTION: configuration file for xindex.lua -- REQUIREMENTS: -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-danteedition.lua 15 2021-08-20 19:01:56Z hvoss $ +-- $Id: xindex-DIN2.lua 13 2021-08-15 10:49:40Z hvoss $ ----------------------------------------------------------------------- -if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.34, - comment = "main configuration to xindex.lua", +if not modules then modules = { } end modules ['xindex-AU'] = { + version = 0.33, + comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", license = "LPPL 1.3" } itemPageDelimiter = "," -- Hello, 14 -compressPages = true -- something like 12--15, instead of 12,13,14,15. the |( ... |) syntax is still valid +compressPages = true -- something like 12--15, instaead 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 = "--" numericPage = true -- for non numerical pagenumbers, like "VI-17" sublabels = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-items first one is for item -pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" -- not used !!! +pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" indexOpening = "" -- commands after \begin{theindex} -idxnewletter = "\\idxnewletter" -- Only valid if -n is not set +rangeSymbol = "--" +idxnewletter = "\\textbf" -- Only valid if -n is not set envStart = "\\begin{theindex}" envStop = "\\end{theindex}" + --[[ Each character's position in this array-like table determines its 'priority'. Several characters in the same slot have the same 'priority'. ]] + alphabet_lower = { -- for sorting { ' ' }, -- only for internal tests - { 'a', 'á', 'à', 'ä', 'â', 'å', 'æ', }, + { 'a', 'á', 'à', 'å', 'æ', }, + { 'ä'}, { 'b' }, { 'c', 'ç' }, { 'd' }, @@ -49,13 +52,17 @@ alphabet_lower = { -- for sorting { 'l' }, { 'm' }, { 'n', 'ñ' }, - { 'o', 'ó', 'ò', 'ö', 'ô', 'ø', 'œ', 'ø'}, + { 'o', 'ó', 'ò', 'ô', 'ø', 'œ', 'ø'}, + { 'ö' }, { 'p' }, { 'q' }, { 'r' }, - { 's', 'š', 'ß' }, + { 's', 'š' }, + { 'ss'}, + { 'ß' }, { 't' }, - { 'u', 'ú', 'ù', 'ü' , 'û'}, + { 'u', 'ú', 'ù', 'û'}, + { 'ü' }, { 'v' }, { 'w' }, { 'x' }, @@ -64,7 +71,8 @@ alphabet_lower = { -- for sorting } alphabet_upper = { -- for sorting { ' ' }, - { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ', 'Â' }, + { 'A', 'Á', 'À', 'Å', 'Æ', 'Â'}, + { 'Ä'}, { 'B' }, { 'C', 'Ç' }, { 'D' }, @@ -78,16 +86,19 @@ alphabet_upper = { -- for sorting { 'L' }, { 'M' }, { 'N', 'Ñ' }, - { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø', 'Ô'}, + { 'O', 'Ó', 'Ò', 'Ø','Œ', 'Ø', 'Ô' }, + { 'Ö' }, { 'P' }, { 'Q' }, { 'R' }, { 'S', 'Š' }, { 'T' }, - { 'U', 'Ú', 'Ù', 'Ü', 'Û' }, + { 'U', 'Ú', 'Ù', 'Û' }, + { 'Ü' }, { 'V' }, { 'W' }, { 'X' }, { 'Y', 'Ý', 'Ÿ' }, { 'Z', 'Ž' } } + diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua index b325346d0e8..35ec8ab4625 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua @@ -1,30 +1,21 @@ ----------------------------------------------------------------------- --- FILE: xindex-cfg.lua +-- FILE: xindex-DIN2.lua -- DESCRIPTION: configuration file for xindex.lua -- REQUIREMENTS: -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-DIN2.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-DIN2.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- -if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.34, +if not modules then modules = { } end modules ['xindex-DIN2'] = { + version = 0.33, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", license = "LPPL 1.3" } -escape_chars = { -- by default " is the escape char - {'""', "\\escapedquote", '\"{}' }, - {'"@', "\\escapedat", "@" }, - {'"|', "\\escapedvert", "|" }, - {'"!', "\\escapedexcl", "!" }, - {'"(', "\\escapedparenleft", "(" }, - {'")', "\\escapedparenright", ")" } -} - itemPageDelimiter = "," -- Hello, 14 compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid fCompress = true -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5 @@ -66,7 +57,8 @@ alphabet_lower = { -- for sorting { 'p' }, { 'q' }, { 'r' }, - { 's', 'š', 'ß' }, + { 'ss', 'ß' }, + { 's', 'š' }, { 't' }, { 'u', 'ú', 'ù', 'û'}, { 'ue', 'ü' }, 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 ac152ba7f97..2244992db41 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua @@ -5,13 +5,13 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-HAdW-eKO.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-HAdW-eKO.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- -- -- configuration for index files of the Heidelberger Akademie der Wissenschaften if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = { - version = 0.34, + version = 0.35, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua index 2bc1fad8d37..20fa9a494d7 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua @@ -5,10 +5,10 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-base.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-base.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- -local info = { version = 0.34 } +local info = { version = 0.35 } -- check config if pageNoPrefixDel ~= "" then @@ -49,10 +49,12 @@ if hyperpage then writeLog(1,"We have hyperpages ... \n",1) end --for _,l in pairs(lines) do print (l) end writeLog(1,"Change escape chars with macros ... \n",0) -for k,v in pairs(lines) do +for k,v in ipairs(lines) do if not commandEntry(v) then - for i, str0 in ipairs(escape_chars) do - v = v:gsub(str0[1],str0[2]) + for i, str0 in ipairs(escape_chars) do -- str0: esc-char, coded, char +-- print(str0[1],str0[2],v) + v = string.gsub(v,str0[1],str0[2]) +-- print("==> "..v) end if k < #lines then if commandEntry(lines[k+1]) then -- is the next line not a \indexentry ? @@ -222,6 +224,7 @@ for k=1,#NewIndex do firstSLine = false if not no_headings then outFile:write(idxnewletter.."{"..index_header[1].."}") + indLines = indLines + 1 -- outFile:write("\\par"..idxnewletter.."{"..index_header[1].."}") if no_labels then outFile:write("\n\\nopagebreak[4]\n") @@ -247,16 +250,20 @@ for k=1,#NewIndex do if firstNLine then firstNLine = false outFile:write("\n\\indexspace\n") + indLines = indLines + 1 if not no_headings then outFile:write(idxnewletter.."{"..index_header[2].."}") + indLines = indLines + 1 if no_labels then outFile:write("\n\\nopagebreak[4]\n") + indLines = indLines + 1 else if (labelPrefix == "") then outFile:write("\\label{xindex-numbers}\n\\nopagebreak[4]\n") else outFile:write("\\label{"..labelPrefix.."-xindex-numbers}\n\\nopagebreak[4]\n") end + indLines = indLines + 1 end end end @@ -272,8 +279,10 @@ for k=1,#NewIndex do writeLog(1,"We have letters to print ...\n",3) if (currentChar ~= oldChar) and (charType == 2) then outFile:write("\n\\indexspace\n") + indLines = indLines + 1 if not no_headings then outFile:write(idxnewletter.."{"..currentChar.."}") + indLines = indLines + 1 if no_labels then outFile:write("\n\\nopagebreak[4]\n") else @@ -282,6 +291,7 @@ for k=1,#NewIndex do else outFile:write("\\label{"..labelPrefix.."-xindex-"..currentChar.."}\n\\nopagebreak[4]\n") end + indLines = indLines + 1 end end oldChar = currentChar diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua index 6508bf17a4d..0ff33a591e1 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-baselib.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-baselib.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-baselib'] = { - version = 0.34, + version = 0.35, 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 cf563b353ad..21267039d5e 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-cfg-common.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-cfg-common.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-common'] = { - version = 0.34, + version = 0.35, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -21,6 +21,7 @@ indexheader = { da = {"Symboler", "Tal"}, de = {"Symbole", "Zahlen"}, en = {"Symbols", "Numbers"}, + es = {"Símbolos", "Números"}, fr = {"Symboles","Nombres"}, it = {"Simboli", "Numeri"}, jp = {"シンボル","番号"}, @@ -32,6 +33,7 @@ folium = { da = {"f", "ff"}, de = {"f", "ff"}, en = {"f", "ff"}, + es = {"f", "ff"}, fr = {"\\,sq.","\\,sqq."}, it = {"f", "ff"}, jp = {"シンボル","番号"}, 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 43cc6e82a50..098e314e3e9 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-cfg-uca.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-cfg-uca.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-lua'] = { - version = 0.34, + version = 0.35, comment = "configuration to xindex-cfg-uca.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 2860dbe50df..0adba23737f 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-cfg.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-cfg.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.34, + version = 0.35, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -53,7 +53,8 @@ alphabet_lower = { -- for sorting { 'p' }, { 'q' }, { 'r' }, - { 's', 'š', 'ß' }, + { 's', 'š' }, + { 'ss', 'ß' }, { 't' }, { 'u', 'ú', 'ù', 'ü' , 'û'}, { 'v' }, diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua index d71a0f8f175..945094663f5 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-dtk.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-dtk.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.34, + version = 0.35, comment = "DTK configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -30,6 +30,9 @@ indexOpening = "" --[[\providecommand*\lettergroupDefault[1]{} \nopagebreak } ]] +idxnewletter = "\\textbf" -- Only valid if -n is not set +envStart = "\\begin{theindex}" +envStop = "\\end{theindex}" --[[ diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua index 717eec69f78..dedf476ac2c 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-lib.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-lib.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-lib'] = { - version = 0.34, + version = 0.35, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua index c58ebf0499d..6d6853dd03b 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua @@ -6,11 +6,11 @@ -- MODIFIED: Sveinung Heggen (2020-01-02) -- LICENSE: LPPL1.3 -- --- $Id: xindex-norsk.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-norsk.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-no'] = { - version = 0.34, + version = 0.35, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -31,15 +31,6 @@ idxnewletter = "\\textbf" -- Only valid if -n is not set envStart = "\\begin{theindex}" envStop = "\\end{theindex}" -escape_chars = { -- by default " is the escape char - {'""', "\\escapedquote", '\"{}' }, - {'"@', "\\escapedat", "@" }, - {'"|', "\\escapedvert", "|" }, - {'"!', "\\escapedexcl", "!" }, - {'"(', "\\escapedparenleft", "(" }, - {'")', "\\escapedparenright", ")" } -} - alphabet_lower = { -- for sorting { ' ' }, -- only for internal tests { 'a', 'á', 'à', }, diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua index 02d95ff5966..80699a0313b 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua @@ -3,11 +3,11 @@ -- Also provides a sandboxed Lua table reader and -- a function to present large numbers in human-friendly format. -- --- $Id: xindex-pretty.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-pretty.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-pretty'] = { - version = 0.34, + version = 0.35, 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 62030ad2479..93757ea4132 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-yannis.lua 13 2021-08-15 10:49:40Z hvoss $ +-- $Id: xindex-yannis.lua 19 2022-01-22 09:59:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-yannis'] = { - version = 0.34, + version = 0.35, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", |