texlive[65584] trunk: xindex (19jan23)
commits+karl at tug.org
commits+karl at tug.org
Thu Jan 19 22:01:53 CET 2023
Revision: 65584
http://tug.org/svn/texlive?view=revision&revision=65584
Author: karl
Date: 2023-01-19 22:01:53 +0100 (Thu, 19 Jan 2023)
Log Message:
-----------
xindex (19jan23)
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/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/demo2.ind
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/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-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
Added Paths:
-----------
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua
Modified: trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -6,11 +6,11 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL 1.3
--
--- $Id: xindex.lua 22 2022-02-11 12:18:15Z hvoss $
+-- $Id: xindex.lua 22 2023-01-18 12:18:15Z hvoss $
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.45
+ local version = 0.46
xindex.version = version
--xindex.self = "xindex"
@@ -51,8 +51,8 @@
-b,--no_labels
-i,--ignoreSpace
-o,--output (default "")
- -k --checklang same as * star for checking aux file
- -l,--language (default en) or * for detecting the language from the aux file
+ -k,--checklang
+ -l,--language (default en)
-p,--prefix (default L)
-u,--use_UCA
-s,--use_stdin
@@ -239,10 +239,13 @@
outFile = io.open(outfilename,"w+")
+check_language = args["checklang"]
local aux_language = ""
-if args["checklang"] or (args["language"] == "*") then
- writeLog(2,'Check language in aux file\n',0)
+
+if check_language then
+ print("check aux file for unknown language")
+-- writeLog(2,'Check language in aux file\n',0)
-- \babel at aux{german}{} package babel
-- \selectlanguage *[variant=german,spelling=new,]{german} package polyglossia
local auxfile = inFiles[1]:split(".")[1]..".aux"
@@ -256,9 +259,9 @@
break
else
if string.find(str, "babel at aux{") then
- -- print("Babel defunden: "..str)
+-- print("Babel gefunden: "..str)
str = str:match("{..+}$") -- get last word {language}
- -- print("Babel: "..str)
+ print("Babel: "..str)
aux_language = str:sub(2,(#str-3))
break
end
@@ -293,6 +296,7 @@
writeLog(2,'Corrected the unknown language "'..language..'" to "en"'.."\n",0)
language = "en"
end
+
index_header = indexheader[language]
if vlevel > 0 then for i=1,#index_header do writeLog(2,index_header[i].."\n",1) end end
if (folium[language] == nil) then
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2023-01-19 21:01:53 UTC (rev 65584)
@@ -1,3 +1,6 @@
+0.46 2023-01-18 - fix for Czech character ch
+ - fix for wrong Upper/Lowercase sorting
+ - fix for detect language from aux file
0.45 2022-09-20 - exit xindex after printing version information
0.44 2022-09-09 - ---
0.43 2022-09-01 - print warning if no input file is defined.
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/README.md 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/README.md 2023-01-19 21:01:53 UTC (rev 65584)
@@ -1,7 +1,13 @@
# xindex
-Copyright 2019-2022 Herbert Voß
+Copyright 2019-2023 Herbert Voß
+These files are provided under the terms of the LPPL v1.3 or
+later as printed in full text in the manual (xindex.pdf).
+\url{https://ctan.org/license/lppl1.3}.
+Report bugs to
+ \url{https://gitlab.com/hvoss49/xindex/issues}.
+
Unicode compatible index programm for LaTeX. It needs Lua 5.3 which
will be included in at least LuaTeX 1.09 (TeXLive 2019)
@@ -35,6 +41,7 @@
-a,--no_casesensitive
-b,--no_labels
-o,--output (default "")
+ -k,--checklang
-l,--language (default en)
-p,--prefix (default L)
-u,--use_UCA
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 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind 2023-01-19 21:01:53 UTC (rev 65584)
@@ -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/demo2.ind
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind 2023-01-19 21:01:53 UTC (rev 65584)
@@ -9,7 +9,7 @@
\indexspace
\textbf{D}\label{L-xindex-D}
\nopagebreak[4]
- \item {Downes}, Michael, {xxxvi}, {xxxvii}
+ \item {Downes}, Michael, {xxxvif}
\indexspace
\textbf{F}\label{L-xindex-F}
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 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2023-01-19 21:01:53 UTC (rev 65584)
@@ -81,9 +81,9 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\xIndexVersion{#2}}
-\setVersion{version = 0.45}% can be automatically changed by perl
+\setVersion{version = 0.46}% can be automatically changed by perl
-\setkeys{hv}{cleanup=true,force=true}
+\setkeys{hv}{cleanup=true,force=false}
\title{Program and package \texttt{xindex} \\--\\ \normalsize \xIndexVersion\ (\today)}
@@ -273,7 +273,7 @@
compiler=lualatex,
crop,
xindex,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -308,7 +308,7 @@
\end{externalDocument}
-For the German language the double quote is an active character and it makes live easier
+For the German language the double quote is an active character and it makes life easier
if one chooses another character.
The escape character can be changed easily by the optional argument \verb|-e "<char>"| or
\verb|--escapechar "<char">|. The following example shows how
@@ -336,7 +336,7 @@
crop,
xindex,
xindexOptions=-e ">",
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -401,7 +401,7 @@
crop,
xindex,
xindexOptions=-l it -e ">",
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -435,8 +435,8 @@
\end{externalDocument}
-The following example was run with \verb|xindex -l "*" <file>.idx|. Then the language is detected from
-the \Lfile{aux} file. This is only possible if package \Lpack{babel} or \Lpack{polyglossia} are used.
+The following example was run with \verb|xindex -k <file>.idx|. In this case \verb|xindex| tries to detect the language from
+the \Lfile{aux} file(s). This is only possible if package \Lpack{babel} or \Lpack{polyglossia} are used.
\begin{externalDocument}[
% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule},
@@ -445,8 +445,8 @@
compiler=lualatex,
crop,
xindex,
- xindexOptions=-l "*" -e "?",
- force=true,
+ xindexOptions=-k -e "?",
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -460,7 +460,7 @@
\let\item\@idxitem}
\makeatother
%StartVisiblePreamble
-\usepackage[canadien]{babel}
+\usepackage[dutch]{babel}
\usepackage{makeidx}\makeindex
%StopVisiblePreamble
\pagestyle{empty}
@@ -479,7 +479,7 @@
\end{document}
\end{externalDocument}
-Instead of using \verb|-l *| one can also use the parameter \verb|-k| or \verb|--checklang|.
+%Instead of using \verb|-l *| one can also use the parameter \verb|-k| or \verb|--checklang|.
@@ -570,7 +570,7 @@
crop,
xindex,
xindexOptions=-l de,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -629,7 +629,7 @@
crop,
xindex,
xindexOptions=-c DIN2 -l DE,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -710,7 +710,7 @@
crop,
xindex,
xindexOptions=-l jp,
- force=true,
+ force=false,
runs=2,
code=false,
docType=latex,
@@ -768,7 +768,7 @@
crop,
xindex,
xindexOptions=-u -l cs,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -818,7 +818,7 @@
crop,
xindex,
% xindexOptions=,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -874,7 +874,7 @@
crop,
xindex,
xindexOptions=-a,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -932,7 +932,7 @@
crop,
xindex,
% xindexOptions=,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -971,7 +971,7 @@
crop,
xindex,
xindexOptions=-i,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1039,7 +1039,7 @@
crop,
xindex,
xindexOptions=-l fr,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1093,7 +1093,7 @@
crop,
xindex,
xindexOptions=-l de,
- force=true,,
+ force=false,,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1212,7 +1212,7 @@
crop,
xindex,
xindexOptions=-c HAdW-eKO,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1333,7 +1333,7 @@
crop,
xindex,
xindexOptions=-c dtk -n -l de,
- force,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1406,7 +1406,7 @@
crop,
xindex,
% xindexOptions=,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1458,7 +1458,7 @@
crop,
xindex,
xindexOptions=-l de,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1535,7 +1535,7 @@
crop,
xindex,
xindexOptions=-l de,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1583,7 +1583,7 @@
crop,
xindex,
xindexOptions=-n,
- force=true,,
+ force=false,,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1635,7 +1635,7 @@
crop,
xindex,
xindexOptions=-c header,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1781,7 +1781,7 @@
crop,
xindex,
xindexOptions=-l de,
- force=true,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1883,7 +1883,7 @@
crop,
xindex,
xindexOptions=-l de,
- force,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1933,7 +1933,7 @@
crop,
xindex,
xindexOptions=-l de,
- force,
+ force=false,
runs=2,code,docType=latex,
showFilename,
align=\centering,
@@ -1958,6 +1958,61 @@
\end{document}
\end{externalDocument}
+
+\clearpage
+
+
+\begin{externalDocument}[
+% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule},
+ mpwidth=0.55\linewidth,
+ pages={2},
+ frame=false,
+ compiler=lualatex --shell-escape,
+ crop,
+ xindex,
+% xindexOptions=-l de,
+ force=false,
+ runs=2,code,docType=latex,
+ showFilename,
+ align=\centering,
+% grfOptions={width=\linewidth},
+ lstOptions={columns=fixed}]{xindex}
+%! lualatex --shell-escape
+\documentclass[paper=a5]{scrartcl}
+\usepackage{libertinus-otf}
+\let\NewPage\newpage% only for demo
+\makeatletter
+\renewcommand\newpage{\NewPage\let\ps at plain\ps at empty}
+\makeatother
+%StartVisiblePreamble
+%% Denis Bitouzé
+\usepackage{makeidx}\makeindex
+%StopVisiblePreamble
+\begin{document}
+Foo\index{foo!bar1!baz1}
+Foo\index{foo!bar1!baz2}
+Foo\index{foo!bar2!baz1}
+Foo\index{foo!bar2!baz2}
\printindex
+\end{document}
+\end{externalDocument}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\printindex
+
\end{document}
Modified: trunk/Master/texmf-dist/scripts/xindex/xindex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -6,11 +6,11 @@
-- AUTHOR: Herbert Voß
-- LICENSE: LPPL 1.3
--
--- $Id: xindex.lua 22 2022-02-11 12:18:15Z hvoss $
+-- $Id: xindex.lua 22 2023-01-18 12:18:15Z hvoss $
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.45
+ local version = 0.46
xindex.version = version
--xindex.self = "xindex"
@@ -51,8 +51,8 @@
-b,--no_labels
-i,--ignoreSpace
-o,--output (default "")
- -k --checklang same as * star for checking aux file
- -l,--language (default en) or * for detecting the language from the aux file
+ -k,--checklang
+ -l,--language (default en)
-p,--prefix (default L)
-u,--use_UCA
-s,--use_stdin
@@ -239,10 +239,13 @@
outFile = io.open(outfilename,"w+")
+check_language = args["checklang"]
local aux_language = ""
-if args["checklang"] or (args["language"] == "*") then
- writeLog(2,'Check language in aux file\n',0)
+
+if check_language then
+ print("check aux file for unknown language")
+-- writeLog(2,'Check language in aux file\n',0)
-- \babel at aux{german}{} package babel
-- \selectlanguage *[variant=german,spelling=new,]{german} package polyglossia
local auxfile = inFiles[1]:split(".")[1]..".aux"
@@ -256,9 +259,9 @@
break
else
if string.find(str, "babel at aux{") then
- -- print("Babel defunden: "..str)
+-- print("Babel gefunden: "..str)
str = str:match("{..+}$") -- get last word {language}
- -- print("Babel: "..str)
+ print("Babel: "..str)
aux_language = str:sub(2,(#str-3))
break
end
@@ -293,6 +296,7 @@
writeLog(2,'Corrected the unknown language "'..language..'" to "en"'.."\n",0)
language = "en"
end
+
index_header = indexheader[language]
if vlevel > 0 then for i=1,#index_header do writeLog(2,index_header[i].."\n",1) end end
if (folium[language] == nil) then
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 2023-01-19 21:01:53 UTC (rev 65584)
@@ -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.46,
+ 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
+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-HAdW-eKO.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -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.45,
+ version = 0.46,
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 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -8,7 +8,7 @@
-- $Id: xindex-base.lua 22 2022-02-07 12:18:15Z hvoss $
-----------------------------------------------------------------------
-local info = { version = 0.45 }
+local info = { version = 0.46 }
-- check config
if pageNoPrefixDel ~= "" then
@@ -47,7 +47,15 @@
os.exit()
end
+print("Presort of \\indexentry lines")
+table.sort(lines)
if vlevel > 1 then
+ print("Pres-Sorted index list:")
+ for _,l in pairs(lines) do print (l) end
+end
+
+
+if vlevel > 1 then
writeLog(1,"--------------- Input data -----------------\n",2)
for _,l in pairs(lines) do writeLog(1,l.."\n",2) end
writeLog(1,"--------------- end Input data -----------------\n",2)
@@ -214,10 +222,22 @@
-- if utf8.codepoint(c) < 12288 then -- Japanese starts at hex 3000
-- firstChar = v["sortChar"]
-- else
- firstChar = utf.sub(v["sortChar"],1,1) -- catch a translatet Ö->OE
+ if language == "cs" then -- Czech language has special char ch
+ if utf.sub(v["sortChar"],1,2) == "CH" then
+ firstChar = "Ch"
+ else
+ firstChar = utf.sub(v["sortChar"],1,1)
+ end
+ else
+ firstChar = utf.sub(v["sortChar"],1,1) -- catch a translatet Ö->OE
+ end
-- end
currentChar = firstChar
- charType = getCharType(firstChar)
+ if string.len(firstChar) > 1 then
+ charType = getCharType(utf.sub(firstChar,1,1))
+ else
+ charType = getCharType(firstChar)
+ end
if charType == 0 then
numbers = false
symbols = true
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-baselib'] = {
- version = 0.45,
+ version = 0.46,
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 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-common'] = {
- version = 0.45,
+ version = 0.46,
comment = "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 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-lua'] = {
- version = 0.45,
+ version = 0.46,
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 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.45,
+ version = 0.46,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.45,
+ version = 0.46,
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 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.45,
+ version = 0.46,
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 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-lib'] = {
- version = 0.45,
+ version = 0.46,
comment = "main library to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -798,7 +798,11 @@
if (i == 1) and (item == "item") then
str = space.."\\"..item.." "..sublabels[i]..currentItems[i].."\n"
else
- str = space.."\\"..item.." "..sublabels[i]..currentItems[i]..itemPageDelimiter.." "..getPageList(v,hyperpage).."\n"
+ if i < excl+1 then -- there is one more ! => so we print no pagenumber
+ str = space.."\\"..item.." "..sublabels[i]..currentItems[i].."\n"
+ else
+ str = space.."\\"..item.." "..sublabels[i]..currentItems[i]..itemPageDelimiter.." "..getPageList(v,hyperpage).."\n"
+ end
end
for i, str0 in ipairs(escape_chars) do -- undo the escape char setting
str = string.gsub(str,str0[2],str0[3])
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -10,7 +10,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-no'] = {
- version = 0.45,
+ version = 0.46,
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 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-pretty'] = {
- version = 0.45,
+ version = 0.46,
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 2023-01-19 21:00:59 UTC (rev 65583)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2023-01-19 21:01:53 UTC (rev 65584)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-yannis'] = {
- version = 0.45,
+ version = 0.46,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
More information about the tex-live-commits
mailing list.