From de59daf49c3b4b4388adb86a33efc674d6b78d49 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 24 Apr 2008 16:30:41 +0000
Subject: edmargin update (23apr08)

git-svn-id: svn://tug.org/texlive/trunk@7634 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/source/latex/edmargin/edmargin.dtx  | 30 ++++++++++++----------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'Master/texmf-dist/source/latex/edmargin/edmargin.dtx')

diff --git a/Master/texmf-dist/source/latex/edmargin/edmargin.dtx b/Master/texmf-dist/source/latex/edmargin/edmargin.dtx
index e826ce04282..3a0175895a0 100644
--- a/Master/texmf-dist/source/latex/edmargin/edmargin.dtx
+++ b/Master/texmf-dist/source/latex/edmargin/edmargin.dtx
@@ -18,7 +18,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01]
 %<package>\ProvidesPackage{edmargin}
-%<package>   [2008/04/14 v1 edmargin file] 
+%<package>   [2008/04/14 v1.01 edmargin file] 
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -32,7 +32,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1955}
+% \CheckSum{1968}
 %
 % \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
@@ -52,7 +52,8 @@
 %
 % 
 % \changes{v1.0}{2008/04/21}{Initial version}
-
+% \changes{v1.01}{2008/04/23}{Bug fix in macro for defining new 
+% endnote kinds.}
 % \GetFileInfo{edmargin.sty}
 % 
 % \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother}
@@ -88,13 +89,13 @@
 % \textsc, \unskip}
 % \setcounter{IndexColumns}{2}
 % \MakeShortVerb{|}
-% \def\fileversion{1}
-% \def\filedate{21 April 2008}
-% \def\docdate{21 April 2008}
+% \def\fileversion{1.01}
+% \def\filedate{23 April 2008}
+% \def\docdate{23 April 2008}
 % \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 21, 2008}
+% \date{April 23, 2008}
 % \maketitle
 % \begin{abstract}
 %  \textsf{edmargin} provides multiple endnotes sections with running
@@ -951,7 +952,7 @@ r@#2\endcsname{}{}\@nil
 \newcommand{\setmargrefmarker}[1]{\margrefmarker={#1}}%
 \newcommand{\makemargreflabel}{\string\label\string{margref\themargrefnumber\string}}
 \newcommand{\setmargref}{%
-\marginpar{\scriptsize {\the\margrefmarker~p.~\pageref{margref\themargrefnumber}}}%
+\marginpar{\scriptsize {\the\margrefmarker~\the\singlepageabbrev~\pageref{margref\themargrefnumber}}}%
 }
 \newcommand{\margreftextnote}{%
 \iftextnoteson\addtocounter{margrefnumber}{1}%
@@ -969,7 +970,7 @@ r@#2\endcsname{}{}\@nil
 \setmargref\else\relax\fi%                                             
 }
 \newcommand{\margrefspecial}[1]{%
-\marginpar{\scriptsize {\the\margrefmarker~p.~\pageref{#1}}}
+\marginpar{\scriptsize {\the\margrefmarker~\the\singlepageabbrev~\pageref{#1}}}
 }
 % or, perhaps the note marker should be in the text rather than in 
 % the margin
@@ -1026,7 +1027,7 @@ r@#2\endcsname{}{}\@nil
 \ifn@temarkinmargin%
 \iftextnotespara\relax\else%
 \immediate\write\textnotes{\string\par}\fi%
-\immediate\write\textnotes{\string{\string\textbf\string{p.\
+\immediate\write\textnotes{\string{\string\textbf\string{\the\singlepageabbrev\
 \string\pageref\string{notl\theallendnotes\string}\string}\string}}%
 \else
 \iftextnotespara\relax\else%
@@ -1058,7 +1059,7 @@ r@#2\endcsname{}{}\@nil
 \ifn@temarkinmargin%
 \ifexplanationspara\relax\else%
 \immediate\write\explanations{\string\par}\fi%
-\immediate\write\explanations{\string{\string\textbf\string{p.\
+\immediate\write\explanations{\string{\string\textbf\string{\the\singlepageabbrev\
 \string\pageref\string{notl\theallendnotes\string}\string}\string}}%
 \else%
 \ifexplanationspara\relax\else%
@@ -1090,7 +1091,7 @@ r@#2\endcsname{}{}\@nil
 \ifn@temarkinmargin%
 \ifemendationspara\relax\else%
 \immediate\write\emendations{\string\par}\fi%
-\immediate\write\emendations{\string{\string\textbf\string{p.\
+\immediate\write\emendations{\string{\string\textbf\string{\the\singlepageabbrev\
 \string\pageref\string{notl\theallendnotes\string}\string}\string}}%
 \else%
 \ifemendationspara\relax\else%
@@ -1304,7 +1305,8 @@ r@#2\endcsname{}{}\@nil
 \margrefmarker={#2:}%
 \ifn@temarkinmargin%
 \n@wputmargref{#1}%
-\else%
+\fi%
+\ifn@temarkintext%
 \n@wputnotenum{#1}%
 \fi%
 \stepcounter{allendnotes}\label{notl\theallendnotes}%
@@ -1312,7 +1314,7 @@ r@#2\endcsname{}{}\@nil
 \ifn@temarkinmargin%
 \immediate\write\expandafter\csname #1s\endcsname{\string\enmrconditionalpar}%
 %\immediate\write\expandafter\csname #1s\endcsname{\string\par}
-\immediate\write\expandafter\csname #1s\endcsname{\string{\string\textbf\string{p.\
+\immediate\write\expandafter\csname #1s\endcsname{\string{\string\textbf\string{\the\singlepageabbrev\
 \string\pageref\string{notl\theallendnotes\string}\string}\string}}%
 \else%
 % \immediate\write\csname #1s\endcsname{\string\par}
-- 
cgit v1.2.3

