*** texinfo.tex	Sun Sep 12 11:08:08 1999
--- texinfo.tex	Mon Sep 13 08:13:43 1999
***************
*** 102,110 ****
  \newlinechar = `^^J
  
  % Set up fixed words for English if not already set.
! \ifx\putwordAppendix\undefined  \gdef\putwordAppendix{Appendix}\fi
! \ifx\putwordChapter\undefined   \gdef\putwordChapter{Chapter}\fi
! \ifx\putwordfile\undefined      \gdef\putwordfile{file}\fi
  \ifx\putwordin\undefined        \gdef\putwordin{in}\fi
  \ifx\putwordIndexIsEmpty\undefined     \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
  \ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
--- 102,110 ----
  \newlinechar = `^^J
  
  % Set up fixed words for English if not already set.
! \ifx\putwordAppendix\undefined  \gdef\putwordAppendix{$BIUO?(B}\fi
! \ifx\putwordChapter\undefined   \gdef\putwordChapter{$B>O(B}\fi
! \ifx\putwordfile\undefined      \gdef\putwordfile{$B%U%!%$%k(B}\fi
  \ifx\putwordin\undefined        \gdef\putwordin{in}\fi
  \ifx\putwordIndexIsEmpty\undefined     \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
  \ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
***************
*** 114,127 ****
  \ifx\putwordNoTitle\undefined   \gdef\putwordNoTitle{No Title}\fi
  \ifx\putwordof\undefined        \gdef\putwordof{of}\fi
  \ifx\putwordon\undefined        \gdef\putwordon{on}\fi
! \ifx\putwordpage\undefined      \gdef\putwordpage{page}\fi
! \ifx\putwordsection\undefined   \gdef\putwordsection{section}\fi
! \ifx\putwordSection\undefined   \gdef\putwordSection{Section}\fi
! \ifx\putwordsee\undefined       \gdef\putwordsee{see}\fi
! \ifx\putwordSee\undefined       \gdef\putwordSee{See}\fi
! \ifx\putwordShortTOC\undefined  \gdef\putwordShortTOC{Short Contents}\fi
! \ifx\putwordTOC\undefined       \gdef\putwordTOC{Table of Contents}\fi
! %
  \ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi
  \ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi
  \ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi
--- 114,127 ----
  \ifx\putwordNoTitle\undefined   \gdef\putwordNoTitle{No Title}\fi
  \ifx\putwordof\undefined        \gdef\putwordof{of}\fi
  \ifx\putwordon\undefined        \gdef\putwordon{on}\fi
! \ifx\putwordpage\undefined      \gdef\putwordpage{$B%Z!<%8(B}\fi
! \ifx\putwordsection\undefined   \gdef\putwordsection{$B@a(B}\fi
! \ifx\putwordSection\undefined   \gdef\putwordSection{$B@a(B}\fi
! \ifx\putwordsee\undefined       \gdef\putwordsee{$B$r;2>H(B}\fi
! \ifx\putwordSee\undefined       \gdef\putwordSee{$B$r;2>H$7$F$/$@$5$$(B}\fi
! \ifx\putwordShortTOC\undefined  \gdef\putwordShortTOC{$B35MWL\<!(B}\fi
! \ifx\putwordTOC\undefined       \gdef\putwordTOC{$BL\!!<!(B}\fi
! 
  \ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi
  \ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi
  \ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi
***************
*** 1190,1197 ****
  % \smartitalic{ARG} outputs arg in italics, followed by an italic correction
  % unless the following character is such as not to need one.
  \def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else\/\fi\fi\fi}
! \def\smartslanted#1{{\sl #1}\futurelet\next\smartitalicx}
! \def\smartitalic#1{{\it #1}\futurelet\next\smartitalicx}
  
  \let\i=\smartitalic
  \let\var=\smartslanted
--- 1190,1197 ----
  % \smartitalic{ARG} outputs arg in italics, followed by an italic correction
  % unless the following character is such as not to need one.
  \def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else\/\fi\fi\fi}
! \def\smartslanted#1{{\sl\tendg #1}\futurelet\next\smartitalicx}
! \def\smartitalic#1{{\it\tendg #1}\futurelet\next\smartitalicx}
  
  \let\i=\smartitalic
  \let\var=\smartslanted
***************
*** 1199,1205 ****
  \let\emph=\smartitalic
  \let\cite=\smartslanted
  
! \def\b#1{{\bf #1}}
  \let\strong=\b
  
  % We can't just use \exhyphenpenalty, because that only has effect at
--- 1199,1205 ----
  \let\emph=\smartitalic
  \let\cite=\smartslanted
  
! \def\b#1{{\bf\tendg #1}}
  \let\strong=\b
  
  % We can't just use \exhyphenpenalty, because that only has effect at
***************
*** 1214,1220 ****
    \null
  }
  \let\ttfont=\t
! \def\samp#1{`\tclose{#1}'\null}
  \setfont\smallrm\rmshape{8}{1000}
  \font\smallsy=cmsy9
  \def\key#1{{\smallrm\textfont2=\smallsy \leavevmode\hbox{%
--- 1214,1220 ----
    \null
  }
  \let\ttfont=\t
! \def\samp#1{$B!V(B\tclose{#1}$B!W(B\null}  % `...' $B$NBe$j$K!V(B...$B!W(B
  \setfont\smallrm\rmshape{8}{1000}
  \font\smallsy=cmsy9
  \def\key#1{{\smallrm\textfont2=\smallsy \leavevmode\hbox{%
***************
*** 3274,3280 ****
  \gdef\thischaptername{#1}%
  % We don't substitute the actual chapter name into \thischapter
  % because we don't want its macros evaluated now.
! \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}%
  \toks0 = {#1}%
  \edef\temp{\noexpand\writetocentry{\realbackslash chapentry{\the\toks0}%
                                    {\the\chapno}}}%
--- 3274,3280 ----
  \gdef\thischaptername{#1}%
  % We don't substitute the actual chapter name into \thischapter
  % because we don't want its macros evaluated now.
! \xdef\thischapter{\the\chapno\putwordChapter{} \noexpand\thischaptername}%
  \toks0 = {#1}%
  \edef\temp{\noexpand\writetocentry{\realbackslash chapentry{\the\toks0}%
                                    {\the\chapno}}}%
***************
*** 5041,5048 ****
  
  % @inforef is relatively simple.
  \def\inforef #1{\inforefzzz #1,,,,**}
! \def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
!   node \samp{\ignorespaces#1{}}}
  
  % @node's job is to define \lastnode.
  \def\node{\ENVcheck\parsearg\nodezzz}
--- 5041,5048 ----
  
  % @inforef is relatively simple.
  \def\inforef #1{\inforefzzz #1,,,,**}
! \def\inforefzzz #1,#2,#3,#4**{\putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}
!   $B$N%N!<%I(B \samp{\ignorespaces#1{}}\putwordSee{}}
  
  % @node's job is to define \lastnode.
  \def\node{\ENVcheck\parsearg\nodezzz}
***************
*** 5110,5126 ****
  % node name, #4 the name of the Info file, #5 the name of the printed
  % manual.  All but the node name can be omitted.
  %
! \def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
! \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
  \def\ref#1{\xrefX[#1,,,,,,,]}
  \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
    \def\printedmanual{\ignorespaces #5}%
    \def\printednodename{\ignorespaces #3}%
    \setbox1=\hbox{\printedmanual}%
    \setbox0=\hbox{\printednodename}%
    \ifdim \wd0 = 0pt
      % No printed node name was explicitly given.
!     \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
        % Use the node name inside the square brackets.
        \def\printednodename{\ignorespaces #1}%
      \else
--- 5110,5129 ----
  % node name, #4 the name of the Info file, #5 the name of the printed
  % manual.  All but the node name can be omitted.
  %
! \def\pxref#1{\xrefX[#1,,,,,,,]\putwordsee{}}
! \def\xref#1{\xrefX[#1,,,,,,,]\putwordSee{}}
  \def\ref#1{\xrefX[#1,,,,,,,]}
  \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
    \def\printedmanual{\ignorespaces #5}%
    \def\printednodename{\ignorespaces #3}%
    \setbox1=\hbox{\printedmanual}%
+   \ifdim \wd1 = 0pt
+     \def\printednodename{}% ignore internal printed node name
+   \fi
    \setbox0=\hbox{\printednodename}%
    \ifdim \wd0 = 0pt
      % No printed node name was explicitly given.
!     \expandafter\ifx\csname X#1-title\endcsname\relax
        % Use the node name inside the square brackets.
        \def\printednodename{\ignorespaces #1}%
      \else
***************
*** 5161,5167 ****
    \fi
    %
    \ifdim \wd1 > 0pt
!     \putwordsection{} ``\printednodename'' \putwordin{} \cite{\printedmanual}%
    \else
      % _ (for example) has to be the character _ for the purposes of the
      % control sequence corresponding to the node, but it has to expand
--- 5164,5170 ----
    \fi
    %
    \ifdim \wd1 > 0pt
!     \cite{\printedmanual}$B$N!V(B\printednodename $B!W(B %
    \else
      % _ (for example) has to be the character _ for the purposes of the
      % control sequence corresponding to the node, but it has to expand
***************
*** 5175,5183 ****
       \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
      }%
      % [mynode],
!     [\printednodename],\space
      % page 3
!     \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
    \fi
    \ifpdf \Black\pdfendlink \fi
  \endgroup}
--- 5178,5186 ----
       \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
      }%
      % [mynode],
!     $B!V(B\printednodename $B!W(B
      % page 3
!     \turnoffactive \refx{#1-pg}{}\tie\putwordpage%
    \fi
    \ifpdf \Black\pdfendlink \fi
  \endgroup}
***************
*** 5211,5231 ****
  \def\Ynothing{}
  
  \def\Ysectionnumberandtype{%
! \ifnum\secno=0 \putwordChapter\xreftie\the\chapno %
! \else \ifnum \subsecno=0 \putwordSection\xreftie\the\chapno.\the\secno %
  \else \ifnum \subsubsecno=0 %
! \putwordSection\xreftie\the\chapno.\the\secno.\the\subsecno %
  \else %
! \putwordSection\xreftie\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno %
  \fi \fi \fi }
  
  \def\Yappendixletterandtype{%
  \ifnum\secno=0 \putwordAppendix\xreftie'char\the\appendixno{}%
! \else \ifnum \subsecno=0 \putwordSection\xreftie'char\the\appendixno.\the\secno %
  \else \ifnum \subsubsecno=0 %
! \putwordSection\xreftie'char\the\appendixno.\the\secno.\the\subsecno %
  \else %
! \putwordSection\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %
  \fi \fi \fi }
  
  \gdef\xreftie{'tie}
--- 5214,5234 ----
  \def\Ynothing{}
  
  \def\Ysectionnumberandtype{%
! \ifnum\secno=0 \xreftie\the\chapno\putwordChapter %
! \else \ifnum \subsecno=0 \xreftie\the\chapno.\the\secno\putwordSection %
  \else \ifnum \subsubsecno=0 %
! \xreftie\the\chapno.\the\secno.\the\subsecno\putwordSection %
  \else %
! \xreftie\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno\putwordSection %
  \fi \fi \fi }
  
  \def\Yappendixletterandtype{%
  \ifnum\secno=0 \putwordAppendix\xreftie'char\the\appendixno{}%
! \else \ifnum \subsecno=0 \xreftie'char\the\appendixno.\the\secno\putwordSection %
  \else \ifnum \subsubsecno=0 %
! \xreftie'char\the\appendixno.\the\secno.\the\subsecno\putwordSection %
  \else %
! \xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno\putwordSection %
  \fi \fi \fi }
  
  \gdef\xreftie{'tie}