[6490] \hatchar instead of \hat for our \chardef

[karl]

Revision: 6490
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6490
Author:   karl
Date:     2015-08-01 21:39:41 +0000 (Sat, 01 Aug 2015)
Log Message:
-----------
\hatchar instead of \hat for our \chardef

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-31 22:51:41 UTC (rev 6489)
+++ trunk/ChangeLog     2015-08-01 21:39:41 UTC (rev 6490)
@@ -1,3 +1,12 @@
+2015-08-01  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\ctrl): remove this long-obsolete control sequence.
+       (\hatchar): use this instead of \hat for the \chardef,
+       to avoid conflict with plain's (math accent) \hat.
+       (\activehat): use it.
+       Based on ideas in (tiny change) bug-texinfo mail
+       from Ralph Schleicher, 01 Aug 2015 21:37:58.
+
 2015-07-31  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/ModulePath.pm.in: New file, to add directories to 

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-07-31 22:51:41 UTC (rev 6489)
+++ trunk/doc/texinfo.tex       2015-08-01 21:39:41 UTC (rev 6490)
@@ -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-07-01.07}
+\def\texinfoversion{2015-08-01.14}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2881,9 +2881,6 @@
 \def\sup{\ifmmode \expandafter\ptexsp \else \expandafter\finishsup\fi}
 \def\finishsup#1{$\ptexsp{\hbox{\selectfonts\lllsize #1}}$}%
 
-% ctrl is no longer a Texinfo command, but leave this definition for fun.
-\def\ctrl #1{{\tt \rawbackslash \hat}#1}
-
 % @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
 % Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
 % except specified as a normal braced arg, so no newlines to worry about.
@@ -10186,8 +10183,8 @@
 \def\activedoublequote{{\tt\char34}}
 \let"=\activedoublequote
 \catcode`\~=\active \def\activetilde{{\tt\char126}} \let~ = \activetilde
-\chardef\hat=`\^
-\catcode`\^=\active \def\activehat{{\tt \hat}} \let^ = \activehat
+\chardef\hatchar=`\^
+\catcode`\^=\active \def\activehat{{\tt \hatchar}} \let^ = \activehat
 
 \catcode`\_=\active
 \def_{\ifusingtt\normalunderscore\_}