From 030513f4b74c6610bf6d20311a8beb66af15ceca Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Aug 2013 22:38:04 +0000 Subject: poemscol (3aug13) git-svn-id: svn://tug.org/texlive/trunk@31338 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/poemscol/poemscol.sty | 36 ++++++++++++++--------- 1 file changed, 22 insertions(+), 14 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 eb9a66bafe1..0686ae5934f 100644 --- a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty +++ b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty @@ -22,7 +22,12 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{poemscol} - [2013/03/24 v2.62 poemscol file] + [2013/08/20 v2.64 poemscol file] + + + + + @@ -137,12 +142,12 @@ \advance\leftmargin\runoverindentvalue} \item[]} {\endlist} -\newenvironment{quotedverse}{% -\let\\=\@centercr% -\list{}{\itemsep\z@ \itemindent 0pt\listparindent \itemindent - \rightmargin 0sp\leftmargin 0sp\advance\leftmargin - \runoverindentvalue}\item[]} -{\endlist} + \newenvironment{quotedverse}{% + \let\\=\@centercr% + \list{}{\itemsep\z@ \itemindent -\runoverindentvalue\listparindent \itemindent + \rightmargin 0sp\leftmargin 0sp\advance\leftmargin + \runoverindentvalue}\item[]} + {\endlist} \newcounter{verselinenumber} \newcounter{printlineindex} @@ -721,7 +726,6 @@ } } - \newcommand{\@pagemarktotextnotes}[1]{% \immediate\write\textnotes{\string\setcounterfrompageref\string{notepageholdertitle\string}% \string{#1\string}\string\unskip}% @@ -1568,9 +1572,11 @@ \fi } \newcommand{\titletoothernotes}{\string\par +\ifputpagenumberinnotes% \string\argpageref\string{\@compoundlabelscratch\string}% \string\setcounterfrompageref\string{notepageholdertitle\string}% \string{\@compoundlabelscratch\string}% +\fi% \string\textbf\string{\ \the\fulltitleholder\string}}% \newif\ifemendationssinglepar \newcommand{\emendation}[2][0]{ @@ -1669,11 +1675,12 @@ \immediate\write\csname #1s\endcsname{\string\if#1stwocol} \csname literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}% -\expandafter\newcommand\csname first#1\endcsname{ -\immediate\write\expandafter\csname #1s\endcsname{\titletoothernotes} -\immediate\write\csname #1s\endcsname{\string\if#1ssinglepar} -\immediate\write\csname #1s\endcsname{\string\par} -\immediate\write\csname #1s\endcsname{\string\fi}} +\expandafter\newcommand\csname first#1\endcsname{% +\immediate\write\expandafter\csname #1s\endcsname{\titletoothernotes}% +\immediate\write\csname #1s\endcsname{\string\if#1ssinglepar}% +\immediate\write\csname #1s\endcsname{\string\par}% +\immediate\write\csname #1s\endcsname{\string\fi}% +} \expandafter\newcommand\csname #1\endcsname[2][0]{% \setlemmarange{##1}% \csname ifno#1yet\endcsname% @@ -1688,7 +1695,7 @@ literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}% \fi% \resetlemmacounters% } -\expandafter\newcommand\csname prose#1\endcsname[3][0]{% % +\expandafter\newcommand\csname prose#1\endcsname[3][0]{% \unskip\proselinelabel{##2}% \setproselemmarange{##2}{##1}% \csname ifno#1yet\endcsname% @@ -1699,6 +1706,7 @@ literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}% \csname literal#1\endcsname{##3}% \csname if#1ssinglepar\endcsname% \csname literal#1\endcsname{\par}% +\unskip% \fi% \resetlemmacounters\unskip% } -- cgit v1.2.3