diff options
author | Norbert Preining <norbert@preining.info> | 2023-01-21 03:01:20 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-01-21 03:01:20 +0000 |
commit | 94c0d48361932b4beca57cc5609d26a46270dfeb (patch) | |
tree | ffc783a6c17a404847f0b7b46f3d49912497add3 /indexing | |
parent | 6d3235d032cbed920059ab39370928067056573a (diff) |
CTAN sync 202301210301
Diffstat (limited to 'indexing')
-rw-r--r-- | indexing/xindex/CHANGELOG | 1 | ||||
-rw-r--r-- | indexing/xindex/doc/xindex-doc.pdf | bin | 468883 -> 492316 bytes | |||
-rw-r--r-- | indexing/xindex/doc/xindex-doc.tex | 111 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-AU.lua | 2 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-HAdW-eKO.lua | 2 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-RU.lua | 101 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-base.lua | 2 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-baselib.lua | 2 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-cfg-common.lua | 4 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-cfg-uca.lua | 2 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-cfg.lua | 2 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-danteedition.lua | 2 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-dtk.lua | 2 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-lib.lua | 2 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-norsk.lua | 2 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-pretty.lua | 2 | ||||
-rw-r--r-- | indexing/xindex/lualatex/xindex-yannis.lua | 2 | ||||
-rwxr-xr-x | indexing/xindex/scripts/xindex.lua | 2 |
18 files changed, 198 insertions, 45 deletions
diff --git a/indexing/xindex/CHANGELOG b/indexing/xindex/CHANGELOG index cc12a7f3b3..c9e35b1cec 100644 --- a/indexing/xindex/CHANGELOG +++ b/indexing/xindex/CHANGELOG @@ -1,3 +1,4 @@ +0.47 2023-01-20 - added support for russian language 0.46 2023-01-18 - fix for Czech character ch - fix for wrong Upper/Lowercase sorting - fix for detect language from aux file diff --git a/indexing/xindex/doc/xindex-doc.pdf b/indexing/xindex/doc/xindex-doc.pdf Binary files differindex 35bd80e916..a8e4fb594a 100644 --- a/indexing/xindex/doc/xindex-doc.pdf +++ b/indexing/xindex/doc/xindex-doc.pdf diff --git a/indexing/xindex/doc/xindex-doc.tex b/indexing/xindex/doc/xindex-doc.tex index 69ecf8f001..767ea1b072 100644 --- a/indexing/xindex/doc/xindex-doc.tex +++ b/indexing/xindex/doc/xindex-doc.tex @@ -81,9 +81,9 @@ \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} -\setVersion{version = 0.46}% can be automatically changed by perl +\setVersion{version = 0.47}% can be automatically changed by perl -\setkeys{hv}{cleanup=true,force=false} +\setkeys{hv}{cleanup=false,force=false} \title{Program and package \texttt{xindex} \\--\\ \normalsize \xIndexVersion\ (\today)} @@ -104,6 +104,7 @@ Brian Dunn; Gonzalo Pesquero Serrano; Michal Hoftich; Mykel Kochenderfer; +Alexey Kuznetzov; Frank Mittelbach; Peter Müller; Heiko Oberdiek; @@ -111,7 +112,8 @@ Matteo Paolini; Stefan Pinnow; Florent Rougon; Martin Sievers; -Simon Spiegel +Simon Spiegel; +Jürhen Spitzmüller; \clearpage \section{Introduction} @@ -214,28 +216,6 @@ xindex -l de -c DIN2 < myDoc.idx -\iffalse -local args = require ('xindex-lapp') [[ - parameter handling - -q,--quiet - -h,--help - -v... Verbosity level; can be -v, -vv, -vvv - -c,--config (default cfg) - -e,--escapechar (default ") - -n,--noheadings - -a,--no_casesensitive - -b,--no_labels - -o,--output (default "") - -l,--language (default en) - -p,--prefix (default L) - -u,--use_UCA - -s,--use_stdin - <files...> (default stdin) [.idx] file(s) -]] -\fi - - - The \Index{language} has to be chosen as an international abbreviation in lower- or uppercase letters, see \url{https://en.wikipedia.org/wiki/ISO_3166-2} @@ -386,8 +366,9 @@ indexheader = { fr = {"Symboles","Nombres", "french", "francais", "canadien", "acadian"}, it = {"Simboli", "Numeri", "italian"}, \Japanese jp = {"シンボル","番号","japanese"}, - \DejaVuMono nl = {"Symbolen", "Nummers", "dutch"}, + \DejaVuMono nl = {"Symbolen", "Nummers", "dutch"}, no = {"Symboler","Tall", "norsk", "nynorsk"}, + ru = {"Символы", "Числа", "russian"}, } \end{Verbatim} @@ -446,7 +427,7 @@ the \Lfile{aux} file(s). This is only possible if package \Lpack{babel} or \Lpa crop, xindex, xindexOptions=-k -e "?", - force=false, + force=true, runs=2,code,docType=latex, showFilename, align=\centering, @@ -473,7 +454,7 @@ the \Lfile{aux} file(s). This is only possible if package \Lpack{babel} or \Lpa \item Double doublequote \verb|""| \index{?"?"} \item At character @ \index{At (?@)} \end{itemize} -Run \texttt{xindex} with \texttt{xindex -l "*" -e "?"}\index{123} +Run \texttt{xindex} with \texttt{xindex -k -e "?"}\index{123} \newpage \printindex \end{document} @@ -482,6 +463,71 @@ Run \texttt{xindex} with \texttt{xindex -l "*" -e "?"}\index{123} %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. +This allows to have different indexes with different language. + + + + +\begin{externalDocument}[ +% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule}, + pages={1}, + frame, + compiler=lualatex, + crop, + xindex, + xindexOptions=-u -l RU -c RU, + force=true, + runs=2,code,docType=latex, + showFilename, + align=\centering, + usefancyvrb, +% lstOptions={columns=fixed} +]{xindex} +%! lualatex +\documentclass{scrartcl} +\makeatletter +\def\theindex{% only for demonstration + \section*{\indexname} + \parskip\z@ \@plus .3\p@\relax \parindent\z@ + \let\item\@idxitem} +\makeatother +%StartVisiblePreamble +\usepackage[russian]{babel} +\usepackage{fontspec} +\usepackage[regular]{newcomputermodern} +\defaultfontfeatures{Ligatures=TeX} +\usepackage{xindex}\makeindex % run with xindex -u -l RU -c RU <file> +%StopVisiblePreamble +\pagestyle{empty} +\begin{document} +\begin{tabular}{ll} + Хвойные: & \verb|\index{Хвойные} |\index{Хвойные}\\ +\quad торрея, & + \verb|\index{Хвойные!тисовые!торрея (Torreya)}|% + \index{Хвойные!тисовые!торрея (Torreya) }\\ +\quad тис ягодный, & + \verb|\index{Хвойные!тисовые!тис!ягодный (Táxus baccata)}|% + \index{Хвойные!тисовые!тис!ягодный (Táxus baccata) }\\ +\quad ливанский кедр, & + \verb|\index{Хвойные!сосновые!кедр!ливанский (Cedrus libani)}|% + \index{Хвойные!сосновые!кедр!ливанский (Cedrus libani)}\\ +\quad ель обыкновенная. & + \verb|\index{Хвойные!сосновые!ель!обыкновенная (Pícea ábies)}|% + \index{Хвойные!сосновые!ель!обыкновенная (Pícea ábies)}\\[2ex] +Под колючей ежевикой & \verb|\index{Ежевика (Rúbus) }|% + \index{Ежевика (Rúbus)}\\ +жил ушастый ёж. & + \verb|\index{Ёж!ушастый (Hemiechinus auritus)}|% + \index{Ёж!ушастый (Hemiechinus auritus)} +\end{tabular} +\printindex % xindex -u -l RU -c RU <file> +\end{document} +\end{externalDocument} + + + + \section{Sorting} @@ -573,8 +619,10 @@ alphabet_upper = { -- for sorting force=false, runs=2,code,docType=latex, showFilename, + usefancyvrb, align=\centering, - lstOptions={columns=fixed}]{xindex} +% lstOptions={columns=fixed} +]{xindex} %! lualatex \documentclass[paper=a5]{scrartcl} \usepackage[ngerman]{babel} @@ -716,8 +764,9 @@ The following runs with \verb|xindex -l jp <file>|: docType=latex, showFilename, align=\centering, -% usefancyvrb, - lstOptions={fontfamily=helvetica}]{xindex} + usefancyvrb, +% lstOptions={fontfamily=helvetica} +]{xindex} %! lualatex \documentclass[a5paper]{article} %StartVisiblePreamble diff --git a/indexing/xindex/lualatex/xindex-AU.lua b/indexing/xindex/lualatex/xindex-AU.lua index e69311fb3e..a9fef04291 100644 --- a/indexing/xindex/lualatex/xindex-AU.lua +++ b/indexing/xindex/lualatex/xindex-AU.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-AU'] = { - version = 0.46, + version = 0.47, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-HAdW-eKO.lua b/indexing/xindex/lualatex/xindex-HAdW-eKO.lua index bd95ecb5a8..1f0337a06a 100644 --- a/indexing/xindex/lualatex/xindex-HAdW-eKO.lua +++ b/indexing/xindex/lualatex/xindex-HAdW-eKO.lua @@ -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.46, + version = 0.47, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-RU.lua b/indexing/xindex/lualatex/xindex-RU.lua new file mode 100644 index 0000000000..c72bc462d8 --- /dev/null +++ b/indexing/xindex/lualatex/xindex-RU.lua @@ -0,0 +1,101 @@ +----------------------------------------------------------------------- +-- FILE: xindex-RU.lua +-- DESCRIPTION: configuration file for xindex.lua +-- REQUIREMENTS: +-- AUTHOR: Alexey Kuznetzov +-- LICENSE: LPPL1.3 +-- +-- $Id: xindex-DIN2.lua 13 2021-08-15 10:49:40Z hvoss $ +----------------------------------------------------------------------- + +if not modules then modules = { } end modules ['xindex-RU'] = { + version = 0.47, + comment = "configuration to xindex.lua", + author = "Alexey Kuznetzov", + copyright = "Herbert Voß", + 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 = false -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5 +minCompress = 2 -- 1--3 +rangeSymbol = "--" +numericPage = true -- for non numerical pagenumbers, like "VI-17" +sublabels = {"", "--- \\-", "--- --- \\-", "--- --- --- \\-"} -- Russian (sub(sub(sub-items +pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" -- not used !!! +idxnewletter = "\\textbf" -- Only valid if -n is not set +envStart = "\\begin{theindex}" +indexOpening = "\\makeatletter\\def\\subitem{\\@idxitem}\\def\\subsubitem{\\@idxitem}\\def\\subsubsubitem{\\@idxitem}\\makeatother" -- Russian (sub(sub(sub-items +envStop = "\\end{theindex}" + +-- indexheader = { ru = {"Символы", "Числа", "russian"}, } -- Russian headers + +-- There is no folio abbreviation in Russian +-- folium = { ru = { "" , "" }, } -- Is this correct? + +--[[ + 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' }, + { 'е', 'ё' }, + { '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' }, + { 'Е', 'Ё' }, + { 'F' }, + { 'G' }, + { 'H' }, + { 'I', 'Í', 'Ì', 'Ï', 'Î' }, + { 'J' }, + { 'K' }, + { 'L' }, + { 'M' }, + { 'N', 'Ñ' }, + { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø', 'Ô'}, + { 'P' }, + { 'Q' }, + { 'R' }, + { 'S', 'Š' }, + { 'T' }, + { 'U', 'Ú', 'Ù', 'Ü', 'Û' }, + { 'V' }, + { 'W' }, + { 'X' }, + { 'Y', 'Ý', 'Ÿ' }, + { 'Z', 'Ž' } +} diff --git a/indexing/xindex/lualatex/xindex-base.lua b/indexing/xindex/lualatex/xindex-base.lua index 968d130ba8..7a6e918eca 100644 --- a/indexing/xindex/lualatex/xindex-base.lua +++ b/indexing/xindex/lualatex/xindex-base.lua @@ -8,7 +8,7 @@ -- $Id: xindex-base.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- -local info = { version = 0.46 } +local info = { version = 0.47 } -- check config if pageNoPrefixDel ~= "" then diff --git a/indexing/xindex/lualatex/xindex-baselib.lua b/indexing/xindex/lualatex/xindex-baselib.lua index a0a07fcdfd..7b43c81942 100644 --- a/indexing/xindex/lualatex/xindex-baselib.lua +++ b/indexing/xindex/lualatex/xindex-baselib.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-baselib'] = { - version = 0.46, + version = 0.47, comment = "base library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-cfg-common.lua b/indexing/xindex/lualatex/xindex-cfg-common.lua index cade65084c..45c8197474 100644 --- a/indexing/xindex/lualatex/xindex-cfg-common.lua +++ b/indexing/xindex/lualatex/xindex-cfg-common.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-common'] = { - version = 0.46, + version = 0.47, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -27,6 +27,7 @@ indexheader = { jp = {"シンボル","番号", "japanese"}, nl = {"Symbolen", "Nummers", "dutch"}, no = {"Symboler","Tall", "norsk", "nynorsk"}, + ru = {"Символы", "Числа", "russian"}, } --[[ babel @@ -88,6 +89,7 @@ folium = { jp = {"シンボル","番号"}, nl = {"f.", "ff."}, no = {"\\,f.","\\,ff."}, + ru = {"",""}, -- doesn't exist } alphabet_uppercase = { diff --git a/indexing/xindex/lualatex/xindex-cfg-uca.lua b/indexing/xindex/lualatex/xindex-cfg-uca.lua index 3aa2eadc40..24e07fe924 100644 --- a/indexing/xindex/lualatex/xindex-cfg-uca.lua +++ b/indexing/xindex/lualatex/xindex-cfg-uca.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-lua'] = { - version = 0.46, + version = 0.47, comment = "configuration to xindex-cfg-uca.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-cfg.lua b/indexing/xindex/lualatex/xindex-cfg.lua index 5778980fd4..082408a0f3 100644 --- a/indexing/xindex/lualatex/xindex-cfg.lua +++ b/indexing/xindex/lualatex/xindex-cfg.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.46, + version = 0.47, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-danteedition.lua b/indexing/xindex/lualatex/xindex-danteedition.lua index 15ac0c7385..a3a2b00701 100644 --- a/indexing/xindex/lualatex/xindex-danteedition.lua +++ b/indexing/xindex/lualatex/xindex-danteedition.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.46, + version = 0.47, comment = "configuration file for the DANTE Edition", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-dtk.lua b/indexing/xindex/lualatex/xindex-dtk.lua index c83109a51a..fcdf30cfc8 100644 --- a/indexing/xindex/lualatex/xindex-dtk.lua +++ b/indexing/xindex/lualatex/xindex-dtk.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.46, + version = 0.47, comment = "DTK configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-lib.lua b/indexing/xindex/lualatex/xindex-lib.lua index c8b2a73718..042377410c 100644 --- a/indexing/xindex/lualatex/xindex-lib.lua +++ b/indexing/xindex/lualatex/xindex-lib.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-lib'] = { - version = 0.46, + version = 0.47, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-norsk.lua b/indexing/xindex/lualatex/xindex-norsk.lua index 119de90d5f..78a06ba988 100644 --- a/indexing/xindex/lualatex/xindex-norsk.lua +++ b/indexing/xindex/lualatex/xindex-norsk.lua @@ -10,7 +10,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-no'] = { - version = 0.46, + version = 0.47, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-pretty.lua b/indexing/xindex/lualatex/xindex-pretty.lua index 2706977090..939b34fc2c 100644 --- a/indexing/xindex/lualatex/xindex-pretty.lua +++ b/indexing/xindex/lualatex/xindex-pretty.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-pretty'] = { - version = 0.46, + version = 0.47, comment = "dump a Lua table for debugging", author = "Steve Donovan", copyright = "Steve Donovan", diff --git a/indexing/xindex/lualatex/xindex-yannis.lua b/indexing/xindex/lualatex/xindex-yannis.lua index 9ef3151f92..7b00b2bcc2 100644 --- a/indexing/xindex/lualatex/xindex-yannis.lua +++ b/indexing/xindex/lualatex/xindex-yannis.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-yannis'] = { - version = 0.46, + version = 0.47, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/scripts/xindex.lua b/indexing/xindex/scripts/xindex.lua index 2b6123cdb2..de8016cc1e 100755 --- a/indexing/xindex/scripts/xindex.lua +++ b/indexing/xindex/scripts/xindex.lua @@ -10,7 +10,7 @@ ----------------------------------------------------------------------- xindex = xindex or { } - local version = 0.46 + local version = 0.47 xindex.version = version --xindex.self = "xindex" |