From 45ee5d92b198fe66f73b1db07106418d6c97b5e1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 29 Oct 2019 21:24:43 +0000 Subject: poemscol (29oct19) git-svn-id: svn://tug.org/texlive/trunk@52574 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/poemscol/poemscol.sty | 38 ++++++++++++++++++----- 1 file changed, 31 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/poemscol') diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty index 756f8a04270..89b947b51e8 100644 --- a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty +++ b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{poemscol} - [2019/09/27 v3.14 poemscol file] + [2019/10/29 v3.141 poemscol file] %|\prosexyznote| %% @@ -2554,6 +2554,8 @@ r@#2\endcsname{}{}\@nil \newif{\ifprosebysentence} \newif{\ifrunningsentencenumbers}\runningsentencenumberstrue \newif{\ifmarginsentencenumbers}\marginsentencenumberstrue +\newif{\ifsuppressfirstpara}\suppressfirstparafalse +\newif{\ifsuppressfirstsentence}\suppressfirstsentencefalse \newtoks{\pmnoteheader} @@ -2567,7 +2569,13 @@ r@#2\endcsname{}{}\@nil \noexplainyettrue% }{} \newcommand{\runningsentencenumberformat}[1]{\nobreak% -\textsuperscript{\scriptsize{#1}}\unskip\nobreak} +\ifsuppressfirstsentence% +\ifthenelse{\thepmsentencenumber=1}{\relax}{% +\unskip\textsuperscript{\scriptsize{#1}}}% +\unskip\nobreak% +\else% +\textsuperscript{\scriptsize{#1}}%\fi +\unskip\nobreak} \newcommand{\marginsentencenumberformat}[1]{\scriptsize{#1}} \newcommand{\setpmmodulo}[1]{\setcounter{pmmodulo}{#1}% \addtocounter{pmmodulo}{-1}% @@ -2594,8 +2602,13 @@ r@#2\endcsname{}{}\@nil \setlength{\marginparsep}{18pt}% } \newcommand{\putpmsentencenumber}{% +\ifsuppressfirstsentence% +\ifthenelse{\thepmsentencenumber=1}{\relax}{\putpmmarginnumber{\thepmsentencenumber}% +{\marginsentencenumberformat}}% +\else% \putpmmarginnumber{\thepmsentencenumber}% -{\marginsentencenumberformat}} +{\marginsentencenumberformat}% +\fi} \newcommand{\putpmmarginnumber}[2]{% \nolinebreak\begin{marginenvironment}% \nolinebreak% @@ -2621,8 +2634,8 @@ r@#2\endcsname{}{}\@nil \addtocounter{pmindexcount}{1}% \leavevmode% \ifthenelse{\value{pmindexcount}>\value{pmmodulo}}% -{ \putpmsentencenumber\nobreak% - \setcounter{pmindexcount}{0}% +{\putpmsentencenumber\nobreak% +\setcounter{pmindexcount}{0}% }{\relax}% \fi% \ifpmparas% @@ -2717,9 +2730,20 @@ r@#2\endcsname{}{}\@nil \newif{\ifpmsentencebypara}% reset sentence counter every paragraph \pmsentencebyparatrue \newcommand{\pmparmarformat}[1]{\textbf{{\small #1}}} -\newcommand{\pmpararunningformat}[1]{\textbf{\small #1}} +\newcommand{\pmpararunningformat}[1]{% +\ifsuppressfirstpara% +\ifthenelse{\thepmparagraph=1}{\relax}{\textbf{\small #1}~}% +\else% +\textbf{\small #1}~% +\fi} \newcommand{\putpmmarparanumber}{% -\putpmmarginnumber{\llap{\thepmparagraph~~}}{\pmparmarformat}} +\ifsuppressfirstpara% +\ifthenelse{\thepmparagraph=1}{\relax}{\putpmmarginnumber{\llap{\thepmparagraph~~}} +{\pmparmarformat}}% +\else% +\putpmmarginnumber{\llap{\thepmparagraph~~}}{\pmparmarformat}% +\fi} + \newcommand{\pmpara}{\leavevmode% \pmparastrue\addtocounter{pmparagraph}{1}% \ifpmparainmar% put in marginal paragraph number -- cgit v1.2.3