[doc]

  * texinfo.tex: update to the latest version 2017-12-18.20, which
    reverts the change done in 2017-12-01.13 attempting to support
    @var with script font size (e.g. in exponent); but this change
    didn't work correctly.
  * mpfr.texi: introduced a @svar macro to handle this case. It
    currently disables the use of @var, the other workaround being
    worse.

git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@12009 280ebfd0-de03-0410-8827-d642c229c3f4

2 files changed, 23 insertions, 22 deletions

diff --git a/doc/mpfr.texi b/doc/mpfr.texi
index cf22fe464..2963cd7e1 100644
--- a/doc/mpfr.texi
+++ b/doc/mpfr.texi
@@ -15,10 +15,6 @@
 @c as the "info" utility cannot currently handle them.
 @c   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=212549
 
-@c texinfo.tex 2017-12-01.13 or later is needed to support @var{} in exponent.
-@c See thread at
-@c   http://lists.gnu.org/archive/html/bug-texinfo/2017-11/msg00019.html
-
 @copying
 This manual documents how to install and use the Multiple Precision
 Floating-Point Reliable Library, version @value{VERSION}.
@@ -107,6 +103,23 @@ floating-point arithmetic, version @value{VERSION}.
 @end menu
 
 
+@c Texinfo currently doesn't support @var in script font size:
+@c error "@scriptfont 5 is undefined". See thread at
+@c   http://lists.gnu.org/archive/html/bug-texinfo/2017-11/msg00019.html
+@c   http://lists.gnu.org/archive/html/bug-texinfo/2017-12/msg00001.html
+@c Use the @svar macro, defined below, instead. It currently disables
+@c the use of @var, with the consequence that this appears in italic
+@c instead of slanted. Alternatively, the following could be used for
+@c the macro definition: @hbox{@switchtolllsize@var{\V\}}
+@c But with this workaround, the font is larger than it should be, making
+@c some cases ugly, such as in: {\log 2 \over \log @svar{b}}
+@iftex
+@macro svar {V}
+\V\
+@end macro
+@end iftex
+
+
 @c  @m{T,N} is $T$ in tex or @math{N} otherwise.  This is an easy way to give
 @c  different forms for math in tex and info.  Commas in N or T don't work,
 @c  but @C{} can be used instead.  \, works in info but not in tex.
@@ -1690,7 +1703,7 @@ minimal precision @math{m} depending only on @var{p} = PREC(@var{op}) and
 m = 1 + ceil(@var{p}*log(2)/log(@var{b})),
 @end ifnottex
 @tex
-$m = 1 + \left\lceil @var{p} {\log 2 \over \log @var{b}} \right\rceil$,
+$m = 1 + \left\lceil @var{p} {\log 2 \over \log @svar{b}} \right\rceil$,
 @end tex
 with @var{p} replaced by @var{p}@minus{}1 if @var{b} is a power of 2,
 but in some very rare cases, it might be @math{m+1}
@@ -1965,7 +1978,7 @@ or both arguments are NaN@. But only floating-point numbers can be compared
 
 @deftypefun int mpfr_cmp_ui_2exp (mpfr_t @var{op1}, unsigned long int @var{op2}, mpfr_exp_t @var{e})
 @deftypefunx int mpfr_cmp_si_2exp (mpfr_t @var{op1}, long int @var{op2}, mpfr_exp_t @var{e})
-Compare @var{op1} and @m{@var{op2} \times 2^{@var{e}}, @var{op2} multiplied by two to
+Compare @var{op1} and @m{@var{op2} \times 2^{@svar{e}}, @var{op2} multiplied by two to
 the power @var{e}}. Similar as above.
 @end deftypefun
 
@@ -2205,7 +2218,7 @@ at @minus{}@var{op} (formula 5.1.1 from the same reference).
 @deftypefun int mpfr_li2 (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
 Set @var{rop} to real part of the dilogarithm of @var{op}, rounded in the
 direction @var{rnd}. MPFR defines the dilogarithm function as
-@m{-\int_{t=0}^{@var{op}} \log(1-t)/t\ dt,the integral of -log(1-t)/t from 0
+@m{-\int_{t=0}^{@svar{op}} \log(1-t)/t\ dt,the integral of -log(1-t)/t from 0
 to @var{op}}.
 @end deftypefun
 
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 5d05ba5ca..42bb98335 100644
--- a/doc/texinfo.tex
+++ b/doc/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{2017-12-01.13}
+\def\texinfoversion{2017-12-18.20}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2503,25 +2503,13 @@ end
 
 
 % In order for the font changes to affect most math symbols and letters,
-% we have to define the \textfont of the standard families.
+% we have to define the \textfont of the standard families.  We don't
+% bother to reset \scriptfont and \scriptscriptfont; awaiting user need.
 %
 \def\resetmathfonts{%
   \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont
   \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont
   \textfont\ttfam=\ttfont \textfont\sffam=\sffont
-  %
-  \scriptfont0=\rmfont \scriptfont1=\ifont \scriptfont2=\syfont
-  \scriptfont\itfam=\itfont \scriptfont\slfam=\slfont \scriptfont\bffam=\bffont
-  \scriptfont\ttfam=\ttfont \scriptfont\sffam=\sffont
-  %
-  \scriptscriptfont0=\rmfont
-  \scriptscriptfont1=\ifont
-  \scriptscriptfont2=\syfont
-  \scriptscriptfont\itfam=\itfont
-  \scriptscriptfont\slfam=\slfont
-  \scriptscriptfont\bffam=\bffont
-  \scriptscriptfont\ttfam=\ttfont
-  \scriptscriptfont\sffam=\sffont
 }
 
 %