mirror of
https://salsa.debian.org/srivasta/make-dfsg.git
synced 2024-12-25 13:41:45 +00:00
(\HEADINGSdouble, \HEADINGSsingle,
HEADINGSdoubleafter, \HEADINGSsingleafter, \CHAPPAGoff, \CHAPPAGon, \CHAPPAGodd): Set \contentsalignmacro, analogous to \pagealignmacro. (\startcontents): Call \contentsalignmacro instead of \pagealignmacro.
This commit is contained in:
parent
a7f3831457
commit
30cf28ef63
1 changed files with 18 additions and 5 deletions
23
texinfo.tex
23
texinfo.tex
|
@ -1426,7 +1426,8 @@ where each line of input produces a line of output.}
|
|||
% @headings after turns on double-sided headings after this page.
|
||||
% @headings doubleafter turns on double-sided headings after this page.
|
||||
% @headings singleafter turns on single-sided headings after this page.
|
||||
% By default, they are off.
|
||||
% By default, they are off at the start of a document,
|
||||
% and turned `on' after @end titlepage.
|
||||
|
||||
\def\headings #1 {\csname HEADINGS#1\endcsname}
|
||||
|
||||
|
@ -1440,22 +1441,24 @@ where each line of input produces a line of output.}
|
|||
% title on inside top of left hand pages, and page numbers on outside top
|
||||
% edge of all pages.
|
||||
\def\HEADINGSdouble{
|
||||
%\pagealignmacro
|
||||
\global\pageno=1
|
||||
\global\evenfootline={\hfil}
|
||||
\global\oddfootline={\hfil}
|
||||
\global\evenheadline={\line{\folio\hfil\thistitle}}
|
||||
\global\oddheadline={\line{\thischapter\hfil\folio}}
|
||||
\global\let\contentsalignmacro = \chapoddpage
|
||||
}
|
||||
\let\contentsalignmacro = \chappager
|
||||
|
||||
% For single-sided printing, chapter title goes across top left of page,
|
||||
% page number on top right.
|
||||
\def\HEADINGSsingle{
|
||||
%\pagealignmacro
|
||||
\global\pageno=1
|
||||
\global\evenfootline={\hfil}
|
||||
\global\oddfootline={\hfil}
|
||||
\global\evenheadline={\line{\thischapter\hfil\folio}}
|
||||
\global\oddheadline={\line{\thischapter\hfil\folio}}
|
||||
\global\let\contentsalignmacro = \chappager
|
||||
}
|
||||
\def\HEADINGSon{\HEADINGSdouble}
|
||||
|
||||
|
@ -1466,6 +1469,7 @@ where each line of input produces a line of output.}
|
|||
\global\oddfootline={\hfil}
|
||||
\global\evenheadline={\line{\folio\hfil\thistitle}}
|
||||
\global\oddheadline={\line{\thischapter\hfil\folio}}
|
||||
\global\let\contentsalignmacro = \chapoddpage
|
||||
}
|
||||
|
||||
\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex}
|
||||
|
@ -1474,6 +1478,7 @@ where each line of input produces a line of output.}
|
|||
\global\oddfootline={\hfil}
|
||||
\global\evenheadline={\line{\thischapter\hfil\folio}}
|
||||
\global\oddheadline={\line{\thischapter\hfil\folio}}
|
||||
\global\let\contentsalignmacro = \chappager
|
||||
}
|
||||
|
||||
% Subroutines used in generating headings
|
||||
|
@ -2908,15 +2913,18 @@ width0pt\relax} \fi
|
|||
\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
|
||||
|
||||
\def\CHAPPAGoff{
|
||||
\global\let\contentsalignmacro = \chappager
|
||||
\global\let\pchapsepmacro=\chapbreak
|
||||
\global\let\pagealignmacro=\chappager}
|
||||
|
||||
\def\CHAPPAGon{
|
||||
\global\let\contentsalignmacro = \chappager
|
||||
\global\let\pchapsepmacro=\chappager
|
||||
\global\let\pagealignmacro=\chappager
|
||||
\global\def\HEADINGSon{\HEADINGSsingle}}
|
||||
|
||||
\def\CHAPPAGodd{
|
||||
\global\let\contentsalignmacro = \chapoddpage
|
||||
\global\let\pchapsepmacro=\chapoddpage
|
||||
\global\let\pagealignmacro=\chapoddpage
|
||||
\global\def\HEADINGSon{\HEADINGSdouble}}
|
||||
|
@ -3027,7 +3035,11 @@ width0pt\relax} \fi
|
|||
|
||||
\newskip\contentsrightmargin \contentsrightmargin=1in
|
||||
\def\startcontents#1{%
|
||||
\pagealignmacro
|
||||
% If @setchapternewpage on, and @headings double, the contents should
|
||||
% start on an odd page, unlike chapters. Thus, we maintain
|
||||
% \contentsalignmacro in parallel with \pagealignmacro.
|
||||
% From: Torbjorn Granlund <tege@matematik.su.se>
|
||||
\contentsalignmacro
|
||||
\immediate\closeout \contentsfile
|
||||
\ifnum \pageno>0
|
||||
\pageno = -1 % Request roman numbered pages.
|
||||
|
@ -4193,7 +4205,8 @@ width0pt\relax} \fi
|
|||
% The trailing space in the following definition for supereject is
|
||||
% vital for proper filling; pages come out unaligned when you do a
|
||||
% pagealignmacro call if that space before the closing brace is
|
||||
% removed.
|
||||
% removed. (Generally, numeric constants should always be followed by a
|
||||
% space to prevent strange expansion errors.)
|
||||
\def\supereject{\par\penalty -20000\footnoteno =0 }
|
||||
|
||||
% @footnotestyle is meaningful for info output only..
|
||||
|
|
Loading…
Reference in a new issue