From f7191a3abc2d21dd2a71306921870243953794f3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 Jul 2012 22:06:28 +0000 Subject: sync git-svn-id: svn://tug.org/texlive/trunk@27123 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bib/beebe/texbook2.bib | 12 ++++----- Master/texmf-dist/tex/texinfo/texinfo.tex | 33 +++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 8 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib index a99256d619f..bedf7d5de5e 100644 --- a/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib +++ b/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib @@ -5,9 +5,9 @@ %%% ==================================================================== %%% BibTeX-file{ %%% author = "Nelson H. F. Beebe", -%%% version = "2.06", -%%% date = "26 May 2012", -%%% time = "08:52:11 MDT", +%%% version = "2.07", +%%% date = "25 June 2012", +%%% time = "12:08:15 MDT", %%% filename = "texbook2.bib", %%% address = "University of Utah %%% Department of Mathematics, 110 LCB @@ -16,7 +16,7 @@ %%% USA", %%% telephone = "+1 801 581 5254", %%% FAX = "+1 801 581 4148", -%%% checksum = "52668 9601 35623 348441", +%%% checksum = "19586 9601 35623 348444", %%% email = "beebe at math.utah.edu, beebe at acm.org, %%% beebe at computer.org (Internet)", %%% codetable = "ISO/ASCII", @@ -32,7 +32,7 @@ %%% printed if the is-alpha.bst or is-plain.bst %%% style files are used. %%% -%%% At version 2.06, the year coverage looked +%%% At version 2.07, the year coverage looked %%% like this: %%% %%% 1979 ( 1) 1990 ( 99) 2001 ( 2) @@ -3533,7 +3533,7 @@ @Book{deBroglie:HUP90, author = "Louis de Broglie", - title = "Heisenberg's Uncertainty Principle and the + title = "{Heisenberg's Uncertainty Principle} and the Probabilistic Interpretation of Wave Mechanics", number = "40", publisher = pub-KLUWER, diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index a5a7b2beac7..2b646dd671c 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{2012-06-05.14} +\def\texinfoversion{2012-07-03.16} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -4206,7 +4206,7 @@ end } \def\ifsetfail{\doignore{ifset}} -% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been +% @ifclear VAR ... @end executes the `...' iff VAR has never been % defined with @set, or has been undefined with @clear. % % The `\else' inside the `\doifset' parameter is a trick to reuse the @@ -4217,6 +4217,35 @@ end \def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}} \def\ifclearfail{\doignore{ifclear}} +% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written +% without the @) is in fact defined. We can only feasibly check at the +% TeX level, so something like `mathcode' is going to considered +% defined even though it is not a Texinfo command. +% +\makecond{ifcommanddefined} +\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}} +% +\def\doifcmddefined#1#2{{% + \makevalueexpandable + \let\next=\empty + \expandafter\ifx\csname #2\endcsname\relax + #1% If not defined, \let\next as above. + \fi + \expandafter + }\next +} +\def\ifcmddefinedfail{\doignore{ifcommanddefined}} + +% @ifcommandnotdefined CMD ... handlded similar to @ifclear above. +\makecond{ifcommandnotdefined} +\def\ifcommandnotdefined{% + \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}} +\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}} + +% Set the `txicommandconditionals' variable, so documents have a way to +% test if the @ifcommand...defined conditionals are available. +\set txicommandconditionals + % @dircategory CATEGORY -- specify a category of the dir file % which this file should belong to. Ignore this in TeX. \let\dircategory=\comment -- cgit v1.2.3