ednotes 1.23b update

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

6 files changed, 49 insertions, 23 deletions

diff --git a/Master/texmf-dist/doc/latex/ednotes/CHANGES.txt b/Master/texmf-dist/doc/latex/ednotes/CHANGES.txt
index e2502aac4c4..f05a95f96e0 100644
--- a/Master/texmf-dist/doc/latex/ednotes/CHANGES.txt
+++ b/Master/texmf-dist/doc/latex/ednotes/CHANGES.txt
@@ -1,3 +1,16 @@
+CHANGES for ednotes.sty v1.23b 2006/01/26: 
+
+1. Remarks in documentation: how not to suppress hyphenation 
+   of first word in a lemma tag. (I prefer explaining 
+   customization to changing the default -- which some 
+   users may prefer.) 
+
+2. Package option `edmacpara' adapted to nccfoots v1.2 
+   -- this requires updating mfparptc.sty as well. 
+
+3. Occasionally LPPL v1.3a -> v1.3c . 
+
+
 CHANGES for ednotes.sty v1.23 2006/01/16: 
 
 1. Now works with \includeonly, which may be helpful 
diff --git a/Master/texmf-dist/doc/latex/ednotes/ednotes.pdf b/Master/texmf-dist/doc/latex/ednotes/ednotes.pdf
index 4a3cd322865..8bfe10a099a 100644
--- a/Master/texmf-dist/doc/latex/ednotes/ednotes.pdf
+++ b/Master/texmf-dist/doc/latex/ednotes/ednotes.pdf
diff --git a/Master/texmf-dist/tex/latex/ednotes/edcntwd0.sty b/Master/texmf-dist/tex/latex/ednotes/edcntwd0.sty
index 64ff79827d8..48c44001300 100644
--- a/Master/texmf-dist/tex/latex/ednotes/edcntwd0.sty
+++ b/Master/texmf-dist/tex/latex/ednotes/edcntwd0.sty
@@ -1,5 +1,5 @@
 %% EdCntWd0.sty--count word occurrences with ednotes.sty. 
-\def\fileversion{0.32a} \def\filedate{2006/06/16} %% TODO 
+\def\fileversion{0.32b} \def\filedate{2006/06/26} %% TODO 
 
 %% Copyright (C) 2004 Uwe L\"uck & Christian Tapp (direction) 
 %%               2005 2006 Uwe L\"uck. 
@@ -9,7 +9,7 @@
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
 %% archives in directory macros/latex/base/lppl.txt; either
-%% version 1.3a of the License, or any later version.
+%% version 1.3c of the License, or any later version.
 %% We did our best to help you, but there is NO WARRANTY. 
 
 %% * USAGE: *
@@ -359,3 +359,5 @@ v0.32a    /06/07  \c@CW@par with \includeonly.
                   \@CW@make@placeindexlist etc.; 
                   extended documentation; rearranged code. 
       2006/06/16  \@CW@missingdata. 
+v0.32b    /06/26  LPPL v1.3c. 
+
diff --git a/Master/texmf-dist/tex/latex/ednotes/ednotes.sty b/Master/texmf-dist/tex/latex/ednotes/ednotes.sty
index 646bee669cc..6fb640b67e5 100644
--- a/Master/texmf-dist/tex/latex/ednotes/ednotes.sty
+++ b/Master/texmf-dist/tex/latex/ednotes/ednotes.sty
@@ -5,11 +5,11 @@
 %% --author-maintained, for critical editions
 %% (varying J. Lavagnino's and D. Wujastyk's EDMAC). 
 %% 
-\def\fileversion{1.23a} \def\filedate{2006/06/20} %% TODO 
+\def\fileversion{1.23b} \def\filedate{2006/06/26} %% TODO 
 % 
 %% This file can be redistributed and/or modified under 
 %% the terms of the LaTeX Project Public License; either 
-%% version 1.3a of the License, or any later version.
+%% version 1.3c of the License, or any later version.
 %% The latest version of this license is in
 %%
 %%     http://www.latex-project.org/lppl.txt
@@ -54,7 +54,7 @@
 % *Packages required:* 
 % This package will not work without the following ones 
 % ("visible"--cf. visible.txt in CTAN ednotes folder): 
-% o  Packages `manyfoot.sty' and `nccfoots.sty' by 
+% o  Packages `manyfoot.sty' (v1.9+) and `nccfoots.sty' by 
 %    Alexander I. Rozhenko from the `ncctools' bundle. 
 %    You needn't know anything about these 
 %    except perhaps options `para' and `para*' 
