From e5a6b18348ead0cec45f680a2bacf024120cfdec Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 5 Sep 2012 22:34:21 +0000 Subject: edmargin (5sep12) git-svn-id: svn://tug.org/texlive/trunk@27599 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/edmargin/README | 4 + Master/texmf-dist/doc/latex/edmargin/edmargin.pdf | Bin 199785 -> 301631 bytes .../texmf-dist/source/latex/edmargin/edmargin.dtx | 86 +++++++++++++-------- Master/texmf-dist/tex/latex/edmargin/edmargin.sty | 40 +++++----- 4 files changed, 76 insertions(+), 54 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/edmargin/README b/Master/texmf-dist/doc/latex/edmargin/README index cd84fc6f05a..9e2370583ae 100644 --- a/Master/texmf-dist/doc/latex/edmargin/README +++ b/Master/texmf-dist/doc/latex/edmargin/README @@ -7,3 +7,7 @@ either as individual notes or as block paragraphs (for cases in which there are many small notes). Endnote sections have headers of the form "Textual notes to pp. xx--yy." New endnote sections can be defined on the fly. + +This material is subject to the LaTeX Project Public License. See +http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the +details of that license. diff --git a/Master/texmf-dist/doc/latex/edmargin/edmargin.pdf b/Master/texmf-dist/doc/latex/edmargin/edmargin.pdf index 43b33846e0a..fe2b7f85230 100644 Binary files a/Master/texmf-dist/doc/latex/edmargin/edmargin.pdf and b/Master/texmf-dist/doc/latex/edmargin/edmargin.pdf differ diff --git a/Master/texmf-dist/source/latex/edmargin/edmargin.dtx b/Master/texmf-dist/source/latex/edmargin/edmargin.dtx index df6564c9ab1..defdeb00687 100644 --- a/Master/texmf-dist/source/latex/edmargin/edmargin.dtx +++ b/Master/texmf-dist/source/latex/edmargin/edmargin.dtx @@ -1,4 +1,5 @@ % \iffalse meta-comment +% !TEX TS-program = dtxmk % % Copyright (C) 2008 by John Burt % -------------------------------------------------- @@ -18,7 +19,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1997/12/01] %\ProvidesPackage{edmargin} -% [2008/04/14 v1.02 edmargin file] +% [2012/09/04 v1.2 edmargin file] % %<*driver> \documentclass{ltxdoc} @@ -32,7 +33,7 @@ % % \fi % -% \CheckSum{1968} +% \CheckSum{1970} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -55,6 +56,8 @@ % \changes{v1.01}{2008/04/23}{Bug fix in macro for defining new % endnote kinds.} % \changes{v1.02}{2008/04/28}{Corrections to manual.} +% \changes{v1.2}{2012/09/04}{Fixed a bug the interfered with use of memoir class} + % \GetFileInfo{edmargin.sty} % @@ -91,13 +94,13 @@ % \textsc, \unskip} % \setcounter{IndexColumns}{2} % \MakeShortVerb{|} -% \def\fileversion{1.02} -% \def\filedate{28 April 2008} -% \def\docdate{28 April 2008} +% \def\fileversion{1.2} +% \def\filedate{4 September 2012} +% \def\docdate{4 September 2012} % \title{\textsf{Edmargin:} A Simple Design for Critical Editions with Multiple Endnote Series\thanks{This document % corresponds to \textsf{edmargin}~\fileversion, dated \filedate.}} % \author{John Burt \\ \texttt{burt@brandeis.edu}} -% \date{April 23, 2008} +% \date{September 4, 2012} % \maketitle % \begin{abstract} % \textsf{edmargin} provides multiple endnotes sections with running @@ -214,7 +217,7 @@ % \DescribeMacro{\notesbychapter} |\notesbychapter| % resets the note counters for each kind of endnote and % puts a centered line reading ``Chapter \textless\emph{chapter -% number}\textgreater : ~ \textless\emph{chapter title}\textgreater'' in +% number}\textgreater ~ \textless\emph{chapter title}\textgreater'' in % each of the three predefined sections of the the notes whenever % |\chapter| is issued. If you want only the chapter number, not its % title, issue |\titleinnotesfalse| in your preamble. Please note @@ -253,19 +256,33 @@ % \end{sloppypar} % % \DescribeMacro{\resetendnotes} Conceivably you might wish to do what -% |\notesbychapter| does for each chapter individually. For instance, +% |\notesbychapter| does for each chapter individually. Issue this +% command just after theh |\chapter| command. For instance, % there may be a chapter without endnotes, in which case % |\notesbychapter| would issue the centered line for that chapter, % but no notes would follow, which is ugly. Also, since the -% Bibliography is, as far as memoir class is concerned, a chapter, you must -% use |\resetendnotes| before each chapter rather issuing +% Bibliography is, as far as memoir class is concerned, a chapter, you +% must use |\resetendnotes| before each chapter rather issuing % |\notesbychapter| in the preamble if you have a bibliography, or odd -% results will follow. +% results will follow. |\resetendnotes| will put a divider line (and +% give the chapter name) in the endnotes for all three of the preset +% endnote sections. It will also put a divider line (and give the +% chapter name) for any section you add using |\definenewnotetype|, if +% you define new species of note types. This is convenient if you +% know that there will be each species of note for a given chapter. +% If the chapter does not include one of the species of notes, you +% would be wiser to use the individual commands in the next paragraph % -% \DescribeMacro{\resettextnotes} \DescribeMacro{\resetemendations} -% \DescribeMacro{\resetexplanatory} These commands do what -% |\resetendnotes| does, but only for the named section, not for all -% three predefined endnote sections. +% \DescribeMacro{\resettextnotes} \DescribeMacro{\resetemendations} +% \DescribeMacro{\resetexplanatory} These commands do what +% |\resetendnotes| does, but only for the named section, not for all +% three predefined endnote sections. If you used |\definenewnotetype| +% to create a new kind of endnote, you will also be able to use the +% corresponding ``reset'' command. For instance, if you created an +% |\xyznote| command, you can issue |\resetxyznotes|. If you use +% these commands, issue |\label{chapter\thechapter}| just after the +% |\chapter| command, and then issue the reset commands you plan to +% use. % % \section{Predefined Endnote Sections} % \textsf{edmargin} comes with three predefined endnotes sections and @@ -567,8 +584,8 @@ r@#2\endcsname{}{}\@nil {{\small{\em \the\notesheadername~\mymarks}}}{} \makeoddhead{endnotesstyle}{}{{\small{\em \the\notesheadername~\mymarks}}} {{\small\textrm{\thepage}}} -\makeevenfoot{}{}{} -\makeoddfoot{}{}{} +\makeevenfoot{endnotesstyle}{}{}{} +\makeoddfoot{endnotesstyle}{}{}{} }{\fancypagestyle{plain}{% \fancyhf{} \fancyhead[RO,LE]{{\small\textrm{\thepage}}} @@ -642,26 +659,26 @@ r@#2\endcsname{}{}\@nil \newcommand{\backmattertextfont}{\small} % writes unexpanded text on the specified external file \def\strip#1>{} -\newcommand{\literaltextnote}[1]{ - \begingroup +\newcommand{\literaltextnote}[1]{% + \begingroup% \def\next{#1}% - \newlinechar='40 + \newlinechar='40% \immediate\write\textnotes{\expandafter\strip\meaning\next}% - \endgroup + \endgroup% } -\newcommand{\literalemend}[1]{ - \begingroup +\newcommand{\literalemend}[1]{% + \begingroup% \def\next{#1}% - \newlinechar='40 + \newlinechar='40% \immediate\write\emendations{\expandafter\strip\meaning\next}% - \endgroup + \endgroup% } -\newcommand{\literalexplain}[1]{ - \begingroup +\newcommand{\literalexplain}[1]{% + \begingroup% \def\next{#1}% - \newlinechar='40 + \newlinechar='40% \immediate\write\explanations{\expandafter\strip\meaning\next}% - \endgroup + \endgroup% } % Nothing happens to textual notes unless you say you want to collect % them. @@ -674,7 +691,7 @@ r@#2\endcsname{}{}\@nil \edmrgnotesname={TEXTUAL NOTES} \newcommand{\changetextnotesname}[1]{\edmrgnotesname={#1}} \newtoks{\textnotesheadername} -\notesheadername={Textual Notes to} +\textnotesheadername={Textual Notes to} \newcommand{\changetextnotesheader}[1]{\textnotesheadername={#1}} \newtoks{\textnotescontentsname} \textnotescontentsname={Textual Notes} @@ -953,7 +970,7 @@ r@#2\endcsname{}{}\@nil \newcommand{\setmargrefmarker}[1]{\margrefmarker={#1}}% \newcommand{\makemargreflabel}{\string\label\string{margref\themargrefnumber\string}} \newcommand{\setmargref}{% -\marginpar{\scriptsize {\the\margrefmarker~\the\singlepageabbrev~\pageref{margref\themargrefnumber}}}% +\marginpar{\scriptsize{\the\margrefmarker~\the\singlepageabbrev~\pageref{margref\themargrefnumber}}}% } \newcommand{\margreftextnote}{% \iftextnoteson\addtocounter{margrefnumber}{1}% @@ -978,7 +995,7 @@ r@#2\endcsname{}{}\@nil \newif\ifn@temarkinmargin% \n@temarkinmargintrue% \newif\ifn@temarkintext% -\n@temarkintexttrue% +\n@temarkintextfalse% \newcommand{\notemarkinmargin}{\n@temarkinmargintrue\n@temarkintextfalse} \newcommand{\notemarkintext}{\n@temarkinmarginfalse\n@temarkintexttrue} %\newif\ifnotemarkinmargin \notemarkinmargintrue% @@ -1162,6 +1179,7 @@ r@#2\endcsname{}{}\@nil \immediate\write\explanations{\string\endgroup}% } \newcommand{\resetendnotes}{% +% \label{chapter\thechapter}% removed SEP-04-2012 \resettextnotes% \resetemendations% \resetexplanatory} @@ -1170,14 +1188,14 @@ r@#2\endcsname{}{}\@nil % \begin{macro}{\notesbychapter} % \begin{macrocode} \newif\ifnotesbychapteron \notesbychapteronfalse -\@ifclassloaded{memoir}{\newcommand{\notesbychapter}{\notesbychapterontrue +\@ifclassloaded{memoir}{\newcommand{\notesbychapter}{\notesbychapterontrue} \addtoiargdef{\chapter}{}{ \iftitleinnotes% \label{chapter\thechapter}% \fi% \ifnotesbychapteron% \relax% \resetendnotes% - \fi}} + \fi} }{\newcommand{\notesbychapter}{\notesbychapterontrue} \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne \if@mainmatter diff --git a/Master/texmf-dist/tex/latex/edmargin/edmargin.sty b/Master/texmf-dist/tex/latex/edmargin/edmargin.sty index bd7eb51ba6d..f89ce25cd37 100644 --- a/Master/texmf-dist/tex/latex/edmargin/edmargin.sty +++ b/Master/texmf-dist/tex/latex/edmargin/edmargin.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{edmargin} - [2008/04/14 v1.02 edmargin file] + [2012/09/04 v1.2 edmargin file] @@ -105,8 +105,8 @@ r@#2\endcsname{}{}\@nil {{\small{\em \the\notesheadername~\mymarks}}}{} \makeoddhead{endnotesstyle}{}{{\small{\em \the\notesheadername~\mymarks}}} {{\small\textrm{\thepage}}} -\makeevenfoot{}{}{} -\makeoddfoot{}{}{} +\makeevenfoot{endnotesstyle}{}{}{} +\makeoddfoot{endnotesstyle}{}{}{} }{\fancypagestyle{plain}{% \fancyhf{} \fancyhead[RO,LE]{{\small\textrm{\thepage}}} @@ -140,26 +140,26 @@ r@#2\endcsname{}{}\@nil \newcommand{\backmatterafterheadersink}{\leavevmode\vspace{11pt}} \newcommand{\backmattertextfont}{\small} \def\strip#1>{} -\newcommand{\literaltextnote}[1]{ - \begingroup +\newcommand{\literaltextnote}[1]{% + \begingroup% \def\next{#1}% - \newlinechar='40 + \newlinechar='40% \immediate\write\textnotes{\expandafter\strip\meaning\next}% - \endgroup + \endgroup% } -\newcommand{\literalemend}[1]{ - \begingroup +\newcommand{\literalemend}[1]{% + \begingroup% \def\next{#1}% - \newlinechar='40 + \newlinechar='40% \immediate\write\emendations{\expandafter\strip\meaning\next}% - \endgroup + \endgroup% } -\newcommand{\literalexplain}[1]{ - \begingroup +\newcommand{\literalexplain}[1]{% + \begingroup% \def\next{#1}% - \newlinechar='40 + \newlinechar='40% \immediate\write\explanations{\expandafter\strip\meaning\next}% - \endgroup + \endgroup% } \newif\iftextnoteson \textnotesonfalse \newif\ifexplanon \explanonfalse @@ -169,7 +169,7 @@ r@#2\endcsname{}{}\@nil \edmrgnotesname={TEXTUAL NOTES} \newcommand{\changetextnotesname}[1]{\edmrgnotesname={#1}} \newtoks{\textnotesheadername} -\notesheadername={Textual Notes to} +\textnotesheadername={Textual Notes to} \newcommand{\changetextnotesheader}[1]{\textnotesheadername={#1}} \newtoks{\textnotescontentsname} \textnotescontentsname={Textual Notes} @@ -306,7 +306,7 @@ r@#2\endcsname{}{}\@nil \newcommand{\setmargrefmarker}[1]{\margrefmarker={#1}}% \newcommand{\makemargreflabel}{\string\label\string{margref\themargrefnumber\string}} \newcommand{\setmargref}{% -\marginpar{\scriptsize {\the\margrefmarker~\the\singlepageabbrev~\pageref{margref\themargrefnumber}}}% +\marginpar{\scriptsize{\the\margrefmarker~\the\singlepageabbrev~\pageref{margref\themargrefnumber}}}% } \newcommand{\margreftextnote}{% \iftextnoteson\addtocounter{margrefnumber}{1}% @@ -329,7 +329,7 @@ r@#2\endcsname{}{}\@nil \newif\ifn@temarkinmargin% \n@temarkinmargintrue% \newif\ifn@temarkintext% -\n@temarkintexttrue% +\n@temarkintextfalse% \newcommand{\notemarkinmargin}{\n@temarkinmargintrue\n@temarkintextfalse} \newcommand{\notemarkintext}{\n@temarkinmarginfalse\n@temarkintexttrue} \newcounter{enmrnotescratchcount}% @@ -483,14 +483,14 @@ r@#2\endcsname{}{}\@nil \resetemendations% \resetexplanatory} \newif\ifnotesbychapteron \notesbychapteronfalse -\@ifclassloaded{memoir}{\newcommand{\notesbychapter}{\notesbychapterontrue +\@ifclassloaded{memoir}{\newcommand{\notesbychapter}{\notesbychapterontrue} \addtoiargdef{\chapter}{}{ \iftitleinnotes% \label{chapter\thechapter}% \fi% \ifnotesbychapteron% \relax% \resetendnotes% - \fi}} + \fi} }{\newcommand{\notesbychapter}{\notesbychapterontrue} \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne \if@mainmatter -- cgit v1.2.3