diff options
| -rw-r--r-- | Build/source/texk/tests/TeXLive/TLUtils.pm | 119 | ||||
| -rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 127 | ||||
| -rw-r--r-- | Master/texmf-dist/bibtex/bib/beebe/texbook3.bib | 68 | ||||
| -rw-r--r-- | Master/texmf-dist/bibtex/bib/beebe/typeset.bib | 62 |
4 files changed, 255 insertions, 121 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index 61102113735..5b603cf52f1 100644 --- a/Build/source/texk/tests/TeXLive/TLUtils.pm +++ b/Build/source/texk/tests/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 44243 $'; +my $svnrev = '$Revision: 44872 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -802,32 +802,61 @@ sub dir_writable { =item C<mkdirhier($path, [$mode])> -The function C<mkdirhier> does the same as the UNIX command C<mkdir -p>, -and dies on failure. The optional parameter sets the permission bits. +The function C<mkdirhier> does the same as the UNIX command C<mkdir -p>. +It behaves differently depending on the context in which it is called: +If called in void context it will die on failure. If called in +scalar context, it will return 1/0 on sucess/failure. If called in +list context, it returns 1/0 as first element and an error message +as second, if an error occurred (and no second element in case of +success). The optional parameter sets the permission bits. =cut sub mkdirhier { my ($tree,$mode) = @_; + my $ret = 1; + my $reterror; - return if (-d "$tree"); - my $subdir = ""; - # win32 is special as usual: we need to separate //servername/ part - # from the UNC path, since (! -d //servername/) tests true - $subdir = $& if ( win32() && ($tree =~ s!^//[^/]+/!!) ); - - @dirs = split (/\//, $tree); - for my $dir (@dirs) { - $subdir .= "$dir/"; - if (! -d $subdir) { - if (defined $mode) { - mkdir ($subdir, $mode) - || die "$0: mkdir($subdir,$mode) failed, goodbye: $!\n"; - } else { - mkdir ($subdir) || die "$0: mkdir($subdir) failed, goodbye: $!\n"; + if (-d "$tree") { + $ret = 1; + } else { + my $subdir = ""; + # win32 is special as usual: we need to separate //servername/ part + # from the UNC path, since (! -d //servername/) tests true + $subdir = $& if ( win32() && ($tree =~ s!^//[^/]+/!!) ); + + @dirs = split (/\//, $tree); + for my $dir (@dirs) { + $subdir .= "$dir/"; + if (! -d $subdir) { + if (defined $mode) { + if (! mkdir ($subdir, $mode)) { + $ret = 0; + $reterror = "mkdir($subdir,$mode) failed: $!"; + last; + } + } else { + if (! mkdir ($subdir)) { + $ret = 0; + $reterror = "mkdir($subdir) failed: $!"; + last; + } + } } } } + if ($ret) { + return(1); # nothing bad here returning 1 in any case, will + # be ignored in void context, and give 1 in list context + } else { + if (wantarray) { + return(0, $reterror); + } elsif (defined wantarray) { + return(0); + } else { + die "$0: $reterror\n"; + } + } } @@ -1809,7 +1838,11 @@ On Windows it returns undefined. sub add_link_dir_dir { my ($from,$to) = @_; - mkdirhier ($to); + my ($ret, $err) = mkdirhier ($to); + if (!$ret) { + tlwarn("$err\n"); + return 0; + } if (-w $to) { debug ("linking files from $from to $to\n"); chomp (@files = `ls "$from"`); @@ -1864,7 +1897,7 @@ sub remove_link_dir_dir { tlwarn ("not removing $to/$f, not a link or wrong destination!\n"); } } - # trry to remove the destination directory, it might be empty and + # try to remove the destination directory, it might be empty and # we might have write permissions, ignore errors # `rmdir "$to" 2>/dev/null`; return $ret; @@ -1896,7 +1929,7 @@ sub add_remove_symlinks { } else { die ("should not happen, unknown mode $mode in add_remove_symlinks!"); } - + # man my $top_man_dir = "$Master/texmf-dist/doc/man"; debug("$mode symlinks for man pages to $sys_man from $top_man_dir\n"); @@ -1904,25 +1937,35 @@ sub add_remove_symlinks { ; # better to be silent? #info("skipping add of man symlinks, no source directory $top_man_dir\n"); } else { - mkdirhier $sys_man if ($mode eq "add"); - if (-w $sys_man) { - my $foo = `(cd "$top_man_dir" && echo *)`; - my @mans = split (' ', $foo); - chomp (@mans); - foreach my $m (@mans) { - my $mandir = "$top_man_dir/$m"; - next unless -d $mandir; - if ($mode eq "add") { - $errors++ unless add_link_dir_dir($mandir, "$sys_man/$m"); - } else { - $errors++ unless remove_link_dir_dir($mandir, "$sys_man/$m"); + my $man_doable = 1; + if ($mode eq "add") { + my ($ret, $err) = mkdirhier $sys_man; + if (!$ret) { + $man_doable = 0; + tlwarn("$err\n"); + $errors++; + } + } + if ($man_doable) { + if (-w $sys_man) { + my $foo = `(cd "$top_man_dir" && echo *)`; + my @mans = split (' ', $foo); + chomp (@mans); + foreach my $m (@mans) { + my $mandir = "$top_man_dir/$m"; + next unless -d $mandir; + if ($mode eq "add") { + $errors++ unless add_link_dir_dir($mandir, "$sys_man/$m"); + } else { + $errors++ unless remove_link_dir_dir($mandir, "$sys_man/$m"); + } } + #`rmdir "$sys_man" 2>/dev/null` if ($mode eq "remove"); + } else { + tlwarn("man symlink destination ($sys_man) not writable, " + . "cannot $mode symlinks.\n"); + $errors++; } - #`rmdir "$sys_man" 2>/dev/null` if ($mode eq "remove"); - } else { - tlwarn("man symlink destination ($sys_man) not writable," - . "cannot $mode symlinks.\n"); - $errors++; } } diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index d086264bcb1..ae25ab9f70b 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 45499 2017-10-08 14:26:19Z preining $ +# $Id: tlmgr.pl 45532 2017-10-13 06:50:59Z 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: 45499 $'; -my $datrev = '$Date: 2017-10-08 16:26:19 +0200 (Sun, 08 Oct 2017) $'; +my $svnrev = '$Revision: 45532 $'; +my $datrev = '$Date: 2017-10-13 08:50:59 +0200 (Fri, 13 Oct 2017) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -169,7 +169,7 @@ my %action_specification = ( "function" => \&action_conf }, "dump-tlpdb" => { - "options" => { "local" => 1, remote => 1 }, + "options" => { local => 1, remote => 1, json => 1 }, "run-post" => 0, "function" => \&action_dumptlpdb }, @@ -210,6 +210,7 @@ my %action_specification = ( "info" => { "options" => { "data" => "=s", + "all" => 1, "list" => 1, "only-installed" => 1, }, @@ -334,6 +335,7 @@ my %action_specification = ( "no-auto-remove" => 1, "no-depends" => 1, "no-depends-at-all" => 1, + "no-restart" => 1, "reinstall-forcibly-removed" => 1, "self" => 1, }, @@ -1376,14 +1378,22 @@ sub action_dumptlpdb { $::machinereadable = 1; if ($opts{"local"} && !$opts{"remote"}) { - # for consistency we write out the location of the installation, - # too, in the same format as when dumping the remote tlpdb - print "location-url\t", $localtlpdb->root, "\n"; - $localtlpdb->writeout; + if ($opts{"json"}) { + print $localtlpdb->as_json; + } else { + # for consistency we write out the location of the installation, + # too, in the same format as when dumping the remote tlpdb + print "location-url\t", $localtlpdb->root, "\n"; + $localtlpdb->writeout; + } } elsif ($opts{"remote"} && !$opts{"local"}) { - init_tlmedia_or_die(); - $remotetlpdb->writeout; + init_tlmedia_or_die(1); + if ($opts{"json"}) { + print $remotetlpdb->as_json; + } else { + $remotetlpdb->writeout; + } } else { tlwarn("$prg dump-tlpdb: need exactly one of --local and --remote.\n"); @@ -1402,13 +1412,34 @@ sub action_info { my $ret = $F_OK | $F_NOPOSTACTION; my @datafields; my $fmt = "list"; - if ($opts{'data'}) { + if ($opts{'data'} eq "json") { + eval { require JSON; }; + if ($@) { + # that didn't work out, give some usefull error message and stop + if ($^O =~ /^MSWin/i) { + # that should not happen, we are shipping Tk!! + require Win32; + my $msg = "Cannot load JSON:PP, that should not happen as we ship it!\n(Error message: $@)\n"; + Win32::MsgBox($msg, 1|Win32::MB_ICONSTOP(), "Warning"); + } else { + printf STDERR " +$prg: Cannot load JSON. +This module is shipped with core Perl unless you have a very old Perl, +in which case you cannot use the json option. +Goodbye. +"; + } + } + $fmt = 'json'; + # the 1 is the silent mode! + init_tlmedia_or_die(1); + } elsif ($opts{'data'}) { # output format is changed to csv with " as quotes # we need to determine the fields @datafields = split(',', $opts{'data'}); # check for correctness of data fields for my $d (@datafields) { - if ($d !~ m/name|category|localrev|remoterev|shortdesc|longdesc|size|installed|relocatable|cat-version|cat-date|cat-license/) { + if ($d !~ m/name|category|localrev|remoterev|shortdesc|longdesc|size|installed|relocatable|depends|cat-version|cat-date|cat-license/) { tlwarn("unknown data field: $d\n"); return($F_ERROR); } @@ -1430,14 +1461,21 @@ sub action_info { } # we are still here, so $what is defined and neither collection nor scheme, # so assume the arguments are package names - $fmt = ($opts{'data'} ? "csv" : "detail"); + if ($opts{'data'} ne "json") { + $fmt = ($opts{'data'} ? "csv" : "detail"); + } my @adds; if ($opts{'data'}) { @adds = @datafields; } + print "[\n" if ($fmt eq "json"); + my $first = 1; foreach my $ppp ($what, @todo) { + print "," if ($fmt eq "json" && !$first); + $first = 0; $ret |= show_one_package($ppp, $fmt, @adds); } + print "]\n" if ($fmt eq "json"); return ($ret); } @@ -2379,7 +2417,7 @@ sub action_update { } my $dry_run_cont = $opts{"dry-run"} && ($opts{"dry-run"} < 0); if ( !$dry_run_cont && !$opts{"self"} && @critical) { - critical_updates_warning(); + critical_updates_warning() if (!$::machinereadable); if ($opts{"force"}) { tlwarn("$prg: Continuing due to --force.\n"); } elsif ($opts{"list"}) { @@ -3216,7 +3254,7 @@ sub action_update { } my $restart_tlmgr = 0; - if ($opts{"self"} && @critical && + if ($opts{"self"} && @critical && !$opts{'no-restart'} && $infra_update_done && $other_updates_asked_for) { # weed out the --self argument from the saved arguments @::SAVEDARGV = grep (!m/^-?-self$/, @::SAVEDARGV); @@ -3265,14 +3303,15 @@ sub action_update { # warn if nothing is updated. Unless they said --self, in which case # we've already reported it. if (!(@new || @updated) && ! $opts{"self"}) { - info("$prg: no updates available\n") if (!$::machinereadable); - if ($remotetlpdb->media ne "NET" - && $remotetlpdb->media ne "virtual" - && !$opts{"dry-run"} - && !$opts{"repository"} - && !$ENV{"TEXLIVE_INSTALL_ENV_NOCHECK"} - ) { - tlwarn(<<END_DISK_WARN); + if (!$::machinereadable) { + info("$prg: no updates available\n"); + if ($remotetlpdb->media ne "NET" + && $remotetlpdb->media ne "virtual" + && !$opts{"dry-run"} + && !$opts{"repository"} + && !$ENV{"TEXLIVE_INSTALL_ENV_NOCHECK"} + ) { + tlwarn(<<END_DISK_WARN); $prg: Your installation is set up to look on the disk for updates. To install from the Internet for this one time only, run: tlmgr -repository $TeXLiveURL ACTION ARG... @@ -3281,6 +3320,7 @@ where ACTION is install, update, etc.; see tlmgr -help if needed. To change the default for all future updates, run: tlmgr option repository $TeXLiveURL END_DISK_WARN + } } } return ($ret); @@ -3359,7 +3399,7 @@ sub action_install { # check for updates to tlmgr itself, and die unless --force is given if (!$opts{"usermode"}) { if (check_for_critical_updates( $localtlpdb, $remotetlpdb)) { - critical_updates_warning(); + critical_updates_warning() if (!$::machinereadable); if ($opts{"force"}) { tlwarn("$prg: Continuing due to --force\n"); } else { @@ -3556,6 +3596,8 @@ sub show_one_package { $ret = show_one_package_detail($pkg, @rest); } elsif ($fmt eq "csv") { $ret = show_one_package_csv($pkg, @rest); + } elsif ($fmt eq "json") { + $ret = show_one_package_json($pkg); } else { tlwarn("$prg: show_one_package: unknown format: $fmt\n"); return($F_ERROR); @@ -3563,6 +3605,24 @@ sub show_one_package { return($ret); } +sub show_one_package_json { + my ($p) = @_; + my @out; + my $loctlp = $localtlpdb->get_package($p); + my $remtlp = $remotetlpdb->get_package($p); + 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(); + print $str, "\n"; + return($F_OK); +} + + sub show_one_package_csv { my ($p, @datafields) = @_; my @out; @@ -3611,6 +3671,8 @@ sub show_one_package_csv { push @out, ($is_installed ? $loctlp->revision : 0); } elsif ($d eq "remoterev") { push @out, ($is_available ? $remtlp->revision : 0); + } elsif ($d eq "depends") { + push @out, (join(":", $tlp->depends)); } elsif ($d eq "size") { # tlp->*size is in 4k blocks! my $srcsize = $tlp->srcsize * $TeXLive::TLConfig::BlockSize; @@ -6217,7 +6279,7 @@ sub action_shell { print "OK\n"; } # make sure that we restart after having called update --self! - if (($cmd eq 'update') && $opts{'self'}) { + if (($cmd eq 'update') && $opts{'self'} && !$opts{'no-restart'}) { print "tlmgr has been updated, restarting!\n"; exec("tlmgr", @::SAVEDARGV); } @@ -7621,10 +7683,15 @@ locally installed packages, collections, or schemes are listed. If the option C<--data> is given, its argument must be a comma separated list of field names from: C<name>, C<category>, C<localrev>, C<remoterev>, -C<shortdesc>, C<longdesc>, C<installed>, C<size>, C<relocatable>, C<cat-version>, -C<cat-date>, or C<cat-licence>. In this case the requested packages' -information is listed in CSV format one package per line, and the -column information is given by the C<itemN>. +C<shortdesc>, C<longdesc>, C<installed>, C<size>, C<relocatable>, C<depends>, +C<cat-version>, C<cat-date>, or C<cat-licence>. In this case the requested +packages' information is listed in CSV format one package per line, and the +column information is given by the C<itemN>. The C<depends> column contains +the name of all dependencies separated by C<:>. + +In case the only value passed to C<--data> is C<json>, the output is a +JSON encoded array where each array element is the JSON representation of +the internal object. =back @@ -9097,7 +9164,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 45499 2017-10-08 14:26:19Z preining $ +$Id: tlmgr.pl 45532 2017-10-13 06:50:59Z 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 154fd3b682e..9e513d435c3 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.63", -%%% date = "26 July 2017", -%%% time = "17:13:26 MDT", +%%% version = "3.64", +%%% date = "13 October 2017", +%%% time = "08:16:21 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 = "39243 17193 70413 691510", +%%% checksum = "51525 17193 70413 691455", %%% 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.63, the year coverage looks +%%% At version 3.64, the year coverage looks %%% like this: %%% %%% 1928 ( 1) 1958 ( 0) 1988 ( 50) @@ -2198,7 +2198,7 @@ address = pub-ACM:adr, pages = "489--498", year = "2001", - DOI = "http://dx.doi.org/10.1145/371920.372146", + DOI = "https://doi.org/10.1145/371920.372146", ISBN = "1-58113-348-0", ISBN-13 = "978-1-58113-348-6", LCCN = "TK5105.888 .I573 200", @@ -2839,7 +2839,7 @@ edition = "Second", pages = "607--621", year = "2006", - DOI = "http://dx.doi.org/10.1016/B0-08-044854-2/00984-6", + DOI = "https://doi.org/10.1016/B0-08-044854-2/00984-6", ISBN = "0-08-044299-4, 0-08-044854-2 (e-book)", ISBN-13 = "978-0-08-044299-0, 978-0-08-044854-1 (e-book)", LCCN = "P29 .E48 2006", @@ -3420,7 +3420,7 @@ crossref = "Klein:2003:CSP", pages = "49--68", year = "2003", - DOI = "http://dx.doi.org/10.1007/3-540-36477-3_5", + DOI = "https://doi.org/10.1007/3-540-36477-3_5", bibdate = "Sat May 26 14:24:20 2012", bibsource = "http://www.math.utah.edu/pub/tex/bib/texbook3.bib", acknowledgement = ack-nhfb, @@ -3860,7 +3860,7 @@ month = jun, year = "2012", CODEN = "SPEXBL", - DOI = "http://dx.doi.org/10.1002/spe.1096", + DOI = "https://doi.org/10.1002/spe.1096", ISSN = "0038-0644 (print), 1097-024X (electronic)", ISSN-L = "0038-0644", bibdate = "Sat May 26 08:23:02 MDT 2012", @@ -3960,7 +3960,7 @@ month = sep, year = "2012", CODEN = "????", - DOI = "http://dx.doi.org/10.1145/2344416.2344417", + DOI = "https://doi.org/10.1145/2344416.2344417", ISSN = "1559-1131 (print), 1559-114X (electronic)", ISSN-L = "1559-1131", bibdate = "Tue Nov 6 19:07:49 MST 2012", @@ -4207,7 +4207,7 @@ crossref = "King:2005:DPA", pages = "64--73", year = "2005", - DOI = "http://dx.doi.org/10.1145/1096601.1096622", + DOI = "https://doi.org/10.1145/1096601.1096622", bibdate = "Thu Dec 13 17:55:03 2012", bibsource = "http://www.math.utah.edu/pub/tex/bib/texbook3.bib", acknowledgement = ack-nhfb, @@ -6238,7 +6238,7 @@ edition = "Fifth", pages = "xxx + 609", year = "2016", - DOI = "http://dx.doi.org/10.1007/978-3-319-23796-1", + DOI = "https://doi.org/10.1007/978-3-319-23796-1", ISBN = "3-319-23795-0, 3-319-23796-9 (e-book)", ISBN-13 = "978-3-319-23795-4, 978-3-319-23796-1 (e-book)", LCCN = "Z253.4.L38 G745 2016", @@ -6737,7 +6737,7 @@ address = pub-ACM:adr, pages = "109--111", year = "2004", - DOI = "http://dx.doi.org/10.1145/1030397.1030419", + DOI = "https://doi.org/10.1145/1030397.1030419", ISBN = "1-58113-938-1", ISBN-13 = "978-1-58113-938-9", LCCN = "HF5736 .A27 2004", @@ -7043,7 +7043,7 @@ month = jul, year = "1987", CODEN = "CGRADI, CPGPBZ", - DOI = "http://dx.doi.org/10.1145/37402.37431", + DOI = "https://doi.org/10.1145/37402.37431", ISSN = "0097-8930", MRclass = "68U15", MRnumber = "987 659", @@ -7982,7 +7982,7 @@ month = jul, year = "2003", CODEN = "ATGRDF", - DOI = "http://dx.doi.org/10.1145/882262.882353", + DOI = "https://doi.org/10.1145/882262.882353", ISSN = "0730-0301 (print), 1557-7368 (electronic)", ISSN-L = "0730-0301", bibdate = "Sat Oct 25 10:10:37 MDT 2003", @@ -8040,7 +8040,7 @@ month = aug, year = "2004", CODEN = "CACMA2", - DOI = "http://dx.doi.org/10.1145/1012037.1012063", + DOI = "https://doi.org/10.1145/1012037.1012063", ISSN = "0001-0782 (print), 1557-7317 (electronic)", ISSN-L = "0001-0782", bibdate = "Thu Dec 2 06:08:31 MST 2004", @@ -9576,7 +9576,7 @@ month = dec, year = "2008", CODEN = "????", - DOI = "http://dx.doi.org/10.1007/s11786-008-0055-5", + DOI = "https://doi.org/10.1007/s11786-008-0055-5", ISSN = "1661-8270 (print), 1661-8289 (electronic)", ISSN-L = "1661-8270", MRclass = "subject classification (2000); 68U15", @@ -10608,7 +10608,7 @@ address = pub-IEEE:adr, pages = "86--90", year = "2005", - DOI = "http://dx.doi.org/10.1109/ICDAR.2005.42", + DOI = "https://doi.org/10.1109/ICDAR.2005.42", ISBN = "0-7695-2420-6", ISBN-13 = "978-0-7695-2420-7", ISSN = "1520-5263", @@ -10630,7 +10630,7 @@ month = may, year = "2006", CODEN = "CAIDA5", - DOI = "http://dx.doi.org/10.1016/j.cad.2005.11.006", + DOI = "https://doi.org/10.1016/j.cad.2005.11.006", ISSN = "0010-4485 (print), 1879-2685 (electronic)", ISSN-L = "0010-4485", bibdate = "Wed Jan 23 06:03:19 2013", @@ -10708,7 +10708,7 @@ address = pub-ACM:adr, pages = "101--108", year = "2004", - DOI = "http://dx.doi.org/10.1145/964442.964462", + DOI = "https://doi.org/10.1145/964442.964462", ISBN = "1-58113-815-6", ISBN-13 = "978-1-58113-815-3", LCCN = "QA76.9.H85 I573 200", @@ -10725,7 +10725,7 @@ crossref = "King:2005:DPA", pages = "95--97", year = "2005", - DOI = "http://dx.doi.org/10.1145/1096601.1096626", + DOI = "https://doi.org/10.1145/1096601.1096626", bibsource = "http://www.math.utah.edu/pub/tex/bib/texbook3.bib", abstract = "The pagination strategy of XSL Formatting Objects (XSL:FO) is based on a `break if no fit' approach that @@ -11018,7 +11018,7 @@ number = "1", pages = "1--4", year = "2011", - DOI = "http://dx.doi.org/10.1002/meet.2011.14504801302", + DOI = "https://doi.org/10.1002/meet.2011.14504801302", ISSN = "1550-8390 (print), 1936-1734 (electronic)", ISSN-L = "1550-8390", bibdate = "Wed Jan 23 07:39:55 2013", @@ -11056,7 +11056,7 @@ address = pub-ACM:adr, pages = "125--134", year = "2007", - DOI = "http://dx.doi.org/10.1145/1284420.1284455", + DOI = "https://doi.org/10.1145/1284420.1284455", ISBN = "1-59593-776-5", ISBN-13 = "978-1-59593-776-6", bibdate = "Sat May 26 14:05:00 2012", @@ -11082,7 +11082,7 @@ address = pub-IEEE:adr, pages = "588--593", year = "2005", - DOI = "http://dx.doi.org/10.1109/SECON.2005.1423310", + DOI = "https://doi.org/10.1109/SECON.2005.1423310", ISBN = "0-7803-8865-8", ISBN-13 = "978-0-7803-8865-9", LCCN = "TK7801 .I117 2005", @@ -11759,7 +11759,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", @@ -12383,7 +12383,7 @@ month = jul, year = "2003", CODEN = "SPEXBL", - DOI = "http://dx.doi.org/10.1002/spe.532", + DOI = "https://doi.org/10.1002/spe.532", ISSN = "0038-0644 (print), 1097-024X (electronic)", ISSN-L = "0038-0644", bibdate = "Sat Nov 29 17:39:47 MST 2003", @@ -12562,7 +12562,7 @@ month = dec, year = "2016", CODEN = "FNDPA4", - DOI = "http://dx.doi.org/10.1007/s10701-016-0044-5", + DOI = "https://doi.org/10.1007/s10701-016-0044-5", ISSN = "0015-9018 (print), 1572-9516 (electronic)", ISSN-L = "0015-9018", bibdate = "Tue Nov 15 08:11:02 MST 2016", @@ -13319,7 +13319,7 @@ month = jun, year = "1990", CODEN = "CPHCBZ", - DOI = "http://dx.doi.org/10.1016/0010-4655(90)90188-7", + DOI = "https://doi.org/10.1016/0010-4655(90)90188-7", ISSN = "0010-4655 (print), 1879-2944 (electronic)", ISSN-L = "0010-4655", bibdate = "Mon Feb 13 21:29:12 MST 2012", @@ -13366,7 +13366,7 @@ pages = "97--112", year = "1997", CODEN = "MCMOEG", - DOI = "http://dx.doi.org/10.1016/S0895-7177(97)00106-4", + DOI = "https://doi.org/10.1016/S0895-7177(97)00106-4", ISSN = "0895-7177", ISSN-L = "0895-7177", MRclass = "68U15", @@ -15600,7 +15600,7 @@ address = pub-ACM:adr, pages = "31--33", year = "1986", - DOI = "http://dx.doi.org/10.1145/324239.324238", + DOI = "https://doi.org/10.1145/324239.324238", ISBN = "0-89791-208-X", ISBN-13 = "978-0-89791-208-2", LCCN = "QA74.A15 1986", @@ -15648,7 +15648,7 @@ month = dec, year = "1985", CODEN = "IJMMBC", - DOI = "http://dx.doi.org/10.1016/S0020-7373(85)80062-6", + DOI = "https://doi.org/10.1016/S0020-7373(85)80062-6", ISSN = "0020-7373", bibdate = "Wed Jan 23 06:16:55 2013", bibsource = "http://www.math.utah.edu/pub/tex/bib/texbook3.bib", @@ -15931,7 +15931,7 @@ crossref = "Gutierrez:2004:IJU", pages = "305--311", year = "2004", - DOI = "http://dx.doi.org/10.1145/1005285.1005329", + DOI = "https://doi.org/10.1145/1005285.1005329", bibdate = "Fri Oct 21 06:52:53 MDT 2005", bibsource = "http://portal.acm.org/; http://www.math.utah.edu/pub/tex/bib/texbook3.bib", @@ -16697,7 +16697,7 @@ pages = "x + 355", year = "2003", CODEN = "LNCSD9", - DOI = "http://dx.doi.org/10.1007/3-540-36477-3", + DOI = "https://doi.org/10.1007/3-540-36477-3", ISBN = "3-540-00579-X (softcover)", ISBN-13 = "978-3-540-00579-7 (softcover)", ISSN = "0302-9743 (print), 1611-3349 (electronic)", @@ -17046,7 +17046,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)", diff --git a/Master/texmf-dist/bibtex/bib/beebe/typeset.bib b/Master/texmf-dist/bibtex/bib/beebe/typeset.bib index 21024f50340..abca818b790 100644 --- a/Master/texmf-dist/bibtex/bib/beebe/typeset.bib +++ b/Master/texmf-dist/bibtex/bib/beebe/typeset.bib @@ -2,9 +2,9 @@ %%% ==================================================================== %%% BibTeX-file{ %%% author = "Nelson H. F. Beebe", -%%% version = "2.43", -%%% date = "26 August 2017", -%%% time = "08:33:44 MDT", +%%% version = "2.45", +%%% date = "13 October 2017", +%%% time = "08:15:34 MDT", %%% filename = "typeset.bib", %%% address = "University of Utah %%% Department of Mathematics, 110 LCB @@ -14,7 +14,7 @@ %%% telephone = "+1 801 581 5254", %%% FAX = "+1 801 581 4148", %%% URL = "http://www.math.utah.edu/~beebe", -%%% checksum = "46738 22817 107733 1015795", +%%% checksum = "00367 22841 107820 1016791", %%% email = "beebe at math.utah.edu, beebe at acm.org, %%% beebe at computer.org (Internet)", %%% codetable = "ISO/ASCII", @@ -39,7 +39,7 @@ %%% and PDF (Portable Document Format), and %%% sgml.bib covers SGML and HTML. %%% -%%% At version 2.43, the year coverage looked +%%% At version 2.45, the year coverage looked %%% like this: %%% %%% 1881 ( 1) 1927 ( 0) 1973 ( 10) @@ -86,12 +86,12 @@ %%% 1922 ( 0) 1968 ( 4) 2014 ( 1) %%% 1923 ( 1) 1969 ( 9) 2015 ( 3) %%% 1924 ( 0) 1970 ( 7) 2016 ( 1) -%%% 1925 ( 0) 1971 ( 11) 2017 ( 2) +%%% 1925 ( 0) 1971 ( 11) 2017 ( 3) %%% 1926 ( 1) 1972 ( 8) %%% 19xx ( 3) %%% 20xx ( 2) %%% -%%% Article: 321 +%%% Article: 322 %%% Book: 303 %%% InCollection: 5 %%% InProceedings: 54 @@ -103,7 +103,7 @@ %%% Proceedings: 33 %%% TechReport: 31 %%% -%%% Total entries: 839 +%%% Total entries: 840 %%% %%% This bibliography has been collected from %%% bibliographies in the author's personal @@ -318,6 +318,8 @@ @String{j-IBM-TDB = "IBM Technical Disclosure Bulletin"} +@String{j-IEEE-ANN-HIST-COMPUT = "IEEE Annals of the History of Computing"} + @String{j-IEEE-CGA = "IEEE Computer Graphics and Applications"} @String{j-IEEE-J-SOLID-STATE-CIRCUITS = "IEEE Journal of Solid-State Circuits"} @@ -1495,7 +1497,7 @@ month = oct, year = "1966", CODEN = "AMDOA7", - DOI = "http://dx.doi.org/10.1002/asi.5090170411", + DOI = "https://doi.org/10.1002/asi.5090170411", ISSN = "0096-946X", ISSN-L = "0096-946X", bibdate = "Fri Sep 11 06:21:26 MDT 2015", @@ -2394,7 +2396,7 @@ month = sep, year = "1973", CODEN = "IEPCBU", - DOI = "http://dx.doi.org/10.1109/TPC.1973.6592676", + DOI = "https://doi.org/10.1109/TPC.1973.6592676", ISSN = "0361-1434", ISSN-L = "0361-1434", bibdate = "Fri Nov 20 16:26:09 2015", @@ -4996,7 +4998,7 @@ month = apr, year = "1981", CODEN = "ICGADZ", - DOI = "http://dx.doi.org/10.1109/MCG.1981.1673865", + DOI = "https://doi.org/10.1109/MCG.1981.1673865", ISSN = "0272-1716 (print), 1558-1756 (electronic)", bibdate = "Mon Dec 16 08:30:04 MST 1996", bibsource = "Compendex database; @@ -12536,7 +12538,7 @@ address = pub-ACM:adr, pages = "93--100", year = "2000", - DOI = "http://dx.doi.org/10.1145.62523", + DOI = "https://doi.org/10.1145.62523", ISBN = "0-89791-291-8", ISBN-13 = "978-0-89791-291-4", LCCN = "QA76.9.T48 A25 1988", @@ -13082,7 +13084,7 @@ month = may, year = "1988", CODEN = "IEESAM", - DOI = "http://dx.doi.org/10.1109/6.4550", + DOI = "https://doi.org/10.1109/6.4550", ISSN = "0018-9235 (print), 1939-9340 (electronic)", ISSN-L = "0018-9235", bibdate = "Mon Dec 16 08:30:04 MST 1996", @@ -14921,7 +14923,7 @@ month = nov, year = "1990", CODEN = "CPHCBZ", - DOI = "http://dx.doi.org/10.1016/0010-4655(90)90116-I", + DOI = "https://doi.org/10.1016/0010-4655(90)90116-I", ISSN = "0010-4655 (print), 1879-2944 (electronic)", ISSN-L = "0010-4655", bibdate = "Mon Feb 13 21:29:14 MST 2012", @@ -15189,7 +15191,7 @@ month = nov, year = "1990", CODEN = "CPHCBZ", - DOI = "http://dx.doi.org/10.1016/0010-4655(90)90115-H", + DOI = "https://doi.org/10.1016/0010-4655(90)90115-H", ISSN = "0010-4655 (print), 1879-2944 (electronic)", ISSN-L = "0010-4655", bibdate = "Mon Feb 13 21:29:14 MST 2012", @@ -17713,7 +17715,7 @@ month = mar, year = "1994", CODEN = "IJSCBC", - DOI = "http://dx.doi.org/10.1109/4.278349", + DOI = "https://doi.org/10.1109/4.278349", ISSN = "0018-9200 (print), 1558-173X (electronic)", bibdate = "Mon Dec 16 08:30:04 MST 1996", bibsource = "Compendex database; @@ -18486,7 +18488,7 @@ month = nov, year = "1995", CODEN = "ICGADZ", - DOI = "http://dx.doi.org/10.1109/38.469511", + DOI = "https://doi.org/10.1109/38.469511", ISSN = "0272-1716 (print), 1558-1756 (electronic)", bibdate = "Mon Dec 16 08:30:04 MST 1996", bibsource = "Compendex database; @@ -20463,7 +20465,7 @@ month = "????", year = "1999", CODEN = "AISJB6", - DOI = "http://dx.doi.org/10.1002/(SICI)1097-4571(1999)50:9<840::AID-ASI15>3.0.CO%3B2-5", + DOI = "https://doi.org/10.1002/(SICI)1097-4571(1999)50:9<840::AID-ASI15>3.0.CO%3B2-5", ISSN = "0002-8231 (print), 1097-4571 (electronic)", ISSN-L = "0002-8231", bibdate = "Fri Sep 11 09:04:34 MDT 2015", @@ -21562,7 +21564,7 @@ month = jun, year = "2012", CODEN = "SPEXBL", - DOI = "http://dx.doi.org/10.1002/spe.1096", + DOI = "https://doi.org/10.1002/spe.1096", ISSN = "0038-0644 (print), 1097-024X (electronic)", ISSN-L = "0038-0644", bibdate = "Sat May 26 08:23:02 MDT 2012", @@ -21974,6 +21976,28 @@ journal-URL = "https://printinghistory.org/publications/printing-history/ns/", } +@Article{Walden:2017:DPP, + author = "David Walden and Hiromichi Hashizume", + title = "Desktop Publishing Pioneer Meeting at {Computer + History Museum}", + journal = j-IEEE-ANN-HIST-COMPUT, + volume = "39", + number = "3", + pages = "65--67", + month = jul # "\slash " # sep, + year = "2017", + CODEN = "IAHCEX", + DOI = "https://doi.org/10.1109/MAHC.2017.3481336", + ISSN = "1058-6180 (print), 1934-1547 (electronic)", + ISSN-L = "1058-6180", + bibdate = "Thu Sep 21 08:02:09 MDT 2017", + bibsource = "http://www.math.utah.edu/pub/tex/bib/ieeeannhistcomput.bib; + http://www.math.utah.edu/pub/tex/bib/typeset.bib", + URL = "https://www.computer.org/csdl/mags/an/2017/03/man2017030065-abs.html", + acknowledgement = ack-nhfb, + journal-URL = "http://ieeexplore.ieee.org/xpl/RecentIssue.jsp?punumber=85", +} + @Misc{Anonymous:20xx:W, author = "Anonymous", title = "WhatTheFont", |