summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/build-aux/texinfo.tex33
-rw-r--r--Master/doc.html4
2 files changed, 33 insertions, 4 deletions
diff --git a/Build/source/build-aux/texinfo.tex b/Build/source/build-aux/texinfo.tex
index a5a7b2beac7..2b646dd671c 100644
--- a/Build/source/build-aux/texinfo.tex
+++ b/Build/source/build-aux/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
diff --git a/Master/doc.html b/Master/doc.html
index da76ad9a83e..4af00890bde 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -3960,7 +3960,7 @@ The title font of the Mads Fok magazine.
</small></li>
<li><b><a href="texmf-dist/doc/fonts/fonetika">fonetika</a></b>:<small>
-Support for the danish "Dania" phonetic system.
+Support for the Danish "Dania" phonetic system.
<a href="texmf-dist/doc/fonts/fonetika/fonetika.pdf">fonetika.pdf</a>.
</small></li>
@@ -5017,7 +5017,7 @@ A LaTeX class for the preparation of letters and invoices.
</small></li>
<li><b><a href="texmf-dist/doc/latex/isomath">isomath</a></b>:<small>
-Mathematics "for scientists" (conformant to ISO 31).
+Typesetting mathematics, for natural scientists.
<a href="texmf-dist/doc/latex/isomath/README.html">README.html</a>,
<a href="texmf-dist/doc/latex/isomath/isomath-test.pdf">isomath-test.pdf</a>,
<a href="texmf-dist/doc/latex/isomath/isomath.html">isomath.html</a>,