ednotes 1.5 (10jul06)

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

5 files changed, 222 insertions, 75 deletions

diff --git a/Master/texmf-dist/doc/latex/ednotes/CHANGES.txt b/Master/texmf-dist/doc/latex/ednotes/CHANGES.txt
index f05a95f96e0..c714e26716a 100644
--- a/Master/texmf-dist/doc/latex/ednotes/CHANGES.txt
+++ b/Master/texmf-dist/doc/latex/ednotes/CHANGES.txt
@@ -1,3 +1,34 @@
+CHANGES for ednotes.sty v1.3 2006/07/08: 
+
+1. Customizing (different) footnote rules -- as invented by 
+   Christian Tapp and Alex Rozhenko, implemented in manyfoot 
+   v1.5 -- is now supported by ednotes at last. To learn 
+   more on this new feature, please search ednotes.sty for 
+   `Customizing *footnote rules*'. 
+
+   One application for this, asked for by Sergei Mariev 
+   (who has inspired so many improvements) is demonstrated 
+   in file varnrule.tex . 
+
+   (Jumping from v1.23 to v1.3 expresses my happiness about 
+    this gain!)
+
+2. Overlapping lemmas work as I had desired for a long time 
+   -- especially in "moving arguments" (e.g. section titles). 
+   Moreover, my recent work on this had introduced another 
+   bug -- that is fixed only now. 
+
+   Macros \IfLemmaTag and \IfTypesetting (each with two 
+   arguments) have become public in case you need 
+   something more special/general concerning overlapping 
+   lemmas and/or moving arguments than what has been 
+   provided so far. 
+ 
+3. [Recent \includeonly features have been re-implemented 
+    internally more parsimoniously -- I hope you won't 
+    experience any effect of this.]
+
+
 CHANGES for ednotes.sty v1.23b 2006/01/26: 
 
 1. Remarks in documentation: how not to suppress hyphenation 
diff --git a/Master/texmf-dist/doc/latex/ednotes/README.txt b/Master/texmf-dist/doc/latex/ednotes/README.txt
index ba63715211e..388e7dd0842 100644
--- a/Master/texmf-dist/doc/latex/ednotes/README.txt
+++ b/Master/texmf-dist/doc/latex/ednotes/README.txt
@@ -3,11 +3,11 @@
                           FIRST INSTRUCTIONS 
                                  for 
                                EDNOTES 
-                       Distribution April 2005
-                      (this file April 26, 2005) 
+                        Distribution July 2006
+                       (this file July 8, 2006)
 
-                    Uwe Lueck, dir. Christian Tapp
-                      Munich/Goettingen, Germany 
+                     Uwe Lueck, Munich (Germany)
+                dir. Christian Tapp, Pittsburgh (USA)
                  http://www.contact-ednotes.sty.de.vu
 
 ====================+=====+=======++=======+=====+====================
@@ -105,92 +105,92 @@ USAGE of `ednotes':
   CTAN folders. Here is just a guide through files and folders to 
   increase your knowledge step by step: 
 
