diff options
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 122 | ||||
-rw-r--r-- | Master/texmf-dist/bibtex/bib/beebe/texbook3.bib | 53 | ||||
-rw-r--r-- | Master/texmf-dist/bibtex/bib/beebe/texgraph.bib | 14 |
3 files changed, 115 insertions, 74 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index ae25ab9f70b..9165f0463d7 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 45532 2017-10-13 06:50:59Z preining $ +# $Id: tlmgr.pl 45613 2017-10-26 23:18:10Z preining $ # # Copyright 2008-2017 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 45532 $'; -my $datrev = '$Date: 2017-10-13 08:50:59 +0200 (Fri, 13 Oct 2017) $'; +my $svnrev = '$Revision: 45613 $'; +my $datrev = '$Date: 2017-10-27 01:18:10 +0200 (Fri, 27 Oct 2017) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -1412,7 +1412,7 @@ sub action_info { my $ret = $F_OK | $F_NOPOSTACTION; my @datafields; my $fmt = "list"; - if ($opts{'data'} eq "json") { + if ($opts{'data'} && ($opts{'data'} eq "json")) { eval { require JSON; }; if ($@) { # that didn't work out, give some usefull error message and stop @@ -1448,21 +1448,44 @@ Goodbye. # the 1 is the silent mode! init_tlmedia_or_die(1); } + my $tlm; + if ($opts{"only-installed"}) { + $tlm = $localtlpdb; + } else { + # silent mode + init_tlmedia_or_die(1); + $tlm = $remotetlpdb; + } + # # tlmgr info # tlmgr info collection # tlmgr info scheme # these commands just list the packages/collections/schemes installed with # a short list + my @whattolist; $what = ($what || "-all"); - if ($what =~ m/^(collections|schemes|-all)$/i) { - $ret |= show_list_of_packages($fmt, $what, @datafields); - return ($ret); + if ($what =~ m/^collections$/i) { + @whattolist = $tlm->collections; + } elsif ($what =~ m/^schemes$/i) { + @whattolist = $tlm->schemes; + } elsif ($what =~ m/^-all$/i) { + if ($tlm->is_virtual) { + @whattolist = $tlm->list_packages("-all"); + } else { + @whattolist = $tlm->list_packages; + } + # add also the local packages + TeXLive::TLUtils::push_uniq(@whattolist, $localtlpdb->list_packages); + } else { + @whattolist = ($what, @todo); } - # we are still here, so $what is defined and neither collection nor scheme, - # so assume the arguments are package names - if ($opts{'data'} ne "json") { - $fmt = ($opts{'data'} ? "csv" : "detail"); + if ($opts{'data'}) { + if ($opts{'data'} ne "json") { + $fmt = "csv"; + } + } else { + $fmt = "detail"; } my @adds; if ($opts{'data'}) { @@ -1470,7 +1493,8 @@ Goodbye. } print "[\n" if ($fmt eq "json"); my $first = 1; - foreach my $ppp ($what, @todo) { + foreach my $ppp (@whattolist) { + next if ($ppp =~ m/^00texlive\./); print "," if ($fmt eq "json" && !$first); $first = 0; $ret |= show_one_package($ppp, $fmt, @adds); @@ -3613,11 +3637,19 @@ sub show_one_package_json { my $is_installed = (defined($loctlp) ? 1 : 0); my $is_available = (defined($remtlp) ? 1 : 0); if (!($is_installed || $is_available)) { - tlwarn("$prg: package $p not found neither locally nor remote!\n"); - return($F_WARNING); - } - my $tlp = ($is_installed ? $loctlp : $remtlp); - my $str = $tlp->as_json(); + # output proper JSON for unavailable packages + print "{ \"name\":\"$p\", \"available\":false }\n"; + #tlwarn("$prg: package $p not found neither locally nor remote!\n"); + #return($F_WARNING); + return($F_OK); + } + my $tlp = ($is_available ? $remtlp : $loctlp); + # add available, installed, lrev, rrev fields and remove revision field + my $str = $tlp->as_json(available => ($is_available ? $JSON::true : $JSON::false), + installed => ($is_installed ? $JSON::true : $JSON::false), + lrev => ($is_installed ? $loctlp->revision : 0), + rrev => ($is_available ? $remtlp->revision : 0), + revision => undef); print $str, "\n"; return($F_OK); } @@ -3982,41 +4014,6 @@ sub show_one_package_detail { return($ret); } -sub show_list_of_packages { - init_local_db(); - my ($fmt, $what, @datafields) = @_; - my $ret = $F_OK; - my $tlm; - if ($opts{"only-installed"}) { - $tlm = $localtlpdb; - } else { - # silent mode - init_tlmedia_or_die(1); - $tlm = $remotetlpdb; - } - my @whattolist; - if ($what =~ m/^collections/i) { - @whattolist = $tlm->collections; - } elsif ($what =~ m/^schemes/i) { - @whattolist = $tlm->schemes; - } elsif ($what =~ m/^-all/i) { - if ($tlm->is_virtual) { - @whattolist = $tlm->list_packages("-all"); - } else { - @whattolist = $tlm->list_packages; - } - } else { - tlwarn("$prg: show_list_of_package: don't know what to list: $what\n"); - return($F_ERROR); - } - my @extra; - foreach (@whattolist) { - next if ($_ =~ m/^00texlive/); - $ret |= show_one_package($_, $fmt, @datafields); - } - return($ret); -} - # PINNING # # this action manages the pinning file @@ -5921,25 +5918,25 @@ sub texconfig_conf_mimic { info(give_version()); info("==================== executables found by searching PATH =================\n"); info("PATH: $PATH\n"); - for my $cmd (qw/kpsewhich updmap fmtutil tlmgr tex pdftex mktexpk - dvips dvipdfmx/) { - info("$cmd: " . TeXLive::TLUtils::which($cmd) . "\n"); + for my $cmd (qw/kpsewhich updmap fmtutil tlmgr tex pdftex luatex xetex + mktexpk dvips dvipdfmx/) { + info(sprintf("%-10s %s\n", "$cmd:", TeXLive::TLUtils::which($cmd))); } info("=========================== active config files ==========================\n"); for my $m (qw/texmf.cnf updmap.cfg/) { for my $f (`kpsewhich -all $m`) { - info("$m: $f"); + info(sprintf("%-17s %s", "$m:", $f)); } } for my $m (qw/fmtutil.cnf config.ps mktex.cnf pdftexconfig.tex/) { - info("$m: " . `kpsewhich $m`); + info(sprintf("%-17s %s", "$m:", `kpsewhich $m`)); } #tlwarn("$prg: missing finding of XDvi, config!\n"); info("============================= font map files =============================\n"); for my $m (qw/psfonts.map pdftex.map ps2pk.map kanjix.map/) { - info("$m: " . `kpsewhich $m`); + info(sprintf("%-12s %s", "$m:", `kpsewhich $m`)); } info("=========================== kpathsea variables ===========================\n"); @@ -7482,7 +7479,7 @@ but tinkering with settings in this way is strongly discouraged. Again, no error checking on either keys or values is done, so any sort of breakage is possible. -=head2 dump-tlpdb [--local|--remote] +=head2 dump-tlpdb [--local|--remote] [--json] Dump complete local or remote TLPDB to standard output, as-is. The output is analogous to the C<--machine-readable> output; see @@ -7500,6 +7497,11 @@ Dump the local TLPDB. Dump the remote TLPDB. +=item B<--json> + +Instead of dumping the actual content, the database is dumped as +JSON. + =back Exactly one of C<--local> and C<--remote> must be given. @@ -9164,7 +9166,7 @@ This script and its documentation were written for the TeX Live distribution (L<http://tug.org/texlive>) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 45532 2017-10-13 06:50:59Z preining $ +$Id: tlmgr.pl 45613 2017-10-26 23:18:10Z preining $ =cut # to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib index 9e513d435c3..fa39cea25ec 100644 --- a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib +++ b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib @@ -5,9 +5,9 @@ %%% ==================================================================== %%% BibTeX-file{ %%% author = "Nelson H. F. Beebe", -%%% version = "3.64", -%%% date = "13 October 2017", -%%% time = "08:16:21 MDT", +%%% version = "3.65", +%%% date = "24 October 2017", +%%% time = "07:05:55 MDT", %%% filename = "texbook3.bib", %%% address = "University of Utah %%% Department of Mathematics, 110 LCB @@ -17,7 +17,7 @@ %%% telephone = "+1 801 581 5254", %%% FAX = "+1 801 581 4148", %%% URL = "http://www.math.utah.edu/~beebe", -%%% checksum = "51525 17193 70413 691455", +%%% checksum = "25113 17232 70648 693656", %%% email = "beebe at math.utah.edu, beebe at acm.org, %%% beebe at computer.org (Internet)", %%% codetable = "ISO/ASCII", @@ -37,7 +37,7 @@ %%% covered in separate bibliographies %%% (ep.bib, epodd.bib, and sgml.bib). %%% -%%% At version 3.64, the year coverage looks +%%% At version 3.65, the year coverage looks %%% like this: %%% %%% 1928 ( 1) 1958 ( 0) 1988 ( 50) @@ -16149,7 +16149,7 @@ publisher = pub-U-CHICAGO, address = pub-U-CHICAGO:adr, edition = "17th", - pages = "????", + pages = "xvi + 1144", year = "2017", ISBN = "0-226-28705-X (hardcover)", ISBN-13 = "978-0-226-28705-8 (hardcover)", @@ -16158,9 +16158,48 @@ bibsource = "http://www.math.utah.edu/pub/tex/bib/master.bib; http://www.math.utah.edu/pub/tex/bib/texbook3.bib; z3950.loc.gov:7090/Voyager", + abstract = "In the seven years since the previous edition debuted, + we have seen an extraordinary evolution in the way we + create and share knowledge. This seventeenth edition of + The Chicago Manual of Style has been prepared with an + eye toward how we find, create, and cite information + that readers are as likely to access from their pockets + as from a bookshelf. It offers updated guidelines on + electronic workflows and publication formats, tools for + PDF annotation and citation management, web + accessibility standards, and effective use of metadata, + abstracts, and keywords. It recognizes the needs of + those who are self-publishing or following open access + or Creative Commons publishing models. The citation + chapters reflect the ever-expanding universe of + electronic sources--including social media posts and + comments, private messages, and app content--and also + offer updated guidelines on such issues as DOIs, time + stamps, and e-book locators.", acknowledgement = ack-nhfb, - libnote = "Not yet in my library.", subject = "printing; style manuals; authorship", + tableofcontents = "Part 1: The publishing process Books and journals + \\ + Manuscript preparation, manuscript editing, and + proofreading \\ + Illustrations and tables \\ + Rights, permissions, and copyright administration / $r + by William S. Strong \\ + Part 2: Style and usage \\ + Grammar and usage / by Bryan A. Garner \\ + Punctuation \\ + Spelling, distinctive treatment of words, and compounds + \\ + Names, terms, and titles of terms \\ + Numbers \\ + Abbreviations \\ + Languages other than English \\ + Mathematics in type \\ + Quotations and dialogue \\ + Part 3: Source citations and indexes \\ + Notes and bibliography \\ + Author--date references \\ + Indexes", } @Book{Jackowski:2017:PD, diff --git a/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib b/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib index 26c3a5c0f9f..180290964c2 100644 --- a/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib +++ b/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib @@ -4,9 +4,9 @@ %%% ==================================================================== %%% BibTeX-file{ %%% author = "Nelson H. F. Beebe", -%%% version = "2.08", -%%% date = "07 August 2013", -%%% time = "09:36:00 MDT", +%%% version = "2.09", +%%% date = "14 October 2017", +%%% time = "10:26:47 MDT", %%% filename = "texgraph.bib", %%% address = "University of Utah %%% Department of Mathematics, 110 LCB @@ -15,7 +15,7 @@ %%% USA", %%% telephone = "+1 801 581 5254", %%% FAX = "+1 801 581 4148", -%%% checksum = "19391 3081 11517 114561", +%%% checksum = "26967 3081 11517 114558", %%% email = "beebe at math.utah.edu, beebe at acm.org, %%% beebe at computer.org (Internet)", %%% codetable = "ISO/ASCII", @@ -39,7 +39,7 @@ %%% printed if the is-alpha.bst or is-plain.bst %%% style files are used. %%% -%%% At version 2.08, the year coverage looked +%%% At version 2.09, the year coverage looked %%% like this: %%% %%% 1967 ( 1) 1980 ( 1) 1993 ( 0) @@ -2022,7 +2022,7 @@ month = oct, year = "1995", CODEN = "CPHCBZ", - DOI = "http://dx.doi.org/10.1016/0010-4655(95)90137-S", + DOI = "https://doi.org/10.1016/0010-4655(95)90137-S", ISSN = "0010-4655 (print), 1879-2944 (electronic)", ISSN-L = "0010-4655", bibdate = "Mon Feb 13 21:29:59 MST 2012", @@ -2962,7 +2962,7 @@ pages = "viii + 263", year = "2004", CODEN = "LNCSD9", - DOI = "http://dx.doi.org/10.1007/b99374", + DOI = "https://doi.org/10.1007/b99374", ISBN = "3-540-22801-2", ISBN-13 = "978-3-540-22801-1", ISSN = "0302-9743 (print), 1611-3349 (electronic)", |