summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-24 21:30:31 +0000
committerKarl Berry <karl@freefriends.org>2015-06-24 21:30:31 +0000
commit375ce45529dbb82b8d404a7ce310c5d96227e208 (patch)
treed9ff8e9aa4a6106a04eef6ec12b3129efe1fd60b /Master
parent950ff9d2523f08c6d7d855f4af237de38144d3b2 (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@37656 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/bibtex/bib/beebe/texbook3.bib98
-rwxr-xr-x[-rw-r--r--]Master/texmf-dist/scripts/diadia/diadia.lua0
-rw-r--r--Master/texmf-dist/tex/texinfo/texinfo.tex39
-rw-r--r--Master/tlpkg/doc/releng.txt58
4 files changed, 122 insertions, 73 deletions
diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib
index 158b61bbd60..c78bee0483a 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.55",
-%%% date = "09 July 2014",
-%%% time = "10:56:36 MDT",
+%%% version = "3.56",
+%%% date = "11 June 2015",
+%%% time = "08:41:53 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 = "36494 16888 69083 678250",
+%%% checksum = "12062 16910 69189 679181",
%%% email = "beebe at math.utah.edu, beebe at acm.org,
%%% beebe at computer.org (Internet)",
%%% codetable = "ISO/ASCII",
@@ -37,42 +37,43 @@
%%% covered in separate bibliographies
%%% (ep.bib, epodd.bib, and sgml.bib).
%%%
-%%% At version 3.55, the year coverage looks
+%%% At version 3.56, the year coverage looks
%%% like this:
%%%
-%%% 1928 ( 1) 1957 ( 0) 1986 ( 42)
-%%% 1929 ( 0) 1958 ( 0) 1987 ( 48)
-%%% 1930 ( 0) 1959 ( 0) 1988 ( 50)
-%%% 1931 ( 0) 1960 ( 0) 1989 ( 54)
-%%% 1932 ( 0) 1961 ( 0) 1990 ( 51)
-%%% 1933 ( 0) 1962 ( 1) 1991 ( 41)
-%%% 1934 ( 0) 1963 ( 0) 1992 ( 82)
-%%% 1935 ( 0) 1964 ( 0) 1993 ( 45)
-%%% 1936 ( 0) 1965 ( 0) 1994 ( 36)
-%%% 1937 ( 0) 1966 ( 0) 1995 ( 28)
-%%% 1938 ( 0) 1967 ( 1) 1996 ( 14)
-%%% 1939 ( 0) 1968 ( 0) 1997 ( 24)
-%%% 1940 ( 0) 1969 ( 1) 1998 ( 7)
-%%% 1941 ( 0) 1970 ( 2) 1999 ( 10)
-%%% 1942 ( 0) 1971 ( 1) 2000 ( 6)
-%%% 1943 ( 0) 1972 ( 2) 2001 ( 8)
-%%% 1944 ( 0) 1973 ( 1) 2002 ( 3)
-%%% 1945 ( 0) 1974 ( 1) 2003 ( 12)
-%%% 1946 ( 0) 1975 ( 1) 2004 ( 36)
-%%% 1947 ( 0) 1976 ( 3) 2005 ( 13)
-%%% 1948 ( 0) 1977 ( 2) 2006 ( 5)
-%%% 1949 ( 0) 1978 ( 7) 2007 ( 6)
-%%% 1950 ( 0) 1979 ( 5) 2008 ( 5)
-%%% 1951 ( 0) 1980 ( 8) 2009 ( 6)
-%%% 1952 ( 0) 1981 ( 12) 2010 ( 4)
-%%% 1953 ( 0) 1982 ( 21) 2011 ( 6)
-%%% 1954 ( 0) 1983 ( 24) 2012 ( 6)
-%%% 1955 ( 0) 1984 ( 15) 2013 ( 5)
-%%% 1956 ( 0) 1985 ( 36)
+%%% 1928 ( 1) 1958 ( 0) 1988 ( 50)
+%%% 1929 ( 0) 1959 ( 0) 1989 ( 54)
+%%% 1930 ( 0) 1960 ( 0) 1990 ( 51)
+%%% 1931 ( 0) 1961 ( 0) 1991 ( 41)
+%%% 1932 ( 0) 1962 ( 1) 1992 ( 82)
+%%% 1933 ( 0) 1963 ( 0) 1993 ( 45)
+%%% 1934 ( 0) 1964 ( 0) 1994 ( 36)
+%%% 1935 ( 0) 1965 ( 0) 1995 ( 28)
+%%% 1936 ( 0) 1966 ( 0) 1996 ( 14)
+%%% 1937 ( 0) 1967 ( 1) 1997 ( 24)
+%%% 1938 ( 0) 1968 ( 0) 1998 ( 7)
+%%% 1939 ( 0) 1969 ( 1) 1999 ( 10)
+%%% 1940 ( 0) 1970 ( 2) 2000 ( 6)
+%%% 1941 ( 0) 1971 ( 1) 2001 ( 8)
+%%% 1942 ( 0) 1972 ( 2) 2002 ( 3)
+%%% 1943 ( 0) 1973 ( 1) 2003 ( 12)
+%%% 1944 ( 0) 1974 ( 1) 2004 ( 36)
+%%% 1945 ( 0) 1975 ( 1) 2005 ( 13)
+%%% 1946 ( 0) 1976 ( 3) 2006 ( 5)
+%%% 1947 ( 0) 1977 ( 2) 2007 ( 6)
+%%% 1948 ( 0) 1978 ( 7) 2008 ( 5)
+%%% 1949 ( 0) 1979 ( 5) 2009 ( 6)
+%%% 1950 ( 0) 1980 ( 8) 2010 ( 4)
+%%% 1951 ( 0) 1981 ( 12) 2011 ( 6)
+%%% 1952 ( 0) 1982 ( 21) 2012 ( 6)
+%%% 1953 ( 0) 1983 ( 24) 2013 ( 5)
+%%% 1954 ( 0) 1984 ( 15) 2014 ( 0)
+%%% 1955 ( 0) 1985 ( 36) 2015 ( 1)
+%%% 1956 ( 0) 1986 ( 42)
+%%% 1957 ( 0) 1987 ( 48)
%%% 19xx ( 2)
%%%
%%% Article: 194
-%%% Book: 310
+%%% Book: 311
%%% Booklet: 12
%%% InCollection: 11
%%% InProceedings: 125
@@ -85,7 +86,7 @@
%%% TechReport: 60
%%% Unpublished: 2
%%%
-%%% Total entries: 800
+%%% Total entries: 801
%%%
%%% The ISBN and ISSN fields will be printed if
%%% the is-alpha.bst or is-plain.bst style
@@ -9428,8 +9429,8 @@
@Book{Knuth:2013:EK,
author = "Donald Ervin Knuth and Edgar G. Daylight",
title = "Essential {Knuth}",
- publisher = "Lonely Scholar",
- address = "????",
+ publisher = "Lonely Scholar Scientific Books",
+ address = "Geel, Belgium",
pages = "94",
year = "2013",
ISBN = "94-91386-03-4",
@@ -9442,6 +9443,27 @@
author-dates = "1938--",
}
+@Book{Knuth:2015:ABF,
+ author = "Donald E. Knuth and Edgar G. Daylight",
+ title = "Algorithmic Barriers Falling: {P\,=\,NP}?",
+ publisher = "Lonely Scholar Scientific Books",
+ address = "Geel, Belgium",
+ pages = "xix + 116",
+ year = "2015",
+ ISBN = "94-91386-04-2",
+ ISBN-13 = "978-94-91386-04-6",
+ LCCN = "QA76.9.A43 K58 2014",
+ bibdate = "Wed May 27 09:57:32 2015",
+ bibsource = "http://www.math.utah.edu/pub/tex/bib/texbook3.bib",
+ series = "Conversations",
+ acknowledgement = ack-nhfb,
+ author-dates = "1938--",
+ remark = "A conversation with Donald E. Knuth conducted by Edgar
+ G. Daylight on 18 June 2014 in Paris, France. Edited by
+ Kurt De Grave.",
+ subject = "Computer algorithms; Computer algorithms.",
+}
+
@Article{Kohlhase:2008:USM,
author = "Michael Kohlhase",
title = "Using {\LaTeX} as a Semantic Markup Format",
diff --git a/Master/texmf-dist/scripts/diadia/diadia.lua b/Master/texmf-dist/scripts/diadia/diadia.lua
index 81d668499e7..81d668499e7 100644..100755
--- a/Master/texmf-dist/scripts/diadia/diadia.lua
+++ b/Master/texmf-dist/scripts/diadia/diadia.lua
diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index 152e9853485..60951102f3f 100644
--- a/Master/texmf-dist/tex/texinfo/texinfo.tex
+++ b/Master/texmf-dist/tex/texinfo/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2015-05-06.11}
+\def\texinfoversion{2015-06-14.15}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -304,6 +304,7 @@
% Avoid "undefined control sequence" errors.
\def\lastchapterdefs{}
\def\lastsectiondefs{}
+\def\lastsection{}
\def\prevchapterdefs{}
\def\prevsectiondefs{}
\def\lastcolordefs{}
@@ -3195,8 +3196,15 @@ end
\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E}
\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e}
%
-% Use the ec* fonts (cm-super in outline format) for non-CM glyphs.
-\def\ecfont{%
+% Use the European Computer Modern fonts (cm-super in outline format)
+% for non-CM glyphs. That is ec* for regular text and tc* for the text
+% companion symbols (LaTeX TS1 encoding). Both are part of the ec
+% package and follow the same conventions.
+%
+\def\ecfont{\etcfont{e}}
+\def\tcfont{\etcfont{t}}
+%
+\def\etcfont#1{%
% We can't distinguish serif/sans and italic/slanted, but this
% is used for crude hacks anyway (like adding French and German
% quotes to documents typeset with CM, where we lose kerning), so
@@ -3205,14 +3213,14 @@ end
\edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
\ifmonospace
% typewriter:
- \font\thisecfont = ectt\ecsize \space at \nominalsize
+ \font\thisecfont = #1ctt\ecsize \space at \nominalsize
\else
\ifx\curfontstyle\bfstylename
% bold:
- \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
+ \font\thisecfont = #1cb\ifusingit{i}{x}\ecsize \space at \nominalsize
\else
% regular:
- \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+ \font\thisecfont = #1c\ifusingit{ti}{rm}\ecsize \space at \nominalsize
\fi
\fi
\thisecfont
@@ -7607,7 +7615,7 @@ end
\long\def\nillm@{\nil@}%
% This macro is expanded during the Texinfo macro expansion, not during its
-% definition. It gets all the arguments values and assigns them to macros
+% definition. It gets all the arguments' values and assigns them to macros
% macarg.ARGNAME
%
% #1 is the macro name
@@ -8954,7 +8962,6 @@ directory should work if nowhere else does.}
\catcode\count255=#1\relax
\advance\count255 by 1
\repeat
-
}
% @documentencoding sets the definition of non-ASCII characters
@@ -9021,17 +9028,17 @@ directory should work if nowhere else does.}
\def\latonechardefs{%
\gdef^^a0{\tie}
\gdef^^a1{\exclamdown}
- \gdef^^a2{\missingcharmsg{CENT SIGN}}
- \gdef^^a3{{\pounds}}
- \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
- \gdef^^a5{\missingcharmsg{YEN SIGN}}
- \gdef^^a6{\missingcharmsg{BROKEN BAR}}
+ \gdef^^a2{{\tcfont \char162}} % cent
+ \gdef^^a3{\pounds}
+ \gdef^^a4{{\tcfont \char164}} % currency
+ \gdef^^a5{{\tcfont \char165}} % yen
+ \gdef^^a6{{\tcfont \char166}} % broken bar
\gdef^^a7{\S}
\gdef^^a8{\"{}}
\gdef^^a9{\copyright}
\gdef^^aa{\ordf}
\gdef^^ab{\guillemetleft}
- \gdef^^ac{$\lnot$}
+ \gdef^^ac{\ensuremath\lnot}
\gdef^^ad{\-}
\gdef^^ae{\registeredsymbol}
\gdef^^af{\={}}
@@ -9396,7 +9403,11 @@ directory should work if nowhere else does.}
\def\utfeightchardefs{%
\DeclareUnicodeCharacter{00A0}{\tie}
\DeclareUnicodeCharacter{00A1}{\exclamdown}
+ \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent
\DeclareUnicodeCharacter{00A3}{\pounds}
+ \DeclareUnicodeCharacter{00A4}{{\tcfont \char164}}% 0244=currency
+ \DeclareUnicodeCharacter{00A5}{{\tcfont \char165}}% 0245=yen
+ \DeclareUnicodeCharacter{00A6}{{\tcfont \char166}}% 0246=brokenbar
\DeclareUnicodeCharacter{00A7}{\S}
\DeclareUnicodeCharacter{00A8}{\"{ }}
\DeclareUnicodeCharacter{00A9}{\copyright}
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 885d199244e..6297ce979df 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -144,18 +144,19 @@ mkdir $hx/$this
cd /home/ftp/texlive/Images
cp README.html $hx/$prev/
mv *.iso* *.torrent* $hx/$prev/
-mv test/*.iso* .
+mv test/texlive2*.iso* .
mv test/texlive*.tar.xz* $hx/$this/ # tar version only in historic
-update README and test/README (touch them even if no text changes)
+update README (touch even if no real changes needed)
+ and test/README (pretest over)
- mactex (from tlpretest)
hm=/home/ftp/historic/systems/mactex
mkdir $hm/$prev
cd ~ftp/tex/mactex
-mv mactex2*.pkg* basic* $hm/$prev
-cp $hm/$prev/README .
+mv mactex*.pkg* basic* $hm/$prev
mv ~ftp/texlive/tlpretest/mactex* .
-
+ln -s mactex-20*.pkg MacTeX.pkg
+
- rest of tlnet
cd /home/ftp/texlive/tlnet
mkdir $hx/$prev/tlnet
@@ -163,9 +164,20 @@ cd /home/ftp/texlive/tlnet
diff -qr . $hx/$prev/tlnet-final # should already be there from before, so:
rm -rf [a-z]*
mv ../tlpretest/[a-z]* .
-update README and ../tlpretest/README (touch even if no text changes)
-
+update README (touch even if no real changes needed)
+ and ../tlpretest/README (pretest over)
+
+- update on CTAN to avoid copying everything back again:
+cy=/home/ftp/tex-archive/systems
+fx=/home/ftp/tex
+cp -a ... $cy/texlive/Images/
+cp -a ... $cy/texlive/Source/
+cp -a ... $cy/texlive/tlnet/
+cp -a $fx/mactex/* $cy/mac/mactex/
+cp -a $fx/protext/dist/* $cy/windows/protext/ # probably already done
cd /home/httpd/html/texlive
+
+- TL web pages:
mkdir $hx/$prev/web
cp *.html !$ # remove tugstyle.css ref from bugs.html
@@ -177,14 +189,14 @@ perl install-tl # do full install to default location.
rm /usr/local/texlive-rel; ln -s texlive/$this /usr/local/texlive-rel
newsrc=!$/source
mkdir $newsrc
-cp source/texlive-*.tar.xz source/w32tex-src.tar.xz $newsrc
+cp source/{install-tl,texlive,w32tex}*.tar.?z $newsrc
mount /home/ftp/texlive/Contents/live
cd && umount /mnt/tl
update historic/systems with final proTeXt, when ready.
https://bscw.fernuni-hagen.de
ftp://ftp.fernuni-hagen.de/pub/windows/win32/ProTeXt/
-update ~www/texlive web pages (search for $prev):
+update ~www/texlive web pages (search for $prev and $prev-1):
acquire* - general
bugs.html - general, also case of $prevprev at bottom
doc.html - platform list, translation list
@@ -195,17 +207,17 @@ check for new Texinfo manuals to link to html versions:
further web updates below.
- announcements:
-Dick Koch @ updating MacTeX.
+Dick @ updating MacTeX.
Martin @ torrents.
CTAN @ ISO update, re-enabling tlnet mirroring.
-Siep @ w32client.html, Norbert @ debian.html.
-pretest mirror admins @ done till next year (~www/texlive/mirmon/tl*.txt).
+Siep @ w32client.html, Norbert @ debian,updmap-kanji.html.
- make tag + branch:
-svn copy -r 34252 -m'texlive-2014.0 tag based on r34252' \
- svn://tug.org/texlive/trunk svn://tug.org/texlive/tags/texlive-2014.0
-svn copy -r 34252 -m'branch2014 branch based on r34252' \
- svn://tug.org/texlive/trunk svn://tug.org/texlive/branches/branch2014
+(determine revision number from svn log, in case commits were mistakenly made)
+svn copy -r 37491 -m'texlive-2015.0 tag based on r37491' \
+ svn://tug.org/texlive/trunk svn://tug.org/texlive/tags/texlive-2015.0
+svn copy -r 37491 -m'branch2015 branch based on r37491' \
+ svn://tug.org/texlive/trunk svn://tug.org/texlive/branches/branch2015
It's the same command, just different destinations.
http://svnbook.red-bean.com/en/1.5/svn-book.html#svn.branchmerge
@@ -227,6 +239,7 @@ svn co file:///home/svn/texlive/branches/branch2015/Build/source . >&out
- update ~karl/bin/cron.tl, and reenable when feel ready.
critical=
pretest=
+images_froze=true
net_frozen=false
all_frozen=false
@@ -236,27 +249,30 @@ hy=/home/ftp/historic/systems/texcollection
mkdir -p $hy/$this/packaging
#
# copy files from DVD:
+mount /mnt/tc
cd /mnt/tc
cp -R [A-T]* index* setup /home/ftp/historic/systems/texcollection/$this
#
# copy ctan snapshot for TUG members:
-nice -19 tar cf ~www/members/ctan14-20140604.tar ctan
+rm -i ~www/members/ctan14-*.tar # assuming it's linked!
+nice -19 tar cf ~www/members/ctan15-20140531.tar ctan
chmod a=r ~www/members/ctan*.tar # and edit members/index.html
mkdir /home/ftp/historic/systems/ctancd/$this
ln ~www/members/ctan*.tar !$ # or maybe later?
#
umount /mnt/tc
#
+cd $hy/$this/packaging
# copy in files from texcollection svn, then:
-pdftoppm -gray -r 222 texcoll-cover.pdf >temp.pnm
-# edit temp.pnm to be just the cover.
-pnmcrop temp.pnm | pnmtopng >~www/texcollection/texcollection$this.png
+pdftoppm -gray -r 222 texcoll-cover.pdf temp
+# edit temp*.pgm to be just the cover.
+pnmcrop temp*.pgm | pnmtopng >~www/texcollection/texcollection$this.png
cp texcoll-cover.pdf ~www/texcollection/texcollection$this.pdf
#
~www/texcollection/index.html
-
~www/store/index.html
/home/httpd/cgi-bin/tug-common.pl
~www/forms/current/memberapp.html
+#
~www/rss/tug.xml
~www/index.html