From de59daf49c3b4b4388adb86a33efc674d6b78d49 Mon Sep 17 00:00:00 2001 From: Karl Berry 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 --- Master/texmf-dist/tex/latex/edmargin/edmargin.sty | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex/latex/edmargin') diff --git a/Master/texmf-dist/tex/latex/edmargin/edmargin.sty b/Master/texmf-dist/tex/latex/edmargin/edmargin.sty index 7a8ad9026c0..323d1655809 100644 --- a/Master/texmf-dist/tex/latex/edmargin/edmargin.sty +++ b/Master/texmf-dist/tex/latex/edmargin/edmargin.sty @@ -22,8 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{edmargin} - [2008/04/14 v1 edmargin file] - + [2008/04/14 v1.01 edmargin file] \providecommand*{\ifrefundefined}[1]{% @@ -306,7 +305,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}% @@ -324,7 +323,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}}} } \newif\ifn@temarkinmargin% \n@temarkinmargintrue% @@ -362,7 +361,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% @@ -390,7 +389,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% @@ -418,7 +417,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% @@ -605,14 +604,15 @@ r@#2\endcsname{}{}\@nil \margrefmarker={#2:}% \ifn@temarkinmargin% \n@wputmargref{#1}% -\else% +\fi% +\ifn@temarkintext% \n@wputnotenum{#1}% \fi% \stepcounter{allendnotes}\label{notl\theallendnotes}% \immediate\write\expandafter\csname #1s\endcsname{\checknoteheaders}% \ifn@temarkinmargin% \immediate\write\expandafter\csname #1s\endcsname{\string\enmrconditionalpar}% -\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\expandafter\csname #1s\endcsname{\string\enmrconditionalpar}% -- cgit v1.2.3