texinfo/doc texinfo.tex,1.34,1.35

[karl]

Update of /cvsroot/texinfo/texinfo/doc
In directory sheep:/tmp/cvs-serv25958

Modified Files:
        texinfo.tex 
Log Message:
2004-02-24  Stepan Kasal  <address@hidden>

        * doc/texinfo.tex (\centerchap): Fixed to work again,
          don't open group.
          (\centerparameters): New macro.
          (\centerchfplain): Nuked.

        The following continues with procecution of @setchapterstyle{open}:
        * doc/texinfo.tex (\chfplain): renamed to \chapmacro.
          (\CHAPFplain): Nuked.
          (\setchapterstyle): Moved next to its deprecated friends.


Index: texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** texinfo.tex 24 Feb 2004 14:34:26 -0000      1.34
--- texinfo.tex 24 Feb 2004 14:35:45 -0000      1.35
***************
*** 3916,3922 ****
  }
  
- % @centerchap is like @unnumbered, but the heading is centered.
- \outer\parseargdef\centerchap{{\unnumberedyyy{#1}}}
- 
  \outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls 
unnumberedzzz
  \def\unnumberedzzz#1{%
--- 3916,3919 ----
***************
*** 3949,3952 ****
--- 3946,3959 ----
  }
  
+ % @centerchap is like @unnumbered, but the heading is centered.
+ \outer\parseargdef\centerchap{%
+   % Well, we could do the following in a group, but that would break
+   % an assumption that \chapmacro is called at the outermost level.
+   % Thus we are safer this way:               --kasal, 24feb04
+   \let\centerparametersmaybe = \centerparameters
+   \unnmhead0{#1}%
+   \let\centerparametersmaybe = \relax
+ }
+ 
  % @top is like @unnumbered.
  \let\top\unnumbered
***************
*** 4080,4085 ****
  \def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
  
- \def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
- 
  %%% Define plain chapter starts, and page on/off switching for it
  % Parameter controlling skip before chapter headings (if needed)
--- 4087,4090 ----
***************
*** 4112,4120 ****
  \CHAPPAGon
  
! \def\CHAPFplain{%
! \global\let\chapmacro=\chfplain
! \global\let\centerchapmacro=\centerchfplain}
! 
! % Normal chapter opening.
  % 
  % #1 is the text, #2 is the section type (Ynumbered, Ynothing,
--- 4117,4121 ----
  \CHAPPAGon
  
! % Chapter opening.
  % 
  % #1 is the text, #2 is the section type (Ynumbered, Ynothing,
***************
*** 4126,4130 ****
  \def\Yappendixkeyword{Yappendix}
  %
! \def\chfplain#1#2#3{%
    \pchapsepmacro
    {%
--- 4127,4131 ----
  \def\Yappendixkeyword{Yappendix}
  %
! \def\chapmacro#1#2#3{%
    \pchapsepmacro
    {%
***************
*** 4187,4204 ****
  % @centerchap -- centered and unnumbered.
  \let\centerparametersmaybe = \relax
! \def\centerchfplain#1{{%
!   \def\centerparametersmaybe{%
!     \advance\rightskip by 3\rightskip
!     \leftskip = \rightskip
!     \parfillskip = 0pt
!   }%
!   \chfplain{#1}{Ynothing}{}%
! }}
  
- \CHAPFplain % The default
  
  % I don't think this chapter style is supported any more, so I'm not
  % updating it with the new noderef stuff.  We'll see.  --karl, 11aug03.
  % 
  \def\unnchfopen #1{%
  \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
--- 4188,4203 ----
  % @centerchap -- centered and unnumbered.
  \let\centerparametersmaybe = \relax
! \def\centerparameters{%
!   \advance\rightskip by 3\rightskip
!   \leftskip = \rightskip
!   \parfillskip = 0pt
! }
  
  
  % I don't think this chapter style is supported any more, so I'm not
  % updating it with the new noderef stuff.  We'll see.  --karl, 11aug03.
  % 
+ \def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
+ %
  \def\unnchfopen #1{%
  \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
***************
*** 4206,4215 ****
                         \rm #1\hfill}}\bigskip \par\nobreak
  }
- 
  \def\chfopen #1#2{\chapoddpage {\chapfonts
  \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
  \par\penalty 5000 %
  }
- 
  \def\centerchfopen #1{%
  \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
--- 4205,4212 ----
***************
*** 4217,4224 ****
                         \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
  }
- 
  \def\CHAPFopen{%
! \global\let\chapmacro=\chfopen
! \global\let\centerchapmacro=\centerchfopen}
  
  
--- 4214,4220 ----
                         \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
  }
  \def\CHAPFopen{%
!   \global\let\chapmacro=\chfopen
!   \global\let\centerchapmacro=\centerchfopen}