diff options
author | Karl Berry <karl@freefriends.org> | 2022-09-01 20:56:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-09-01 20:56:57 +0000 |
commit | e40f563d40e04a05b994b39fb17a7ce227bd1349 (patch) | |
tree | c479aee81b197cf3d9ff5980a0c3e41ef2f7c6f0 | |
parent | e54d39c1730c4a54701d1c12181e64949410b709 (diff) |
xindex (1sep22)
git-svn-id: svn://tug.org/texlive/trunk@64256 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/xindex/xindex.lua | 16 | ||||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/CHANGELOG | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/README.md | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf | bin | 451220 -> 459729 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex | 16 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/xindex/xindex.lua | 16 |
6 files changed, 44 insertions, 11 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua index a54fe953c10..b20996aabe8 100755 --- a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua +++ b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua @@ -10,7 +10,7 @@ ----------------------------------------------------------------------- xindex = xindex or { } - local version = 0.41 + local version = 0.43 xindex.version = version --xindex.self = "xindex" @@ -56,6 +56,7 @@ local args = require ('xindex-lapp') [[ -p,--prefix (default L) -u,--use_UCA -s,--use_stdin + -V,--version <files...> (default stdin) .idx file(s) ]] @@ -66,6 +67,10 @@ local args = require ('xindex-lapp') [[ Three -v flags, v is { true, true, true } ]] +if args.version then + print("xindex version "..xindex.version) +end + vlevel = not args.v[1] and 0 or #args.v not_quiet = not args["quiet"] @@ -98,6 +103,15 @@ end require('xindex-baselib') local nInFiles = #args.files + +-- print(#args.files,args.files_name[1]) + +if not useStdInput and not args.files_name then + print("Use option -s for StdIn or define an input data file!") + os.exit() +end + + if not useStdInput then if vlevel == 3 then print(tostring(nInFiles).." input file(s): ") diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG index 211f66e846d..09d7a7d5fc1 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG +++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG @@ -1,3 +1,5 @@ +0.43 2022-09-01 - print warning if no input file is defined. +0.42 2022-08-28 - added -V|--version 0.41 2022-03-08 - fix for empty idx files 0.40 2022-02-12 - added -i,--ignoreSpace for sorting 0.39 2022-02-12 - detect language in aux file @@ -14,7 +16,7 @@ - add optional argument -s for standard input - allow piping with standard input - allow more than one input file -0.30 2021-07-07 - added otional argument -b for no label setting in the <index>.ind +0.30 2021-07-07 - added optional argument -b for no label setting in the <index>.ind 0.29 2021-07-05 - don't use language specific names for the labels - use math.max() - check for language specific folium pages and not only "f", "ff" @@ -48,4 +50,4 @@ 0.05 2018-12-01 - modified HAdW config 0.04 2018-10-29 - added an own pretty printer function for tables 0.03 2018-10-27 -fix for same pagenumber but different special -0.02 2018-10-27 -Updated documention +0.02 2018-10-27 -Updated documentation diff --git a/Master/texmf-dist/doc/lualatex/xindex/README.md b/Master/texmf-dist/doc/lualatex/xindex/README.md index 2191a2ffecf..38dae0bdd00 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/README.md +++ b/Master/texmf-dist/doc/lualatex/xindex/README.md @@ -39,6 +39,7 @@ possible options are (short,long): -p,--prefix (default L) -u,--use_UCA -s,--use_stdin + -V,--version <files...> (default stdin) .idx file(s) Testfiles: diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf Binary files differindex 5281e469084..de46f830d58 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf +++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex index 701dbd24d69..a290cadcc44 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex +++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex @@ -41,7 +41,7 @@ \usepackage{xltabular} \usepackage{hvlogos} % for Wikipedia W \usepackage{listings} -\usepackage{dtk-extern} % for Wikipedia W +\usepackage{hvextern} % for Wikipedia W \lstset{basicstyle=\ttfamily\small,language=[LaTeX]TeX} \usepackage{ragged2e} \usepackage{makeidx}\makeindex @@ -81,9 +81,9 @@ \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} -\setVersion{version = 0.41}% can be automatically changed by perl +\setVersion{version = 0.43}% can be automatically changed by perl -\setkeys{dtk}{cleanup=true,force=true} +\setkeys{hv}{cleanup=true,force=true} \title{Program and package \texttt{xindex} \\--\\ \normalsize \xIndexVersion\ (\today)} @@ -99,6 +99,7 @@ Thanks to: \\ Mark Baudoin; Denis Bitouzé; +Andreas Deininger; Brian Dunn; Gonzalo Pesquero Serrano; Michal Hoftich; @@ -181,6 +182,7 @@ xindex [-p,--prefix] default L [-u,--use_UCA ] default is false [-s,--use_stdin ] default is false + [-V,--version ] <files...> (default stdin) file(s)[.idx] one or more files \end{verbatim} @@ -795,7 +797,7 @@ Sorted with \verb|-u -l cs| \end{document} \end{externalDocument} -The sorting order can be easliy modified. Read the documentation of the package \texttt{LUA-UCA} +The sorting order can be easily modified. Read the documentation of the package \texttt{LUA-UCA} on how to do it and what languages are supported so far. Any additional code setting for UCA should be don't in the file \Lfile{xindex-cfg-uca.lua}, which will automatically be read by \Lprog{xindex}. @@ -1077,7 +1079,7 @@ foo\index{foo} and foo\index{foo|bar} \end{verbatim} then we have two \emph{different} index entries which will not be compressed to one entry. -In the follwoing example we have four different entries for \emph{foo} which is the reason +In the following example we have four different entries for \emph{foo} which is the reason that we do not get an output like \texttt{foo, 1--4}. Only the first two entries are of the same type, so we get \texttt{1f} in the output. @@ -1657,7 +1659,7 @@ if not modules then modules = { } end modules ['xindex-header'] = { } itemPageDelimiter = "," -- Hello, 14 -compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid +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 = "--" @@ -1855,7 +1857,7 @@ maybe \verb|symbols|, \verb|numbers|, or \verb|A| (a letter). For example The labels can be used to create a reference to a specific part in the index, for example the letter X is in the index on page \pageref{L-xindex-X} (\Lcs{pageref}\Largb{L-xindex-X}). -With the optional argument \verb|-b| for the run of \XI one can supress the creation of the +With the optional argument \verb|-b| for the run of \XI one can suppress the creation of the labels, e.g. \verb|xindex -b -l fr ...| diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua index a54fe953c10..b20996aabe8 100755 --- a/Master/texmf-dist/scripts/xindex/xindex.lua +++ b/Master/texmf-dist/scripts/xindex/xindex.lua @@ -10,7 +10,7 @@ ----------------------------------------------------------------------- xindex = xindex or { } - local version = 0.41 + local version = 0.43 xindex.version = version --xindex.self = "xindex" @@ -56,6 +56,7 @@ local args = require ('xindex-lapp') [[ -p,--prefix (default L) -u,--use_UCA -s,--use_stdin + -V,--version <files...> (default stdin) .idx file(s) ]] @@ -66,6 +67,10 @@ local args = require ('xindex-lapp') [[ Three -v flags, v is { true, true, true } ]] +if args.version then + print("xindex version "..xindex.version) +end + vlevel = not args.v[1] and 0 or #args.v not_quiet = not args["quiet"] @@ -98,6 +103,15 @@ end require('xindex-baselib') local nInFiles = #args.files + +-- print(#args.files,args.files_name[1]) + +if not useStdInput and not args.files_name then + print("Use option -s for StdIn or define an input data file!") + os.exit() +end + + if not useStdInput then if vlevel == 3 then print(tostring(nInFiles).." input file(s): ") |