ledmac (5apr12)

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

8 files changed, 108 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/ledmac/ledarab.pdf b/Master/texmf-dist/doc/latex/ledmac/ledarab.pdf
index 881712d9d19..72c6f42f4f5 100644
--- a/Master/texmf-dist/doc/latex/ledmac/ledarab.pdf
+++ b/Master/texmf-dist/doc/latex/ledmac/ledarab.pdf
diff --git a/Master/texmf-dist/doc/latex/ledmac/ledmac.pdf b/Master/texmf-dist/doc/latex/ledmac/ledmac.pdf
index 50fe42adb61..c2681364cd7 100644
--- a/Master/texmf-dist/doc/latex/ledmac/ledmac.pdf
+++ b/Master/texmf-dist/doc/latex/ledmac/ledmac.pdf
diff --git a/Master/texmf-dist/doc/latex/ledmac/ledpar.pdf b/Master/texmf-dist/doc/latex/ledmac/ledpar.pdf
index 5062e10ffe5..8c7fbb6327f 100644
--- a/Master/texmf-dist/doc/latex/ledmac/ledpar.pdf
+++ b/Master/texmf-dist/doc/latex/ledmac/ledpar.pdf
diff --git a/Master/texmf-dist/source/latex/ledmac/ledmac.dtx b/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
index a01c2b301ef..229f1f57553 100644
--- a/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
+++ b/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
@@ -50,7 +50,7 @@
 %
 % \fi
 %
-% \CheckSum{9157}
+% \CheckSum{9200}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -137,6 +137,7 @@
 % \def\fileversion{v0.12.1} \def\filedate{2011/10/02}
 % \def\fileversion{v0.13} \def\filedate{2011/11/08}
 % \def\fileversion{v0.13.1} \def\filedate{2011/11/18}
+% \def\fileversion{v0.14} \def\filedate{2012/04/04}
 % \changes{v0.1}{2003/03/25}{First public release}
 % \changes{v0.2}{2003/08/16}{Added tabmac code, and extended indexing}
 % \changes{v0.2.1}{2003/09/13}{Bug fixes and match with mempatch v1.8}
