Fix some bugs in the dynamic engraver and PostScript backend

4 files changed, 215 insertions, 783 deletions

diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 34abb77ed9..b29da5acbf 100644
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -1,7 +1,7 @@
 depth = ..
 
 TEX_FILES = $(filter-out texinfo.tex, $(call src-wildcard,*.tex))
-EXTRA_DIST_FILES = $(TEX_FILES) texinfo.tex texinfo.cnf quotes.patch
+EXTRA_DIST_FILES = $(TEX_FILES) texinfo.tex texinfo.cnf
 STEPMAKE_TEMPLATES=install install-out
 
 INSTALLATION_DIR=$(local_lilypond_datadir)/tex/
diff --git a/tex/quotes.patch b/tex/quotes.patch
deleted file mode 100644
index b7bba2e124..0000000000
--- a/tex/quotes.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- texinfo/doc/texinfo.tex	2006-06-02 03:19:04.000000000 +0200
-+++ texinfo.tex	2006-06-02 03:19:10.000000000 +0200
-@@ -1878,9 +1878,12 @@
- {
-   \catcode`\-=\active
-   \catcode`\_=\active
-+  \catcode`\'=\active
-   %
-   \global\def\code{\begingroup
-     \catcode`\-=\active  \catcode`\_=\active
-+    \catcode`\'=\active
-+    \let'\singlequotechar
-     \ifallowcodebreaks
-      \let-\codedash
-      \let_\codeunder
-@@ -5059,11 +5062,10 @@
- %
- \maketwodispenvs {lisp}{example}{%
-   \nonfillstart
--  \tt
-+  \tt\quoteexpand
-   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-   \gobble       % eat return
- }
--
- % @display/@smalldisplay: same as @lisp except keep current font.
- %
- \makedispenv {display}{%
-@@ -5191,6 +5193,12 @@
- \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
- %
- \def\starttabbox{\setbox0=\hbox\bgroup}
-+%
-+%
-+% Don't replace quotes with curly quotes. This makes cut & pasting
-+% from a PDF file problematic.
-+% 
-+\def\singlequotechar{\char'15\relax}
- \begingroup
-   \catcode`\^^I=\active
-   \gdef\tabexpand{%
-@@ -5203,6 +5211,11 @@
-       \wd0=\dimen0 \box0 \starttabbox
-     }%
-   }
-+  \catcode`\'=\active
-+  \gdef\quoteexpand{%
-+    \catcode`\'=\active
-+    \def'{\singlequotechar}
-+  }%
- \endgroup
- \def\setupverbatim{%
-   \let\nonarrowing = t%
-@@ -5212,6 +5225,7 @@
-   \def\par{\leavevmode\egroup\box0\endgraf}%
-   \catcode`\`=\active
-   \tabexpand
-+  \quoteexpand
-   % Respect line breaks,
-   % print special symbols as themselves, and
-   % make each space count
diff --git a/tex/texinfo.cnf b/tex/texinfo.cnf
index ef267420c3..d9311f2399 100644
--- a/tex/texinfo.cnf
+++ b/tex/texinfo.cnf
@@ -1,498 +1,196 @@
-@c -*- coding: utf-8 -*-
-
-@c We map some UTF-8 characters to corresponding texinfo macros.
+@c We map some latin-1 characters to corresponding texinfo macros.
 
 @tex
-
-% This UTF-8 parser is based on LaTeX's `utf8.def'.
-
-\newcount\countX
-\newcount\countY
-\newcount\countZ
-
-\gdef\UTFviiiTwoOctets#1#2{%
-  \expandafter
-   \UTFviiiDefined\csname u8:#1\string #2\endcsname}
-\gdef\UTFviiiThreeOctets#1#2#3{%
-  \expandafter
-   \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname}
-\gdef\UTFviiiFourOctets#1#2#3#4{%
-  \expandafter
-   \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname}
-
-\gdef\UTFviiiDefined#1{%
-  \ifx #1\relax
-    \message{%
-     \linenumber Unicode char \string #1 not set up for use with texinfo}
-  \else
-    \expandafter #1%
-  \fi
-}
-
-\begingroup
-  \catcode`\~13
-  \catcode`\"12
-
-  \def\UTFviiiLoop{%
-    \global\catcode\countX\active
-    \uccode`\~\countX
-    \uppercase\expandafter{\UTFviiiTmp}%
-    \advance\countX by 1
-    \ifnum\countX < \countY
-      \expandafter\UTFviiiLoop
-    \fi}
-
-  \countX = "C2
-  \countY = "E0
-  \def\UTFviiiTmp{%
-    \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
-  \UTFviiiLoop
-
-  \countX = "E0
-  \countY = "F0
-  \def\UTFviiiTmp{%
-    \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
-  \UTFviiiLoop
-
-  \countX = "F0
-  \countY = "F4
-  \def\UTFviiiTmp{%
-    \xdef~{\noexpand\UTFviiiFourOctets\string~}}
-  \UTFviiiLoop
-\endgroup
-
-\begingroup
-  \catcode`\"=12
-  \catcode`\<=12
-  \catcode`\.=12
-  \catcode`\,=12
-  \catcode`\;=12
-  \catcode`\!=12
-  \catcode`\~=13
-
-  \gdef\DeclareUnicodeCharacter#1#2{%
-    \countZ = "#1\relax
-    \wlog{\space\space defining Unicode char U+#1 (decimal \the\countZ)}%
-    \begingroup
-      \parseXMLCharref
-      \def\UTFviiiTwoOctets##1##2{%
-        \csname u8:##1\string ##2\endcsname}%
-      \def\UTFviiiThreeOctets##1##2##3{%
-        \csname u8:##1\string ##2\string ##3\endcsname}%
-      \def\UTFviiiFourOctets##1##2##3##4{%
-        \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
-      \expandafter\expandafter\expandafter\expandafter
-       \expandafter\expandafter\expandafter
-       \gdef\UTFviiiTmp{#2}%
-    \endgroup}
-
-  \gdef\parseXMLCharref{%
-    \ifnum\countZ < "A0\relax
-      \errhelp = \EMsimple
-      \errmessage{Cannot define Unicode char value < 00A0}%
-    \else\ifnum\countZ < "800\relax
-      \parseUTFviiiA,%
-      \parseUTFviiiB C\UTFviiiTwoOctets.,%
-    \else\ifnum\countZ < "10000\relax
-      \parseUTFviiiA;%
-      \parseUTFviiiA,%
-      \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
-    \else
-      \parseUTFviiiA;%
-      \parseUTFviiiA,%
-      \parseUTFviiiA!%
-      \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
-    \fi\fi\fi
-  }
-
-  \gdef\parseUTFviiiA#1{%
-    \countX = \countZ
-    \divide\countZ by 64
-    \countY = \countZ
-    \multiply\countZ by 64
-    \advance\countX by -\countZ
-    \advance\countX by 128
-    \uccode `#1\countX
-    \countZ = \countY}
-
-  \gdef\parseUTFviiiB#1#2#3#4{%
-    \advance\countZ by "#10\relax
-    \uccode `#3\countZ
-    \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
-\endgroup
-
-\DeclareUnicodeCharacter{00A0}{\tie}
-\DeclareUnicodeCharacter{00A1}{\exclamdown}		% ¡
-\DeclareUnicodeCharacter{00A3}{\pounds}			% £
-\DeclareUnicodeCharacter{00A8}{\"{ }}			% ¨
-\DeclareUnicodeCharacter{00A9}{\copyright}		% ©
-\DeclareUnicodeCharacter{00AA}{\ordf}			% ª
-\DeclareUnicodeCharacter{00AD}{\-}			% discretionary hyphen
-\DeclareUnicodeCharacter{00AE}{\registeredsymbol}	% ®
-\DeclareUnicodeCharacter{00AF}{\={ }}			% ¯
-
-\DeclareUnicodeCharacter{00B0}{\ringaccent{ }}		% °
-\DeclareUnicodeCharacter{00B4}{\'{ }}	    		% ´
-\DeclareUnicodeCharacter{00B8}{\,{ }}			% ¸
-\DeclareUnicodeCharacter{00BA}{\ordm}			% º
-\DeclareUnicodeCharacter{00BF}{\questiondown}		% ¿
-
-\DeclareUnicodeCharacter{00C0}{\`A}			% À
-\DeclareUnicodeCharacter{00C1}{\'A}			% Á
-\DeclareUnicodeCharacter{00C2}{\^A}			% Â
-\DeclareUnicodeCharacter{00C3}{\~A}			% Ã
-\DeclareUnicodeCharacter{00C4}{\"A}			% Ä
-\DeclareUnicodeCharacter{00C5}{\AA}			% Å
-\DeclareUnicodeCharacter{00C6}{\AE}			% Æ
-\DeclareUnicodeCharacter{00C7}{\,{C}}			% Ç
-\DeclareUnicodeCharacter{00C8}{\`E}			% È
-\DeclareUnicodeCharacter{00C9}{\'E}			% É
-\DeclareUnicodeCharacter{00CA}{\^E}			% Ê
-\DeclareUnicodeCharacter{00CB}{\"E}			% Ë
-\DeclareUnicodeCharacter{00CC}{\`I}			% Ì
-\DeclareUnicodeCharacter{00CD}{\'I}			% Í
-\DeclareUnicodeCharacter{00CE}{\^I}			% Î
-\DeclareUnicodeCharacter{00CF}{\"I}			% Ï
-
-\DeclareUnicodeCharacter{00D1}{\~N}			% Ñ
-\DeclareUnicodeCharacter{00D2}{\`O}			% Ò
-\DeclareUnicodeCharacter{00D3}{\'O}			% Ó
-\DeclareUnicodeCharacter{00D4}{\^O}			% Ô
-\DeclareUnicodeCharacter{00D5}{\~O}			% Õ
-\DeclareUnicodeCharacter{00D6}{\"O}			% Ö
-\DeclareUnicodeCharacter{00D8}{\O}			% Ø
-\DeclareUnicodeCharacter{00D9}{\`U}			% Ù
-\DeclareUnicodeCharacter{00DA}{\'U}			% Ú
-\DeclareUnicodeCharacter{00DB}{\^U}			% Û
-\DeclareUnicodeCharacter{00DC}{\"U}			% Ü
-\DeclareUnicodeCharacter{00DD}{\'Y}			% Ý
-\DeclareUnicodeCharacter{00DF}{\ss}			% ß
-
-\DeclareUnicodeCharacter{00E0}{\`a}			% à
-\DeclareUnicodeCharacter{00E1}{\'a}			% á
-\DeclareUnicodeCharacter{00E2}{\^a}			% â
-\DeclareUnicodeCharacter{00E3}{\~a}			% ã
-\DeclareUnicodeCharacter{00E4}{\"a}			% ä
-\DeclareUnicodeCharacter{00E5}{\aa}			% å
-\DeclareUnicodeCharacter{00E6}{\ae}			% æ
-\DeclareUnicodeCharacter{00E7}{\,{c}}			% ç
-\DeclareUnicodeCharacter{00E8}{\`e}			% è
-\DeclareUnicodeCharacter{00E9}{\'e}			% é
-\DeclareUnicodeCharacter{00EA}{\^e}			% ê
-\DeclareUnicodeCharacter{00EB}{\"e}			% ë
-\DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}		% ì
-\DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}		% í
-\DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}		% î
-\DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}		% ï
-
-\DeclareUnicodeCharacter{00F1}{\~n}			% ñ
-\DeclareUnicodeCharacter{00F2}{\`o}			% ò
-\DeclareUnicodeCharacter{00F3}{\'o}			% ó
-\DeclareUnicodeCharacter{00F4}{\^o}			% ô
-\DeclareUnicodeCharacter{00F5}{\~o}			% õ
-\DeclareUnicodeCharacter{00F6}{\"o}			% ö
-\DeclareUnicodeCharacter{00F8}{\o}			% ø
-\DeclareUnicodeCharacter{00F9}{\`u}			% ù
-\DeclareUnicodeCharacter{00FA}{\'u}			% ú
-\DeclareUnicodeCharacter{00FB}{\^u}			% û
-\DeclareUnicodeCharacter{00FC}{\"u}			% ü
-\DeclareUnicodeCharacter{00FD}{\'y}			% ý
-\DeclareUnicodeCharacter{00FF}{\"y}			% ÿ
-
-\DeclareUnicodeCharacter{0100}{\=A}			% Ā
-\DeclareUnicodeCharacter{0101}{\=a}			% ā
-\DeclareUnicodeCharacter{0102}{\u{A}}			% Ă
-\DeclareUnicodeCharacter{0103}{\u{a}}			% ă
-\DeclareUnicodeCharacter{0106}{\'C}			% Ć
-\DeclareUnicodeCharacter{0107}{\'c}			% ć
-\DeclareUnicodeCharacter{0108}{\^C}			% Ĉ
-\DeclareUnicodeCharacter{0109}{\^c}			% ĉ
-\DeclareUnicodeCharacter{010A}{\dotaccent{C}}		% Ċ
-\DeclareUnicodeCharacter{010B}{\dotaccent{c}}		% ċ
-\DeclareUnicodeCharacter{010C}{\v{C}}			% Č
-\DeclareUnicodeCharacter{010D}{\v{c}}			% č
-\DeclareUnicodeCharacter{010E}{\v{D}}			% Ď
-%\DeclareUnicodeCharacter{010F}{\v{d}}			% ď
-
-\DeclareUnicodeCharacter{0112}{\=E}			% Ē
-\DeclareUnicodeCharacter{0113}{\=e}			% ē
-\DeclareUnicodeCharacter{0114}{\u{E}}			% Ĕ
-\DeclareUnicodeCharacter{0115}{\u{e}}			% ĕ
-\DeclareUnicodeCharacter{0116}{\dotaccent{E}}		% Ė
-\DeclareUnicodeCharacter{0117}{\dotaccent{e}}		% ė
-\DeclareUnicodeCharacter{011A}{\v{E}}			% Ě
-\DeclareUnicodeCharacter{011B}{\v{e}}			% ě
-\DeclareUnicodeCharacter{011C}{\^G}			% Ĝ
-\DeclareUnicodeCharacter{011D}{\^g}			% ĝ
-\DeclareUnicodeCharacter{011E}{\u{G}}			% Ğ
-\DeclareUnicodeCharacter{011F}{\u{g}}			% ğ
-
-\DeclareUnicodeCharacter{0120}{\dotaccent{G}}		% Ġ
-\DeclareUnicodeCharacter{0121}{\dotaccent{g}}		% ġ
-\DeclareUnicodeCharacter{0124}{\^H}			% Ĥ
-\DeclareUnicodeCharacter{0125}{\^h}			% ĥ
-\DeclareUnicodeCharacter{0128}{\~I}			% Ĩ
-\DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}		% ĩ
-\DeclareUnicodeCharacter{012A}{\=I}			% Ī
-\DeclareUnicodeCharacter{012B}{\={\dotless{i}}}		% ī
-\DeclareUnicodeCharacter{012C}{\u{I}}			% Ĭ
-\DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}		% ĭ
-
-\DeclareUnicodeCharacter{0130}{\dotaccent{I}}		% İ
-\DeclareUnicodeCharacter{0131}{\dotless{i}}		% ı
-\DeclareUnicodeCharacter{0132}{IJ}			% IJ
-\DeclareUnicodeCharacter{0133}{ij}			% ij
-\DeclareUnicodeCharacter{0134}{\^J}			% Ĵ
-\DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}		% ĵ
-\DeclareUnicodeCharacter{0139}{\'L}			% Ĺ
-\DeclareUnicodeCharacter{013A}{\'l}			% ĺ
-
-\DeclareUnicodeCharacter{0141}{\L}			% Ł
-\DeclareUnicodeCharacter{0142}{\l}			% ł
-\DeclareUnicodeCharacter{0143}{\'N}			% Ń
-\DeclareUnicodeCharacter{0144}{\'n}			% ń
-\DeclareUnicodeCharacter{0147}{\v{N}}			% Ň
-\DeclareUnicodeCharacter{0148}{\v{n}}			% ň
-\DeclareUnicodeCharacter{014C}{\=O}			% Ō
-\DeclareUnicodeCharacter{014D}{\=o}			% ō
-\DeclareUnicodeCharacter{014E}{\u{O}}			% Ŏ
-\DeclareUnicodeCharacter{014F}{\u{o}}			% ŏ
-
-\DeclareUnicodeCharacter{0150}{\H{O}}			% Ő
-\DeclareUnicodeCharacter{0151}{\H{o}}			% ő
-\DeclareUnicodeCharacter{0152}{\OE}			% Œ
-\DeclareUnicodeCharacter{0153}{\oe}			% œ
-\DeclareUnicodeCharacter{0154}{\'R}			% Ŕ
-\DeclareUnicodeCharacter{0155}{\'r}			% ŕ
-\DeclareUnicodeCharacter{0158}{\v{R}}			% Ř
-\DeclareUnicodeCharacter{0159}{\v{r}}			% ř
-\DeclareUnicodeCharacter{015A}{\'S}			% Ś
-\DeclareUnicodeCharacter{015B}{\'s}			% ś
-\DeclareUnicodeCharacter{015C}{\^S}			% Ŝ
-\DeclareUnicodeCharacter{015D}{\^s}			% ŝ
-\DeclareUnicodeCharacter{015E}{\,{S}}			% Ş
-\DeclareUnicodeCharacter{015F}{\,{s}}			% ş
-
-\DeclareUnicodeCharacter{0160}{\v{S}}			% Š
-\DeclareUnicodeCharacter{0161}{\v{s}}			% š
-\DeclareUnicodeCharacter{0162}{\,{t}}			% Ţ
-\DeclareUnicodeCharacter{0163}{\,{T}}			% ţ
-\DeclareUnicodeCharacter{0164}{\v{T}}			% Ť
-%\DeclareUnicodeCharacter{0165}{\v{t}}			% ť
-\DeclareUnicodeCharacter{0168}{\~U}			% Ũ
-\DeclareUnicodeCharacter{0169}{\~u}			% ũ
-\DeclareUnicodeCharacter{016A}{\=U}			% Ū
-\DeclareUnicodeCharacter{016B}{\=u}			% ū
-\DeclareUnicodeCharacter{016C}{\u{U}}			% Ŭ
-\DeclareUnicodeCharacter{016D}{\u{u}}			% ŭ
-\DeclareUnicodeCharacter{016E}{\ringaccent{U}}		% Ů
-\DeclareUnicodeCharacter{016F}{\ringaccent{u}}		% ů
-
-\DeclareUnicodeCharacter{0170}{\H{U}}			% Ű
-\DeclareUnicodeCharacter{0171}{\H{u}}			% ű
-\DeclareUnicodeCharacter{0174}{\^W}			% Ŵ
-\DeclareUnicodeCharacter{0175}{\^w}			% ŵ
-\DeclareUnicodeCharacter{0176}{\^Y}			% Ŷ
-\DeclareUnicodeCharacter{0177}{\^y}			% ŷ
-\DeclareUnicodeCharacter{0178}{\"Y}			% Ÿ
-\DeclareUnicodeCharacter{0179}{\'Z}			% Ź
-\DeclareUnicodeCharacter{017A}{\'z}			% ź
-\DeclareUnicodeCharacter{017B}{\dotaccent{Z}}		% Ż
-\DeclareUnicodeCharacter{017C}{\dotaccent{z}}		% ż
-\DeclareUnicodeCharacter{017D}{\v{Z}}			% Ž
-\DeclareUnicodeCharacter{017E}{\v{z}}			% ž
-
-\DeclareUnicodeCharacter{01C4}{D\v{Z}}			% DŽ
-\DeclareUnicodeCharacter{01C5}{D\v{z}}			% Dž
-\DeclareUnicodeCharacter{01C6}{d\v{z}}			% dž
-\DeclareUnicodeCharacter{01C7}{LJ}			% LJ
-\DeclareUnicodeCharacter{01C8}{Lj}			% Lj
-\DeclareUnicodeCharacter{01C9}{lj}			% lj
-\DeclareUnicodeCharacter{01CA}{NJ}			% NJ
-\DeclareUnicodeCharacter{01CB}{Nj}			% Nj
-\DeclareUnicodeCharacter{01CC}{nj}			% nj
-\DeclareUnicodeCharacter{01CD}{\v{A}}			% Ǎ
-\DeclareUnicodeCharacter{01CE}{\v{a}}			% ǎ
-\DeclareUnicodeCharacter{01CF}{\v{I}}			% Ǐ
-
-\DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}		% ǐ
-\DeclareUnicodeCharacter{01D1}{\v{O}}			% Ǒ
-\DeclareUnicodeCharacter{01D2}{\v{o}}			% ǒ
-\DeclareUnicodeCharacter{01D3}{\v{U}}			% Ǔ
-\DeclareUnicodeCharacter{01D4}{\v{u}}			% ǔ
-
-\DeclareUnicodeCharacter{01E2}{\={\AE}}			% Ǣ
-\DeclareUnicodeCharacter{01E3}{\={\ae}}			% ǣ
-\DeclareUnicodeCharacter{01E6}{\v{G}}			% Ǧ
-\DeclareUnicodeCharacter{01E7}{\v{g}}			% ǧ
-\DeclareUnicodeCharacter{01E8}{\v{K}}			% Ǩ
-\DeclareUnicodeCharacter{01E9}{\v{k}}			% ǩ
-
-\DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}		% ǰ
-\DeclareUnicodeCharacter{01F1}{DZ}			% DZ
-\DeclareUnicodeCharacter{01F2}{Dz}			% Dz
-\DeclareUnicodeCharacter{01F3}{dz}			% dz
-\DeclareUnicodeCharacter{01F4}{\'G}			% Ǵ
-\DeclareUnicodeCharacter{01F5}{\'g}			% ǵ
-\DeclareUnicodeCharacter{01F8}{\`N}			% Ǹ
-\DeclareUnicodeCharacter{01F9}{\`n}			% ǹ
-\DeclareUnicodeCharacter{01FC}{\'{\AE}}			% Ǽ
-\DeclareUnicodeCharacter{01FD}{\'{\ae}}			% ǽ
-\DeclareUnicodeCharacter{01FE}{\'{\O}}			% Ǿ
-\DeclareUnicodeCharacter{01FF}{\'{\o}}			% ǿ
-
-\DeclareUnicodeCharacter{021E}{\v{H}}			% Ȟ
-\DeclareUnicodeCharacter{021F}{\v{h}}			% ȟ
-
-\DeclareUnicodeCharacter{0226}{\dotaccent{A}}		% Ȧ
-\DeclareUnicodeCharacter{0227}{\dotaccent{a}}		% ȧ
-\DeclareUnicodeCharacter{0228}{\,{E}}			% Ȩ
-\DeclareUnicodeCharacter{0229}{\,{e}}			% ȩ
-\DeclareUnicodeCharacter{022E}{\dotaccent{O}}		% Ȯ
-\DeclareUnicodeCharacter{022F}{\dotaccent{o}}		% ȯ
-
-\DeclareUnicodeCharacter{0232}{\=Y}			% Ȳ
-\DeclareUnicodeCharacter{0233}{\=y}			% ȳ
-\DeclareUnicodeCharacter{0237}{\dotless{j}}		% ȷ
-
-\DeclareUnicodeCharacter{1E02}{\dotaccent{B}}		% Ḃ
-\DeclareUnicodeCharacter{1E03}{\dotaccent{b}}		% ḃ
-\DeclareUnicodeCharacter{1E04}{\udotaccent{B}}		% Ḅ
-\DeclareUnicodeCharacter{1E05}{\udotaccent{b}}		% ḅ
-\DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}		% Ḇ
-\DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}		% ḇ
-\DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}		% Ḋ
-\DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}		% ḋ
-\DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}		% Ḍ
-\DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}		% ḍ
-\DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}		% Ḏ
-\DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}		% ḏ
-
-\DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}		% Ḟ
-\DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}		% ḟ
-
-\DeclareUnicodeCharacter{1E20}{\=G}			% Ḡ
-\DeclareUnicodeCharacter{1E21}{\=g}			% ḡ
-\DeclareUnicodeCharacter{1E22}{\dotaccent{H}}		% Ḣ
-\DeclareUnicodeCharacter{1E23}{\dotaccent{h}}		% ḣ
-\DeclareUnicodeCharacter{1E24}{\udotaccent{H}}		% Ḥ
-\DeclareUnicodeCharacter{1E25}{\udotaccent{h}}		% ḥ
-\DeclareUnicodeCharacter{1E26}{\"H}			% Ḧ
-\DeclareUnicodeCharacter{1E27}{\"h}			% ḧ
-
-\DeclareUnicodeCharacter{1E30}{\'K}			% Ḱ
-\DeclareUnicodeCharacter{1E31}{\'k}			% ḱ
-\DeclareUnicodeCharacter{1E32}{\udotaccent{K}}		% Ḳ
-\DeclareUnicodeCharacter{1E33}{\udotaccent{k}}		% ḳ
-\DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}		% Ḵ
-\DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}		% ḵ
-\DeclareUnicodeCharacter{1E36}{\udotaccent{L}}		% Ḷ
-\DeclareUnicodeCharacter{1E37}{\udotaccent{l}}		% ḷ
-\DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}		% Ḻ
-\DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}		% ḻ
-\DeclareUnicodeCharacter{1E3E}{\'M}			% Ḿ
-\DeclareUnicodeCharacter{1E3F}{\'m}			% ḿ
-
-\DeclareUnicodeCharacter{1E40}{\dotaccent{M}}		% Ṁ
-\DeclareUnicodeCharacter{1E41}{\dotaccent{m}}		% ṁ
-\DeclareUnicodeCharacter{1E42}{\udotaccent{M}}		% Ṃ
-\DeclareUnicodeCharacter{1E43}{\udotaccent{m}}		% ṃ
-\DeclareUnicodeCharacter{1E44}{\dotaccent{N}}		% Ṅ
-\DeclareUnicodeCharacter{1E45}{\dotaccent{n}}		% ṅ
-\DeclareUnicodeCharacter{1E46}{\udotaccent{N}}		% Ṇ
-\DeclareUnicodeCharacter{1E47}{\udotaccent{n}}		% ṇ
-\DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}		% Ṉ
-\DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}		% ṉ
-
-\DeclareUnicodeCharacter{1E54}{\'P}			% Ṕ
-\DeclareUnicodeCharacter{1E55}{\'p}			% ṕ
-\DeclareUnicodeCharacter{1E56}{\dotaccent{P}}		% Ṗ
-\DeclareUnicodeCharacter{1E57}{\dotaccent{p}}		% ṗ
-\DeclareUnicodeCharacter{1E58}{\dotaccent{R}}		% Ṙ
-\DeclareUnicodeCharacter{1E59}{\dotaccent{r}}		% ṙ
-\DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}		% Ṛ
-\DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}		% ṛ
-\DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}		% Ṟ
-\DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}		% ṟ
-
-\DeclareUnicodeCharacter{1E60}{\dotaccent{S}}		% Ṡ
-\DeclareUnicodeCharacter{1E61}{\dotaccent{s}}		% ṡ
-\DeclareUnicodeCharacter{1E62}{\udotaccent{S}}		% Ṣ
-\DeclareUnicodeCharacter{1E63}{\udotaccent{s}}		% ṣ
-\DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}		% Ṫ
-\DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}		% ṫ
-\DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}		% Ṭ
-\DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}		% ṭ
-\DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}		% Ṯ
-\DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}		% ṯ
-
-\DeclareUnicodeCharacter{1E7C}{\~V}			% Ṽ
-\DeclareUnicodeCharacter{1E7D}{\~v}			% ṽ
-\DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}		% Ṿ
-\DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}		% ṿ
-
-\DeclareUnicodeCharacter{1E80}{\`W}			% Ẁ
-\DeclareUnicodeCharacter{1E81}{\`w}			% ẁ
-\DeclareUnicodeCharacter{1E82}{\'W}			% Ẃ
-\DeclareUnicodeCharacter{1E83}{\'w}			% ẃ
-\DeclareUnicodeCharacter{1E84}{\"W}			% Ẅ
-\DeclareUnicodeCharacter{1E85}{\"w}			% ẅ
-\DeclareUnicodeCharacter{1E86}{\dotaccent{W}}		% Ẇ
-\DeclareUnicodeCharacter{1E87}{\dotaccent{w}}		% ẇ
-\DeclareUnicodeCharacter{1E88}{\udotaccent{W}}		% Ẉ
-\DeclareUnicodeCharacter{1E89}{\udotaccent{w}}		% ẉ
-\DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}		% Ẋ
-\DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}		% ẋ
-\DeclareUnicodeCharacter{1E8C}{\"X}			% Ẍ
-\DeclareUnicodeCharacter{1E8D}{\"x}			% ẍ
-\DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}		% Ẏ
-\DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}		% ẏ
-
-\DeclareUnicodeCharacter{1E90}{\^Z}			% Ẑ
-\DeclareUnicodeCharacter{1E91}{\^z}			% ẑ
-\DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}		% Ẓ
-\DeclareUnicodeCharacter{1E93}{\udotaccent{z}}		% ẓ
-\DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}		% Ẕ
-\DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}		% ẕ
-\DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}		% ẖ
-\DeclareUnicodeCharacter{1E97}{\"t}			% ẗ
-\DeclareUnicodeCharacter{1E98}{\ringaccent{w}}		% ẘ
-\DeclareUnicodeCharacter{1E99}{\ringaccent{y}}		% ẙ
-
-\DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}		% Ạ
-\DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}		% ạ
-
-\DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}		% Ẹ
-\DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}		% ẹ
-\DeclareUnicodeCharacter{1EBC}{\~E}			% Ẽ
-\DeclareUnicodeCharacter{1EBD}{\~e}			% ẽ
-
-\DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}		% Ị
-\DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}		% ị
-\DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}		% Ọ
-\DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}		% ọ
-
-\DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}		% Ụ
-\DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}		% ụ
-
-\DeclareUnicodeCharacter{1EF2}{\`Y}			% Ỳ
-\DeclareUnicodeCharacter{1EF3}{\`y}			% ỳ
-\DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}		% Ỵ
-%\DeclareUnicodeCharacter{1EF5}{\udotaccent{y}}		% ỵ
-\DeclareUnicodeCharacter{1EF8}{\~Y}			% Ỹ
-\DeclareUnicodeCharacter{1EF9}{\~y}			% ỹ
-
-\DeclareUnicodeCharacter{2013}{--}			% –
-\DeclareUnicodeCharacter{2014}{---}			% —
-\DeclareUnicodeCharacter{2022}{\bullet}			% •
-\DeclareUnicodeCharacter{2026}{\dots}			% …
-\DeclareUnicodeCharacter{20AC}{\euro}			% €
-
-\DeclareUnicodeCharacter{2192}{\expansion}		% →
-\DeclareUnicodeCharacter{21D2}{\result}			% ⇒
-
-\DeclareUnicodeCharacter{2212}{\minus}			% −
-\DeclareUnicodeCharacter{2217}{\point}			% ∗
-\DeclareUnicodeCharacter{2261}{\equiv}			% ≡
-
+\global\catcode`^^a0\active % `�'
+\gdef^^a0{\tie}
+\global\catcode`^^a1\active % �
+\gdef^^a1{\exclamdown}
+%\global\catcode`^^a2\active % �
+%\gdef^^a2{}
+\global\catcode`^^a3\active % �
+\gdef^^a3{\pounds}
+%\global\catcode`^^a4\active % �
+%\gdef^^a4{}
+%\global\catcode`^^a5\active % �
+%\gdef^^a5{}
+%\global\catcode`^^a6\active % �
+%\gdef^^a6{}
+%\global\catcode`^^a7\active % �
+%\gdef^^a7{}
+\global\catcode`^^a8\active % �
+\gdef^^a8{\"{ }}
+\global\catcode`^^a9\active % �
+\gdef^^a9{\copyright}
+\global\catcode`^^aa\active % �
+\gdef^^aa{\ordf}
+%\global\catcode`^^ab\active % �
+%\gdef^^ab{}
+%\global\catcode`^^ac\active % �
+%\gdef^^ac{}
+%\global\catcode`^^ad\active % �
+%\gdef^^ad{}
+\global\catcode`^^ae\active % �
+\gdef^^ae{\registeredsymbol}
+\global\catcode`^^af\active % �
+\gdef^^af{\={ }}
+\global\catcode`^^b0\active % �
+\gdef^^b0{\ringaccent{ }}
+%\global\catcode`^^b1\active % �
+%\gdef^^b1{}
+%\global\catcode`^^b2\active % �
+%\gdef^^b2{}
+%\global\catcode`^^b3\active % �
+%\gdef^^b3{}
+\global\catcode`^^b4\active % �
+\gdef^^b4{\'{ }}
+%\global\catcode`^^b5\active % �
+%\gdef^^b5{}
+%\global\catcode`^^b6\active % �
+%\gdef^^b6{}
+%\global\catcode`^^b7\active % �
+%\gdef^^b7{}
+\global\catcode`^^b8\active % �
+\gdef^^b8{\,{ }}
+%\global\catcode`^^b9\active % �
+%\gdef^^b9{}
+\global\catcode`^^ba\active % �
+\gdef^^ba{\ordm}
+%\global\catcode`^^bb\active % �
+%\gdef^^bb{}
+%\global\catcode`^^bc\active % �
+%\gdef^^bc{}
+%\global\catcode`^^bd\active % �
+%\gdef^^bd{}
+%\global\catcode`^^be\active % �
+%\gdef^^be{}
+\global\catcode`^^bf\active % �
+\gdef^^bf{\exclamdown}
+\global\catcode`^^c0\active % �
+\gdef^^c0{\`A}
+\global\catcode`^^c1\active % �
+\gdef^^c1{\'A}
+\global\catcode`^^c2\active % �
+\gdef^^c2{\^A}
+\global\catcode`^^c3\active % �
+\gdef^^c3{\~A}
+\global\catcode`^^c4\active % �
+\gdef^^c4{\"A}
+\global\catcode`^^c5\active % �
+\gdef^^c5{\AA}
+\global\catcode`^^c6\active % �
+\gdef^^c6{\AE}
+\global\catcode`^^c7\active % �
+\gdef^^c7{\,{C}}
+\global\catcode`^^c8\active % �
+\gdef^^c8{\`E}
+\global\catcode`^^c9\active % �
+\gdef^^c9{\'E}
+\global\catcode`^^ca\active % �
+\gdef^^ca{\^E}
+\global\catcode`^^cb\active % �
+\gdef^^cb{\"E}
+\global\catcode`^^cc\active % �
+\gdef^^cc{\`I}
+\global\catcode`^^cd\active % �
+\gdef^^cd{\'I}
+\global\catcode`^^ce\active % �
+\gdef^^ce{\^I}
+\global\catcode`^^cf\active % �
+\gdef^^cf{\"I}
+%\global\catcode`^^d0\active % �
+%\gdef^^d0{}
+\global\catcode`^^d1\active % �
+\gdef^^d1{\~N}
+\global\catcode`^^d2\active % �
+\gdef^^d2{\`O}
+\global\catcode`^^d3\active % �
+\gdef^^d3{\'O}
+\global\catcode`^^d4\active % �
+\gdef^^d4{\^O}
+\global\catcode`^^d5\active % �
+\gdef^^d5{\~O}
+\global\catcode`^^d6\active % �
+\gdef^^d6{\"O}
+%\global\catcode`^^d7\active % �
+%\gdef^^d7{}
+\global\catcode`^^d8\active % �
+\gdef^^d8{\O}
+\global\catcode`^^d9\active % �
+\gdef^^d9{\`U}
+\global\catcode`^^da\active % �
+\gdef^^da{\'U}
+\global\catcode`^^db\active % �
+\gdef^^db{\^U}
+\global\catcode`^^dc\active % �
+\gdef^^dc{\"U}
+\global\catcode`^^dd\active % �
+\gdef^^dd{\'Y}
+%\global\catcode`^^de\active % �
+%\gdef^^de{}
+\global\catcode`^^df\active % �
+\gdef^^df{\ss}
+\global\catcode`^^e0\active % �
+\gdef^^e0{\`a}
+\global\catcode`^^e1\active % �
+\gdef^^e1{\'a}
+\global\catcode`^^e2\active % �
+\gdef^^e2{\^a}
+\global\catcode`^^e3\active % �
+\gdef^^e3{\~a}
+\global\catcode`^^e4\active % �
+\gdef^^e4{\"a}
+\global\catcode`^^e5\active % �
+\gdef^^e5{\aa}
+\global\catcode`^^e6\active % �
+\gdef^^e6{\ae}
+\global\catcode`^^e7\active % �
+\gdef^^e7{\,{c}}
+\global\catcode`^^e8\active % �
+\gdef^^e8{\`e}
+\global\catcode`^^e9\active % �
+\gdef^^e9{\'e}
+\global\catcode`^^ea\active % �
+\gdef^^ea{\^e}
+\global\catcode`^^eb\active % �
+\gdef^^eb{\"e}
+\global\catcode`^^ec\active % �
+\gdef^^ec{\`{\dotless{i}}}
+\global\catcode`^^ed\active % �
+\gdef^^ed{\'{\dotless{i}}}
+\global\catcode`^^ee\active % �
+\gdef^^ee{\^{\dotless{i}}}
+\global\catcode`^^ef\active % �
+\gdef^^ef{\"{\dotless{i}}}
+%\global\catcode`^^f0\active % �
+%\gdef^^f0{}
+\global\catcode`^^f1\active % �
+\gdef^^f1{\~n}
+\global\catcode`^^f2\active % �
+\gdef^^f2{\`o}
+\global\catcode`^^f3\active % �
+\gdef^^f3{\'o}
+\global\catcode`^^f4\active % �
+\gdef^^f4{\^o}
+\global\catcode`^^f5\active % �
+\gdef^^f5{\~o}
+\global\catcode`^^f6\active % �
+\gdef^^f6{\"o}
+%\global\catcode`^^f7\active % �
+%\gdef^^f7{}
+\global\catcode`^^f8\active % �
+\gdef^^f8{\o}
+\global\catcode`^^f9\active % �
+\gdef^^f9{\`u}
+\global\catcode`^^fa\active % �
+\gdef^^fa{\'u}
+\global\catcode`^^fb\active % �
+\gdef^^fb{\^u}
+\global\catcode`^^fc\active % �
+\gdef^^fc{\"u}
+\global\catcode`^^fd\active % �
+\gdef^^fd{\'y}
+%\global\catcode`^^fe\active % �
+%\gdef^^fe{}
+\global\catcode`^^ff\active % �
+\gdef^^ff{\"y}
 @end tex
diff --git a/tex/texinfo.tex b/tex/texinfo.tex
index 62fa9a4f63..6bc9fcdadd 100644
--- a/tex/texinfo.tex
+++ b/tex/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{2006-06-01.17}
+\def\texinfoversion{2006-02-13.16}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
@@ -385,7 +385,7 @@
 %
 \def\parsearg{\parseargusing{}}
 \def\parseargusing#1#2{%
-  \def\argtorun{#2}%
+  \def\next{#2}%
   \begingroup
     \obeylines
     \spaceisspace
@@ -416,7 +416,8 @@
 \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
   \def\temp{#3}%
   \ifx\temp\empty
-    % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
+    % We cannot use \next here, as it holds the macro to run;
+    % thus we reuse \temp.
     \let\temp\finishparsearg
   \else
     \let\temp\argcheckspaces
@@ -428,14 +429,14 @@
 % If a _delimited_ argument is enclosed in braces, they get stripped; so
 % to get _exactly_ the rest of the line, we had to prevent such situation.
 % We prepended an \empty token at the very beginning and we expand it now,
-% just before passing the control to \argtorun.
+% just before passing the control to \next.
 % (Similarily, we have to think about #3 of \argcheckspacesY above: it is
 % either the null string, or it ends with \^^M---thus there is no danger
 % that a pair of braces would be stripped.
 %
 % But first, we have to remove the trailing space token.
 %
-\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
+\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}}
 
 % \parseargdef\foo{...}
 %	is roughly equivalent to
@@ -1084,24 +1085,15 @@ where each line of input produces a line of output.}
 \def\minus{$-$}
 
 % @dots{} outputs an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in the cm
-% typewriter fonts as three actual period characters; on the other hand,
-% in other typewriter fonts three periods are wider than 1.5em.  So do
-% whichever is larger.
+% We do .5em per period so that it has the same spacing in a typewriter
+% font as three actual period characters.
 %
 \def\dots{%
   \leavevmode
-  \setbox0=\hbox{...}% get width of three periods
-  \ifdim\wd0 > 1.5em
-    \dimen0 = \wd0
-  \else
-    \dimen0 = 1.5em
-  \fi
-  \hbox to \dimen0{%
-    \hskip 0pt plus.25fil
-    .\hskip 0pt plus1fil
-    .\hskip 0pt plus1fil
-    .\hskip 0pt plus.5fil
+  \hbox to 1.5em{%
+    \hskip 0pt plus 0.25fil
+    .\hfil.\hfil.%
+    \hskip 0pt plus 0.5fil
   }%
 }
 
@@ -1246,10 +1238,9 @@ where each line of input produces a line of output.}
 \ifpdf
   \input pdfcolor
   \pdfcatalog{/PageMode /UseOutlines}%
-  % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
   \def\dopdfimage#1#2#3{%
-    \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
-    \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+    \def\imagewidth{#2}%
+    \def\imageheight{#3}%
     % without \immediate, pdftex seg faults when the same image is
     % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
     \ifnum\pdftexversion < 14
@@ -1257,8 +1248,8 @@ where each line of input produces a line of output.}
     \else
       \immediate\pdfximage
     \fi
-      \ifdim \wd0 >0pt width \imagewidth \fi
-      \ifdim \wd2 >0pt height \imageheight \fi
+      \ifx\empty\imagewidth\else width \imagewidth \fi
+      \ifx\empty\imageheight\else height \imageheight \fi
       \ifnum\pdftexversion<13
          #1.pdf%
        \else
@@ -1481,7 +1472,6 @@ where each line of input produces a line of output.}
 % We don't need math for this font style.
 \def\ttsl{\setfontstyle{ttsl}}
 
-
 % Default leading.
 \newdimen\textleading  \textleading = 13.2pt
 
@@ -1503,13 +1493,11 @@ where each line of input produces a line of output.}
   }%
 }
 
-
 % Set the font macro #1 to the font named #2, adding on the
 % specified font prefix (normally `cm').
 % #3 is the font's design size, #4 is a scale factor
 \def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
 
-
 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
 % before you read in texinfo.tex.
@@ -1533,10 +1521,6 @@ where each line of input produces a line of output.}
 \def\scshape{csc}
 \def\scbshape{csc}
 
-% Definitions for a main text size of 11pt.  This is the default in
-% Texinfo.
-% 
-\def\definetextfontsizexi{
 % Text fonts (11.2pt, magstep1).
 \def\textnominalsize{11pt}
 \edef\mainmagstep{\magstephalf}
@@ -1650,165 +1634,6 @@ where each line of input produces a line of output.}
 \font\reducedi=cmmi10
 \font\reducedsy=cmsy10
 
-% reset the current fonts
-\textfonts
-\rm
-} % end of 11pt text font size definitions
-
-
-% Definitions to make the main text be 10pt Computer Modern, with
-% section, chapter, etc., sizes following suit.  This is for the GNU
-% Press printing of the Emacs 22 manual.  Maybe other manuals in the
-% future.  Used with @smallbook, which sets the leading to 12pt.
-% 
-\def\definetextfontsizex{%
-% Text fonts (10pt).
-\def\textnominalsize{10pt}
-\edef\mainmagstep{1000}
-\setfont\textrm\rmshape{10}{\mainmagstep}
-\setfont\texttt\ttshape{10}{\mainmagstep}
-\setfont\textbf\bfshape{10}{\mainmagstep}
-\setfont\textit\itshape{10}{\mainmagstep}
-\setfont\textsl\slshape{10}{\mainmagstep}
-\setfont\textsf\sfshape{10}{\mainmagstep}
-\setfont\textsc\scshape{10}{\mainmagstep}
-\setfont\textttsl\ttslshape{10}{\mainmagstep}
-\font\texti=cmmi10 scaled \mainmagstep
-\font\textsy=cmsy10 scaled \mainmagstep
-
-% A few fonts for @defun names and args.
-\setfont\defbf\bfshape{10}{\magstephalf}
-\setfont\deftt\ttshape{10}{\magstephalf}
-\setfont\defttsl\ttslshape{10}{\magstephalf}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
-
-% Fonts for indices, footnotes, small examples (9pt).
-\def\smallnominalsize{9pt}
-\setfont\smallrm\rmshape{9}{1000}
-\setfont\smalltt\ttshape{9}{1000}
-\setfont\smallbf\bfshape{10}{900}
-\setfont\smallit\itshape{9}{1000}
-\setfont\smallsl\slshape{9}{1000}
-\setfont\smallsf\sfshape{9}{1000}
-\setfont\smallsc\scshape{10}{900}
-\setfont\smallttsl\ttslshape{10}{900}
-\font\smalli=cmmi9
-\font\smallsy=cmsy9
-
-% Fonts for small examples (8pt).
-\def\smallernominalsize{8pt}
-\setfont\smallerrm\rmshape{8}{1000}
-\setfont\smallertt\ttshape{8}{1000}
-\setfont\smallerbf\bfshape{10}{800}
-\setfont\smallerit\itshape{8}{1000}
-\setfont\smallersl\slshape{8}{1000}
-\setfont\smallersf\sfshape{8}{1000}
-\setfont\smallersc\scshape{10}{800}
-\setfont\smallerttsl\ttslshape{10}{800}
-\font\smalleri=cmmi8
-\font\smallersy=cmsy8
-
-% Fonts for title page (20.4pt):
-\def\titlenominalsize{20pt}
-\setfont\titlerm\rmbshape{12}{\magstep3}
-\setfont\titleit\itbshape{10}{\magstep4}
-\setfont\titlesl\slbshape{10}{\magstep4}
-\setfont\titlett\ttbshape{12}{\magstep3}
-\setfont\titlettsl\ttslshape{10}{\magstep4}
-\setfont\titlesf\sfbshape{17}{\magstep1}
-\let\titlebf=\titlerm
-\setfont\titlesc\scbshape{10}{\magstep4}
-\font\titlei=cmmi12 scaled \magstep3
-\font\titlesy=cmsy10 scaled \magstep4
-\def\authorrm{\secrm}
-\def\authortt{\sectt}
-
-% Chapter fonts (14.4pt).
-\def\chapnominalsize{14pt}
-\setfont\chaprm\rmbshape{12}{\magstep1}
-\setfont\chapit\itbshape{10}{\magstep2}
-\setfont\chapsl\slbshape{10}{\magstep2}
-\setfont\chaptt\ttbshape{12}{\magstep1}
-\setfont\chapttsl\ttslshape{10}{\magstep2}
-\setfont\chapsf\sfbshape{12}{\magstep1}
-\let\chapbf\chaprm
-\setfont\chapsc\scbshape{10}{\magstep2}
-\font\chapi=cmmi12 scaled \magstep1
-\font\chapsy=cmsy10 scaled \magstep2
-
-% Section fonts (12pt).
-\def\secnominalsize{12pt}
-\setfont\secrm\rmbshape{12}{1000}
-\setfont\secit\itbshape{10}{\magstep1}
-\setfont\secsl\slbshape{10}{\magstep1}
-\setfont\sectt\ttbshape{12}{1000}
-\setfont\secttsl\ttslshape{10}{\magstep1}
-\setfont\secsf\sfbshape{12}{1000}
-\let\secbf\secrm
-\setfont\secsc\scbshape{10}{\magstep1}
-\font\seci=cmmi12 
-\font\secsy=cmsy10 scaled \magstep1
-
-% Subsection fonts (10pt).
-\def\ssecnominalsize{10pt}
-\setfont\ssecrm\rmbshape{10}{1000}
-\setfont\ssecit\itbshape{10}{1000}
-\setfont\ssecsl\slbshape{10}{1000}
-\setfont\ssectt\ttbshape{10}{1000}
-\setfont\ssecttsl\ttslshape{10}{1000}
-\setfont\ssecsf\sfbshape{10}{1000}
-\let\ssecbf\ssecrm
-\setfont\ssecsc\scbshape{10}{1000}
-\font\sseci=cmmi10
-\font\ssecsy=cmsy10
-
-% Reduced fonts for @acro in text (9pt).
-\def\reducednominalsize{9pt}
-\setfont\reducedrm\rmshape{9}{1000}
-\setfont\reducedtt\ttshape{9}{1000}
-\setfont\reducedbf\bfshape{10}{900}
-\setfont\reducedit\itshape{9}{1000}
-\setfont\reducedsl\slshape{9}{1000}
-\setfont\reducedsf\sfshape{9}{1000}
-\setfont\reducedsc\scshape{10}{900}
-\setfont\reducedttsl\ttslshape{10}{900}
-\font\reducedi=cmmi9
-\font\reducedsy=cmsy9
-
-% reduce space between paragraphs
-\divide\parskip by 2
-
-% reset the current fonts
-\textfonts
-\rm
-} % end of 10pt text font size definitions
-
-
-% We provide the user-level command
-%   @fonttextsize 10
-% (or 11) to redefine the text font size.  pt is assumed.
-% 
-\def\xword{10}
-\def\xiword{11}
-%
-\parseargdef\fonttextsize{%
-  \def\textsizearg{#1}%
-  \wlog{doing @fonttextsize \textsizearg}%
-  %
-  % Set \globaldefs so that documents can use this inside @tex, since
-  % makeinfo 4.8 does not support it, but we need it nonetheless.
-  % 
- \begingroup \globaldefs=1
-  \ifx\textsizearg\xword \definetextfontsizex
-  \else \ifx\textsizearg\xiword \definetextfontsizexi
-  \else
-    \errhelp=\EMsimple
-    \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
-  \fi\fi
- \endgroup
-}
-
-
 % In order for the font changes to affect most math symbols and letters,
 % we have to define the \textfont of the standard families.  Since
 % texinfo doesn't allow for producing subscripts and superscripts except
@@ -1919,7 +1744,7 @@ where each line of input produces a line of output.}
 
 % Set up the default fonts, so we can use them for creating boxes.
 %
-\definetextfontsizexi
+\textfonts \rm
 
 % Define these so they can be easily changed for other fonts.
 \def\angleleft{$\langle$}
@@ -3403,39 +3228,12 @@ where each line of input produces a line of output.}
   \escapechar = `\\     % use backslash in output files.
   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
   \def\ {\realbackslash\space }%
-  %
   % Need these in case \tex is in effect and \{ is a \delimiter again.
   % But can't use \lbracecmd and \rbracecmd because texindex assumes
   % braces and backslashes are used only as delimiters.
   \let\{ = \mylbrace
   \let\} = \myrbrace
   %
-  % I don't entirely understand this, but when an index entry is
-  % generated from a macro call, the \endinput which \scanmacro inserts
-  % causes processing to be prematurely terminated.  This is,
-  % apparently, because \indexsorttmp is fully expanded, and \endinput
-  % is an expandable command.  The redefinition below makes \endinput
-  % disappear altogether for that purpose -- although logging shows that
-  % processing continues to some further point.  On the other hand, it
-  % seems \endinput does not hurt in the printed index arg, since that
-  % is still getting written without apparent harm.
-  % 
-  % Sample source (mac-idx3.tex, reported by Graham Percival to
-  % help-texinfo, 22may06):
-  % @macro funindex {WORD}
-  % @findex xyz
-  % @end macro
-  % ...
-  % @funindex commtest
-  % 
-  % The above is not enough to reproduce the bug, but it gives the flavor.
-  % 
-  % Sample whatsit resulting:
-  % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
-  % 
-  % So:
-  \let\endinput = \empty
-  %
   % Do the redefinitions.
   \commondummies
 }
@@ -4584,17 +4382,14 @@ where each line of input produces a line of output.}
     \ifx\temptype\Ynothingkeyword
       \setbox0 = \hbox{}%
       \def\toctype{unnchap}%
-      \gdef\thischapternum{}%
       \gdef\thischapter{#1}%
     \else\ifx\temptype\Yomitfromtockeyword
       \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
       \def\toctype{omit}%
-      \gdef\thischapternum{}%
       \gdef\thischapter{}%
     \else\ifx\temptype\Yappendixkeyword
       \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
       \def\toctype{app}%
-      \xdef\thischapternum{\appendixletter}%
       % We don't substitute the actual chapter name into \thischapter
       % because we don't want its macros evaluated now.  And we don't
       % use \thissection because that changes with each section.
@@ -4604,7 +4399,6 @@ where each line of input produces a line of output.}
     \else
       \setbox0 = \hbox{#3\enspace}%
       \def\toctype{numchap}%
-      \xdef\thischapternum{\the\chapno}%
       \xdef\thischapter{\putwordChapter{} \the\chapno:
                         \noexpand\thischaptername}%
     \fi\fi\fi
@@ -5268,7 +5062,7 @@ where each line of input produces a line of output.}
 %
 \maketwodispenvs {lisp}{example}{%
   \nonfillstart
-  \tt\quoteexpand
+  \tt
   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
   \gobble       % eat return
 }
@@ -5882,6 +5676,7 @@ where each line of input produces a line of output.}
     \spaceisspace
     %
     % Append \endinput to make sure that TeX does not see the ending newline.
+    %
     % I've verified that it is necessary both for e-TeX and for ordinary TeX
     %							--kasal, 29nov03
     \scantokens{#1\endinput}%
@@ -6148,11 +5943,11 @@ where each line of input produces a line of output.}
 % {.  If so it reads up to the closing }, if not, it reads the whole
 % line.  Whatever was read is then fed to the next control sequence
 % as an argument (by \parsebrace or \parsearg)
-\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
+\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
 \def\braceorlinexxx{%
   \ifx\nchar\bgroup\else
     \expandafter\parsearg
-  \fi \macnamexxx}
+  \fi \next}
 
 
 % @alias.