3 files changed, 63 insertions, 36 deletions
diff --git a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
index 8d97ec5b82f..e5c9d55eb02 100644
--- a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
+++ b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
diff --git a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
index 0a360fbd3de..5a4984c229d 100644
--- a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
+++ b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
@@ -23,7 +23,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01]
 %<package>\ProvidesPackage{poemscol}
-%<package>   [2019/10/29 v3.141 poemscol file] 
+%<package>   [2020/06/02 v3.14159 poemscol file] 
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -38,7 +38,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{10539}
+% \CheckSum{10550}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -263,9 +263,11 @@
 % sections numbered by paragraph and sentence. You can suppress the appearance of the
 % first sentence number, whether in the margin or in the running text. You can suppress
 % the appearance of the first paragraph number, whether in the margin or in the running text.}
-% \changes{v3.14159}{2020/05/25}{Changed controlling how to place 
+% \changes{v3.1415}{2020/05/25}{Changed controlling how to place 
 % marginal marks in JHpoemtitle and its siblings, and in JHtextnote 
 % and its siblings. Marginal marks are now set using their own inserts, rather than using marginpar.}
+% \changes{v3.14159}{2020/06/02}{Marginal marks set by JHpoemtitle now work with the different 
+% title placement schemes.}
 % \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother}
 % \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip}
 % \DoNotIndex{\newcommand, \section, \subsection, \subsubsection,
@@ -298,15 +300,15 @@
 % \textsc, \unskip} 
 % \setcounter{IndexColumns}{2} 
 % \MakeShortVerb{|}
-% \def\fileversion{3.1415} 
-% \def\filedate{25 May 2020} 
-% \def\docdate{25 May 2020}
+% \def\fileversion{3.14159} 
+% \def\filedate{2 June 2020} 
+% \def\docdate{2 June 2020}
 %  \title{Typesetting Poetry Collections with
 % \textsf{poemscol}\thanks{This document corresponds to
 % \textsf{poemscol}~\fileversion, dated \filedate.}} 
 % \author{John Burt
 % \\ \texttt{burt@brandeis.edu}} 
-% \date{25 May 2020} 
+% \date{2 June 2020} 
 % \maketitle
 % \begin{abstract} \textsf{poemscol} provides commands for \LaTeX\ for
 % setting collections of poetry.  It is especially suited for setting
@@ -632,9 +634,11 @@
 % These marks could be returned to their normal position in the 
 % margin by setting the boolean |\margrefstomargin| to true. As of 
 % version 3.141 these marks are set in the margin by default even 
-% when verse block centering is in effect. The marks can be made to 
-% move towards the verse block when verse block centering is in 
-% effect by setting |\margrefstomargin| to false.
+% when verse block centering is in effect. The boolean |\margrefstomargin| controls
+% nothing, but has been left in case I decide to restore the possibility
+% of moving the marginal marks in when the lines are centered. You can control
+% the horizontal placement of these marginal marks by changing the value
+% of the length |\JHmarginparsep|.
 %
 % \section{Marking up individual poems}
 % First, a word about the command names. The command names may seem 
@@ -7115,6 +7119,7 @@
 \newcommand{\interjectiontitlemiddleline}[1]{
 \sequencefirstsubsectionmiddleline{#1}
 }
+% \subsubsection{Titles and Notes with marginal marks} 
 %    \end{macrocode}
 %    \begin{macro}{\setmargpoemtitle}
 % Titles with a marginal reference to the notes giving the page in 
@@ -7131,6 +7136,10 @@
 \setlength{\JHmarginparsep}{0pt}
 \newlength{\JHmarginparvshift}
 \setlength{\JHmarginparvshift}{0pt}
+\newlength{\JHmarginparwidth}
+\setlength{\JHmarginparwidth}{\marginparwidth}
+\newlength{\JHmarginparsepmin}
+\setlength{\JHmarginparsepmin}{\marginparsepmin}
 \newif{\ifJHmarkstoleft}
 \JHmarkstolefttrue
 \newif{\ifJHmarkstoright}
@@ -7188,23 +7197,19 @@
 \rlap{\kern-\parindent%
 \kern\JHtextwidth\kern\JHmarginparsep% at right
 \setbox0=\vtop to 0pt{% added
-\begin{minipage}[t]{\marginparwidth}% added
+\begin{minipage}[t]{\JHmarginparwidth}% added
 #1%
 \end{minipage}%
 \vss}% 
 \vtop to 0pt{\kern\JHmarginparvshift% default should be 0pt 
 \kern-\dp\strutbox \kern-\ht0 \box0 \vss}}}\pmclesphack}% 
