diff options
author | Karl Berry <karl@freefriends.org> | 2017-03-14 21:51:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-03-14 21:51:58 +0000 |
commit | 59413b7e6b14f78e42de6b95bea2014d50200d74 (patch) | |
tree | fe015ac5c498a7a78dd82067841477dffcb6e443 /Master/texmf-dist/tex/lualatex | |
parent | d8b72356da66172cbf65bea41e6d41eddb6226b0 (diff) |
novel (14mar17)
git-svn-id: svn://tug.org/texlive/trunk@43498 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/lualatex')
5 files changed, 42 insertions, 42 deletions
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty index 2ed0a50c957..bbecf3ce63a 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-ChapterScene.sty}% -[2017/03/09 v1.0.7 LaTeX file (chapter and scene macros)] +[2017/03/12 v1.0.8 LaTeX file (chapter and scene macros)] %% @@ -56,7 +56,7 @@ %% Repair \FirstLine{} command from `magaz' package. -% Problem: Conflict with \noindent\nov@AfterGroup as used in ChapterDisplay. +% Problem: Conflict with \noindent\nov@AfterGroup as used in ChapterStart. % The \noindent is carried past \FirstLine to the following paragraph. % Solution: After FirstLine completes, back up one line vertically, then insert % and empty line to restore grid and absorb the noindent. @@ -73,7 +73,7 @@ -%% ChapterDisplay environment. +%% ChapterStart environment. % The most useful way to start a new chapter. Occupies a fixed amount of % vertical space. Also self-adjust when used with dropfolio. Automatically % calls \thispagestyle if set for all chapter displays. @@ -82,13 +82,13 @@ \newif \if@csalignok \@csalignokfalse % % The argument is the number of normal baselineskips high: -\newenvironment{ChapterDisplay}[1][10] +\newenvironment{ChapterStart}[1][10] {% - \FPsub{\@fixlines}{#1}{3}% + \FPsub{\@fixlines}{#1}{2}% \FPsub{\@fixlines}{\@fixlines}{0.001}% fudge to avoid rounding problems - \if@thispagestyleset\else\thispagestyle{\@setchapterdisplay}\fi% - \ResetFootnoteSymbol% resets symbolic markers, but not numeric markers - \if@addCTline\null\else\fi% used with dropfolio + \if@thispagestyleset\else\thispagestyle{\@setchapterstart}\fi% + \ResetFootnoteSymbol% resets symbolic markers, but not numerical markers + \null% \setcounter{@linequarter}{0}% \begin{textblock*}{\textwidth}[0,0](0pt,0pt)% }{% @@ -106,10 +106,12 @@ }{\vspace{0.25\nbs}}{}% \end{textblock*}% \vspace{\@fixlines\nbs}% + \if@addCTline\null\fi% \nov@AfterGroup\NoIndentAfterThis% etextools and noindentafter } %% - +\LetLtxMacro\ChapterDisplay\ChapterStart\relax % deprecated +\LetLtxMacro\endChapterDisplay\endChapterStart\relax % deprecated % \newcommand\ChapterTitle[2][c]{% optional alignment l, c, r @@ -201,7 +203,7 @@ % the right edge of the Epigraph. % The text may be styled with the usual simple commands such as \emph{}. % There is no provision for a horizontal line. -% If used on a stand-alone page, or in the ChapterDisplay environment, +% If used on a stand-alone page, or in the ChapterStart environment, % then the vertical extent of the Epigraph does not much matter. % If mingled with main text (not recommended) you may have to correct % the line grid using some amount of \vspace{}. That's your problem. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty index 184678f513e..3457596f0f8 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty @@ -22,7 +22,7 @@ % In `novel' class, you may place footnotes at the botom of the textblock. % The markers may be symbolic (default begins with asterisk), or % set so that the asterisk is not used, or the markers may be numbers, -% If symbolic, they will be automatically reset by ChapterDisplay. +% If symbolic, they will be automatically reset by ChapterStart. % You can manually reset them at any time. % You can also make a non-marked footnote, which does not increment the count. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty index a37471d1611..356733fcefa 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-HeadFootStyles.sty}% -[2017/03/09 v1.0.7 LaTeX file (header and footer styles)] +[2017/03/12 v1.0.8 LaTeX file (header and footer styles)] %% @@ -276,8 +276,7 @@ % \@dropfolioinside reduces the textblock height by one lineskip. At the bottom, % where the last line would have been, the styled page number is centered. \newcommand\@dropfolioinside{% - \thispagestyle{empty}% - \enlargethispage{-\nbs} + \enlargethispage{-\nbs}% \setlength\temp@pgnumwidth{% \widthof{{\headfont\textls[\@looseheadnum]{\pagenumberstyle}}}}% \if@offcenterTrim% @@ -305,7 +304,6 @@ % \@dropfoliobeneath does not change the textblock height. The styled page % number is centered where an extra line would be, within the bottom margin. \newcommand\@dropfoliobeneath{% - \thispagestyle{empty}% \setlength\temp@pgnumwidth{% \widthof{{\headfont\textls[\@looseheadnum]{\pagenumberstyle}}}}% \if@offcenterTrim% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty index 8ab84227466..3536ba7cb6a 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty @@ -269,45 +269,45 @@ \fi } % end \@reserveHFspace % Each new chapter generally has its own header/footer style. This allows a -% default setting when chapters begin with ChapterDisplay environment: -\gdef\SetChapterDisplay#1{\gdef\@setchapterdisplay{#1}} -\SetChapterDisplay{footer} % default +% default setting when chapters begin with ChapterStart environment: +\gdef\SetChapterStart#1{\gdef\@setchapterstart{#1}} +\SetChapterStart{footer} % default \AtBeginDocument{% check if user wrote good command or not - \def\@setchapterdisplayOK{false}% - \ifthenelse{\equal{\@setchapterdisplay}{empty}}{% - \def\@setchapterdisplayOK{true}% + \def\@setchapterstartOK{false}% + \ifthenelse{\equal{\@setchapterstart}{empty}}{% + \def\@setchapterstartOK{true}% }{}% - \ifthenelse{\equal{\@setchapterdisplay}{plain}}{% - \def\@setchapterdisplayOK{true}% + \ifthenelse{\equal{\@setchapterstart}{plain}}{% + \def\@setchapterstartOK{true}% }{}% - \ifthenelse{\equal{\@setchapterdisplay}{footer}}{% - \def\@setchapterdisplayOK{true}% + \ifthenelse{\equal{\@setchapterstart}{footer}}{% + \def\@setchapterstartOK{true}% }{}% - \ifthenelse{\equal{\@setchapterdisplay}{fancyplain}}{% - \def\@setchapterdisplayOK{true}% + \ifthenelse{\equal{\@setchapterstart}{fancyplain}}{% + \def\@setchapterstartOK{true}% }{}% - \ifthenelse{\equal{\@setchapterdisplay}{fancy}}{% - \def\@setchapterdisplayOK{true}% + \ifthenelse{\equal{\@setchapterstart}{fancy}}{% + \def\@setchapterstartOK{true}% }{}% - \ifthenelse{\equal{\@setchapterdisplay}{forcenumber}}{% - \def\@setchapterdisplayOK{true}% + \ifthenelse{\equal{\@setchapterstart}{forcenumber}}{% + \def\@setchapterstartOK{true}% }{}% - \ifthenelse{\equal{\@setchapterdisplay}{dropfolio}}{% no footnote there - \def\@setchapterdisplayOK{true}% + \ifthenelse{\equal{\@setchapterstart}{dropfolio}}{% no footnote there + \def\@setchapterstartOK{true}% }{}% - \ifthenelse{\equal{\@setchapterdisplay}{dropfoliolater}}{% has footnote(s) there - \def\@setchapterdisplayOK{true}% + \ifthenelse{\equal{\@setchapterstart}{dropfoliolater}}{% has footnote(s) there + \def\@setchapterstartOK{true}% }{}% - \ifthenelse{\equal{\@setchapterdisplay}{foliobeneath}}{% - \def\@setchapterdisplayOK{true}% + \ifthenelse{\equal{\@setchapterstart}{foliobeneath}}{% + \def\@setchapterstartOK{true}% }{}% - \ifthenelse{\equal{\@setchapterdisplayOK}{true}}{}{% - \ClassError{novel}{\string\SetChapterDisplay\space bad argument}% - {\string\SetChapterDisplay\space only allows certain choices.^^J}% + \ifthenelse{\equal{\@setchapterstartOK}{true}}{}{% + \ClassError{novel}{\string\SetChapterStart\space bad argument}% + {\string\SetChapterStart\space only allows certain choices.^^J}% }% } % -%% End reserve space for header/footer and set default ChapterDisplay +%% End reserve space for header/footer and set default ChapterStart %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty index ae0a0853088..7f47c520063 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty @@ -33,7 +33,7 @@ % \thesubtitle or \theSubtitle returns string set by \subtitle{} or \SetSubtitle{} -- See novel-LayoutSettings.sty. % \InlineImage, \BlockImage, \ClearImage -- See novel-Images.sty. % \scenebreak, \sceneline, \scenestars -- See novel-ChapterScene.sty. -% ChapterDisplay, \ChapterTitle{}, \ChapterSubtitle{}, \ChapterDeco{}, \ChapterText -- See novel-ChapterScene.sty. +% ChapterStart, \ChapterTitle{}, \ChapterSubtitle{}, \ChapterDeco{}, \ChapterText -- See novel-ChapterScene.sty. % \DecoChapterTitle{}{}, \SideDecoChapterTitle{}, ModernChapterTitle[]{}{} -- See novel-ChapterScene.sty. % {\chapterfont text} and other pre-defined font selection commands -- See novel-LayoutSettings.sty. % \decoglyph{} and \acronym{} -- See novel-FontDefaults.sty. |