@@ -169,6 +170,7 @@
 % \changes{v0.12.1}{2011/10/02}{Don't number \cs{pstarts} of stanza.}
 %\changes{v0.13}{2011/11/08}{New stanzaindentsrepetition counter  to repeat stanza indents every \emph{n} verses.}
 % \changes{v0.13.1}{2011/11/18}{\cs{thepstartL} and \cs{thepstartR}  use now \cs{bfseries} and not \cs{bf}, which is deprecated and make conflicts with memoir class.}
+% \changes{v0.14}{2012/04/04}{Tweaked \cs{edlabel} to get correct line number if the command is first element of a paragraph.}
 % \hyphenation{man-u-script man-u-scripts}
 %
 % \newcommand{\Lpack}[1]{\textsf{#1}}
@@ -278,7 +280,7 @@
 % \Lpack{poemscol} for poetical works.
 % \end{PW}
 % 
-% To report bugs, please go to ledmac's GitHub page and click "New Issue": \url{lhttps://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac).  GitHub accounts are free for open-source users.
+% To report bugs, please go to ledmac's GitHub page and click "New Issue": \url{https://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac).  GitHub accounts are free for open-source users.
 % \end{abstract}
 %
 % \tableofcontents
@@ -2972,7 +2974,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledmac}[2011/11/18 v0.13.1 LaTeX port of EDMAC]
+\ProvidesPackage{ledmac}[2012/04/04 v0.14 LaTeX port of EDMAC]
 
 %    \end{macrocode}
 %
@@ -8440,6 +8442,7 @@
 % \end{PW}
 % 
 % \changes{v0.2.1}{2003/08/26}{Tweaked \cs{edlabel} to get correct page numbers}
+% \changes{v0.14}{2012/04/04}{Tweaked \cs{edlabel} to get correct line number if the command is first element of a paragraph.}
 %    \begin{macrocode}
 \newcommand*{\edlabel}[1]{\@bsphack
   \write\linenum@out{\string\@lab}%
@@ -8447,6 +8450,9 @@
     \xdef\label@refs{\zz@@@}%
   \else
     \gl@p\labelref@list\to\label@refs
+  \ifvmode
+  	\advancelabel@refs
+  \fi
   \fi
 %  \edef\next{\write\@aux{\string\l@dmake@labels\label@refs|{#1}}}%
 %  \next}
@@ -8464,6 +8470,32 @@
 %    \end{macrocode}
 % \end{macro}
 %
+%
+%\begin{macro}{\advancelabel@refs}
+%\begin{macro}{\labelrefsparseline}
+%\begin{macro}{\labelrefsparsesubline}
+% \begin{macrocode}
+% In case which \cs{edlabel} is the first in a paragraph, we have a problem, because  line's number changes only at first horizontal box  of the paragraph. And so, we need test in \cs{edlable} if we are at the top of paragraph, with \cs{ifvmode}. If true, we need advance of on unity text that we write in .aux file. We do it with \cs{advancelabel@refs} command.
+\newcommand{\advancelabel@refs}{%
+	\newcount\line%
+	\ledmac@warning{\label@refs}
+	\line=\expandafter\labelrefsparseline\label@refs%
+	\advance\line by 1%
+	\ifsublines@%
+		\newcount\subline%
+		\subline=\labelrefsparsesubline\label@refs%
+		\advance\subline by 1%
+		\def\label@refs{\the\line|\the\subline}%
+	\else%
+		\def\label@refs{\the\line|0}%
+	\fi%
+	}
+\def\labelrefsparseline#1|#2{#1}
+\def\labelrefsparsesubline#1|#2{#2}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
 % \begin{macro}{\l@dmake@labels}
 % The \cs{l@dmake@labels} macro gets executed when the labels file is
 % read. For each label it defines a macro, whose name is made up
diff --git a/Master/texmf-dist/source/latex/ledmac/ledpar.dtx b/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
index ad8a3f8c9ac..4e02ab0fb9f 100644
--- a/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
+++ b/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
@@ -50,7 +50,7 @@
 %
 % \fi
 %
-% \CheckSum{4524}
+% \CheckSum{4564}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -131,6 +131,7 @@
 % \def\fileversion{v0.9.1}\def\filedate{2011/10/02}
 % \def\fileversion{v0.9.2}\def\filedate{2011/11/08}
 % \def\fileversion{v0.9.3}\def\filedate{2011/11/18}
+% \def\fileversion{v0.10}\def\filedate{2012/04/04}
 % \changes{v0.1}{2004/12/10}{First public release}
 % \changes{v0.2}{2005/01/01}{Fix babel problems}
 % \changes{v0.3}{2005/03/24}{Reorganize for ledarab}
@@ -146,6 +147,8 @@
 % \changes{v0.9.1}{2011/10/02}{The numbering of the pstarts restarts on each \cs{beginnumbering}.}
 % \changes{v0.9.2}{2011/11/08}{Debug : with \cs{Columns}, the hanging indentation now runs on the left columns and the hanging symbol is shown only when \cs{stanza} is used.}
 % \changes{v0.9.3}{2011/11/18}{\cs{thepstartL} and \cs{thepstartR}  use now \cs{bfseries} and not \cs{bf}, which is deprecated and make conflicts with memoir class.}
+% \changes{v0.10}{2011/04/04}{\cs{edlabel} which start a paragraph are now put in the right place.}
+% \changes{v0.10}{2011/04/04}{\cs{edlabel} on the right side are now correctly indicated.}
 % \hyphenation{man-u-script man-u-scripts}
 %
 % \newcommand{\Lpack}[1]{\textsf{#1}}
@@ -200,7 +203,7 @@
 % which enables texts and their critical apparatus to be typeset in 
 % parallel, either in two columns or on pairs of facing pages.
 %
-% To report bugs, please go to ledmac's GitHub page and click "New Issue": \url{lhttps://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac).  GitHub accounts are free for open-source users.
+% To report bugs, please go to ledmac's GitHub page and click "New Issue": \url{https://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac).  GitHub accounts are free for open-source users.
 % \end{abstract}
 %
 % \tableofcontents
@@ -701,7 +704,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledpar}[2011/11/18 v0.9.3 ledmac extension for parallel texts]
+\ProvidesPackage{ledpar}[2012/04/04 v0.10 ledmac extension for parallel texts]
 
 %    \end{macrocode}
 %  With the option `shiftedverses' a long verse one the left side (or in the right side) don't make a blank on the corresponding verse, but the blank is put on the bottom of the page. Consequently, the verses on the parallel pages are shifted, but the shifted stop at every end of pages.
@@ -3141,7 +3144,23 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-%
+% \begin{macro}{\l@dedendmini}
+%    \begin{macrocode}
+\renewcommand*{\l@dedendmini}{%
+  \ifl@dpairing
+    \ifledRcol
+      \flush@notesR
+    \else
+      \flush@notes
+    \fi
+  \fi
+  \ifvoid\mpAfootins\else\mpAfootgroup{A}\fi%
+  \ifvoid\mpBfootins\else\mpBfootgroup{B}\fi%
+  \ifvoid\mpCfootins\else\mpCfootgroup{C}\fi%
+  \ifvoid\mpDfootins\else\mpDfootgroup{D}\fi%
+  \ifvoid\mpEfootins\else\mpEfootgroup{E}\fi}
+%    \end{macrocode}
+% \end{macro}
 % \subsection{Normal footnote formatting} \label{sec:nfootformat}
 %
 % The \cs{printlines} macro prints the line
@@ -3217,6 +3236,9 @@
     \else
       \gl@p\labelref@listR\to\label@refs
     \fi
+    \ifvmode
+    	\advancelabel@refs
+    \fi
     \protected@write\@auxout{}%
       {\string\l@dmake@labelsR\space\thepage|\label@refs|{#1}}%
   \else
@@ -3226,9 +3248,12 @@
     \else
       \gl@p\labelref@list\to\label@refs
     \fi
-  \fi
+    \ifvmode
+    	\advancelabel@refs
+    \fi
   \protected@write\@auxout{}%
     {\string\l@dmake@labels\space\thepage|\label@refs|{#1}}%
+  \fi
   \@esphack}
 
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
index 8ddf7c31b27..3a9c19cc5fb 100644
--- a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
+++ b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
@@ -23,7 +23,7 @@
 %%   This work consists of the files listed in the README file.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledmac}[2011/11/18 v0.13.1 LaTeX port of EDMAC]
+\ProvidesPackage{ledmac}[2012/04/04 v0.14 LaTeX port of EDMAC]
 
 \newif\ifledfinal
 \DeclareOption{final}{\ledfinaltrue}
@@ -1703,11 +1703,30 @@
     \xdef\label@refs{\zz@@@}%
   \else
     \gl@p\labelref@list\to\label@refs
+  \ifvmode
+   \advancelabel@refs
+  \fi
   \fi
   \protected@write\@auxout{}%
     {\string\l@dmake@labels\space\thepage|\label@refs|{#1}}%
   \@esphack}
 
+\newcommand{\advancelabel@refs}{%
+\newcount\line%
+\ledmac@warning{\label@refs}
+\line=\expandafter\labelrefsparseline\label@refs%
+\advance\line by 1%
+\ifsublines@%
+\newcount\subline%
+\subline=\labelrefsparsesubline\label@refs%
+\advance\subline by 1%
+\def\label@refs{\the\line|\the\subline}%
+\else%
+\def\label@refs{\the\line|0}%
+\fi%
+}
+\def\labelrefsparseline#1|#2{#1}
+\def\labelrefsparsesubline#1|#2{#2}
 \newcommand*{\l@dmake@labels}{}
 \def\l@dmake@labels#1|#2|#3|#4{%
   \expandafter\ifx\csname the@label#4\endcsname \relax\else
diff --git a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
index 7bcfa8019b6..4b93ec2e423 100644
--- a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
+++ b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
@@ -24,7 +24,7 @@
 %% 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledpar}[2011/11/18 v0.9.3 ledmac extension for parallel texts]
+\ProvidesPackage{ledpar}[2012/04/04 v0.10 ledmac extension for parallel texts]
 
 \newif\ifshiftedverses
 \shiftedversesfalse
@@ -1325,6 +1325,19 @@
   \else
     \mpvEfootnote{E}{{0|0|0|0|0|0|0}{}{#1}}%
   \fi\ignorespaces}
+\renewcommand*{\l@dedendmini}{%
+  \ifl@dpairing
+    \ifledRcol
+      \flush@notesR
+    \else
+      \flush@notes
+    \fi
+  \fi
+  \ifvoid\mpAfootins\else\mpAfootgroup{A}\fi%
+  \ifvoid\mpBfootins\else\mpBfootgroup{B}\fi%
+  \ifvoid\mpCfootins\else\mpCfootgroup{C}\fi%
+  \ifvoid\mpDfootins\else\mpDfootgroup{D}\fi%
+  \ifvoid\mpEfootins\else\mpEfootgroup{E}\fi}
 \def\printlinesR#1|#2|#3|#4|#5|#6|#7|{\begingroup
   \setprintlines{#1}{#2}{#3}{#4}{#5}{#6}%
   \ifl@d@pnum #1\fullstop\fi
@@ -1348,6 +1361,9 @@
     \else
       \gl@p\labelref@listR\to\label@refs
     \fi
+    \ifvmode
+     \advancelabel@refs
+    \fi
     \protected@write\@auxout{}%
       {\string\l@dmake@labelsR\space\thepage|\label@refs|{#1}}%
   \else
@@ -1357,9 +1373,12 @@
     \else
       \gl@p\labelref@list\to\label@refs
     \fi
-  \fi
+    \ifvmode
+     \advancelabel@refs
+    \fi
   \protected@write\@auxout{}%
     {\string\l@dmake@labels\space\thepage|\label@refs|{#1}}%
+  \fi
   \@esphack}
 
 \def\l@dmake@labelsR#1|#2|#3|#4{%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 7dcb69d190e..004062839ec 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -662,7 +662,8 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'pitthesis',	"die 'skipping, noinfo license",
  'pl',		"die 'skipping, not ready, cf. cc-pl, sorry",
  'pl-qx',	"&MAKEplqx",
- 'pmx',		"die 'skipping, problematic musixtex binaries'",
+ 'pmx',		"die 'skipping, musixtex binaries'",
+ 'pmxchords',	"die 'skipping, problematic musixtex scripts'",
  'pointRuler',	"die 'skipping, requires compilation'",
  'poltawski',	"&MAKEcopy",
  'polyglossia-kannada',	"die 'skipping, now in polyglossia proper'",