summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-02-27 23:12:41 +0000
committerKarl Berry <karl@freefriends.org>2018-02-27 23:12:41 +0000
commit2bb7d79a47d2bd5af29299935502441864bbb469 (patch)
tree6af336c3fdde01fef85d882c8b9f7eea8fd69a0c
parentdb205b45f945c0169b2aa41c3c528aa73514438e (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@46758 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm15
-rw-r--r--Master/texmf-dist/bibtex/bib/beebe/texjourn.bib50
-rw-r--r--Master/texmf-dist/bibtex/bib/beebe/typeset.bib122
3 files changed, 165 insertions, 22 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index e2d8789e918..cc1d119f778 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -1,11 +1,12 @@
+# $Id: TLUtils.pm 46421 2018-01-24 03:55:35Z preining $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
-# Copyright 2007-2017 Norbert Preining, Reinhard Kotucha
+# Copyright 2007-2018 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 46045 $';
+my $svnrev = '$Revision: 46421 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -361,6 +362,7 @@ sub platform_desc {
my ($platform) = @_;
my %platform_name = (
+ 'aarch64-linux' => 'GNU/Linux on ARM64',
'alpha-linux' => 'GNU/Linux on DEC Alpha',
'amd64-freebsd' => 'FreeBSD on x86_64',
'amd64-kfreebsd' => 'GNU/kFreeBSD on x86_64',
@@ -2062,6 +2064,11 @@ not agree. If a check argument is not given, that check is not performed.
sub check_file {
my ($xzfile, $checksum, $checksize) = @_;
+ debug("check_file $xzfile, $checksum, $checksize\n");
+ if (!$checksum && !$checksize) {
+ tlwarn("TLUtils::check_file: neither checksum nor checksize available for $xzfile, cannot check integrity!\n");
+ return;
+ }
# only run checksum tests if we can actually compute the checksum
if ($checksum && $::checksum_method) {
my $tlchecksum = TeXLive::TLCrypto::tlchecksum($xzfile);
@@ -2070,6 +2077,10 @@ sub check_file {
tlwarn("TLUtils::check_file: TL=$tlchecksum, arg=$checksum\n");
unlink($xzfile);
return;
+ } else {
+ debug("TLUtils::check_file: checksums for $xzfile agree\n");
+ # if we have checked the checksum, we don't need to check the size, too
+ return;
}
}
if ($checksize) {
diff --git a/Master/texmf-dist/bibtex/bib/beebe/texjourn.bib b/Master/texmf-dist/bibtex/bib/beebe/texjourn.bib
index cc6d81fc956..936dbdb99ea 100644
--- a/Master/texmf-dist/bibtex/bib/beebe/texjourn.bib
+++ b/Master/texmf-dist/bibtex/bib/beebe/texjourn.bib
@@ -4,9 +4,9 @@
%%% ====================================================================
%%% BibTeX-file{
%%% author = "Nelson H. F. Beebe",
-%%% version = "1.52",
-%%% date = "19 February 2013",
-%%% time = "12:15:13 MST",
+%%% version = "1.54",
+%%% date = "07 February 2018",
+%%% time = "06:46:33 MST",
%%% filename = "texjourn.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 = "38874 1447 6232 60146",
+%%% checksum = "36173 1485 6355 61457",
%%% email = "beebe at math.utah.edu, beebe at acm.org,
%%% beebe at computer.org (Internet)",
%%% codetable = "ISO/ASCII",
@@ -30,7 +30,7 @@
%%% author-supplied hardcopy, or that rekey the
%%% text for typesetting by another system.
%%%
-%%% At version 1.52, the year coverage looked
+%%% At version 1.53, the year coverage looked
%%% like this:
%%%
%%% 1985 ( 1) 1991 ( 1) 1997 ( 1)
@@ -1440,8 +1440,46 @@
@Periodical{tj-z-phys,
key = "ZP",
- title = "{Zeitschrift F{\"u}r Physik}",
+ title = "{Zeitschrift f{\"u}r Physik}",
bibsource = "http://www.math.utah.edu/pub/tex/bib/texjourn.bib",
note = "Need to confirm this.",
acknowledgement = ack-dl,
}
+
+@Periodical{tj-rp,
+ key = "RP",
+ title = "{Radical Philosophy}",
+ ISSN = "0300-211X",
+ ISSN-L = "0300-211X",
+ bibdate = "Tue Feb 6 18:28:21 2018",
+ bibsource = "http://www.math.utah.edu/pub/tex/bib/texjourn.bib",
+ acknowledgement = ack-nhfb,
+ journal-URL = "https://www.radicalphilosophy.com/issues/",
+ remark = "Publication began in 1972. Recent issues are typeset
+ using Lua\LaTeX.",
+}
+
+@Periodical{tj-pi,
+ key = "PI",
+ title = "{Philosopher's Imprint}",
+ ISSN = "1533-628X",
+ ISSN-L = "1533-628X",
+ bibdate = "Tue Feb 6 18:28:21 2018",
+ bibsource = "http://www.math.utah.edu/pub/tex/bib/texjourn.bib",
+ acknowledgement = ack-nhfb,
+ journal-URL = "https://www.philosophersimprint.org/",
+}
+
+@Periodical{tj-res,
+ key = "RES",
+ title = "{Res Philosophica}",
+ ISSN = "2168-9105 (print), 2168-9113 (electronic)",
+ ISSN-L = "2168-9105",
+ year = "2013",
+ bibdate = "Tue Feb 6 18:28:21 2018",
+ bibsource = "http://www.math.utah.edu/pub/tex/bib/texjourn.bib",
+ acknowledgement = ack-nhfb,
+ journal-URL = "http://www.pdcnet.org/resphilosophica",
+ remark = "Publication began with volume 90, number 1, in January
+ 2013",
+}
diff --git a/Master/texmf-dist/bibtex/bib/beebe/typeset.bib b/Master/texmf-dist/bibtex/bib/beebe/typeset.bib
index e6584f12be0..67cc12e9bca 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.46",
-%%% date = "04 November 2017",
-%%% time = "07:47:13 MDT",
+%%% version = "2.48",
+%%% date = "12 February 2018",
+%%% time = "06:02:51 MST",
%%% 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 = "13220 23005 108478 1023519",
+%%% checksum = "62589 23099 108892 1027676",
%%% 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.46, the year coverage looked
+%%% At version 2.48, the year coverage looked
%%% like this:
%%%
%%% 1881 ( 1) 1927 ( 0) 1973 ( 10)
@@ -71,10 +71,10 @@
%%% 1907 ( 0) 1953 ( 0) 1999 ( 10)
%%% 1908 ( 0) 1954 ( 3) 2000 ( 8)
%%% 1909 ( 0) 1955 ( 1) 2001 ( 5)
-%%% 1910 ( 0) 1956 ( 0) 2002 ( 12)
+%%% 1910 ( 0) 1956 ( 0) 2002 ( 13)
%%% 1911 ( 0) 1957 ( 0) 2003 ( 4)
%%% 1912 ( 0) 1958 ( 1) 2004 ( 1)
-%%% 1913 ( 0) 1959 ( 1) 2005 ( 6)
+%%% 1913 ( 0) 1959 ( 1) 2005 ( 7)
%%% 1914 ( 0) 1960 ( 0) 2006 ( 2)
%%% 1915 ( 0) 1961 ( 2) 2007 ( 3)
%%% 1916 ( 1) 1962 ( 3) 2008 ( 0)
@@ -86,13 +86,13 @@
%%% 1922 ( 0) 1968 ( 4) 2014 ( 2)
%%% 1923 ( 1) 1969 ( 9) 2015 ( 4)
%%% 1924 ( 0) 1970 ( 7) 2016 ( 1)
-%%% 1925 ( 0) 1971 ( 11) 2017 ( 4)
+%%% 1925 ( 0) 1971 ( 11) 2017 ( 5)
%%% 1926 ( 1) 1972 ( 8)
%%% 19xx ( 3)
%%% 20xx ( 2)
%%%
%%% Article: 322
-%%% Book: 305
+%%% Book: 308
%%% InCollection: 5
%%% InProceedings: 54
%%% Manual: 42
@@ -103,7 +103,7 @@
%%% Proceedings: 33
%%% TechReport: 34
%%%
-%%% Total entries: 848
+%%% Total entries: 851
%%%
%%% This bibliography has been collected from
%%% bibliographies in the author's personal
@@ -549,6 +549,9 @@
Technology"}
@String{pub-NIST:adr = "Gaithersburg, MD, USA"}
+@String{pub-NORTON = "W. W. Norton \& Co."}
+@String{pub-NORTON:adr = "New York, NY, USA"}
+
@String{pub-OAK-KNOLL = "Oak Knoll Books"}
@String{pub-OAK-KNOLL:adr = "414 Delaware St., New Castle, DE 19720, USA"}
@@ -20874,6 +20877,36 @@
keywords = "Carter, Harry Graham (1901--1982)",
}
+@Book{deBiasi:2002:SDP,
+ author = "Pierre-Marc de Biasi and Karine Douplitzky",
+ title = "La saga du papier",
+ publisher = "Arte Editions",
+ address = "Issy-les-Moulineaux (Hauts-de-Seine)",
+ pages = "255",
+ year = "2002",
+ ISBN = "2-87660-350-0 (paperback), 2-87660-228-8 (hardcover)",
+ ISBN-13 = "978-2-87660-350-9 (paperback), 978-2-87660-228-1
+ (hardcover)",
+ LCCN = "TS1094 .B53 1999",
+ bibdate = "Sat Feb 10 08:03:46 MST 2018",
+ bibsource = "fsz3950.oclc.org:210/WorldCat;
+ http://www.math.utah.edu/pub/tex/bib/typeset.bib",
+ series = "Collection ``Textures''",
+ URL = "http://catalogue.bnf.fr/ark:/12148/cb38857166s",
+ abstract = "L'histoire d'une mati{\`e}re et de ses usages qui en
+ envisage tous les aspects, l'{\'e}conomie, la
+ confection, l'artisanat, les beaux-arts mais aussi
+ l'industrie, les cons{\'e}quences {\'e}cologiques et
+ les technologies nouvelles.",
+ acknowledgement = ack-nhfb,
+ author-dates = "1950--",
+ language = "French",
+ remark = "Out of print, but still available at some online used
+ booksellers at inflated prices.",
+ subject = "Papier; Histoire; Industrie et commerce; Histoire.;
+ Industrie papeti{\`e}re; papier.; origines; 20e s.",
+}
+
@Book{Jury:2002:AFR,
author = "David Jury",
title = "About Face: Reviving the Rules of Typography",
@@ -21205,6 +21238,47 @@
publishing",
}
+@Book{Mitchell:2005:BTD,
+ author = "Michael Mitchell and Susan Wightman",
+ title = "Book typography: a designer's manual",
+ publisher = "Libanus Press",
+ address = "Marlborough, Wiltshire, UK",
+ pages = "xi + 434",
+ year = "2005",
+ ISBN = "0-948021-66-7",
+ ISBN-13 = "978-0-948021-66-4",
+ LCCN = "Z246 .M57 2005",
+ bibdate = "Mon Feb 12 05:56:50 MST 2018",
+ bibsource = "fsz3950.oclc.org:210/WorldCat;
+ http://www.math.utah.edu/pub/tex/bib/typeset.bib",
+ URL = "http://catalogue.bnf.fr/ark:/12148/cb40927963h",
+ abstract = "Books depend on good design to communicate. This
+ practical guide to typography explains the principles
+ of good design, why they exist and when and how to put
+ them into practice.",
+ acknowledgement = ack-nhfb,
+ author-dates = "Michael Mitchell (13 July 1939--17 November 2017)",
+ subject = "Imprimerie; Technique; Livres; Mise en page; Technique
+ du livre; Arts graphiques; Typographie; Manuels
+ d'amateurs; Design graphique",
+ tableofcontents = "1. Function and readability \\
+ 2. The text panel \\
+ 3. Typeface characteristics and choices \\
+ 4. Text composition \\
+ 5. Headings \\
+ 6. Prelims and endmatter \\
+ 7. Additional elements on the page \\
+ 8. Extent \\
+ 9. Typesetting \\
+ 10. Numbers \\
+ 11. Illustrated books \\
+ 12. Images \\
+ 13. Further text treatments \\
+ 14. Binding, covers and jackets \\
+ 15. Pre-setting and post-setting \\
+ 16. Time and money",
+}
+
@Book{Mulvany:2005:IB,
author = "Nancy C. Mulvany",
title = "Indexing books",
@@ -22034,16 +22108,17 @@
@Book{Kurlansky:2017:PPT,
author = "Mark Kurlansky",
title = "Paper: paging through history",
- publisher = "W.W. Norton and Company",
- address = "New York, NY, USA",
+ publisher = pub-NORTON,
+ address = pub-NORTON:adr,
pages = "xx + 389",
year = "2017",
ISBN = "0-393-23961-6 (hardcover), 0-393-35370-2 (paperback)",
ISBN-13 = "978-0-393-23961-4 (hardcover), 978-0-393-35370-9
(paperback)",
- LCCN = "TS1090 .K87 2016",
- bibdate = "Wed Jul 5 06:52:35 MDT 2017",
+ LCCN = "TS1090 .K87 2017",
+ bibdate = "Sat Dec 23 09:09:31 MST 2017",
bibsource = "fsz3950.oclc.org:210/WorldCat;
+ http://www.math.utah.edu/pub/tex/bib/master.bib;
http://www.math.utah.edu/pub/tex/bib/typeset.bib",
abstract = "Through tracing paper's evolution, Mark Kurlansky
challenges common assumptions about technology's
@@ -22126,6 +22201,25 @@
journal-URL = "https://printinghistory.org/publications/printing-history/ns/",
}
+@Book{Mitchell:2017:TSH,
+ author = "Michael Mitchell and Susan Wightman",
+ title = "Typographic Style Handbook",
+ publisher = "MacLehose Press",
+ address = "London, UK",
+ pages = "287",
+ year = "2017",
+ ISBN = "0-85705-753-7",
+ ISBN-13 = "978-0-85705-753-2",
+ LCCN = "Z246 .M58 2017",
+ bibdate = "Mon Feb 12 06:00:28 MST 2018",
+ bibsource = "http://www.math.utah.edu/pub/tex/bib/typeset.bib;
+ z3950.loc.gov:7090/Voyager",
+ acknowledgement = ack-nhfb,
+ author-dates = "Michael Mitchell (13 July 1939--17 November 2017)",
+ subject = "Graphic design (Typography); Handbooks, manuals, etc;
+ Book design; Type and type-founding",
+}
+
@Misc{Smith:2017:BLB,
author = "Eddie Smith",
title = "From boiling lead and black art: An essay on the