texinfo/doc texinfo.tex,1.17,1.18

[karl]

Update of /cvsroot/texinfo/texinfo/doc
In directory sheep:/tmp/cvs-serv4523

Modified Files:
        texinfo.tex 
Log Message:
2004-01-03  Stepan Kasal  <address@hidden>

        * doc/texinfo.tex (\commondummies, \indexnofonts): Merge the
          common part of these two to ...
          (\commondummiesnofonts): ... a new macro.
          (\indexdummylatex, \indexdummytex, \indexdummydots): Nuke,
          the time saved is not worth the hassle.


Index: texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** texinfo.tex 2004/01/04 14:37:06     1.17
--- texinfo.tex 2004/01/04 22:49:41     1.18
***************
*** 4,8 ****
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-01-04.06}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--- 4,8 ----
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-01-04.14}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
***************
*** 3056,3079 ****
    \normalturnoffactive
    %
!   % Control letters and accents.
    \definedummyletter{_}%
-   \definedummyletter{,}%
-   \definedummyletter{"}%
-   \definedummyletter{`}%
-   \definedummyletter{'}%
-   \definedummyletter{^}%
-   \definedummyletter{~}%
-   \definedummyletter{=}%
-   \definedummyword{u}%
-   \definedummyword{v}%
-   \definedummyword{H}%
-   \definedummyword{dotaccent}%
-   \definedummyword{ringaccent}%
-   \definedummyword{tieaccent}%
-   \definedummyword{ubaraccent}%
-   \definedummyword{udotaccent}%
-   \definedummyword{dotless}%
    %
!   % Other non-English letters.
    \definedummyword{AA}%
    \definedummyword{AE}%
--- 3056,3064 ----
    \normalturnoffactive
    %
!   \commondummiesnofonts
!   %
    \definedummyletter{_}%
    %
!   % Non-English letters.
    \definedummyword{AA}%
    \definedummyword{AE}%
***************
*** 3102,3134 ****
    \definedummyword{tt}%
    %
-   % Texinfo font commands.
-   \definedummyword{b}%
-   \definedummyword{i}%
-   \definedummyword{r}%
-   \definedummyword{sc}%
-   \definedummyword{t}%
-   %
    \definedummyword{LaTeX}%
    \definedummyword{TeX}%
-   \definedummyword{acronym}%
-   \definedummyword{cite}%
-   \definedummyword{code}%
-   \definedummyword{command}%
-   \definedummyword{dfn}%
    \definedummyword{dots}%
-   \definedummyword{emph}%
-   \definedummyword{env}%
-   \definedummyword{file}%
-   \definedummyword{kbd}%
-   \definedummyword{key}%
-   \definedummyword{math}%
-   \definedummyword{option}%
-   \definedummyword{samp}%
-   \definedummyword{strong}%
-   \definedummyword{uref}%
-   \definedummyword{url}%
-   \definedummyword{var}%
-   \definedummyword{verb}%
-   \definedummyword{w}%
    %
    % Assorted special characters.
--- 3087,3093 ----
***************
*** 3158,3161 ****
--- 3117,3172 ----
  }
  
+ % \commondummiesnofonts: common to \commondummies and \indexnofonts.
+ %
+ % Better have this without active chars.
+ {
+   \catcode`\~=\other
+   \gdef\commondummiesnofonts{%
+     % Control letters and accents.
+     \definedummyletter{,}%
+     \definedummyletter{"}%
+     \definedummyletter{`}%
+     \definedummyletter{'}%
+     \definedummyletter{^}%
+     \definedummyletter{~}%
+     \definedummyletter{=}%
+     \definedummyword{u}%
+     \definedummyword{v}%
+     \definedummyword{H}%
+     \definedummyword{dotaccent}%
+     \definedummyword{ringaccent}%
+     \definedummyword{tieaccent}%
+     \definedummyword{ubaraccent}%
+     \definedummyword{udotaccent}%
+     \definedummyword{dotless}%
+     %
+     % Texinfo font commands.
+     \definedummyword{b}%
+     \definedummyword{i}%
+     \definedummyword{r}%
+     \definedummyword{sc}%
+     \definedummyword{t}%
+     %
+     \definedummyword{acronym}%
+     \definedummyword{cite}%
+     \definedummyword{code}%
+     \definedummyword{command}%
+     \definedummyword{dfn}%
+     \definedummyword{emph}%
+     \definedummyword{env}%
+     \definedummyword{file}%
+     \definedummyword{kbd}%
+     \definedummyword{key}%
+     \definedummyword{math}%
+     \definedummyword{option}%
+     \definedummyword{samp}%
+     \definedummyword{strong}%
+     \definedummyword{uref}%
+     \definedummyword{url}%
+     \definedummyword{var}%
+     \definedummyword{verb}%
+     \definedummyword{w}%
+   }
+ }
  
  % \indexnofonts is used when outputting the strings to sort the index
***************
*** 3164,3195 ****
  % would be for a given command (usually its argument).
  %
- \def\indexdummylatex{LaTeX}
- \def\indexdummytex{TeX}
- \def\indexdummydots{...}
- %
  \def\indexnofonts{%
    \def\ { }%
    address@hidden@}%
    % how to handle braces?
    \def\_{\normalunderscore}%
-   %
-   \let\,=\asis
-   \let\"=\asis
-   \let\`=\asis
-   \let\'=\asis
-   \let\^=\asis
-   \let\~=\asis
-   \let\==\asis
-   \let\u=\asis
-   \let\v=\asis
-   \let\H=\asis
-   \let\dotaccent=\asis
-   \let\ringaccent=\asis
-   \let\tieaccent=\asis
-   \let\ubaraccent=\asis
-   \let\udotaccent=\asis
-   \let\dotless=\asis
    %
!   % Other non-English letters.
    \def\AA{AA}%
    \def\AE{AE}%
--- 3175,3197 ----
  % would be for a given command (usually its argument).
  %
  \def\indexnofonts{%
+   \def\definedummyword##1{%
+     \expandafter\let\csname ##1\endcsname\asis
+   }%
+   \let\definedummyletter=\definedummyword
+   %
+   \commondummiesnofonts
+   %
+   % Don't no-op \tt, since it isn't a user-level command
+   % and is used in the definitions of the active chars like <, >, |, etc.
+   % Likewise with the other plain tex font commands.
+   %\let\tt=\asis
+   %
    \def\ { }%
    address@hidden@}%
    % how to handle braces?
    \def\_{\normalunderscore}%
    %
!   % Non-English letters.
    \def\AA{AA}%
    \def\AE{AE}%
***************
*** 3207,3245 ****
    \def\ordf{a}%
    \def\ordm{o}%
-   %
-   % Don't no-op \tt, since it isn't a user-level command
-   % and is used in the definitions of the active chars like <, >, |, etc.
-   % Likewise with the other plain tex font commands.
-   %\let\tt=\asis
    %
!   % Texinfo font commands.
!   \let\b=\asis
!   \let\i=\asis
!   \let\r=\asis
!   \let\sc=\asis
!   \let\t=\asis
!   %
!   \let\LaTeX=\indexdummylatex
!   \let\TeX=\indexdummytex
!   \let\acronym=\asis
!   \let\cite=\asis
!   \let\code=\asis
!   \let\command=\asis
!   \let\dfn=\asis
!   \let\dots=\indexdummydots
!   \let\emph=\asis
!   \let\env=\asis
!   \let\file=\asis
!   \let\kbd=\asis
!   \let\key=\asis
!   \let\math=\asis
!   \let\option=\asis
!   \let\samp=\asis
!   \let\strong=\asis
!   \let\uref=\asis
!   \let\url=\asis
!   \let\var=\asis
!   \let\verb=\asis
!   \let\w=\asis
  }
  
--- 3209,3216 ----
    \def\ordf{a}%
    \def\ordm{o}%
    %
!   \def\LaTeX{LaTeX}%
!   \def\TeX{TeX}%
!   \def\dots{...}%
  }