texlive[61696] trunk: xindex (22jan22)
commits+karl at tug.org
commits+karl at tug.org
Sat Jan 22 22:03:21 CET 2022
Revision: 61696
http://tug.org/svn/texlive?view=revision&revision=61696
Author: karl
Date: 2022-01-22 22:03:20 +0100 (Sat, 22 Jan 2022)
Log Message:
-----------
xindex (22jan22)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
trunk/Master/texmf-dist/scripts/xindex/xindex.lua
trunk/Master/texmf-dist/tex/latex/xindex/xindex.sty
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua
Added Paths:
-----------
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua
Modified: trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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 @@
{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)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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}
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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 @@
Mark Baudoin;
Denis Bitouzé;
Brian Dunn;
+Gonzalo Pesquero Serrano;
Michal Hoftich;
Frank Mittelbach;
Heiko Oberdiek;
@@ -266,7 +268,7 @@
compiler=lualatex,
crop,
xindex,
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -313,9 +315,7 @@
{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 @@
crop,
xindex,
xindexOptions=-e ">",
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -377,9 +377,11 @@
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 @@
crop,
xindex,
xindexOptions=-l it -e ">",
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -512,7 +514,7 @@
crop,
xindex,
xindexOptions=-l de,
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -652,7 +654,7 @@
crop,
xindex,
xindexOptions=-l jp,
- force=false,
+ force=true,
runs=2,
code=false,
docType=latex,
@@ -710,7 +712,7 @@
crop,
xindex,
xindexOptions=-u -l cs,
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -768,6 +770,7 @@
da = {"f", "ff"},
de = {"f", "ff"},
en = {"f", "ff"},
+ es = {"f", "ff"},
fr = {"\\,sq.","\\,sqq."},
it = {"f", "ff"},
jp = {"シンボル","番号"},
@@ -833,7 +836,7 @@
crop,
xindex,
xindexOptions=-l de,
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -894,7 +897,7 @@
crop,
xindex,
xindexOptions=-l de,
- force=false,,
+ force=true,,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1011,14 +1014,13 @@
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 @@
\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 @@
align=\centering,
lstOptions={columns=fixed}]{xindex}
%! lualatex
-\RequirePackage{filecontents}
-\begin{filecontents*}{\jobname.idx}
+\begin{filecontents}[force,noheader]{\jobname.idx}
\indexentry{VoßHerbert at Herbert Voß!Wasgensteig 12\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{3}
\indexentry{SeversMarkus at Markus Severs!siehe Seite~\protect \pageref {president}}{4}
\indexentry{VoßHerbert at Herbert Voß!Wasgensteig 12\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{5}
@@ -1151,7 +1152,7 @@
\indexentry{KoonMartin at Martin Koon!Freiherr-Links-Weg~16\protect \\ 15525~Neckar\protect \\ \Email {koo"@xyz.org}}{31}
\indexentry{SchusterEike at Eike Schulter!Haussteig~15\protect \\ 36396~Stuttgart\protect \\ \Email {eike.schulter"@kabel.de}}{40}
\indexentry{FanntHorst at 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 @@
crop,
xindex,
% xindexOptions=,
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1283,7 +1284,7 @@
crop,
xindex,
xindexOptions=-l de,
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1331,7 +1332,7 @@
crop,
xindex,
xindexOptions=-n,
- force=false,,
+ force=true,,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1383,7 +1384,7 @@
crop,
xindex,
xindexOptions=-c header,
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1390,8 +1391,7 @@
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 @@
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 @@
{ 'Y', 'Ý', 'Ÿ' },
{ 'Z', 'Ž' }
}
-\end{filecontents*}
+\end{filecontents}
\makeatletter
\def\theindex{% only for demonstration
\section*{\indexname}
@@ -1527,7 +1529,7 @@
crop,
xindex,
% xindexOptions=,
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1541,8 +1543,7 @@
\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 @@
\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 @@
crop,
xindex,
xindexOptions=-a,
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1596,8 +1597,7 @@
\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 @@
\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 @@
crop,
xindex,
xindexOptions=-l de,
- force=false,
+ force=true,
runs=2,code,docType=latex,
showFilename,
align=\centering,
Modified: trunk/Master/texmf-dist/scripts/xindex/xindex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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 @@
{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)
Modified: trunk/Master/texmf-dist/tex/latex/xindex/xindex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xindex/xindex.sty 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/latex/xindex/xindex.sty 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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
Added: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua (rev 0)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -0,0 +1,104 @@
+-----------------------------------------------------------------------
+-- FILE: xindex-AU.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 $
+-----------------------------------------------------------------------
+
+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, 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
+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"
+indexOpening = "" -- commands after \begin{theindex}
+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', 'á', 'à', 'å', 'æ', },
+ { 'ä'},
+ { 'b' },
+ { 'c', 'ç' },
+ { 'd' },
+ { 'e', 'é', 'è', 'ë', 'ê' },
+ { 'f' },
+ { 'g' },
+ { 'h' },
+ { 'i', 'í', 'ì', 'î', 'ï' },
+ { 'j' },
+ { 'k' },
+ { 'l' },
+ { 'm' },
+ { 'n', 'ñ' },
+ { 'o', 'ó', 'ò', 'ô', 'ø', 'œ', 'ø'},
+ { 'ö' },
+ { 'p' },
+ { 'q' },
+ { 'r' },
+ { 's', 'š' },
+ { 'ss'},
+ { 'ß' },
+ { 't' },
+ { 'u', 'ú', 'ù', 'û'},
+ { 'ü' },
+ { 'v' },
+ { 'w' },
+ { 'x' },
+ { 'y', 'ý', 'ÿ' },
+ { 'z', 'ž' }
+}
+alphabet_upper = { -- for sorting
+ { ' ' },
+ { 'A', 'Á', 'À', 'Å', 'Æ', 'Â'},
+ { 'Ä'},
+ { 'B' },
+ { 'C', 'Ç' },
+ { 'D' },
+ { 'E', 'È', 'É', 'Ë', 'Ê' },
+ { 'F' },
+ { 'G' },
+ { 'H' },
+ { 'I', 'Í', 'Ì', 'Ï', 'Î' },
+ { 'J' },
+ { 'K' },
+ { 'L' },
+ { 'M' },
+ { 'N', 'Ñ' },
+ { 'O', 'Ó', 'Ò', 'Ø','Œ', 'Ø', 'Ô' },
+ { 'Ö' },
+ { 'P' },
+ { 'Q' },
+ { 'R' },
+ { 'S', 'Š' },
+ { 'T' },
+ { 'U', 'Ú', 'Ù', 'Û' },
+ { 'Ü' },
+ { 'V' },
+ { 'W' },
+ { 'X' },
+ { 'Y', 'Ý', 'Ÿ' },
+ { 'Z', 'Ž' }
+}
+
Property changes on: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -1,15 +1,15 @@
-----------------------------------------------------------------------
--- 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",
@@ -16,15 +16,6 @@
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 @@
{ 'p' },
{ 'q' },
{ 'r' },
- { 's', 'š', 'ß' },
+ { 'ss', 'ß' },
+ { 's', 'š' },
{ 't' },
{ 'u', 'ú', 'ù', 'û'},
{ 'ue', 'ü' },
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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 @@
--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 @@
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,10 +250,13 @@
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")
@@ -257,6 +263,7 @@
else
outFile:write("\\label{"..labelPrefix.."-xindex-numbers}\n\\nopagebreak[4]\n")
end
+ indLines = indLines + 1
end
end
end
@@ -272,8 +279,10 @@
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 @@
else
outFile:write("\\label{"..labelPrefix.."-xindex-"..currentChar.."}\n\\nopagebreak[4]\n")
end
+ indLines = indLines + 1
end
end
oldChar = currentChar
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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 @@
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 @@
da = {"f", "ff"},
de = {"f", "ff"},
en = {"f", "ff"},
+ es = {"f", "ff"},
fr = {"\\,sq.","\\,sqq."},
it = {"f", "ff"},
jp = {"シンボル","番号"},
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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 @@
{ 'p' },
{ 'q' },
{ 'r' },
- { 's', 'š', 'ß' },
+ { 's', 'š' },
+ { 'ss', 'ß' },
{ 't' },
{ 'u', 'ú', 'ù', 'ü' , 'û'},
{ 'v' },
Deleted: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -1,93 +0,0 @@
------------------------------------------------------------------------
--- FILE: xindex-cfg.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 $
------------------------------------------------------------------------
-
-if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.34,
- comment = "main 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
-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 !!!
-indexOpening = "" -- commands after \begin{theindex}
-idxnewletter = "\\idxnewletter" -- 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', 'á', 'à', 'ä', 'â', 'å', 'æ', },
- { 'b' },
- { 'c', 'ç' },
- { 'd' },
- { 'e', 'é', 'è', 'ë', 'ê' },
- { 'f' },
- { 'g' },
- { 'h' },
- { 'i', 'í', 'ì', 'î', 'ï' },
- { 'j' },
- { 'k' },
- { 'l' },
- { 'm' },
- { 'n', 'ñ' },
- { 'o', 'ó', 'ò', 'ö', 'ô', 'ø', 'œ', 'ø'},
- { 'p' },
- { 'q' },
- { 'r' },
- { 's', 'š', 'ß' },
- { 't' },
- { 'u', 'ú', 'ù', 'ü' , 'û'},
- { 'v' },
- { 'w' },
- { 'x' },
- { 'y', 'ý', 'ÿ' },
- { 'z', 'ž' }
-}
-alphabet_upper = { -- for sorting
- { ' ' },
- { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ', 'Â' },
- { 'B' },
- { 'C', 'Ç' },
- { 'D' },
- { 'E', 'È', 'É', 'Ë', 'Ê' },
- { 'F' },
- { 'G' },
- { 'H' },
- { 'I', 'Í', 'Ì', 'Ï', 'Î' },
- { 'J' },
- { 'K' },
- { 'L' },
- { 'M' },
- { 'N', 'Ñ' },
- { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø', 'Ô'},
- { 'P' },
- { 'Q' },
- { 'R' },
- { 'S', 'Š' },
- { 'T' },
- { 'U', 'Ú', 'Ù', 'Ü', 'Û' },
- { 'V' },
- { 'W' },
- { 'X' },
- { 'Y', 'Ý', 'Ÿ' },
- { 'Z', 'Ž' }
-}
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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 @@
\nopagebreak
}
]]
+idxnewletter = "\\textbf" -- Only valid if -n is not set
+envStart = "\\begin{theindex}"
+envStop = "\\end{theindex}"
--[[
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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 @@
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', 'á', 'à', },
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2022-01-22 21:02:50 UTC (rev 61695)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2022-01-22 21:03:20 UTC (rev 61696)
@@ -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",
More information about the tex-live-commits
mailing list.