poemscol (3aug19)

git-svn-id: svn://tug.org/texlive/trunk@51811 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 61 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
index 0c98be0af3e..1a42da65680 100644
--- a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
+++ b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
@@ -22,7 +22,8 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}[1997/12/01]
 \ProvidesPackage{poemscol}
-   [2018/01/11 v2.98 poemscol file]
+   [2019/08/03 v3 poemscol file]
+ % must enclose it in square brackets, not curly ones.\end{sloppypar}
  %|\prosexyznote|
 
 %%
@@ -89,7 +90,29 @@
 \newcommand{\notessequenceclubpenalty}{\penalty-1500}
 \newcommand{\notesvolumetitlepenalty}{\penalty-1500}
 \hfuzz=2pt
-\newcommand{\verseindent}{\hspace{2em}}
+\newlength{\verseindentamount}
+\setlength{\verseindentamount}{2em}
+\newcommand{\verseindent}{\hspace{\verseindentamount}}
+\newlength{\indentedstanzaamount}
+\setlength{\indentedstanzaamount}{\verseindentamount}
+\newlength{\variablestanzaamount}
+\setlength{\variablestanzaamount}{\indentedstanzaamount}
+\newcount\loopcounter
+\newcommand{\adjustst@nzaindent}[1]{\loopcounter=#1
+\loop
+ \addtolength{\variablestanzaamount}{\indentedstanzaamount}
+  \advance \loopcounter -1
+\ifnum \loopcounter>0
+\repeat}
+\newif\ifinindentedverse
+\newenvironment{indentedverse}[1][]{%
+\inindentedversetrue
+\ifthenelse{\equal{#1}{}}{\relax}{\adjustst@nzaindent{#1}}
+\let\\=\@centercr%
+\list{}{\itemsep\z@ \itemindent -\runoverindentvalue\listparindent \itemindent
+\rightmargin 0sp\leftmargin 0sp\advance\leftmargin
+\variablestanzaamount}\item[]}
+{\endlist\inindentedversefalse\setlength{\variablestanzaamount}{\indentedstanzaamount}}
 \setlength{\columnsep}{15pt}
 \newdimen\titleindentamount \titleindentamount=1pc
 \newdimen\titleindenttwoamount \titleindenttwoamount=2pc
@@ -369,10 +392,17 @@
 \let\\=\@centercr%
 \list{}{\topsep\z@%
 \partopsep\z@%
-\itemsep\z@ \itemindent -\titleentryoverrun\listparindent \itemindent
-          \rightmargin 1sp\leftmargin 1sp\advance\leftmargin
-          \titleentryoverrun}\item[]}{\endlist}
+\itemsep\z@ \itemindent -\titleentryoverrun%
+\listparindent \itemindent %
+\ifleftaligntitles
+\left@ligntitleblock
+\rightmargin 1sp\leftmargin \lefttitlemargin%
+\else
+\rightmargin 1sp\leftmargin 1sp%
+\fi
+\advance\leftmargin \titleentryoverrun}\item[]}{\endlist} 
 \newlength{\versewidth}
+\setlength{\versewidth}{\linewidth}% default length for \versewidth
 \newenvironment{poem}[1][\linewidth]
 {\raggedright%
      \language=255%no hyphenation in verse
@@ -941,6 +971,15 @@
 \fi
    \fi\fi
 }
+\newlength{\lefttitlemargin}
+\newcommand{\leftaligntitlespace}{\hspace{\lefttitlemargin}}
+\newif\ifleftaligntitles % title flush with left margin of centered poem
+\leftaligntitlesfalse  % default value
+\newcommand{\left@ligntitleblock}{\rightmargin        \z@%%
+        \setlength{\lefttitlemargin}{\linewidth}%
+           \addtolength{\lefttitlemargin}{-\versewidth}%
+            \addtolength{\lefttitlemargin}{-0.5\lefttitlemargin}
+}
 \newcommand{\poemtitle}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
 {\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
@@ -1652,7 +1691,7 @@
 }
 \newcommand{\tsaccidental}[1]{\iftextnoteson\ifincludetypescripts\accidental{#1}\fi\fi}
 \newcommand{\tsentry}[1]{\iftextnoteson\ifincludetypescripts{\@ifnextchar,{\unskip}{%
-Ê\@ifnextchar;{\unskip}{}%
+Ê\@ifnextchar;{\unskip}{}%
 }#1}\fi\fi\unskip}
 \newcommand{\sources}[1]{%
 \iftextnoteson
@@ -1790,7 +1829,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%
@@ -1805,7 +1844,7 @@ literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}%
 \fi%
 \resetlemmacounters\unskip%
 }
-\expandafter\newcommand\csname pm#1\endcsname[2][0]{%
+\expandafter\newcommand\csname pm#1\endcsname[2][0]{%                                                          
      \setpmlemmarange{##1}%
      \csname ifno#1yet\endcsname%
      \csname first#1\endcsname%
@@ -2700,7 +2739,7 @@ r@#2\endcsname{}{}\@nil
 \relax\else%
 \nolinebreak\incrementverselinenumber%
 \fi%
-\speciallinelockfalse%
+\speciallinelockfalse% 
  \nobreak
  \instanzafalse
 
@@ -3856,14 +3895,22 @@ wherever such spaces are lost in pagination.
 \newlength{\epigraphquoterightmargin}
 \setlength{\epigraphquoteleftmargin}{1.5em}
 \setlength{\epigraphquoterightmargin}{1.5em}
-\newenvironment{epigraphquote}{\list{}{\rightmargin\epigraphquoterightmargin%
-                                       \leftmargin\epigraphquoteleftmargin%
+\newif\ifleftalignepigraphs
+\leftalignepigraphsfalse
+\makeatletter
+\newenvironment{epigraphquote}{\list{}{%
+\ifleftalignepigraphs\left@ligntitleblock%
+\rightmargin 1sp\leftmargin \lefttitlemargin%
+\else
+\rightmargin\epigraphquoterightmargin%
+\leftmargin\epigraphquoteleftmargin%
+\fi
                                        \topsep 0pt%
                                        \partopsep 0pt%
                                        \listparindent 0pt%
                                        }%
                 \item\relax}
-               {\endlist}
+               {\endlist}\makeatother
 \newenvironment{volumetitlepagequote}{\list{}{\rightmargin \voladditionalamount%
                                               \leftmargin \voladditionalamount%
                                        \topsep 0pt%
@@ -3872,6 +3919,8 @@ wherever such spaces are lost in pagination.
                                        }%
                 \item\relax}
                {\endlist}
+\endinput 
+--------------060108090809060900030409--
 \endinput
 %%
 %% End of file `poemscol.sty'.