diff options
| -rw-r--r-- | Master/texmf-dist/doc/eplain/ChangeLog | 16 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/eplain/NEWS | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/eplain/doc/eplain.html | 37 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/eplain/doc/eplain.pdf | bin | 893366 -> 1022329 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/eplain/doc/lscommnt.jpg | bin | 68468 -> 68442 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/eplain/doc/xhyper.jpg | bin | 14084 -> 14044 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/eplain/eplain-source-3.4.zip (renamed from Master/texmf-dist/source/eplain/eplain-source-3.3.zip) | bin | 398812 -> 401941 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/eplain/xeplain.tex | 3 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/eplain/eplain.tex | 11 | ||||
| -rw-r--r-- | Master/texmf/doc/info/eplain.info | 279 | ||||
| -rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 2 |
11 files changed, 219 insertions, 139 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: <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 Binary files differindex 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 Binary files differindex 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 Binary files differindex aa797d53dae..4e99b850ea5 100644 --- a/Master/texmf-dist/doc/eplain/doc/xhyper.jpg +++ b/Master/texmf-dist/doc/eplain/doc/xhyper.jpg diff --git a/Master/texmf-dist/source/eplain/eplain-source-3.3.zip b/Master/texmf-dist/source/eplain/eplain-source-3.4.zip Binary files differindex c7e7e9e4635..9f08f5730e4 100644 --- a/Master/texmf-dist/source/eplain/eplain-source-3.3.zip +++ b/Master/texmf-dist/source/eplain/eplain-source-3.4.zip diff --git a/Master/texmf-dist/source/eplain/xeplain.tex b/Master/texmf-dist/source/eplain/xeplain.tex index 0a3cdb15651..0424c321de7 100644 --- a/Master/texmf-dist/source/eplain/xeplain.tex +++ b/Master/texmf-dist/source/eplain/xeplain.tex @@ -5206,7 +5206,8 @@ \global\let\DeclareOption\eplain@DeclareOption \global\let\PassOptionsToPackage\eplain@PassOptionsToPackage \global\let\ExecuteOptions\eplain@ExecuteOptions - \global\let\ProcessOptions\eplain@ProcessOptions + \gdef\ProcessOptions{\@ifstar\eplain@ProcessOptions + \eplain@ProcessOptions}% \global\let\AtBeginDocument\eplain@AtBeginDocument \global\let\AtEndOfPackage\eplain@AtEndOfPackage \global\let\ProvidesFile\eplain@ProvidesFile diff --git a/Master/texmf-dist/tex/eplain/eplain.tex b/Master/texmf-dist/tex/eplain/eplain.tex index 93bc3df91c0..236ea4efc32 100644 --- a/Master/texmf-dist/tex/eplain/eplain.tex +++ b/Master/texmf-dist/tex/eplain/eplain.tex @@ -1,10 +1,10 @@ %% @texfile{ %% author = "Karl Berry, Steven Smith, Oleg Katsitadze, and others", -%% version = "3.3", -%% date = "Tue Jul 21 21:57:33 PDT 2009", +%% version = "3.4", +%% date = "Sun Feb 21 15:52:21 PST 2010", %% filename = "eplain.tex", %% email = "bug-eplain@tug.org", -%% checksum = "4250 9190 134946", +%% checksum = "4251 9191 135013", %% codetable = "ASCII", %% supported = "yes", %% docstring = "This file defines macros that extend and expand on @@ -4034,7 +4034,8 @@ \global\let\DeclareOption\eplain@DeclareOption \global\let\PassOptionsToPackage\eplain@PassOptionsToPackage \global\let\ExecuteOptions\eplain@ExecuteOptions - \global\let\ProcessOptions\eplain@ProcessOptions + \gdef\ProcessOptions{\@ifstar\eplain@ProcessOptions + \eplain@ProcessOptions}% \global\let\AtBeginDocument\eplain@AtBeginDocument \global\let\AtEndOfPackage\eplain@AtEndOfPackage \global\let\ProvidesFile\eplain@ProvidesFile @@ -4246,5 +4247,5 @@ \def\fmtname{eplain}% \def\eplain{t}% {\edef\plainversion{\fmtversion}% - \xdef\fmtversion{3.3: 21 July 2009 (and plain \plainversion)}% + \xdef\fmtversion{3.4: 21 February 2010 (and plain \plainversion)}% }% diff --git a/Master/texmf/doc/info/eplain.info b/Master/texmf/doc/info/eplain.info index b99257c263e..c4bacfe0ac2 100644 --- a/Master/texmf/doc/info/eplain.info +++ b/Master/texmf/doc/info/eplain.info @@ -1,6 +1,6 @@ This is eplain.info, produced by makeinfo version 4.13 from eplain.texi. -This manual documents the Eplain macros, version 3.3, July 2009. +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. @@ -23,7 +23,7 @@ File: eplain.info, Node: Top, Next: Introduction, Up: (dir) Eplain ****** -This manual documents the Eplain macros, version 3.3, July 2009. +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. @@ -5130,6 +5130,35 @@ sequence `\@optionalarg' expands to it; otherwise, `\@optionalarg' is \fi } + It's possible to define macros that appear to accept optional +arguments intermixed with mandatory arguments in any imaginable way. +For 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 + 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. @@ -7873,128 +7902,128 @@ Concept index Tag Table: -Node: Top802 -Node: Introduction8080 -Node: Installation11047 -Node: Invoking Eplain13099 -Node: User definitions17702 -Node: Diagnostics19529 -Node: Rules21099 -Node: Citations21932 -Node: Formatting citations28287 -Node: Formatting bibliographies29833 -Node: Displays32662 -Node: Formatting displays34057 -Node: Time of day34694 -Node: Lists35455 -Node: Formatting lists37614 -Node: Verbatim listing39910 -Node: Contents43145 -Node: Writing the .toc file43816 -Node: Reading the .toc file46684 -Node: Changing the .toc file's root name48094 -Node: Alternative contents files49114 -Node: Cross-references49679 -Node: Defining generic references51164 -Node: Using generic references52042 -Node: Page references53333 -Node: Equation references54157 -Node: Formatting equation references56933 -Node: Subequation references61300 -Node: Indexing63223 -Node: Indexing terms66337 -Node: Indexing commands67450 -Node: Modifying index entries70478 -Node: Index entries with special characters73455 -Node: Proofing index terms77710 -Node: Typesetting an index79523 -Node: Customizing indexing81990 -Node: Justification85697 -Node: Tables87376 -Node: Margins89879 -Node: Multiple columns92040 -Node: Footnotes94024 -Node: Fractions96611 -Node: Paths97398 -Node: Logos99005 -Node: Boxes99738 -Node: Checking for PDF output101536 -Node: Loading LaTeX packages102627 -Node: The \usepackage command103975 -Node: Environment for loading packages105065 -Node: Packages known to work107132 -Node: Packages known not to work113537 -Node: Hyperlinks114299 -Node: Introduction to hyperlinks114882 -Node: Explicit hyperlinks120438 -Node: Implicit hyperlinks122728 -Node: General hyperlinks124550 -Node: URL hyperlinks126079 -Node: Citation hyperlinks128186 -Node: List hyperlinks128918 -Node: Cross-reference hyperlinks129312 -Node: Page reference hyperlinks130692 -Node: Equation reference hyperlinks131356 -Node: Index hyperlinks132754 -Node: Exact destinations for index terms134518 -Node: Page destinations for index terms136694 -Node: Choosing destination placement139322 -Node: Index page list and page range parsers140114 -Node: Hyperlinks in see and see also entries140667 -Node: Footnote hyperlinks141466 -Node: Contents hyperlinks142664 -Node: Hyperlink drivers143047 -Node: Options supported by all drivers143682 -Node: Hyperlink driver hypertex146486 -Node: Destination types for hypertex149438 -Node: Destination options for hypertex150477 -Node: Link types for hypertex150959 -Node: Link options for hypertex152980 -Node: Hyperlink drivers pdftex and dvipdfm154004 -Node: Destination types for pdftex and dvipdfm154650 -Node: Destination options for pdftex and dvipdfm158149 -Node: Link types for pdftex and dvipdfm160604 -Node: Link options for pdftex and dvipdfm164143 -Node: Hyperlink driver nolinks167782 -Node: Setting hyperlink types and options170194 -Node: Setting default types and options171196 -Node: Setting group types172625 -Node: Setting group options173818 -Node: Turning hyperlinks on/off176308 -Node: Turning low-level commands on/off176946 -Node: Turning hyperlinks on/off for a group177459 -Node: Arrow theoretic diagrams178616 -Node: Slanted lines and vectors178983 -Node: Commutative diagrams181065 -Node: Arrows and morphisms181664 -Node: Construction of commutative diagrams186142 -Node: Commutative diagram parameters193334 -Node: Programming definitions195153 -Node: Category codes196154 -Node: Allocation macros198815 -Node: Iteration200963 -Node: Macro arguments202622 -Node: Converting to characters205121 -Node: Expansion206513 -Node: \csn and \ece207076 -Node: \edefappend207642 -Node: Hooks208191 -Node: Properties210377 -Node: \expandonce211462 -Node: \ifundefined211911 -Node: \ifempty212475 -Node: \ifinteger and \isinteger213218 -Node: \futurenonspacelet214256 -Node: Obeying spaces214855 -Node: Writing out numbers215886 -Node: Mode-specific penalties216209 -Node: Auxiliary files216941 -Node: User-defined environments217864 -Node: Page list and page range parsers219079 -Node: Demo files221216 -Node: Hyperlinks (xhyper.tex)221784 -Node: Highlighting TeX comments in listings (lscommnt.tex)230103 -Node: Macro index232527 -Node: Concept index295920 +Node: Top806 +Node: Introduction8088 +Node: Installation11055 +Node: Invoking Eplain13107 +Node: User definitions17710 +Node: Diagnostics19537 +Node: Rules21107 +Node: Citations21940 +Node: Formatting citations28295 +Node: Formatting bibliographies29841 +Node: Displays32670 +Node: Formatting displays34065 +Node: Time of day34702 +Node: Lists35463 +Node: Formatting lists37622 +Node: Verbatim listing39918 +Node: Contents43153 +Node: Writing the .toc file43824 +Node: Reading the .toc file46692 +Node: Changing the .toc file's root name48102 +Node: Alternative contents files49122 +Node: Cross-references49687 +Node: Defining generic references51172 +Node: Using generic references52050 +Node: Page references53341 +Node: Equation references54165 +Node: Formatting equation references56941 +Node: Subequation references61308 +Node: Indexing63231 +Node: Indexing terms66345 +Node: Indexing commands67458 +Node: Modifying index entries70486 +Node: Index entries with special characters73463 +Node: Proofing index terms77718 +Node: Typesetting an index79531 +Node: Customizing indexing81998 +Node: Justification85705 +Node: Tables87384 +Node: Margins89887 +Node: Multiple columns92048 +Node: Footnotes94032 +Node: Fractions96619 +Node: Paths97406 +Node: Logos99013 +Node: Boxes99746 +Node: Checking for PDF output101544 +Node: Loading LaTeX packages102635 +Node: The \usepackage command103983 +Node: Environment for loading packages105073 +Node: Packages known to work107140 +Node: Packages known not to work113545 +Node: Hyperlinks114307 +Node: Introduction to hyperlinks114890 +Node: Explicit hyperlinks120446 +Node: Implicit hyperlinks122736 +Node: General hyperlinks124558 +Node: URL hyperlinks126087 +Node: Citation hyperlinks128194 +Node: List hyperlinks128926 +Node: Cross-reference hyperlinks129320 +Node: Page reference hyperlinks130700 +Node: Equation reference hyperlinks131364 +Node: Index hyperlinks132762 +Node: Exact destinations for index terms134526 +Node: Page destinations for index terms136702 +Node: Choosing destination placement139330 +Node: Index page list and page range parsers140122 +Node: Hyperlinks in see and see also entries140675 +Node: Footnote hyperlinks141474 +Node: Contents hyperlinks142672 +Node: Hyperlink drivers143055 +Node: Options supported by all drivers143690 +Node: Hyperlink driver hypertex146494 +Node: Destination types for hypertex149446 +Node: Destination options for hypertex150485 +Node: Link types for hypertex150967 +Node: Link options for hypertex152988 +Node: Hyperlink drivers pdftex and dvipdfm154012 +Node: Destination types for pdftex and dvipdfm154658 +Node: Destination options for pdftex and dvipdfm158157 +Node: Link types for pdftex and dvipdfm160612 +Node: Link options for pdftex and dvipdfm164151 +Node: Hyperlink driver nolinks167790 +Node: Setting hyperlink types and options170202 +Node: Setting default types and options171204 +Node: Setting group types172633 +Node: Setting group options173826 +Node: Turning hyperlinks on/off176316 +Node: Turning low-level commands on/off176954 +Node: Turning hyperlinks on/off for a group177467 +Node: Arrow theoretic diagrams178624 +Node: Slanted lines and vectors178991 +Node: Commutative diagrams181073 +Node: Arrows and morphisms181672 +Node: Construction of commutative diagrams186150 +Node: Commutative diagram parameters193342 +Node: Programming definitions195161 +Node: Category codes196162 +Node: Allocation macros198823 +Node: Iteration200971 +Node: Macro arguments202630 +Node: Converting to characters206009 +Node: Expansion207401 +Node: \csn and \ece207964 +Node: \edefappend208530 +Node: Hooks209079 +Node: Properties211265 +Node: \expandonce212350 +Node: \ifundefined212799 +Node: \ifempty213363 +Node: \ifinteger and \isinteger214106 +Node: \futurenonspacelet215144 +Node: Obeying spaces215743 +Node: Writing out numbers216774 +Node: Mode-specific penalties217097 +Node: Auxiliary files217829 +Node: User-defined environments218752 +Node: Page list and page range parsers219967 +Node: Demo files222104 +Node: Hyperlinks (xhyper.tex)222672 +Node: Highlighting TeX comments in listings (lscommnt.tex)230991 +Node: Macro index233415 +Node: Concept index296808 End Tag Table diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index a89c135be66..0ec9d5d25e1 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -3696,7 +3696,7 @@ sub POSTctex sub POSTeplain { print "POST$package - mv README, eplain.info\n"; - &SYSTEM ("$MV README doc/eplain/README.TOP"); + &SYSTEM ("$MV doc/eplain/eplain/README doc/eplain/README.TOP"); my $infodir = "$TOPDEST/texmf/doc/info/"; &xmkdir ($infodir); |