-% setmargref command %right side only for now
-%\newcommand{\setmargref}{
-%\JHrightmarginpar{\scriptsize {\the\margrefmarker~p.~\pageref{margref\themargrefnumber}}}
-%}
 % jhleftmarginpar command for notes % left side
 \newcommand{\JHleftmarginpar}[1]{%
 \pmclbsphack\strut\vadjust{% changed
 \rlap{\kern-\parindent%
-\kern -\JHmarginparsep \kern -\marginparwidth% at left
+\kern -\JHmarginparsep \kern -\JHmarginparwidth% at left
 \setbox0=\vtop to 0pt{
-\begin{minipage}[t]{\marginparwidth}% added
+\begin{minipage}[t]{\JHmarginparwidth}% added
 #1%
 \end{minipage}%
 \vss}% changed
@@ -7274,7 +7279,7 @@
   \rlap{\kern-\parindent
     \if@twocolumn
       \if@firstcolumn     % put at left
-        \kern -\JHmarginparsep \kern -\marginparwidth % at left
+        \kern -\JHmarginparsep \kern -\JHmarginparwidth % at left
       \else               % put at right
         \kern \columnwidth \kern \JHmarginparsep % at right
       \fi
@@ -7282,14 +7287,14 @@
       \ifoddpage            % put at right
         \kern \textwidth \kern \JHmarginparsep        % at right
       \else                 % put at left
-        \kern -\JHmarginparsep \kern -\marginparwidth % at left
+        \kern -\JHmarginparsep \kern -\JHmarginparwidth % at left
       \fi
     \fi
 %     \vbox to 0pt{%
 %      \kern \JHmarginparvshift%           % vertical shift to align top text lines
-%      \begin{minipage}{\marginparwidth}%
+%      \begin{minipage}{\JHmarginparwidth}%
     \setbox0=\vtop to 0pt{% added
-     \begin{minipage}[t]{\marginparwidth}% added
+     \begin{minipage}[t]{\JHmarginparwidth}% added
      \ifoddpage #2\else #1\fi%
       \end{minipage}%
 %   \vss}}}\@esphack}
@@ -7302,25 +7307,30 @@
 \newcommand{\JHrighttitlemarginpar}[1]{%
 \pmclbsphack\strut\vadjust{%
 \rlap{\kern-\parindent%
-\kern\JHtextwidth\kern\JHmarginparsep% at right
+\kern\textwidth\kern\JHmarginparsep% at right
+\ifcentertitleson
 \kern-.5\JHtextwidth\kern\marginparsepmin
+\fi
 \setbox0=\vtop to 0pt{% added
-\begin{minipage}[t]{\marginparwidth}% added
+\begin{minipage}[t]{\JHmarginparwidth}% added
 #1%
 \end{minipage}%
 \vss}% 
 \vtop to 0pt{\kern\JHmarginparvshift% default should be 0pt 
 \kern-\dp\strutbox \kern-\ht0 \box0 \vss}}}\pmclesphack}% 
+
 %
 % commands for placing the marginal marks for titles 
 % left side
 \newcommand{\JHlefttitlemarginpar}[1]{%
 \pmclbsphack\strut\vadjust{% changed
 \rlap{\kern-\parindent%
-\kern -\JHmarginparsep \kern -\marginparwidth% at left
+\kern -\JHmarginparsep \kern -\JHmarginparwidth% at left
+\ifcentertitleson
 \kern-.5\JHtextwidth\kern\marginparsepmin
+\fi
 \setbox0=\vtop to 0pt{
-\begin{minipage}[t]{\marginparwidth}% added
+\begin{minipage}[t]{\JHmarginparwidth}% added
 #1%
 \end{minipage}%
 \vss}% changed
@@ -7357,10 +7367,14 @@
     \else
       \ifoddpage            % put at right
         \kern \textwidth \kern \JHmarginparsep        % at right
+        \ifcentertitleson
         \kern-.5\JHtextwidth\kern\marginparsepmin
+        \fi
       \else                 % put at left
         \kern -\JHmarginparsep \kern -\marginparwidth % at left
+        \ifcentertitleson
                 \kern-.5\JHtextwidth\kern\marginparsepmin
+         \fi
       \fi
     \fi
 %     \vbox to 0pt{%
diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
index 63730c3b4c0..abd1d9d9967 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/10/29 v3.141 poemscol file]
+   [2020/06/02 v3.14159 poemscol file]
  %|\prosexyznote|
 
 %%
@@ -1829,6 +1829,10 @@
 \setlength{\JHmarginparsep}{0pt}
 \newlength{\JHmarginparvshift}
 \setlength{\JHmarginparvshift}{0pt}
+\newlength{\JHmarginparwidth}
+\setlength{\JHmarginparwidth}{\marginparwidth}
+\newlength{\JHmarginparsepmin}
+\setlength{\JHmarginparsepmin}{\marginparsepmin}
 \newif{\ifJHmarkstoleft}
 \JHmarkstolefttrue
 \newif{\ifJHmarkstoright}
@@ -1884,7 +1888,7 @@
 \rlap{\kern-\parindent%
 \kern\JHtextwidth\kern\JHmarginparsep% at right
 \setbox0=\vtop to 0pt{% added
-\begin{minipage}[t]{\marginparwidth}% added
+\begin{minipage}[t]{\JHmarginparwidth}% added
 #1%
 \end{minipage}%
 \vss}%
@@ -1893,9 +1897,9 @@
 \newcommand{\JHleftmarginpar}[1]{%
 \pmclbsphack\strut\vadjust{% changed
 \rlap{\kern-\parindent%
-\kern -\JHmarginparsep \kern -\marginparwidth% at left
+\kern -\JHmarginparsep \kern -\JHmarginparwidth% at left
 \setbox0=\vtop to 0pt{
-\begin{minipage}[t]{\marginparwidth}% added
+\begin{minipage}[t]{\JHmarginparwidth}% added
 #1%
 \end{minipage}%
 \vss}% changed
@@ -1941,7 +1945,7 @@
   \rlap{\kern-\parindent
     \if@twocolumn
       \if@firstcolumn     % put at left
-        \kern -\JHmarginparsep \kern -\marginparwidth % at left
+        \kern -\JHmarginparsep \kern -\JHmarginparwidth % at left
       \else               % put at right
         \kern \columnwidth \kern \JHmarginparsep % at right
       \fi
@@ -1949,11 +1953,11 @@
       \ifoddpage            % put at right
         \kern \textwidth \kern \JHmarginparsep        % at right
       \else                 % put at left
-        \kern -\JHmarginparsep \kern -\marginparwidth % at left
+        \kern -\JHmarginparsep \kern -\JHmarginparwidth % at left
       \fi
     \fi
     \setbox0=\vtop to 0pt{% added
-     \begin{minipage}[t]{\marginparwidth}% added
+     \begin{minipage}[t]{\JHmarginparwidth}% added
      \ifoddpage #2\else #1\fi%
       \end{minipage}%
 \vss}% added
@@ -1962,22 +1966,27 @@
 \newcommand{\JHrighttitlemarginpar}[1]{%
 \pmclbsphack\strut\vadjust{%
 \rlap{\kern-\parindent%
-\kern\JHtextwidth\kern\JHmarginparsep% at right
+\kern\textwidth\kern\JHmarginparsep% at right
+\ifcentertitleson
 \kern-.5\JHtextwidth\kern\marginparsepmin
+\fi
 \setbox0=\vtop to 0pt{% added
-\begin{minipage}[t]{\marginparwidth}% added
+\begin{minipage}[t]{\JHmarginparwidth}% added
 #1%
 \end{minipage}%
 \vss}%
 \vtop to 0pt{\kern\JHmarginparvshift% default should be 0pt
 \kern-\dp\strutbox \kern-\ht0 \box0 \vss}}}\pmclesphack}%
+
 \newcommand{\JHlefttitlemarginpar}[1]{%
 \pmclbsphack\strut\vadjust{% changed
 \rlap{\kern-\parindent%
-\kern -\JHmarginparsep \kern -\marginparwidth% at left
+\kern -\JHmarginparsep \kern -\JHmarginparwidth% at left
+\ifcentertitleson
 \kern-.5\JHtextwidth\kern\marginparsepmin
+\fi
 \setbox0=\vtop to 0pt{
-\begin{minipage}[t]{\marginparwidth}% added
+\begin{minipage}[t]{\JHmarginparwidth}% added
 #1%
 \end{minipage}%
 \vss}% changed
@@ -2011,10 +2020,14 @@
     \else
       \ifoddpage            % put at right
         \kern \textwidth \kern \JHmarginparsep        % at right
+        \ifcentertitleson
         \kern-.5\JHtextwidth\kern\marginparsepmin
+        \fi
       \else                 % put at left
         \kern -\JHmarginparsep \kern -\marginparwidth % at left
+        \ifcentertitleson
                 \kern-.5\JHtextwidth\kern\marginparsepmin
+         \fi
       \fi
     \fi
     \setbox0=\vtop to 0pt{% added