eplain update (22feb10)

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

6 files changed, 56 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/eplain/ChangeLog b/Master/texmf-dist/doc/eplain/ChangeLog
index 9d12ad3aefb..3724e080882 100644
--- a/Master/texmf-dist/doc/eplain/ChangeLog
+++ b/Master/texmf-dist/doc/eplain/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-21  Oleg Katsitadze  <olegkat@gmail.com>
+
+	* ChangeLog, Makefile, NEWS, doc/eplain.info, doc/eplain.pdf:
+	* doc/eplain.texi, eplain.tex:
+	Version 3.4.
+
+2010-02-15  Oleg Katsitadze  <olegkat@gmail.com>
+
+	* xeplain.tex (\@finusepackage):  Make \ProcessOptions accept (and
+	disregard) the optional star argument (patch by Dan Luecking).
+
+2009-09-07  Oleg Katsitadze  <olegkat@gmail.com>
+
+	* doc/progdef.texi (Macro arguments):  Added examples of optional
+	arguments mixed with mandatory arguments.
+
 2009-07-21  Oleg Katsitadze  <olegkat@gmail.com>
 
 	* NEWS, Makefile, eplain.tex, doc/eplain.info, doc/eplain.pdf:
diff --git a/Master/texmf-dist/doc/eplain/NEWS b/Master/texmf-dist/doc/eplain/NEWS
index b30b0254313..54a4354e631 100644
--- a/Master/texmf-dist/doc/eplain/NEWS
+++ b/Master/texmf-dist/doc/eplain/NEWS
@@ -1,7 +1,12 @@
 This file records noteworthy changes.  This file is public domain.
 
+3.4 (21 February 2010)
+* Eplain repository moved from cvs.sarovar.org:/cvsroot/eplain to
+  svn://tug.org/eplain/trunk.
+* Changed \ProcessOptions from miniltx.tex to gobble the optional star
+  argument, to accommodate the new version of epstopdf.sty.
+
 3.3 (21 July 2009)
-
 * New commands \eqnum and \eqalignnum, counterparts of \(l)eqno and
   \(l)eqalignno, producing equation numbers which can be uniformly
   transformed to right-aligned (\righteqnumbers) or left-aligned
@@ -13,11 +18,10 @@ This file records noteworthy changes.  This file is public domain.
 * Non-silent indexing macros have been fixed not to produce a spurious
   newline when newline's catcode is 13 (active).
 * Eplain now takes care to unactivate any active characters before
-  typesetting index term in the margin for proofing.
+  typesetting index terms in the margin for proofing.
 * Updated ifpdf.sty.
 * LaTeX package reloading warnings are now not shown on the terminal.
 * Documentation improvements.
-
 
 3.2 (26 November 2007)
 * Fixed a bug which caused silent indexing macros to output spurious
diff --git a/Master/texmf-dist/doc/eplain/doc/eplain.html b/Master/texmf-dist/doc/eplain/doc/eplain.html
index a7c7a04a014..2574c72a2ee 100644
--- a/Master/texmf-dist/doc/eplain/doc/eplain.html
+++ b/Master/texmf-dist/doc/eplain/doc/eplain.html
@@ -7,8 +7,8 @@
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <!--
-This manual documents the Eplain macros, version 3.3,
-July 2009.  Eplain provides functionality for plain TeX that
+This manual documents the Eplain macros, version 3.4,
+February 2010.  Eplain provides functionality for plain TeX that
 is intended to be useful regardless of how your document is actually
 formatted.
 
@@ -238,8 +238,8 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 
 <h2 class="unnumbered">Eplain</h2>
 
-<p>This manual documents the Eplain macros, version 3.3,
-July 2009.  Eplain provides functionality for plain TeX that
+<p>This manual documents the Eplain macros, version 3.4,
+February 2010.  Eplain provides functionality for plain TeX that
 is intended to be useful regardless of how your document is actually
 formatted.
 
@@ -6074,6 +6074,35 @@ category code of <kbd>@</kbd> set to 11 (letter).  Here is an example:
        \fi
      }
 </pre>
+   <p>It's possible to define macros that appear to accept optional
+arguments intermixed with mandatory arguments in any imaginable way. 
+For example:
+
+<pre class="example">     \makeatletter
+     % \mo{m}[o]
+     \def\mo#1{\def\mo@arg{#1}\@getoptionalarg\fin@mo}
+     \def\fin@mo{\vskip1pc
+       ARG:    \mo@arg       \par
+       OPTARG: \@optionalarg \par
+     }
+     % \mom{m}[o]{m}
+     \def\mom#1{\def\mom@arg{#1}\@getoptionalarg\fin@mom}
+     \def\fin@mom#1{\vskip1pc
+       ARG1:   \mom@arg      \par
+       OPTARG: \@optionalarg \par
+       ARG2:   #1\par
+     }
+     % \omo[o]{m}[o]
+     \def\omo{\@getoptionalarg\fin@omo}
+     \def\fin@omo#1{\let\omo@optarg\@optionalarg
+                    \def\omo@arg{#1}\@getoptionalarg\@fin@omo}
+     \def\@fin@omo{\vskip1pc
+       OPTARG1: \omo@optarg   \par
+       ARG:     \omo@arg      \par
+       OPTARG2: \@optionalarg \par
+     }
+     \makeatother
+</pre>
    <p>If an optional argument contains another optional argument, the inner
 one will need to be enclosed in braces, so TeX does not mistake the
 end of the first for the end of the second.
diff --git a/Master/texmf-dist/doc/eplain/doc/eplain.pdf b/Master/texmf-dist/doc/eplain/doc/eplain.pdf
index d99a093638a..967fed85ffe 100644
--- a/Master/texmf-dist/doc/eplain/doc/eplain.pdf
+++ b/Master/texmf-dist/doc/eplain/doc/eplain.pdf
diff --git a/Master/texmf-dist/doc/eplain/doc/lscommnt.jpg b/Master/texmf-dist/doc/eplain/doc/lscommnt.jpg
index 0ad895dc00f..bd83d55201f 100644
--- a/Master/texmf-dist/doc/eplain/doc/lscommnt.jpg
+++ b/Master/texmf-dist/doc/eplain/doc/lscommnt.jpg
diff --git a/Master/texmf-dist/doc/eplain/doc/xhyper.jpg b/Master/texmf-dist/doc/eplain/doc/xhyper.jpg
index aa797d53dae..4e99b850ea5 100644
--- a/Master/texmf-dist/doc/eplain/doc/xhyper.jpg
+++ b/Master/texmf-dist/doc/eplain/doc/xhyper.jpg