* texinfo.tex (\setref): Take additional argument for the -snt

xref.  Call \indexdummies.
	(\donoderef, \appendixnoderef, \unnumbnoderef): Change \setref calls.

texinfo.tex

@@ -1053,24 +1053,6 @@ where each line of input produces a line of output.}
 \def\bullet{\implicitmath\ptexbullet\implicitmath}
 \def\minus{\implicitmath-\implicitmath}
 
-\def\node{\ENVcheck\parsearg\nodezzz}
-\def\nodezzz#1{\nodexxx [#1,]}
-\def\nodexxx[#1,#2]{\gdef\lastnode{#1}}
-\let\nwnode=\node
-\let\lastnode=\relax
-
-\def\donoderef{\ifx\lastnode\relax\else
-\expandafter\expandafter\expandafter\setref{\lastnode}\fi
-\global\let\lastnode=\relax}
-
-\def\unnumbnoderef{\ifx\lastnode\relax\else
-\expandafter\expandafter\expandafter\unnumbsetref{\lastnode}\fi
-\global\let\lastnode=\relax}
-
-\def\appendixnoderef{\ifx\lastnode\relax\else
-\expandafter\expandafter\expandafter\appendixsetref{\lastnode}\fi
-\global\let\lastnode=\relax}
-
 % @refill is a no-op.
 \let\refill=\relax
 
@@ -4605,6 +4587,7 @@ width0pt\relax} \fi
     \expandafter\parsearg 
   \fi \next}
 
+
 \message{cross references,}
 \newwrite\auxfile
 
@@ -4616,28 +4599,52 @@ width0pt\relax} \fi
 \def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
   node \samp{\ignorespaces#1{}}}
 
-% @setref{foo} defines a cross-reference point named foo.
+% @node's job is to define \lastnode.
+\def\node{\ENVcheck\parsearg\nodezzz}
+\def\nodezzz#1{\nodexxx [#1,]}
+\def\nodexxx[#1,#2]{\gdef\lastnode{#1}}
+\let\nwnode=\node
+\let\lastnode=\relax
 
-\def\setref#1{%
+% The sectioning commands (@chapter, etc.) call these.
-\dosetq{#1-title}{Ytitle}%
+\def\donoderef{%
-\dosetq{#1-pg}{Ypagenumber}%
+  \ifx\lastnode\relax\else
-\dosetq{#1-snt}{Ysectionnumberandtype}}
+    \expandafter\expandafter\expandafter\setref{\lastnode}%
+      {Ysectionnumberandtype}%
+    \global\let\lastnode=\relax
+  \fi
+}
+\def\unnumbnoderef{%
+  \ifx\lastnode\relax\else
+    \expandafter\expandafter\expandafter\setref{\lastnode}{Ynothing}%
+    \global\let\lastnode=\relax
+  \fi
+}
+\def\appendixnoderef{%
+  \ifx\lastnode\relax\else
+    \expandafter\expandafter\expandafter\setref{\lastnode}%
+      {Yappendixletterandtype}
+    \global\let\lastnode=\relax
+  \fi
+}
 
-\def\unnumbsetref#1{%
+% \setref{NAME}{SNT} defines a cross-reference point NAME, namely
-\dosetq{#1-title}{Ytitle}%
+% NAME-title, NAME-pg, and NAME-SNT.  Called from \foonoderef.  We have
-\dosetq{#1-pg}{Ypagenumber}%
+% to set \indexdummies so commands such as @code in a section title
-\dosetq{#1-snt}{Ynothing}}
+% aren't expanded.  It would be nicer not to expand the titles in the
+% first place, but there's so many layers that that is hard to do.
+% 
+\def\setref#1#2{{%
+  \indexdummies
+  \dosetq{#1-title}{Ytitle}%
+  \dosetq{#1-pg}{Ypagenumber}%
+  \dosetq{#1-snt}{#2}
+}}
 
-\def\appendixsetref#1{%
+% @xref, @pxref, and @ref generate cross-references.  For \xrefX, #1 is
-\dosetq{#1-title}{Ytitle}%
+% the node name, #2 the name of the Info cross-reference, #3 the printed
-\dosetq{#1-pg}{Ypagenumber}%
+% node name, #4 the name of the Info file, #5 the name of the printed
-\dosetq{#1-snt}{Yappendixletterandtype}}
+% manual.  All but the node name can be omitted.
-
-% \xref, \pxref, and \ref generate cross-references to specified points.
-% For \xrefX, #1 is the node name, #2 the name of the Info
-% cross-reference, #3 the printed 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,,,,,,,]}