From 816ecdfa1109529b3f0be1c5cbfdca2c6cf647c3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 11 Dec 2015 23:19:37 +0000 Subject: versonotes (11dec15) git-svn-id: svn://tug.org/texlive/trunk@39084 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/versonotes/versonotes.sty | 62 ++++++++++++++++------ 1 file changed, 46 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex/latex/versonotes') diff --git a/Master/texmf-dist/tex/latex/versonotes/versonotes.sty b/Master/texmf-dist/tex/latex/versonotes/versonotes.sty index e9c4808afca..34c8998dd3f 100644 --- a/Master/texmf-dist/tex/latex/versonotes/versonotes.sty +++ b/Master/texmf-dist/tex/latex/versonotes/versonotes.sty @@ -7,7 +7,7 @@ %% versonotes.dtx (with options: `package') %% versonotes: Notes on verso pages %% -%% Release version 0.2, 2015 February 16. +%% Release version 0.3, 2015 December 8. %% %% Copyright 2014, 2015 Norman Gray %% @@ -28,13 +28,16 @@ %% %%%% File: versonotes.dtx -%%%% Source: c64b7a550082, 2015-02-16T18:33:46+00:00 +%%%% Source: 1ce01fd3d4fc, 2015-09-16T13:05:15+01:00 %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{versonotes}[2015/02/16 v0.2] +\ProvidesPackage{versonotes}[2015/12/08 v0.3] +\newif\if@verso@notesonleft +\@verso@notesonlefttrue \def\verso@resetmergestate{\verso@mergestate=2} \DeclareOption{mergecollisions}{\def\verso@resetmergestate{\verso@mergestate=0}} +\DeclareOption{rectonotes}{\@verso@notesonleftfalse} \ProcessOptions \long\def\versonote#1{\@bsphack \pdfsavepos @@ -45,20 +48,35 @@ \newdimen\versoleftmargin \versoleftmargin=\paperwidth \advance\versoleftmargin -\textwidth - \advance\versoleftmargin -\evensidemargin \advance\versoleftmargin -\hoffset \advance\versoleftmargin -1in -\def\versolayout{ - \leftskip=0pt plus 1fil - \rightskip=0pt - \parfillskip=0pt - \parindent=0pt - \parskip=\medskipamount -} +\if@verso@notesonleft + \advance\versoleftmargin -\evensidemargin + \def\versolayout{ + \leftskip=0pt plus 1fil + \rightskip=0pt + \parfillskip=0pt + \parindent=0pt + \parskip=\medskipamount + } +\else + \advance\versoleftmargin -\oddsidemargin + \def\versolayout{ + \leftskip=0pt + \rightskip=0pt plus 4em + \parindent=0pt + \parskip=\medskipamount + } +\fi \def\end@versonote{% \write\@auxout{\string\verso@note{\the\c@page}{-1pt}{}}} \AtEndDocument{\end@versonote} \newtoks\verso@pages + \if@verso@notesonleft + \verso@pages={} + \else + \verso@pages={{}} + \fi \newtoks\verso@currentpage \newcount\verso@currentpagenum \verso@currentpagenum=1 @@ -86,8 +104,13 @@ \@tempdima=#2 % #2 < 0pt is the end-of-document flag \loop \@tempswafalse - \ifnum\@tempcnta>\verso@currentpagenum \@tempswatrue \fi - \ifdim\@tempdima < 0pt \@tempswatrue \@tempdima=0pt \fi + \ifnum\@tempcnta > \verso@currentpagenum + \@tempswatrue + \fi + \ifdim\@tempdima < 0pt + \@tempswatrue + \@tempdima=0pt + \fi \if@tempswa \edef\@tempa{\the\verso@pages {\the\verso@currentpage}} \global\verso@pages=\expandafter{\@tempa} @@ -95,6 +118,9 @@ \verso@currentpage={} \repeat \verso@currentpage=\expandafter{\the\verso@currentpage \\{{#1}{#2}{#3}}} + \ifdim\@tempdima=0pt + \global\verso@pages=\expandafter{\the\verso@pages {}{}} + \fi } \AtEndDocument{\long\def\verso@note#1#2#3{}} \def\verso@testmergenote#1,#2\@nil{ @@ -173,7 +199,12 @@ \let\verso@orig@shipout\shipout \long\def\verso@processonepage@#1#2\@nil{ \def\@tempa{#1} - \ifnum\c@page>1 + \if@verso@notesonleft + \@tempcnta=1 + \else + \@tempcnta=2 + \fi + \ifnum\c@page>\@tempcnta \ifx\@tempa\@empty \verso@orig@shipout\vbox{} \else @@ -198,9 +229,8 @@ \global\verso@pages={#2}} \def\verso@processonepage{ \if@verso@processversonotes - \expandafter\verso@processonepage@\the\verso@pages{}{}\@nil + \expandafter\verso@processonepage@\the\verso@pages\@nil \else - % we don't seem to have any versonotes in this file: don't come here again \global\let\verso@processonepage\relax \fi } -- cgit v1.2.3