texlive[73644] trunk: xindex (29jan25)
commits+karl at tug.org
commits+karl at tug.org
Wed Jan 29 21:32:57 CET 2025
Revision: 73644
https://tug.org/svn/texlive?view=revision&revision=73644
Author: karl
Date: 2025-01-29 21:32:57 +0100 (Wed, 29 Jan 2025)
Log Message:
-----------
xindex (29jan25)
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/README.md
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-AU.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.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-no_uca.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.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
Modified: trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.62
+ local version = 0.64
xindex.version = version
--xindex.self = "xindex"
@@ -249,7 +249,7 @@
print("Detected language: "..language)
else
if args["language"] then
- language = string.lower(args["language"]):sub(1, 2)
+ language = string.lower(args["language"]:sub(1, 2))
else
language = "en"
end
@@ -315,6 +315,8 @@
--print("Sprache:"..language)
+language = string.lower(language)
+print("Used language: "..language)
writeLog(2,"Language = "..language.."\n",1)
if (indexheader[language] == nil) then
writeLog(2,'Corrected the unknown language "'..language..'" to "en"'.."\n",0)
@@ -332,6 +334,7 @@
esc_char = args.escapechar
+print("Escape char "..esc_char)
esc_char2 = esc_char..esc_char
writeLog(2,"Escapechar = "..esc_char.."\n",1)
escape_chars = { -- by default " is the escape char
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2025-01-29 20:32:57 UTC (rev 73644)
@@ -1,3 +1,5 @@
+0.64 2025-01-28 - add UCA conversion table for french
+0.63 2024-11-23 - small fixes
0.62 2024-10-19 - fix for page intervall, eg. |(9-9|)->9
0.61 2024-09-22 - fix for hyperref with \see and \seealso
0.60 2024-05-16 - more fixes for UCA as default mode
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/README.md 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/README.md 2025-01-29 20:32:57 UTC (rev 73644)
@@ -1,6 +1,6 @@
# xindex
-Copyright 2019-2024 Herbert Voß
+Copyright 2019-2025 Herbert Voß
The files xindex-lapp.lua and xindex-pretty.lua have the MIT licence.
all other files are LPPL 1.3
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 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2025-01-29 20:32:57 UTC (rev 73644)
@@ -81,7 +81,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\xIndexVersion{#2}}
-\setVersion{version = 0.62}% can be automatically changed by perl
+\setVersion{version = 0.64}% can be automatically changed by perl
@@ -168,7 +168,7 @@
\subsection{Syntax}
The \Index{syntax} is \verb|xindex [...] <file(s)>| where \verb|[...]| are optional \Index{argument}s, either in short or
-long7 form which, of course, can be mixed:
+long form which, of course, can be mixed:
\begin{verbatim}
xindex
@@ -202,13 +202,19 @@
xindex -c norsk -o index.ind demo1 demo2.bdx demo3.adx
\end{noteblock}
+
+
\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
+\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
+\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
+ 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}
@@ -235,7 +241,7 @@
for typesetting the index.
The default \Index{sorting}
is given by the configuration file, which defines replacements for \Index{accented characters},
-like \texttt{ö}$\rightarrow$\texttt{o}.
+like \texttt{ö}$\rightarrow$\texttt{o}.
\subsection{The \texttt{.idx} file}
There are three (four) characters which must be escaped if used in the command \Lcs{index}:
@@ -286,7 +292,7 @@
\makeatother
%StartVisiblePreamble
\usepackage{makeidx}\makeindex
-\usepackage{xindex}% for \barceLeft|Right
+\usepackage{xindex}% for \braceLeft|Right
%StopVisiblePreamble
\pagestyle{empty}
\begin{document}
@@ -297,8 +303,8 @@
\item Doublequote \verb|"| \index{""}
\item Double doublequote \verb|""| \index{""""}
\item At character @ \index{At ("@)}\index{"@}
-\item Left paranthesis \{ \index{\braceLeft}
-\item Right paranthesis \} \index{\braceRight}
+\item Left parenthesis \{ \index{\braceLeft}
+\item Right parenthesis \} \index{\braceRight}
\end{itemize}
run \texttt{xindex -l fr <file.idx>}\index{file.idx@\texttt{<file.idx>}|textit}\index{123}
\index{Etage} \index{Ètagé}
@@ -370,7 +376,7 @@
will
be a \TeX\ ligature with the output »>>«. %Internally the escape sequences are
-With the beginning of \Lprog{xindex}the escaped chars
+With the beginning of \Lprog{xindex} the escaped chars
are converted into the internal strings and later back to the original meaning.
The two characters \verb|{}| cannot be used as \verb|\{\}| inside the argument of \Lcs{index}.
The package \Lpack{xindex} defines the two helper macros
@@ -542,12 +548,11 @@
%Instead of using \verb|-l *| one can also use the parameter \verb|-k| or \verb|--checklang|.
-For the russian language you have to choose the language and the config file.
+For the Russian language you have to choose the language and the config file.
This allows to have different indexes with different language.
-
\begin{externalDocument}[
% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule},
pages={1},
@@ -806,11 +811,11 @@
\subsection{Default sorting by a character table}
This sorting is not completely unicode aware. It uses a translation table for accented characters,
-which should only be used if the standard sorting method with UCA is not possible! This kind of sortierung
-has to be choosed by the option \texttt{-x} (don't use UCA). The option \texttt{-u} for
+which should only be used if the standard sorting method with UCA is not possible! This kind of sorting
+has to be choosen by the option \texttt{-x} (don't use UCA). The option \texttt{-u} for
using UCA is deprecated, because using UCA is the default.
-Again, if on wants to use an own transformation table, then use something like:
+Again, if one wants to use an own transformation table, then use something like:
\begin{verbatim}
alphabet_lower = { -- for sorting
@@ -844,7 +849,7 @@
}
\end{verbatim}
-There is also a table for the uppercase letters. If it should be edited or extended then copy first the
+There is also a table for the uppercase letters. If it should be edited or extended then first copy the
base configuration file \Lfile{xindex-cfg.lua} and modify that new file. It can be used by \XI
with the optional argument \texttt{-c newfile} if it is named as \Lfile{xindex-newfile.lua}.
For German there already exists a configuration
@@ -1117,6 +1122,68 @@
\end{externalDocument}
+\clearpage%%%%%%%%%%%
+
+\subsubsection{french language with UCA}
+
+\begin{externalDocument}[
+ grfOptions={scale=0.9},%width=\dimexpr\linewidth-2\fboxsep-2\fboxrule},
+ mpwidth=0.4\linewidth,
+ pages={4},
+ frame=false,
+ compiler=lualatex,
+ crop,
+ xindex,
+ xindexOptions=-k, % detect lang (french) and UCA
+ runs=2,
+ code,docType=latex,
+ showFilename,
+ usefancyvrb,
+ align=\centering,
+% lstOptions={columns=fixed}
+]{xindex}
+%! lualatex
+\documentclass[paper=a5]{scrartcl}
+\usepackage[french]{babel}
+%StartVisiblePreamble
+\usepackage[makeidx]{hvindex}
+%StopVisiblePreamble
+\usepackage{multicol}
+\makeatletter
+\def\theindex{% only for demonstration
+ \newpage
+ \section*{\indexname}
+ \begin{multicols}{2}
+ \parskip\z@ \@plus .3\p@\relax \parindent\z@
+ \let\item\@idxitem}
+\def\endtheindex{\end{multicols}}
+\makeatother
+\pagestyle{empty}
+\begin{document}
+\Index{CÔTÉ} \Index{cote} \Index{Côté}
+\Index{COTÉ} \Index{côte} \Index{COTE}
+\Index{côté} \Index{Coté} \Index{coté}
+\Index{Cote} \Index{CÔTE} \Index{Côte}
+\Index{lésé} \Index{péché}\Index{bohème}
+\Index{gêné} \Index{pêche} \Index{cæsium}
+\Index{pêcher} \Index{révèle}
+\Index{pécher} \Index{révélé}
+\Index{Bohême} \Index{relève}
+\Index{PÉCHÉ} \Index{maçon}
+\Index{relevé} \Index{Élève}
+\Index{gêne} \Index{élevé}
+\Index{MÂCON} \Index{gène}
+\Index{Bohémien} \Index{caennais}
+\Index{lèse} \Index{coexistence}
+\Index{cœur} \Index{coefficient}
+\Index{cafard} \Index{CŒUR}
+\Index{CÆSIUM} \newpage \Index{coté}
+\Index{cœur} \Index{péché} \newpage
+\Index{coté}\Index{coefficient}
+\printindex
+\end{document}
+\end{externalDocument}
+
\clearpage
\subsubsection{Japanese language with UCA}
@@ -2434,7 +2501,7 @@
By default \XI creates \Index{label}s in the index for the \Index{symbols}, \Index{numbers}, and other parts (letters) to which one can refer.
with \Lcs{ref}\Largb{label}.
The labels are named \verb|L-xindex-<name>|. The prefix \verb|L| can be changed by the config file. \verb|<name>|
-maybe \verb|symbols|, \verb|numbers|, or \verb|A| (a letter). For example
+may be \verb|symbols|, \verb|numbers|, or \verb|A| (a letter). For example
\begin{verbatim}
\begin{theindex}
Modified: trunk/Master/texmf-dist/scripts/xindex/xindex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.62
+ local version = 0.64
xindex.version = version
--xindex.self = "xindex"
@@ -249,7 +249,7 @@
print("Detected language: "..language)
else
if args["language"] then
- language = string.lower(args["language"]):sub(1, 2)
+ language = string.lower(args["language"]:sub(1, 2))
else
language = "en"
end
@@ -315,6 +315,8 @@
--print("Sprache:"..language)
+language = string.lower(language)
+print("Used language: "..language)
writeLog(2,"Language = "..language.."\n",1)
if (indexheader[language] == nil) then
writeLog(2,'Corrected the unknown language "'..language..'" to "en"'.."\n",0)
@@ -332,6 +334,7 @@
esc_char = args.escapechar
+print("Escape char "..esc_char)
esc_char2 = esc_char..esc_char
writeLog(2,"Escapechar = "..esc_char.."\n",1)
escape_chars = { -- by default " is the escape char
Modified: trunk/Master/texmf-dist/tex/latex/xindex/xindex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xindex/xindex.sty 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/latex/xindex/xindex.sty 2025-01-29 20:32:57 UTC (rev 73644)
@@ -13,7 +13,7 @@
%
%
% -------------------------------------
-\ProvidesPackage{xindex}[2024/05/16 v. 0.61 write into an idx file (hv)]
+\ProvidesPackage{xindex}[2025/01/28 v. 0.64 write into an idx file (hv)]
%
\RequirePackage{xkeyval}
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-AU'] = {
- version = 0.62,
+ version = 0.64,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -11,7 +11,7 @@
-- configuration for index files of the Heidelberger Akademie der Wissenschaften
if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = {
- version = 0.62,
+ version = 0.64,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-RU'] = {
- version = 0.62,
+ version = 0.64,
comment = "configuration to xindex.lua",
author = "Alexey Kuznetzov",
copyright = "Herbert Voß",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -8,7 +8,7 @@
-- $Id: xindex-base.lua 22 2022-02-07 12:18:15Z hvoss $
-----------------------------------------------------------------------
-local info = { version = 0.62 }
+local info = { version = 0.64 }
-- check config
if pageNoPrefixDel ~= "" then
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-baselib'] = {
- version = 0.62,
+ version = 0.64,
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 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-common'] = {
- version = 0.62,
+ version = 0.64,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-no_uca.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-no_uca.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-no_uca.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.62,
+ version = 0.64,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-lua'] = {
- version = 0.62,
+ version = 0.64,
comment = "configuration to xindex-cfg-uca.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -17,21 +17,30 @@
}
languages.fr = function(collator_obj)
+ print("Using languages.fr")
-- reverse search for accents in French (recommended):
collator_obj.accents_backward = true
-- accents: sorting order in French
local tailoring = function(s) collator_obj:tailor_string(s) end
tailoring("&æ=ae")
+ tailoring("&Æ=AE")
tailoring("&œ=oe")
+ tailoring("&Œ=OE")
+ tailoring("&Œ<œ")
tailoring("&th<þ<<<Þ") -- Canadian, see SGQRI004.pdf
+ tailoring("&a<<<A<<á<<<Á<<à<<<À<<â<<<Â<<ä<<<Ä")
+ tailoring("&o<<<O<<ó<<<Ó<<ò<<<Ò<<ô<<<Ô<<ö<<<Ö")
+ tailoring("&e<<<E<<é<<<É<<è<<<È<<ê<<<Ê")
-- lowercase before uppercase in French
- --collator_obj:uppercase_first()
+ -- collator_obj:uppercase_first()
return collator_obj
end
+-- tailoring("&ǀ<æ<<<Æ<<ä<<<Ä<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<å<<<Å<<<aa<<<Aa<<<AA")
-- put any additional code for lua-uca here ---
languages.no = function(collator_obj)
+ print("Using languages.no")
local tailoring = function(s) collator_obj:tailor_string(s) end
collator_obj:uppercase_first()
-- tailoring("&[before 1]b<á<<<Á")
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.62,
+ version = 0.64,
comment = "configuration file for the DANTE Edition",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.62,
+ version = 0.64,
comment = "DTK configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-lib'] = {
- version = 0.62,
+ version = 0.64,
comment = "main library to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -588,7 +588,7 @@
Apage = string.format("%09d",romanToNumber(a["pages"][1]["number"]))
end
else
- Apage = string.format("%09s",a["pages"][1]["number"])
+ Apage = "AAA" .. string.format("%09s",a["pages"][1]["number"])
end
if no_caseSensitive then
A = NormalizedUpper(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!',' ')) -- replace! by empty
@@ -649,7 +649,6 @@
A = a["Entry"]..tostring(pageA)
B = b["Entry"]..tostring(pageB)
end
- if A=="Abendmahl" or B=="Abendmahl" then print(A,B,A==B) end
if A==B then return True end
--print(A,B)
compare = collator_obj:compare_strings(A,B)
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -10,7 +10,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-no'] = {
- version = 0.62,
+ version = 0.64,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-pretty'] = {
- version = 0.62,
+ version = 0.64,
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 2025-01-29 20:32:39 UTC (rev 73643)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2025-01-29 20:32:57 UTC (rev 73644)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-yannis'] = {
- version = 0.62,
+ version = 0.64,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
More information about the tex-live-commits
mailing list.