@@ -229,7 +229,8 @@
 % original one; we hope you understand from these definitions how 
 % they work in general and what the arguments are. E.g., \linesfmt 
 % applies to printing of line numbers and, originally, renders them 
-% bold-faced, followed by \enspace.) 
+% bold-faced, followed by \enspace. Note that this default suppresses 
+% hyphenation of the first word of a lemma tag.) 
 % This controls identical behaviour in *every apparatus*. 
 % For changing appearance of a single apparatus without changing 
 % the remaining, see below.---Note: With v1.1, \ref has been 
@@ -244,6 +245,10 @@
 % \renewcommand*{\differentlines}[2]{\linesfmt{#1--#2}} 
 % %% TODO: \linesfmt into \@EN@note!? 
 % \renewcommand*{\linesfmt}[1]{\textbf{#1}\enspace} 
+% ---E.g., for enabling hyphenation of first word of lemma tag: 
+% % \renewcommand*{\linesfmt}[1]{\textbf{#1}\enspace
+% %                              \hspace*{0pt}}
+% ---Last line works like german.sty's \allowhyphens. 
 % \renewcommand*{\pageandline}[2]{#1.#2} % #1 page, #2 line. 
 % \renewcommand{\lemmafmt}[1]{#1\thinspace]\enskip} 
 % \renewcommand*{\repeatref}[1]{#1} 
@@ -609,8 +614,12 @@
 %
 % Load `mfparptc.sty' after `manyfoot.sty': 
 \DeclareOption{edmacpara}{% 
-  \AtEndOfPackage{\RequirePackage{mfparptc}[2004/08/21]}} 
-% <- `center' bug fix. 
+  \AtEndOfPackage{% 
+%     \RequirePackage{afterpackage}\AfterPackage{% TODO 
+      \RequirePackage{mfparptc}[2006/06/26]}% 
+% <- nccfoots v1.2. 
+%     }% 
+} 
 %
 % Load `edcntwd0.sty' after `lineno.sty': 
 \DeclareOption{countoccurrences}{% 
@@ -642,10 +651,9 @@
 \ProcessOptions 
 % 
 %% Load required packages: 
-\RequirePackage[ruled\if@EN@Apara,para\fi]{manyfoot}
+\RequirePackage[ruled\if@EN@Apara,para\fi]{manyfoot}[2005/05/11]
+%% <- \SetFootnoteHook 
 %% TODO: Leave choice to user!? 
-%% TODO: 2004/10/20 v1.7!? (\ExtraParaSkip) 
-%%            -- cf. reminder about `mfparxsp.sty' below. 
 %% TODO: ruled -> \Execute...!? 
 
 \RequirePackage{lineno}[2004/10/11] 
@@ -1435,4 +1443,6 @@ v1.23 2006/01/23 Example on \NewEdnotesCommand: default "B" -> "A".
       2006/06/16 Additional screen advice with oscillating page breaks 
                  + explanation in manual (\warningpagebreak). 
 v1.23a    /06/20 Corrected \RequirePackage{edcntwd0}-date. 
-
+v1.23b    /06/22 Require manyfoot v1.9. 
+          /06/26 LPPL v1.3c; require mfparptc v4.1; remarks on 
+                 hyphenation of first word in lemma tag. 
diff --git a/Master/texmf-dist/tex/latex/ednotes/mfparptc.sty b/Master/texmf-dist/tex/latex/ednotes/mfparptc.sty
index 562aed7030e..e2008f199d2 100644
--- a/Master/texmf-dist/tex/latex/ednotes/mfparptc.sty
+++ b/Master/texmf-dist/tex/latex/ednotes/mfparptc.sty
@@ -1,18 +1,18 @@
 %% MFParPtc.sty---Uwe L"uck http://www.contact-ednotes.sty.de.vu. 
 %% Modifies Alexander Rozhenko's manyfoot.sty. 
 %%
-%% Copyright (C) 2003--2004 by Uwe L"uck--author-maintained. 
+%% Copyright (C) 2003--2006 by Uwe L"uck--author-maintained. 
 %% 
 %% This file can be redistributed and/or modified under 
 %% the terms of the LaTeX Project Public License; either 
-%% version 1.3a of the License, or any later version.
+%% version 1.3c of the License, or any later version.
 %% The latest version of this license is in
 %%   http://www.latex-project.org/lppl.txt
 %% We did our best to help you, but there is NO WARRANTY. 
 %%
 % 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mfparptc}[2005/01/10 v0.4b %% TODO 
+\ProvidesPackage{mfparptc}[2006/06/26 v0.41 %% TODO 
     ^^J\string"patch\string" for manyfoot.sty's paragraph footnotes 
        (ul)] 
 % 
@@ -59,7 +59,7 @@
 % (Also tests whether manyfoot.sty has been loaded with option 
 %  `para' or `para*'.)
 \CheckCommand*\MFL@fnotepara[3]{\let\@thefnmark\@empty
-  \NCC@makemark{#2}%
+  \NCC@makefnmark{#2}%
   \MFL@insert#1{\reset@font\footnotesize
     \ifx\@thefnmark\@empty \@tempswafalse \else
       \@tempswatrue
@@ -103,7 +103,7 @@
 % Text', TUGboat 11 (1990), pp. 605--612.) 
 % TODO: Might redefine \hfill and more; cf. Michael Downes' paper. 
 \def\MFL@fnotepara#1#2#3{\let\@thefnmark\@empty
-  \NCC@makemark{#2}%
+  \NCC@makefnmark{#2}%
   \MFL@insert#1{\reset@font\footnotesize
     \ifx\@thefnmark\@empty \@tempswafalse \else
       \@tempswatrue
@@ -204,4 +204,5 @@ v0.4  2004/10/07  Ednotes -> ednotes etc.; instructions:
                   ednotes option `edmacpara'. 
 v0.4a 2004/11/07  LPPL v1.3a. 
 v0.4b 2005/01/10  Contact via http. 
-
+v0.41 2006/06/26  \MFL@makemark -> \MFL@makefnmark for nccfoots v1.2; 
+                  LPPL v1.3c. 
diff --git a/Master/texmf-dist/tpm/ednotes.tpm b/Master/texmf-dist/tpm/ednotes.tpm
index 96a46421971..f552725c89c 100644
--- a/Master/texmf-dist/tpm/ednotes.tpm
+++ b/Master/texmf-dist/tpm/ednotes.tpm
@@ -3,8 +3,8 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/ednotes.zip">
     <TPM:Name>ednotes</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/06/20 07:22:00</TPM:Date>
-    <TPM:Version>0.49</TPM:Version>
+    <TPM:Date>2006/06/26 19:21:00</TPM:Date>
+    <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Typeset scholarly edition.</TPM:Title>
     <TPM:Description>
@@ -14,9 +14,9 @@ including support for line numbers and layers of footnotes.
 [description copied from TeX Catalogue]
     </TPM:Description>
     <TPM:Author>Uwe Lueck</TPM:Author>
-    <TPM:Size>614852</TPM:Size>
+    <TPM:Size>637288</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="105855">
+    <TPM:RunFiles size="105037">
 texmf-dist/tex/latex/ednotes/edcntwd0.sty
 texmf-dist/tex/latex/ednotes/ednotes.sty
 texmf-dist/tex/latex/ednotes/lblchng1.sty
@@ -24,7 +24,7 @@ texmf-dist/tex/latex/ednotes/mfparptc.sty
 texmf-dist/tex/latex/ednotes/mfparxsp.sty
 texmf-dist/tpm/ednotes.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="531433">
+    <TPM:DocFiles size="531826">
 texmf-dist/doc/latex/ednotes/CHANGES.txt
 texmf-dist/doc/latex/ednotes/README.txt
 texmf-dist/doc/latex/ednotes/README4U.txt