texlive[50834] trunk: doc,sync
commits+karl at tug.org
commits+karl at tug.org
Sun Apr 7 03:25:25 CEST 2019
Revision: 50834
http://tug.org/svn/texlive?view=revision&revision=50834
Author: karl
Date: 2019-04-07 03:25:25 +0200 (Sun, 07 Apr 2019)
Log Message:
-----------
doc,sync
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu
trunk/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib
trunk/Master/tlpkg/doc/releng.txt
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2019-04-07 01:24:09 UTC (rev 50833)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2019-04-07 01:25:25 UTC (rev 50834)
@@ -1,12 +1,12 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 50692 2019-04-01 15:01:10Z preining $
+# $Id: tlmgr.pl 50796 2019-04-05 22:43:08Z karl $
#
# Copyright 2008-2019 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 50692 $';
-my $datrev = '$Date: 2019-04-01 17:01:10 +0200 (Mon, 01 Apr 2019) $';
+my $svnrev = '$Revision: 50796 $';
+my $datrev = '$Date: 2019-04-06 00:43:08 +0200 (Sat, 06 Apr 2019) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -2520,7 +2520,7 @@
#
# for some packages (texworks, psview, ...) we only have w32 packages
# in the repository, but it is possible that alternative repositories
- # ship binaries for some platforms (like texworks for linux on tlcontrib)
+ # ship binaries for some platforms (like texworks for GNU/Linux on tlcontrib)
# currently updating from tlnet will remove these alternative .ARCH
# packages because they are not listed anywhere locally, so they
# are considered as disappearing.
@@ -7603,6 +7603,9 @@
starts you directly at the update screen. If no action is given, the
GUI will be started at the main screen.
+Note that the new GUIs, tlshell and tlcockpit, are started up as
+separate programs.
+
=for comment Keep language list in sync with install-tl.
=item B<--gui-lang> I<llcode>
@@ -7617,6 +7620,8 @@
Slovenian (sl), Serbian (sr), Ukrainian (uk), Vietnamese (vi),
simplified Chinese (zh_CN), and traditional Chinese (zh_TW).
+Tlshell shares its message catalog with tlmgr.
+
=item B<--debug-translation>
In GUI mode, this switch tells C<tlmgr> to report any untranslated (or
@@ -9283,17 +9288,23 @@
=head1 GUI FOR TLMGR
The graphical user interface for C<tlmgr> requires Perl/Tk
-L<https://search.cpan.org/search?query=perl%2Ftk>. For Windows the
-necessary modules are shipped within TeX Live, for all other (i.e.,
-Unix-based) systems Perl/Tk (as well as Perl of course) has to be
-installed outside of TL. L<https://tug.org/texlive/distro.html#perltk>
-has a list of invocations for some distros.
+L<https://search.cpan.org/search?query=perl%2Ftk>. For Unix-based
+systems Perl/Tk (as well as Perl of course) has to be installed
+outside of TL. L<https://tug.org/texlive/distro.html#perltk> has a
+list of invocations for some distros. For Windows the necessary
+modules are no longer shipped within TeX Live, so you'll have to have an
+external Perl available that includes them.
-The GUI is started with the invocation C<tlmgr gui>; assuming Tk is
-loadable, the graphical user interface will be shown. The main window
-contains a menu bar, the main display, and a status area where messages
-normally shown on the console are displayed.
+We are talking here about the GUI built into tlmgr itself, not about the
+other tlmgr GUIs, which are: tlshell (Tcl/Tk-based), tlcockpit
+(Java-based) and, only on Macs, TeX Live Utility. These are invoked as
+separate programs.
+The GUI mode of tlmgr is started with the invocation C<tlmgr gui>;
+assuming Tk is loadable, the graphical user interface will be shown.
+The main window contains a menu bar, the main display, and a status
+area where messages normally shown on the console are displayed.
+
Within the main display there are three main parts: the C<Display
configuration> area, the list of packages, and the action buttons.
@@ -9769,7 +9780,7 @@
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 50692 2019-04-01 15:01:10Z preining $
+$Id: tlmgr.pl 50796 2019-04-05 22:43:08Z karl $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
Modified: trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl 2019-04-07 01:24:09 UTC (rev 50833)
+++ trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl 2019-04-07 01:25:25 UTC (rev 50834)
@@ -29,8 +29,9 @@
unset dirs
}
+set ::instroot [exec kpsewhich -var-value=TEXMFROOT]
+
# declarations and utilities shared with install-tl-gui.tcl
-set ::instroot [exec kpsewhich -var-value=TEXMFROOT]
source [file join $::instroot "tlpkg" "tltcl" "tltcl.tcl"]
# now is a good time to ask tlmgr for the _TL_ name of our platform
@@ -217,6 +218,9 @@
foreach b [list .mrk_inst .mrk_upd] {
$b state disabled
}
+ if {$::tcl_platform(platform) eq "windows"} {
+ .upd_all state disabled
+ }
} elseif {!$::need_update_tlmgr} {
.upd_tlmgr state disabled
}
@@ -1513,12 +1517,16 @@
##### package-related #####
-proc update_self_q {} {
- 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 administrative command prompt for an admin install."]]]
- return [expr {$ans eq "ok"}]
+proc update_self_w32 {} {
+ if $::multiuser {
+ set mess \
+ [__ "Close this shell and run in an administrative command-prompt:"]
+ } else {
+ set mess [__ "Close this shell and run in a command-prompt:"]
+ }
+ set mess [string cat $mess "\n\ntlmgr update --self"]
+ tk_messageBox -message $mess
+ return
}
proc update_tlmgr {} {
@@ -1526,7 +1534,10 @@
tk_messageBox -message [__ "Nothing to do!"]
return
}
- if {$::tcl_platform(platform) eq "windows" && ! [update_self_q]} return
+ if {$::tcl_platform(platform) eq "windows"} {
+ update_self_w32
+ return
+ }
run_cmd "update --self" 1
vwait ::done_waiting
# tlmgr restarts itself automatically
@@ -1539,6 +1550,9 @@
proc update_all {} {
set updated_tlmgr 0
if $::need_update_tlmgr {
+ if {$::tcl_platform(platform) eq "windows"} {
+ return ; # just to be sure; 'update all' button should be disabled
+ }
run_cmd "update --self" 1
vwait ::done_waiting
# tlmgr restarts itself automatically
@@ -2091,6 +2105,11 @@
# right frame
ppack [ttk::frame .topfr] -in .topf -side right -anchor ne
+ if {$::tcl_platform(platform) eq "windows"} {
+ pack [ttk::label .topfr.ladmin] -side top -anchor e
+ }
+ pack [ttk::label .topfr.lroot] -side top -anchor e
+ .topfr.lroot configure -text [__ "Root at %s" $::instroot]
pack [ttk::label .topfr.linfra] -side top -anchor e
pack [ttk::label .topfr.lshell] -side top -anchor e
@@ -2284,7 +2303,24 @@
populate_main
+ # testing writablilty earlier led to sizing problems
+ if {! [file writable $::instroot]} {
+ set ans [tk_messageBox -type yesno -icon warning -message \
+ [__ "%s is not writable. You can probably not do much.
+ Are you sure you want to continue?" $::instroot]]
+ if {$ans ne "yes"} {exit}
+ }
+
start_tlmgr
+ if {$::tcl_platform(platform) eq "windows"} {
+ run_cmd_waiting "option multiuser"
+ set ::multiuser 0
+ foreach l $::out_log {
+ if [regexp {^\s*multiuser\s+([01])\s*$} $l d ::multiuser] break
+ }
+ .topfr.ladmin configure -text \
+ [expr {$::multiuser ? [__ "Multi-user"] : [__ "Single-user"]}]
+ }
get_repos_from_tlmgr
.topfl.lrepos configure -text [print_repos]
get_packages_info_local
Modified: trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu
===================================================================
--- trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu 2019-04-07 01:24:09 UTC (rev 50833)
+++ trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu 2019-04-07 01:25:25 UTC (rev 50834)
@@ -1,7 +1,7 @@
-local svnrevision = string.match("$Revision: 49485 $", "%d+") or "0"
-local svndate = string.match("$Date: 2018-12-23 16:28:08 +0100 (Sun, 23 Dec 2018) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision: 50675 $", "%d+") or "0"
+local svndate = string.match("$Date: 2019-03-31 21:31:37 +0200 (Sun, 31 Mar 2019) $", "[-%d]+") or "2009-12-04"
local bannerstr = "runscript wrapper utility (rev. " ..
svnrevision .. ", " .. svndate .. ")\n" ..
"usage: runscript script-name [arguments]\n" ..
@@ -642,7 +642,7 @@
['fmtutil-sys'] = true,
}
local try_extern_perl = (kpse.var_value('TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL') == '1') and
- not (guimode or is_restricted_progname or scripts4tlperl[progname])
+ not (is_restricted_progname or scripts4tlperl[progname])
local PERLEXE = try_extern_perl and search_path('perl.exe', PATH)
local extperl_warn
if not PERLEXE then
Modified: trunk/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib
===================================================================
--- trunk/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib 2019-04-07 01:24:09 UTC (rev 50833)
+++ trunk/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib 2019-04-07 01:25:25 UTC (rev 50834)
@@ -16,7 +16,7 @@
%%% USA",
%%% telephone = "+1 801 581 5254",
%%% FAX = "+1 801 581 4148",
-%%% checksum = "46640 11659 47200 456272",
+%%% checksum = "54369 11659 47200 456271",
%%% email = "beebe at math.utah.edu, beebe at acm.org,
%%% beebe at computer.org (Internet)",
%%% codetable = "ISO/ASCII",
@@ -9284,7 +9284,7 @@
@Book{Sharples:CT89,
author = "Mike Sharples and David Hogg and Chris Hutchison and
- Steve Torrance and David Young.",
+ Steve Torrance and David Young",
title = "Computers and Thought",
publisher = pub-MIT,
address = pub-MIT:adr,
Modified: trunk/Master/tlpkg/doc/releng.txt
===================================================================
--- trunk/Master/tlpkg/doc/releng.txt 2019-04-07 01:24:09 UTC (rev 50833)
+++ trunk/Master/tlpkg/doc/releng.txt 2019-04-07 01:25:25 UTC (rev 50834)
@@ -208,7 +208,7 @@
tlmgr version number in texmf-dist/scripts/texlive/NEWS.
Rebuild test images so we get the new source.
Tell developers no more commits: tldev +
- akira, hironobu, jerome, luigi, mojca, takuji.
+ hironobu, jerome, luigi, mojca, takuji.
P. The day before the final pretest:
option adjustrepo 1 in tl-update-tlnet, else install-tl-unx won't go to ctan
More information about the tex-live-commits
mailing list