diff options
| -rw-r--r-- | texinfo.tex | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/texinfo.tex b/texinfo.tex index 7614465..c8368b9 100644 --- a/texinfo.tex +++ b/texinfo.tex @@ -2943,33 +2943,35 @@ width0pt\relax} \fi \global\let\unnumbchapmacro=\unnchfplain \global\let\centerchapmacro=\centerchfplain} -% #1 is the text, #2 the chapter number. -\def\chfplain #1#2{% +% Plain chapter opening. +% #1 is the text, #2 the chapter number or empty if unnumbered. +\def\chfplain#1#2{% \pchapsepmacro {% \chapfonts \rm - \setbox0 = \hbox{#2\enspace}% + \def\chapnum{#2}% + \setbox0 = \hbox{#2\ifx\chapnum\empty\else\enspace\fi}% \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright - \hangindent = \wd0 - \unhbox0 #1}% + \hangindent = \wd0 \centerparametersmaybe + \unhbox0 #1\par}% }% \nobreak\bigskip % no page break after a chapter title \nobreak } -\def\unnchfplain #1{% -\pchapsepmacro % -{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\raggedright - \rm #1\hfill}}\bigskip \par\penalty 10000 % -} +% Plain opening for unnumbered. +\def\unnchfplain#1{\chfplain{#1}{}} -\def\centerchfplain #1{% -\pchapsepmacro % -{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt - {\rm #1}\hfill}}\bigskip \par\penalty 10000 % -} +% @centerchap -- centered and unnumbered. +\let\centerparametersmaybe = \relax +\def\centerchfplain#1{{% + \def\centerparametersmaybe{% + \advance\rightskip by 3\rightskip + \leftskip = \rightskip + \parfillskip = 0pt + }% + \chfplain{#1}{}% +}} \CHAPFplain % The default @@ -3025,10 +3027,13 @@ width0pt\relax} \fi \csname #1headingbreak\endcsname }% {% + % Switch to the right set of fonts. \csname #1fonts\endcsname \rm - \def\secnum{#2}% + % % Only insert the separating space if we have a section number. - \setbox0 = \hbox{#2\ifx\secnum\empty\else \enspace \fi}% + \def\secnum{#2}% + \setbox0 = \hbox{#2\ifx\secnum\empty\else\enspace\fi}% + % \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright \hangindent = \wd0 % zero if no section number \unhbox0 #3}% |