2003-07-23 Stepan Kasal
* doc/texinfo.tex (\heading, \subheading, \subsubheading): Call \suppressfirstparagraphindent after setting the heading. (\headingyyy, \subheadingyyy, \subsubheadingyyy): New macros. (\chapheadingzzz): Call \suppressfirstparagraphindent at the end and move \chapbreak ... (\chapheading): ... here. (\majorheading): Do a modified \chapbreak, then call \chapheadingzzz. (\majorheadingzzz): Deleted. diff -u -p -r1.74 texinfo.tex --- ./doc/texinfo.tex 17 Jul 2003 13:11:25 -0000 1.74 +++ ./doc/texinfo.tex 23 Jul 2003 11:30:17 -0000 @@ -887,13 +887,13 @@ where each line of input produces a line % @firstparagraphindent WORD % If WORD is `none', then suppress indentation of the first paragraph -% after a section heading. If WORD is `insert', then do indentat such +% after a section heading. If WORD is `insert', then do indent at such % paragraphs. % % The paragraph indentation is suppressed or not by calling -% \suppressfirstparagraphindent, which the sectioning commands do. We -% switch the definition of this back and forth according to WORD. By -% default, we suppress indentation. +% \suppressfirstparagraphindent, which the sectioning commands do. +% We switch the definition of this back and forth according to WORD. +% By default, we suppress indentation. % \def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent} \newdimen\currentparindent @@ -4023,23 +4023,27 @@ width0pt\relax} \fi % if justification is not attempted. Hence \raggedright. -\def\majorheading{\parsearg\majorheadingzzz} -\def\majorheadingzzz #1{% +\def\majorheading{% {\advance\chapheadingskip by 10pt \chapbreak }% - {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\raggedright - \rm #1\hfill}}\bigskip \par\penalty 200} + \parsearg\chapheadingzzz +} -\def\chapheading{\parsearg\chapheadingzzz} -\def\chapheadingzzz #1{\chapbreak % +\def\chapheading{\chapbreak \parsearg\chapheadingzzz} +\def\chapheadingzzz #1{% {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt\raggedright - \rm #1\hfill}}\bigskip \par\penalty 200} + \rm #1\hfill}}% + \bigskip \par\penalty 200\relax + \suppressfirstparagraphindent +} % @heading, @subheading, @subsubheading. -\def\heading{\parsearg\plainsecheading} -\def\subheading{\parsearg\plainsubsecheading} -\def\subsubheading{\parsearg\plainsubsubsecheading} +\def\heading{\parsearg\secheadingyyy} +\def\subheading{\parsearg\subsecheadingyyy} +\def\subsubheading{\parsearg\subsubsecheadingyyy} +\def\headingyyy#1{\plainsecheading{#1}\suppressfirstparagraphindent} +\def\subheadingyyy#1{\plainsubsecheading{#1}\suppressfirstparagraphindent} +\def\subsubheadingyyy#1{\plainsubsubsecheading{#1}\suppressfirstparagraphindent} % These macros generate a chapter, section, etc. heading only % (including whitespace, linebreaking, etc. around it),