texlive[50588] trunk: xindex (25mar19)
commits+karl at tug.org
commits+karl at tug.org
Mon Mar 25 21:47:34 CET 2019
Revision: 50588
http://tug.org/svn/texlive?view=revision&revision=50588
Author: karl
Date: 2019-03-25 21:47:34 +0100 (Mon, 25 Mar 2019)
Log Message:
-----------
xindex (25mar19)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
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/Makefile
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-cfg-common.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-lapp.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
Modified: trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl 2019-03-25 20:47:34 UTC (rev 50588)
@@ -367,14 +367,8 @@
} ; # start_tlmgr
proc close_tlmgr {} {
- if {[catch {chan close $::tlshl}] || [catch {chan close $::err}]} {
- tk_messageBox -message [get_stacktrace]
- return 0
- } else {
- set ::perlpid 0
- return 1
- }
-}; # close_tlmgr
+ run_cmd_waiting "quit"
+}
# read a line of tlmgr output
proc read_line {} {
@@ -382,12 +376,20 @@
# if it wants to wait for the command to finish
set l "" ; # will contain the line to be read
if {([catch {chan gets $::tlshl l} len] || [chan eof $::tlshl])} {
- #do_debug "read_line: failing to read "
- puts stderr "Read failure; tlmgr command was $::last_cmd"
- if {! [catch {chan close $::tlshl}]} {set ::perlpid 0}
- # note. the right way to terminate is terminating the GUI shell.
- # This closes stdin of tlmgr shell.
- err_exit
+ if [chan eof $::tlshl] {
+ catch {chan close $::tlshl}
+ catch {chan close $:err}
+ unset -nocomplain ::tlshl
+ unset -nocomplain ::err
+ set ::perlpid 0
+ set ::done_waiting 1
+ } else {
+ #do_debug "read_line: failing to read "
+ puts stderr "Read failure; tlmgr command was $::last_cmd"
+ # note. the normal way to terminate is terminating the GUI shell.
+ # This closes stdin of tlmgr shell.
+ err_exit
+ }
} elseif {$len >= 0} {
# do_debug "read: $l"
if $::ddebug {puts $::flid $l}
@@ -1527,7 +1529,7 @@
set ans [tk_messageBox -type okcancel -icon info -message \
[string cat [__ "If update fails, try on a command-line:"] \
"\ntlmgr update --self\n" \
- [__ "Use an admininstrative command prompt for an admin install."]]]
+ [__ "Use an administrative command prompt for an admin install."]]]
return [$ans eq ok]
}
@@ -2029,8 +2031,12 @@
.mn.opt add cascade -label [__ "GUI language (restarts tlshell)"] \
-menu .mn.opt.lang
menu .mn.opt.lang
- foreach l $::langs {
- .mn.opt.lang add command -label $l -command "set_language $l"
+ foreach l [lsort $::langs] {
+ if {$l eq $::lang} {
+ .mn.opt.lang add command -label "$l *"
+ } else {
+ .mn.opt.lang add command -label "$l" -command "set_language $l"
+ }
}
}
@@ -2065,9 +2071,9 @@
-in .endbuttons -side right
ppack [ttk::button .r -text [__ "Restart self"] -command restart_self] \
-in .endbuttons -side right
- # ppack [ttk::button .t -text [__ "Restart tlmgr"] \
- # -command {close_tlmgr; start_tlmgr}] \
- # -in .endbuttons -side right
+ ppack [ttk::button .t -text [__ "Restart tlmgr"] \
+ -command {close_tlmgr; start_tlmgr}] \
+ -in .endbuttons -side right
ttk::button .showlogs -text [__ "Show logs"] -command show_logs
ppack .showlogs -in .endbuttons -side right
@@ -2097,8 +2103,8 @@
# right frame
ppack [ttk::frame .topfr] -in .topf -side right -anchor ne
- pack [ttk::label .topfr.linfra -text "some"] -side top -anchor e
- pack [ttk::label .topfr.lshell -text "more"] -side top -anchor e
+ pack [ttk::label .topfr.linfra] -side top -anchor e
+ pack [ttk::label .topfr.lshell] -side top -anchor e
pack [ttk::separator .sp -orient horizontal] \
-in .bg -side top -fill x -pady 6
Modified: trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2019-03-25 20:47:34 UTC (rev 50588)
@@ -8,7 +8,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.08
+ local version = 0.09
xindex.version = version
--xindex.self = "xindex"
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2019-03-25 20:47:34 UTC (rev 50588)
@@ -1,3 +1,4 @@
+0.09 2019-03-25 - fix for HAdW config file
0.08 2019-03-06 - fix for config file HAdW
0.07 2019-02-05 - fix for wrong version number
0.06b 2019-01-30 - use another monospace font to allow copy and paste
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/Makefile 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/Makefile 2019-03-25 20:47:34 UTC (rev 50588)
@@ -27,7 +27,7 @@
# $(LATEX) --shell-escape $(MAIN)
clean :
- $(RM) *.dvi *.aux *.log *.xml xindex-?.tex xindex-??.tex *.ind *.idx *.toc *.out *.ilg
+ $(RM) *.dvi *.aux *.log *.xml xindex-?.tex xindex-??.tex *.ind *.idx *.toc *.out *.ilg *.adx
veryclean : clean
$(RM) *.pdf
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 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2019-03-25 20:47:34 UTC (rev 50588)
@@ -79,7 +79,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\xIndexVersion{#2}}
-\setVersion{version = 0.08}% can be autimatically changed by perl
+\setVersion{version = 0.09}% can be autimatically changed by perl
\title{Program and package \texttt{xindex} \\--\\ \normalsize \xIndexVersion\ (\today)}
\author{Herbert Voß\thanks{hvoss at tug.org}}
@@ -828,7 +828,7 @@
function specialCompressPageList(pages)
if (pages[1]["number"] == "") then pages[1]["number"] = " " end
if (#pages <= 1) then
- pages[1]["number"] = pages[1]["number"]:gsub('(.-)-',colorBox)-- replace "-" with ":\\ "
+ pages[1]["number"] = pages[1]["number"]:gsub('-',':~')-- replace "-" with ":~"
return pages
end -- only one pageno
local sortPages = {}
@@ -837,30 +837,26 @@
local page
local i
for i=1,#pages do
- roman = string.gsub(pages[i]["number"],'%U*','') -- only uppercase to catch VII123f (folium pages)
+ roman = string.gsub(pages[i]["number"],'%U*','') -- only uppercase to catch VII/1-123f and VII/3-123ff (folium pages)
if romanToNumber(roman) then
- roman = string.format("%05d",tonumber(romanToNumber(roman)))
+ roman = string.format("%05d",tonumber(romanToNumber(roman))) -- only roman part VII
else
roman = ""
end
- volume = string.gsub(pages[i]["number"],'%a*','')
- if volume then volume = volume:gsub('-%d*','') end
+ volume = string.gsub(pages[i]["number"],'%a*','') -- only the number /2 123 or /2-123
+ if volume then volume = volume:gsub('-%d*','') end -- delete - char to get /2
page = string.gsub(pages[i]["number"],'.*-','')
page = string.format("%5s",page)
sortPages[#sortPages+1] = {
- origin = pages[i],
- sort = roman..volume.." "..page } -- no minus between Roman/Volume and first page
+ origin = pages[i],
+ sort = roman..volume.." "..page } -- no minus between Roman/Volume and first page
end
--- sort the page list
table.sort(sortPages, function(a,b) return a["sort"] < b["sort"] end )
- local Pages = {}
- for i=1,#sortPages do -- use the sorted origin table
- Pages[#Pages+1] = sortPages[i]["origin"]
- end
[...]
-return pages
+ return pages
+ end
end
\end{verbatim}
@@ -897,7 +893,7 @@
\indexentry{Karl!der Große, Kaiser}{VI/2-987}
\indexentry{Karl!der Große, Kaiser}{VI/2-989}
\indexentry{Karl!der Große, Kaiser}{VI/2-1028}
-\indexentry{Karl!IV., Kaiser}{VI/1-XII}
+\indexentry{Karl!IV., Kaiser}{VI/1-12}
\indexentry{Karl!V., Kaiser}{VI/1-84}
\indexentry{Karl!V., Kaiser}{VI/1-284}
\indexentry{Karl!V., Kaiser}{VI/1-654}
Modified: trunk/Master/texmf-dist/scripts/xindex/xindex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2019-03-25 20:47:34 UTC (rev 50588)
@@ -8,7 +8,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.08
+ local version = 0.09
xindex.version = version
--xindex.self = "xindex"
Modified: trunk/Master/texmf-dist/tex/latex/xindex/xindex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xindex/xindex.sty 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/tex/latex/xindex/xindex.sty 2019-03-25 20:47:34 UTC (rev 50588)
@@ -1,6 +1,6 @@
%% This is file `xindex.sty',
%%
-%% Copyright (C) 2018
+%% Copyright (C) 2019-
%% Herbert Voss
%%
%% It may be distributed and/or modified under the
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2019-03-25 20:47:34 UTC (rev 50588)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.08,
+ version = 0.09,
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 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2019-03-25 20:47:34 UTC (rev 50588)
@@ -9,7 +9,7 @@
-- configuration for index files of the Heidelberger Akademie der Wissenschaften
if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = {
- version = 0.08,
+ version = 0.09,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -98,7 +98,7 @@
--\indexentry{Bremen!Adalbert I. von, Erzbischof}{VII/1-50}
function specialCompressPageList(pages)
---print(#pages..".. number:|"..pages[1]["number"].."| Special:"..pages[1]["special"])
+-- print(#pages..".. number:|"..pages[1]["number"].."| Special:"..pages[1]["special"])
if (pages[1]["number"] == "") then pages[1]["number"] = " " end
if (#pages <= 1) then
pages[1]["number"] = pages[1]["number"]:gsub('-',':~')-- replace "-" with ":~"
@@ -118,24 +118,25 @@
local i
--print("----------------------------------------")
for i=1,#pages do
- roman = string.gsub(pages[i]["number"],'%U*','') -- only uppercase to catch VII123f (folium pages)
+ roman = string.gsub(pages[i]["number"],'%U*','') -- only uppercase to catch VII/1-123f and VII/3-123ff (folium pages)
if romanToNumber(roman) then
- roman = string.format("%05d",tonumber(romanToNumber(roman)))
+ roman = string.format("%05d",tonumber(romanToNumber(roman))) -- only roman part VII
else
roman = ""
end
- volume = string.gsub(pages[i]["number"],'%a*','')
- if volume then volume = volume:gsub('-%d*','') end
+ volume = string.gsub(pages[i]["number"],'%a*','') -- only the number /2 123 or /2-123
+ if volume then volume = volume:gsub('-%d*','') end -- delete - char to get /2
page = string.gsub(pages[i]["number"],'.*-','')
page = string.format("%5s",page)
sortPages[#sortPages+1] = {
- origin = pages[i],
- sort = roman..volume.." "..page } -- no minus between Roman/Volume and first page
+ origin = pages[i],
+ sort = roman..volume.." "..page } -- no minus between Roman/Volume and first page
--print(roman..volume.." "..page.." Special:"..pages[i]["special"])
end
-- sort the page list
table.sort(sortPages, function(a,b) return a["sort"] < b["sort"] end )
local Pages = {}
+-- writeLog(1,print(getRawPagesP(sortPages)),2)
for i=1,#sortPages do -- use the sorted origin table
Pages[#Pages+1] = sortPages[i]["origin"]
end
@@ -143,7 +144,8 @@
-- test if two or more pages in the list
if #Pages == 2 then -- only two pages
local page1 = string.gsub(Pages[1]["number"],'%A*','') -- get prefix1
- local page2 = string.gsub(Pages[2]["number"],'%A*','') -- ger prefix2
+ local page2 = string.gsub(Pages[2]["number"],'%A*','') -- get prefix2
+ print(page1,Pages[1]["number"],page2,Pages[2]["number"])
if (page1 == page2) then -- same prefix
page1 = string.gsub(Pages[1]["number"],'.*-','') -- get page1
page2 = string.gsub(Pages[2]["number"],'.*-','') -- get page2
@@ -157,9 +159,9 @@
Pages[2]["number"] = string.gsub(Pages[2]["number"],'.*-','') -- use only number -> same prefix
return Pages -- Pages[1] is the same
end
- else
- Pages[1]["number"] = pages[1]["number"]:gsub('-',':~')
- Pages[2]["number"] = pages[2]["number"]:gsub('-',':~')
+ else -- different prefixes
+ Pages[1]["number"] = Pages[1]["number"]:gsub('-',':~')
+ Pages[2]["number"] = Pages[2]["number"]:gsub('-',':~')
return Pages -- different prefix -> simple return of the two pages
end
else -- more than two pages
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2019-03-25 20:47:34 UTC (rev 50588)
@@ -6,7 +6,7 @@
-- LICENSE: LPPL1.3
-----------------------------------------------------------------------
-local info = { version = 0.08}
+local info = { version = 0.09}
-- check config
if pageNoPrefixDel ~= "" then
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2019-03-25 20:47:34 UTC (rev 50588)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-common'] = {
- version = 0.08,
+ version = 0.09,
comment = "configuration to xindex.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 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2019-03-25 20:47:34 UTC (rev 50588)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.08,
+ version = 0.09,
comment = "main configuration to xindex.lua",
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 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2019-03-25 20:47:34 UTC (rev 50588)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.08,
+ version = 0.09,
comment = "DTK configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua 2019-03-25 20:47:34 UTC (rev 50588)
@@ -28,7 +28,7 @@
--~ n 2
--------------------------------
if not modules then modules = { } end modules ['xindex-lapp'] = {
- version = 0.08,
+ version = 0.09,
comment = "read parameter for xindex.lua",
author = "Steve Donovan",
copyright = "Steve Donovan",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2019-03-25 20:47:34 UTC (rev 50588)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-lib'] = {
- version = 0.08,
+ version = 0.09,
comment = "main library 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 2019-03-25 20:46:58 UTC (rev 50587)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2019-03-25 20:47:34 UTC (rev 50588)
@@ -5,7 +5,7 @@
--
if not modules then modules = { } end modules ['xindex-pretty'] = {
- version = 0.08,
+ version = 0.09,
comment = "dump a Lua table for debugging",
author = "Steve Donovan",
copyright = "Steve Donovan",
More information about the tex-live-commits
mailing list