-    0. Oh, recently some of these explanations have been collected 
-       in ednotes.pdf -- .txt input with .pdf output. 
-
-    1. An overview of `ednotes' has appeared in TUGboat vol. 24. 
-       no. 2; the above `ednotes' directory of CTAN contains an 
-       updated .pdf version `ednotugb.pdf' of it. It demonstrates 
-       through some examples what output certain commands produce. 
-       It also compares `ednotes' with two other (La)TeX packages 
-       for critical edition typesetting. 
-
-    2. Next (or even first) we recommend reading the explanations at 
-       the beginning of `ednotes.sty'. 
-
-    3. You may find references to .sty files from the `ednotes' and 
-       the `lineno' folder for reading about additional details of 
-       usage. 
-
-    4. `lineno.sty' provides commands and options that are very useful 
-       to know for creating critical editions by `ednotes'. You can 
-       read about these commands and options in `lineno.sty'. 
-       Moreover, the explanations from `lineno.sty' can be printed 
-       through `lineno.tex' or `lineno.pdf' obtainable from the above 
-       `ednotes' directory. You find there as well an attempt at a 
-       user's guide for `lineno' -- `ulineno.tex' and `ulineno.pdf'. 
-       The latter is not quite up to date, but it may be helpful 
-       though. -- When you use `ednotes', don't believe what the 
-       `lineno' documentation tells about, e.g., 
- 
-         \usepackage[edtable]{lineno}
-
-       (such statements address usage of `lineno' without `ednotes'). 
-       Many package options of `ednotes.sty' are just passed to 
-       `lineno.sty', so the `lineno' documentation is `ednotes' 
-       documentation in this respect. 
-
-    5. `manyfoot' is another essential module for making `ednotes' 
-       work, though you may hardly need to know about it, `ednotes' 
-       is a kind of user interface for `manyfoot'. However, you may 
-       inform yourself about offers of `manyfoot' for certain fine 
-       points of critical edition typesetting through `manyfoot.dtx' 
-       or `manyfoot.pdf' -- which you find in 
- 
-         http://www.ctan.org/tex-archive/macros/latex/contrib/ncctools 
+  0. Oh, recently some of these explanations have been collected
+     in ednotes.pdf -- .txt input with .pdf output.
+
+  1. An overview of `ednotes' has appeared in TUGboat vol. 24.
+     no. 2; the above `ednotes' directory of CTAN contains an
+     updated .pdf version `ednotugb.pdf' of it. It demonstrates
+     through some examples what output certain commands produce.
+     It also compares `ednotes' with two other (La)TeX packages
+     for critical edition typesetting.
+
+  2. Next (or even first) we recommend reading the explanations at
+     the beginning of `ednotes.sty'.
+
+  3. You may find references to .sty files from the `ednotes' and
+     the `lineno' folder for reading about additional details of
+     usage.
+
+  4. `lineno.sty' provides commands and options that are very useful
+     to know for creating critical editions by `ednotes'. You can
+     read about these commands and options in `lineno.sty'.
+     Moreover, the explanations from `lineno.sty' can be printed
+     through `lineno.tex' or `lineno.pdf' obtainable from the above
+     `ednotes' directory. You find there as well an attempt at a
+     user's guide for `lineno' -- `ulineno.tex' and `ulineno.pdf'.
+     The latter is not quite up to date, but it may be helpful
+     though. -- When you use `ednotes', don't believe what the
+     `lineno' documentation tells about, e.g.,
 
-       (e.g., cf. `CTAN' in the glossary). There are `nccfoots.dtx' 
-       and `nccfoots.pdf' as well. Indeed you may find functions of 
-       `manyfoot' useful just for your commentary passages. 
+       \usepackage[edtable]{lineno}
 
