From 78dae40b2b2532ac683a14c4ab9933431f0c41bf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 22 Aug 2016 22:31:57 +0000 Subject: notespages (22aug16) git-svn-id: svn://tug.org/texlive/trunk@41906 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/notespages/notespages.sty | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/notespages/notespages.sty b/Master/texmf-dist/tex/latex/notespages/notespages.sty index a0600451ce9..c8ec6a4ad38 100644 --- a/Master/texmf-dist/tex/latex/notespages/notespages.sty +++ b/Master/texmf-dist/tex/latex/notespages/notespages.sty @@ -41,8 +41,8 @@ %% Right brace \} Tilde \~} %% %% -\def\fileversion{0.8} -\def\filedate{2016/08/10} +\def\fileversion{0.8.1} +\def\filedate{2016/08/21} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{notespages}[\filedate\space @@ -94,6 +94,8 @@ \newcount\np@notepages \newcommand*{\ifnp@started@on@new@page}{} \newif\ifnp@started@on@new@page +\newcommand*{\ifnp@started@on@full@page}{} +\newif\ifnp@started@on@full@page \newcommand*{\np@fill@minspace}{} \newdimen\np@fill@minspace \newcommand*{\np@fill@maxspace}{} @@ -457,19 +459,24 @@ \vspace*{\np@titleskip}% \fi \def\np@tempa{left}\ifx\np@tempa\np@notesalign +%% \typeout{notespages debug: notestextalign=left}% \raggedright \else \def\np@tempa{right}\ifx\np@tempa\np@notesalign +%% \typeout{notespages debug: notestextalign=right}% \raggedleft \else \def\np@tempa{center}\ifx\np@tempa\np@notesalign +%% \typeout{notespages debug: notestextalign=center}% \centering \fi \fi \fi - \color{NotesTextColor}\notesareatext} + \color{NotesTextColor}\notesareatext\par} \newcommand{\np@inner@notespage}{\parfillskip\z@ plus 1fil% - \csname np@ns@\np@notesstyle\endcsname} + \begingroup + \csname np@ns@\np@notesstyle\endcsname + \endgroup} \newcommand*{\np@notespage}{% \ifKV@np@allowfloats\else \def\np@tempa{newpage}\ifx\np@tempa\np@startnotes @@ -507,14 +514,19 @@ \newcommand*{\notespages}[1][]{% \begingroup \np@marktext@setfalse\setkeys{np}{#1}% +%% \typeout{notespages debug:\space\the\pagetotal\space\the\pagegoal}% \ifdim\pagetotal=\z@ \np@started@on@new@pagetrue\else\np@started@on@new@pagefalse\fi + \ifdim\pagetotal<\pagegoal + \np@started@on@full@pagefalse\else\np@started@on@full@pagetrue\fi \np@notepages\c@page \ifnp@started@on@new@page\advance\np@notepages\m@ne\fi + \ifnp@started@on@full@page\advance\np@notepages\@ne\fi \divide\np@notepages\np@multiple \multiply\np@notepages\np@multiple \advance\np@notepages-\c@page \ifnp@started@on@new@page\advance\np@notepages\@ne\fi + \ifnp@started@on@full@page\advance\np@notepages\m@ne\fi \ifnum\np@notepages<\z@ \advance\np@notepages\np@multiple\fi \np@tempcnta\np@endpages @@ -579,6 +591,8 @@ \newcommand{\nppatchchapter}[1]{% \@ifundefined{chapter}{}{% \def\chapter{\notespages[#1]\np@orig@chapter}}} +\newcommand{\npunpatchchapter}{% + \@ifundefined{chapter}{}{\let\chapter\np@orig@chapter}} \newcommand*{\np@lang@german}{\def\npnotesname{Notizen}% \def\npnotestext{Diese Seite wurde absichtlich leer gelassen.}} \newcommand*{\np@lang@english}{\def\npnotesname{Notes}% -- cgit v1.2.3