-    6. `perpage.sty' is mentioned here mainly to allow use of 
-       `manyfoot's `perpage' option. It contains brief explanations. 
+     (such statements address usage of `lineno' without `ednotes').
+     Many package options of `ednotes.sty' are just passed to
+     `lineno.sty', so the `lineno' documentation is `ednotes'
+     documentation in this respect.
 
-    7. `longtable', of course, is explained in `longtable.dtx' and 
-       various guides for LaTeX. 
+  5. `manyfoot' is another essential module for making `ednotes'
+     work, though you may hardly need to know about it, `ednotes'
+     is a kind of user interface for `manyfoot'. However, you may
+     inform yourself about offers of `manyfoot' for certain fine
+     points of critical edition typesetting through `manyfoot.dtx'
+     or `manyfoot.pdf' -- which you find in
 
-    8. We have prepared something for listing line numbers for index 
-       terms. We don't take the time to integrate it here -- please 
-       contact us (see below) if you are interested. 
+       http://www.ctan.org/tex-archive/macros/latex/contrib/ncctools
+
+     (e.g., cf. `CTAN' in the glossary). There are `nccfoots.dtx'
+     and `nccfoots.pdf' as well. Indeed you may find functions of
+     `manyfoot' useful just for your commentary passages.
+
+  6. `perpage.sty' is mentioned here mainly to allow use of
+     `manyfoot's `perpage' option. It contains brief explanations.
+
+  7. `longtable', of course, is explained in `longtable.dtx' and
+     various guides for LaTeX.
+
+  8. We have prepared something for listing line numbers for index
+     terms. We don't take the time to integrate it here -- please
+     contact us (see below) if you are interested.
 
 Standalone files:
 
   Some of the listed .sty files which are our work may be useful 
   without using `ednotes': 
 
-    1. Whenever you use `manyfoot', you can load `mfparptc.sty' after 
-       `manyfoot.sty' just to modify the behaviour of `manyfoot' in 
-       the way that is explained in `mfparptc.sty'. 
+   1. Whenever you use `manyfoot', you can load `mfparptc.sty' after
+      `manyfoot.sty' just to modify the behaviour of `manyfoot' in
+      the way that is explained in `mfparptc.sty'.
+
+      Moreover, there is a file `mfparxsp.sty', made for the
+      possibility that some `manyfoot' user has used an earlier
+      version of `mfparxsp.sty' which has become obsolete.
 
-       Moreover, there is a file `mfparxsp.sty', made for the 
-       possibility that some `manyfoot' user has used an earlier 
-       version of `mfparxsp.sty' which has become obsolete. 
+   2. For extending lineno.sty by packages from here, see
 
-    2. For extending lineno.sty by packages from here, see 
+        http://www.ctan.org/tex-archive/macros/latex/contrib/lineno
 
-         http://www.ctan.org/tex-archive/macros/latex/contrib/lineno 
+      (e.g., cf. `CTAN' in the glossary).
 
-       (e.g., cf. `CTAN' in the glossary). 
-       
-    3. `ltabptch.sty', a patch for `longtable', can be used whenever 
-       `longtable' is used. 
+   3. `ltabptch.sty', a patch for `longtable', can be used whenever
+      `longtable' is used.
 
-    4. An additional file `lblchng1.sty' deals with page break 
-       oscillations, by code as well as by explanations and 
-       discussion. It can be used entirely independently from 
-       any of the packages mentioned before. 
+   4. An additional file `lblchng1.sty' deals with page break
+      oscillations, by code as well as by explanations and
+      discussion. It can be used entirely independently from
+      any of the packages mentioned before.
 
-Contact us: 
+CONTACT us:
 
    We would be happy about your suggestions and (in a way) about your 
    bug reports. Since documentation is so poor at present, please feel 
@@ -201,7 +201,7 @@ Contact us:
    (Note: in TeX terms, the names in the file heading are `L\"uck' 
    and `G\"ottingen.)
  
-Newsletter: 
+NEWSLETTER:
 
    E.g., you may ask us to take your e-mail address into a mailing 
    list for reporting `ednotes' changes.
diff --git a/Master/texmf-dist/doc/latex/ednotes/ednotes.pdf b/Master/texmf-dist/doc/latex/ednotes/ednotes.pdf
index 8bfe10a099a..0172d59cd68 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/doc/latex/ednotes/ednotes.tex b/Master/texmf-dist/doc/latex/ednotes/ednotes.tex
index 0cd90e4ff74..12650ad0af0 100644
--- a/Master/texmf-dist/doc/latex/ednotes/ednotes.tex
+++ b/Master/texmf-dist/doc/latex/ednotes/ednotes.tex
@@ -80,8 +80,10 @@ alternative \texttt{ledmac}.
 These are some very down-to-earth advices for 
 real \TeX-newbies. 
 \verbatiminput{visible.txt}
+
 \section{The main file: \texttt{ednotes.sty}}
 \verbatiminput{ednotes.sty}
+
 \section{Supplementary macro files}
 \subsection{Tracking page break oscillations:
             \texttt{lblchng1.sty}}
@@ -98,6 +100,9 @@ vertical spacing has been superseded by \texttt{manyfoot}'s
 more recent \cs{ExtraParaSkip}\,.
 \verbatiminput{mfparxsp.sty}
 
+\section{\texttt{varnrule.tex}---customizing footnote rules}
+\verbatiminput{varnrule.tex}
+
 \end{document}
 
 end of Ednotes.tex 
diff --git a/Master/texmf-dist/doc/latex/ednotes/varnrule.tex b/Master/texmf-dist/doc/latex/ednotes/varnrule.tex
new file mode 100644
index 00000000000..4e2d203314e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ednotes/varnrule.tex
@@ -0,0 +1,111 @@
+%% varnrule.tex -- demo for varying footnote rules with 
+%% ednotes.sty (manyfoot feature now supported by ednotes 
+%% -- search ednotes.sty for `Customizing *footnote rules*'). 
+%% Uwe Lueck http://contact-ednotes.sty.de.vu 2006/07/06 
+
+%% Present task: Sergei Mariev wants to use ordinary (numbered) 
+%  footnotes as well as critical apparatuses. An ordinal footnote 
+%  rule should separate the main text from the footnotes in any 
+%  case. The additional footnotes should be separated by usual 
+%  footnote rules as well. However, there shouldn't be a rule 
+%  between the ordinary numbered footnotes and the remaining 
+%  ones. 
+% 
+\documentclass[12pt]{article}
+
+%  Below \endinput here, there is a sample for experiencing the 
+%  manyfoot feature without ednotes ...: 
+% 
+%%%% \iffalse %% To switch to the mere manyfoot sample -- needs 
+%%%%          %% removing percent signs preceding corresponding 
+%%%%          %% \fi as well! 
+
+\newcommand{\SelectAnoteRule}{[1]{no}}
+\newcommand{\SelectBnoteRule}{[0]{default}}
+% <- Priorities 1 and 0 will be overridden by priority 2 
+%    of the Standard LateX footnote rule, 
+%    so there will be a footnote rule between main text and the 
+%    footnotes in any case. Priority 1 above ensures that 
+%    there will never be a visible rule between ordinary footnotes 
+%    and the new A/B/C footnotes handled by manyfoot. 
+%    `no' corresponds to \newcommand{\nofootnoterule} below; 
+%    `default' refers to the standard footnote rule as stored 
+%    by manyfoot. 
+%    -- \newcommand{\Select... must come before loading ednotes. 
+
+\usepackage[Bpara,Cpara]{ednotes}
+
+\renewcommand{\footnoterulepriority}{2} 
+% <- setting default priority, especially for the ordinary LaTeX 
+%    footnotes. This priority is the maximal one here and thus 
+%    overrides all the remaining ones. So there will be a rule 
+%    between main text and the footnotes in any case. 
+%    -- The previous line must come /after/ loading ednotes. 
+
+\newcommand{\nofootnoterule}{} 
+% <- or \let\nofootnoterule\empty; or call it \emptyfootnoterule. 
+%    If so, use `empty' instead of `no' above. 
+%    -- This line may come anywhere before the first page 
+%    is output. 
+
+\begin{document} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+
+\linenumbers 
+
+%% Remove or add some percent signs for playing: 
+Some text.\footnote{Ordinary footnote.} 
+% \Anote{A lemma.}{A note.} 
+\Bnote{B lemma.}{B note.} 
+\Cnote{C lemma.}{C note.} 
+
+\end{document} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+
+
+Code demonstrating manyfoot's feature of customized footnote rules: 
+
+%%%% \fi 
+
+\nofiles 
+
+\usepackage[para,ruled]{manyfoot}
+% <- I wasn't able to get the below -- much wanted -- results 
+%    without the `ruled' option -- may someone do better!? 
+
+\renewcommand{\footnoterulepriority}{2} 
+% <- setting default priority, especially for the ordinary LaTeX 
+%    footnotes. This priority is the maximal one here and thus 
+%    overrides all the remaining ones. So there will be a rule 
+%    between main text and the footnotes in any case. 
+
+\newcommand{\nofootnoterule}{} 
+% <- or \let\nofootnoterule\empty; or call it \emptyfootnoterule. 
+%    If so, use `empty' instead of `no' below. 
+
+\SelectFootnoteRule[1]{no}
+\newfootnote[para]{A} 
+% <- Priorities 1 here and 0 below will be overridden by priority 
+%    2 of the Standard LateX footnote rule, 
+%    so there will be a footnote rule between main text and the 
+%    footnotes in any case. Priority 1 just above ensures that 
+%    there will never be a visible rule between ordinary footnotes 
+%    and the new ("level") footnotes handled by manyfoot. 
+
+\SelectFootnoteRule[0]{default}
+% <- `default' refers to the standard footnote rule as stored 
+%    by manyfoot. 
+\newfootnote[para]{B} 
+\newfootnote[para]{C} 
+% <- Notes in A, B, C will be separated by rules in the usual way. 
+
+\begin{document} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+
+%% Remove or add some percent signs for playing: 
+Some text.\footnote{Ordinary footnote.}% 
+% \FootnotetextA{}{A}% 
+\FootnotetextB{}{B}%
+\FootnotetextC{}{C}
+
+\end{document} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+
+End of varnrule.tex
+