summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/memoir
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-02-15 00:53:04 +0000
committerKarl Berry <karl@freefriends.org>2011-02-15 00:53:04 +0000
commit73b76d6d7b5047bad09c2f43f6a99334e6d5a67c (patch)
tree0d6036237854e95ade2e585cbc305979271b4b35 /Master/texmf-dist/tex/latex/memoir
parent82ac0ba9ed70499005296836d8be39181785d3ba (diff)
memoir 3.6h (13feb11)
git-svn-id: svn://tug.org/texlive/trunk@21406 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/memoir')
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem12.clo4
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memhfixc.sty3
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls370
3 files changed, 296 insertions, 81 deletions
diff --git a/Master/texmf-dist/tex/latex/memoir/mem12.clo b/Master/texmf-dist/tex/latex/memoir/mem12.clo
index 99d51ad2cf7..f064303e9f6 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem12.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem12.clo
@@ -25,7 +25,7 @@
%% This work consists of the files listed in the README file.
%%
\ProvidesFile{mem12.clo}%
- [2008/01/30 v0.4 memoir class 12pt size option]
+ [2010/10/19 v0.4b memoir class 12pt size option]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{14.5}%
\abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@
@@ -83,7 +83,7 @@
\setlength\smallskipamount{3\p@ \@plus 1\p@ \@minus 1\p@}
\setlength\medskipamount{6\p@ \@plus 2\p@ \@minus 2\p@}
\setlength\bigskipamount{12\p@ \@plus 4\p@ \@minus 4\p@}
-\setlength\headheight{14\p@}
+\setlength\headheight{14.5\p@}
\setlength\headsep{.275in}
\setlength\topskip{12\p@}
\setlength\footskip{30\p@}
diff --git a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
index c305304cfbe..16341bb79cc 100644
--- a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
+++ b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
@@ -282,6 +282,9 @@
\let\M@TitleReference\@mem@theTR % interrupt recursion of \ref
\ref*{#1}\endgroup}
+\AtBeginDocument{%
+ \let\printpageinnotes\printpageinnoteshyperref%
+}
\endinput
%%
%% End of file `memhfixc.sty'.
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index e1b29b992e0..153b22ced90 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{memoir}%
- [2010/09/19 v3.6g configurable book, report, article document class]
+ [2011/02/13 v3.6h configurable book, report, article document class]
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -433,6 +433,8 @@
\newcommand*{\memRTLvrightskip}{\rightskip}
\newcommand*{\memRTLraggedright}{\raggedright}
\newcommand*{\memRTLraggedleft}{\raggedleft}
+\newcommand*{\memRTLmainraggedright}{\raggedright}
+\newcommand*{\memRTLmainraggedleft}{\raggedleft}
\newlength{\stockheight}
\newlength{\stockwidth}
@@ -1561,13 +1563,17 @@
\newcommand{\makeheadrule}[3]{%
\mem@ps@safe@change{#1}%
\@namedef{#1headrule}{%
- \hrule\@width #2\@height #3 \vskip-#3}}
+ \@nameuse{#1headruleprefix}\hrule\@width #2\@height #3 \vskip-#3}}
\newcommand{\makefootrule}[4]{%
\mem@ps@safe@change{#1}%
\@namedef{#1footrule}{%
- \vskip-#4\vskip-#3
- \hrule\@width #2\@height #3 \vskip #4}}
+ \vskip-#4\vskip-#3%
+ \@nameuse{#1footruleprefix}\hrule\@width #2\@height #3 \vskip #4}}
+\newcommand\makeheadfootruleprefix[3]{%
+ \@namedef{#1headruleprefix}{#2}%
+ \@namedef{#1footruleprefix}{#3}%
+}
\newcommand{\makeheadposition}[5]{%
\mem@ps@safe@change{#1}%
\nametest{flushleft}{#2}
@@ -1623,6 +1629,51 @@
\mem@ps@safe@change{#1}%
\@namedef{#1headvplacement}{#2}\@namedef{#1footvplacement}{#3}}
+\newlength\mem@maxheadheight
+\newlength\mem@maxfootheight
+\newcommand\mem@sayonce@head{00}
+\newcommand\mem@sayonce@foot{00}
+\newcommand\mem@hf@measure@vbox[4]{%
+ \setbox0\vbox{#4}%
+ \ifdim\ht0>#1\relax%
+ \setlength\@tempdima{\@nameuse{mem@max#2height}}%
+ \ifdim\ht0>\@tempdima\relax%
+ \expandafter\global\@nameuse{mem@max#2height}=\ht0%
+ \expandafter\if\@nameuse{mem@sayonce@#2}\relax%
+ \@memwarn{#3}%
+ \global\@namedef{mem@sayonece@#2}{01}%
+ \fi%
+ \fi%
+ \fi%
+ \box0%
+}
+\newcommand\mem@toolarge@header@message{%
+ The material used in the headers is too large^^J%
+ (\the\mem@maxheadheight) for the given head height
+ (\the\headheight), it is recommended to^^J%
+ either increase the head height or redesign the header^^J%
+ (in both cases you will find help in the memoir manual).%
+}
+\newcommand\mem@toolarge@footer@message{%
+ The material used in the footer is too large^^J%
+ (\the\mem@maxfootheight) for the given foot skip
+ (\the\footskip), it is recommended to^^J%
+ either increase the foot skip or redesign the fotoer^^J%
+ (in both cases you will find help in the memoir manual).%
+}
+\newcommand\mem@hvboxm[1]{%
+ \mem@hf@measure@vbox\headheight{head}\mem@toolarge@header@message{#1}}
+\newcommand\mem@fvboxm[1]{%
+ \mem@hf@measure@vbox\footskip{foot}\mem@toolarge@footer@message{#1}}
+\AtEndDocument{
+ \ifdim\mem@maxheadheight>\headheight
+ \@memwarn{\mem@toolarge@header@message}
+ \fi
+ \ifdim\mem@maxfootheight>\footskip
+ \@memwarn{\mem@toolarge@footer@message}
+ \fi
+}
+\newcommand\mem@ps@entry@wrap{}
\newcommand\mem@ps@HLH[4]{%
% #1 ps name
% #2 type: head, foot
@@ -1630,21 +1681,22 @@
% #4 odd/even short (o,e)
\@namedef{#1@#3#2}{%
\@nameuse{#1#3hpl}\hb@xt@\@nameuse{#1#2runwidth}{\m@mhe@dreset%
- \vbox{\nametest{#2}{foot}\ifsamename\@nameuse{#1#2rule}\fi%
+ \nametest{#2}{head}\ifsamename\let\mem@hfboxer\mem@hvboxm\else\let\mem@hfboxer\mem@fvboxm\fi%
+ \mem@hfboxer{\nametest{#2}{foot}\ifsamename\@nameuse{#1#2rule}\fi%
\hbox{%
\rlap{%
\parbox[\@nameuse{#1#2vplacement}]{\@nameuse{#1#2runwidth}}{%
- \raggedright\@nameuse{#1ps#2strut}%
- \@nameuse{#1#4#2l}%
+ \memRTLmainraggedright\@nameuse{#1ps#2strut}%
+ \mem@ps@entry@wrap{\@nameuse{#1#4#2l}}%
\@nameuse{#1ps#2strut}}}\hfill
\parbox[\@nameuse{#1#2vplacement}]{\@nameuse{#1#2runwidth}}{%
\centering\@nameuse{#1ps#2strut}%
- \@nameuse{#1#4#2c}%
+ \mem@ps@entry@wrap{\@nameuse{#1#4#2c}}%
\@nameuse{#1ps#2strut}}\hfill
\llap{%
\parbox[\@nameuse{#1#2vplacement}]{\@nameuse{#1#2runwidth}}{%
- \raggedleft\@nameuse{#1ps#2strut}%
- \@nameuse{#1#4#2r}%
+ \memRTLmainraggedleft\@nameuse{#1ps#2strut}%
+ \mem@ps@entry@wrap{\@nameuse{#1#4#2r}}%
\@nameuse{#1ps#2strut}}}%
}%
\nametest{#2}{head}\ifsamename\@nameuse{#1#2rule}\fi%
@@ -1717,6 +1769,7 @@
\makeheadposition{#1}{}{}{}{}%
\makeheadrule{#1}{\textwidth}{0pt}%
\makefootrule{#1}{\textwidth}{\footruleheight}{\footruleskip}%
+ \makeheadfootruleprefix{#1}{}{}
\makeheadfootvposition{#1}{b}{b}%
\makepsmarks{#1}{}}
@@ -1746,6 +1799,8 @@
\@namedef{#1oddfpr}{\@nameuse{#2oddfpr}}%
\@namedef{#1headrule}{\@nameuse{#2headrule}}%
\@namedef{#1footrule}{\@nameuse{#2footrule}}%
+ \@namedef{#1headruleprefix}{\@nameuse{#2headruleprefix}}%
+ \@namedef{#1footruleprefix}{\@nameuse{#2footruleprefix}}%
\@namedef{#1psheadstrut}{\@nameuse{#2psheadstrut}}
\@namedef{#1psfootstrut}{\@nameuse{#2psfootstrut}}
\makepsmarks{#1}{\@nameuse{#2pshook}}}
@@ -2761,7 +2816,7 @@
\aliaspagestyle{afterpart}{empty}
\newcommand\chapter{%
- \ifartopt\par\else
+ \ifartopt\par\@nameuse{chapterblock}\else
\clearforchapter
\thispagestyle{chapter}
\global\@topnum\z@
@@ -3395,6 +3450,7 @@
\newcommand{\memsecstarinfo}[2]{}
\renewcommand{\@startsection}[6]{%
+ \@nameuse{#1block}%
\ifraggedbottomsection\if@nobreak\else
\vskip\z@\@plus\bottomsectionskip
\penalty\z@
@@ -3674,6 +3730,7 @@
\advance\skip@ -1\skip@ \advance\skip@ 1\pfbreakskip
\fi
\penalty\pen@ltyabovepfbreak
+ \prevdepth\z@ % added
\vskip\skip@
\penalty\pen@ltybelowpfbreak
}
@@ -3694,6 +3751,7 @@
\advance\skip@ -1\skip@ \advance\skip@ 1\pfbreakskip
\fi
\penalty\pen@ltyabovepfbreak
+ \prevdepth\z@ % added
\vskip\skip@
\penalty\pen@ltybelowpfbreak
}
@@ -6127,12 +6185,15 @@
\@namedef{fleg#2}{#4} % legend naming
\@namedef{flegtoc#2}##1{} % legend name in ToC
- \newenvironment{#2}{\@float{#2}}{\end@float}
- \newenvironment{#2*}{\@dblfloat{#2}}{\end@dblfloat}
+ \newenvironment{#2}[1][\@nameuse{fps@#2}]{\@float{#2}[##1]\@nameuse{#2adjustment}}{\end@float}
+ \newenvironment{#2*}[1][\@nameuse{fps@#2}]{%
+ \@dblfloat{#2}[##1]\@nameuse{#2adjustment}\@nameuse{#2*adjustment}}{\end@dblfloat}
} % end \newfloat
\newcommand*{\setfloatlocations}[2]{\@namedef{fps@#1}{#2}}
+\newcommand*\setfloatadjustment[2]{\@namedef{#1adjustment}{#2}}
+
\newcommand{\newsubfloat}[1]{%
\newlistentry[#1]{sub#1}{\@nameuse{ext@#1}}{1}
\@namedef{ext@sub#1}{\csname ext@#1\endcsname}
@@ -6176,6 +6237,69 @@
\end@float
\fi}}{}}
+\def\mem@fb@botlist{\@botlist}
+\def\mem@fb@topblock{\suppressfloats[t]}
+\def\FloatBlock{\par\begingroup \let\@elt\relax
+ \edef\@tempa{\mem@fb@botlist\@deferlist\@dbldeferlist}%
+ \ifx\@tempa\@empty
+ \else
+ \ifx\@fltovf\relax % my indicator of recursion
+ \if@firstcolumn
+ \clearpage
+ \else
+ \null\newpage\FloatBlock
+ \fi
+ \else
+ \newpage \let\@fltovf\relax
+ \FloatBlock % recurse once only
+ \fi\fi \endgroup
+ \mem@fb@topblock}
+\newcommand*\FloatBlockAllowAbove{\def\mem@fb@topblock{}}
+\newcommand*\FloatBlockAllowBelow{\def\mem@fb@botlist{}}
+
+\newcommand\setFloatBlockFor[1]{%
+ \@namedef{#1block}{\FloatBlock}}
+\newsavebox{\mem@margin@floatbox}
+\newcommand\marginfloatmarginmacro{\marginpar}
+\newenvironment{mem@margin@float}[2][-1.2ex]%
+ {\FloatBlock%
+ \begin{lrbox}{\mem@margin@floatbox}%
+ \begin{minipage}{\marginparwidth}%
+ \def\@captype{#2}%
+ \hbox{}\vspace*{#1}%
+ \@nameuse{margin#2adjustment}%
+ \@nameuse{margin#2captionadjustment}%
+ \noindent%
+ }
+ {\end{minipage}%
+ \end{lrbox}%
+ \marginfloatmarginmacro{\usebox{\mem@margin@floatbox}}%
+ }
+\newenvironment{marginfigure}[1][-1.2ex]{%
+ \begin{mem@margin@float}[#1]{figure}}
+ {\end{mem@margin@float}}
+\newenvironment{margintable}[1][-1.2ex]{%
+ \begin{mem@margin@float}[#1]{table}}
+ {\end{mem@margin@float}}
+\setfloatadjustment{marginfigure}{\centering}
+\setfloatadjustment{margintable}{\centering}
+
+\newcommand*\setmarginfloatcaptionadjustment[2]{%
+ \@namedef{margin#1captionadjustment}{#2}}
+
+\newcommand\setmpjustification[2]{%
+ \@namedef{mem@mp@justification}{%
+ \ifm@msetmp\else\@memerror{In order to use
+ \string\marginCmdAdjust,^^J%
+ please make sure to specify into which margin the^^J%
+ \string\marginpar\space should go, using \string\marginparmargin}{}\fi
+ \m@mwhich@margin{\m@mmpar@margin}%
+ \ifmemtortm #2 \else #1\fi}%
+}
+\newcommand\mpjustification{%
+ \@nameuse{mem@mp@justification}}
+\setmpjustification{\raggedleft}{\raggedright}
+
\newif\if@contcw
\newif\if@conthang
\newif\if@contindent
@@ -6193,12 +6317,12 @@
\captionstyle{}
\renewcommand{\captionstyle}{%
- \@ifnextchar[ {\@memcshort}{\@memcnorm}}
+ \@ifnextchar[{\@memcshort}{\@memcnorm}}
\def\@memcshort[#1]#2{%
- \def\@contcshortstyle{#1}
+ \def\@contcshortstyle{#1}%
\def\@contcstyle{#2}}
\def\@memcnorm#1{%
- \def\@contcshortstyle{#1}
+ \def\@contcshortstyle{#1}%
\def\@contcstyle{#1}}
\captionstyle{}
@@ -6247,13 +6371,15 @@
\else \def\@memtempa{\vbox to\topskip{}}\fi
\let\@contfnote\footnote \renewcommand{\footnote}[2][]{}
\let\@contfmark\footnotemark \renewcommand{\footnotemark}[1][]{}
+ \let\@contpnote\pagenote\renewcommand\pagenote[2][]{}
\sbox\@tempboxa{\@contnfont #1\@contdelim \@conttfont #2\@contfinal}
\let\footnote\@contfnote
\let\footnotemark\@contfmark
+ \let\pagenote\@contpnote
\ifdim\wd\@tempboxa<\linewidth \centering \fi
\if@contcw
\centering
- \parbox{\@contcwidth}{%
+ \parbox[t]{\@contcwidth}{%
\ifdim\wd\@tempboxa<\@contcwidth \centering \fi
\fi
\ifdim\wd\@tempboxa<\linewidth
@@ -8585,6 +8711,7 @@
\fi
\setbox0=\vtop to 0pt{%
\begin{minipage}[t]{\marginparwidth}%
+ \def\baselinestretch{\m@m@footnote@spacing}%
\sideparform\sideparfont%
\ifmemtortm #2\else #1\fi
\end{minipage}%
@@ -8691,6 +8818,7 @@
\insert\sideins{%
\hsize\sidebarwidth
\@parboxrestore
+ \def\baselinestretch{\m@m@footnote@spacing}%
\m@mwhich@margin{\m@msidebar@margin}%
\sidebarform\sidebarfont
\splittopskip=\ht\strutbox
@@ -8730,20 +8858,6 @@
\spacefactor\@x@sf\relax
\fi}
-\renewcommand{\@footnotetext}[1]{\insert\footins{%
- \def\baselinestretch{\m@m@footnote@spacing}%
- \reset@font%
- \foottextfont
- \@preamfntext
- \hsize\columnwidth
- \protected@edef\@currentlabel{%
- \csname p@footnote\endcsname\@thefnmark}%
- \color@begingroup
- \@makefntext{%
- \rule\z@\footnotesep\ignorespaces{\foottextfont #1}%
- \@finalstrut\strutbox}%
- \color@endgroup}\m@mmf@prepare}
-\let\m@mold@footnotetext\@footnotetext
\renewcommand*{\@footnotemark}{%
\leavevmode
\ifhmode
@@ -8756,6 +8870,18 @@
\ifhmode\spacefactor\@x@sf\fi
\relax}
+\newcommand{\mem@multiple@marker}[1]{%
+ \leavevmode
+ \ifhmode
+ \edef\@x@sf{\the\spacefactor}%
+ \m@mmf@check
+ \nobreak
+ \fi
+ #1%
+ \m@mmf@prepare
+ \ifhmode\spacefactor\@x@sf\fi
+ \relax}
+
\newlength{\footmarkwidth}
\newlength{\footmarksep}
\newlength{\footparindent}
@@ -8890,7 +9016,7 @@
\@finalstrut\strutbox}%
\color@endgroup}}
-\let\m@mold@mpfootnotetext\@mpfootnotetext
+\let\@plainmpfootnotetext\@mpfootnotetext
\newcommand{\m@mdoextrafeetmini}{%
\extrafeetminihook}
@@ -8922,8 +9048,8 @@
\expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}}
\newcommand{\plainfootnotes}{%
- \let\@footnotetext\m@mold@footnotetext
- \let\@mpfootnotetext\m@mold@mpfootnotetext}
+ \let\@footnotetext\@plainfootnotetext
+ \let\@mpfootnotetext\@plainmpfootnotetext}
\newcommand{\newfootnoteseries}[1]{%
\expandafter\newinsert\csname footins#1\endcsname% -> \footins#1
@@ -9708,6 +9834,7 @@
\color@endgroup}%
\fi%
\m@mmf@prepare}
+\let\@plainfootnotetext\@footnotetext
\newcommand*{\sidefootmargin}[1]{%
\m@msetm@argin{#1}%
@@ -10000,9 +10127,13 @@
\newwrite\@notefile
\immediate\openout\@notefile=\jobname.ent
\mempagenotestrue
- \def\pagenote{\@bsphack\begingroup
+ \DeclareRobustCommand\pagenote{\@bsphack\begingroup
\@sanitize
\m@m@wrpnote}%
+ \DeclareRobustCommand\mem@footto@pagenote{\@bsphack\begingroup
+ \@sanitize
+ \def\mem@pn@step{01}%
+ \m@m@wrpnote}%
\typeout{Writing note file \jobname.ent}%
\let\makepagenote\@empty}
@@ -10015,40 +10146,80 @@
\endgroup
\if@nobreak\ifvmode\nobreak\fi\fi}
-\let\m@m@pnwrite\immediate@protected@write
-\AtBeginDocument{%
- \ifm@mpnpageopt
- \let\m@m@pnwrite\protected@write
- \fi}
+\newcommand{\m@m@pnwrite}[3]{\immediate\write#1{#3}}
\newcommand*{\pnchap}{\f@rtoc}
\newcommand*{\pnschap}{\f@rbdy}
+\newcounter{pagenoteshadow}
+ \setcounter{pagenoteshadow}{0}
+\newcommand\mem@pn@step{00} % i.e. true
+\newlength\mem@pn@lastkern
\newcommand{\m@m@wrpnote}[2][]{%
- \@ifmtarg{#1}{\refstepcounter{pagenote}%
- \notenumintext{\thepagenote}}{}%
+ \mem@pn@lastkern=\lastkern%
+ \refstepcounter{pagenoteshadow}%
+ \ifm@mpnpageopt%
+ \phantomsection%
+ \label{pagenote\thepagenoteshadow-\thesheetsequence}%
+ \fi%
+ \if\mem@pn@step%
+ \@ifmtarg{#1}{\refstepcounter{pagenote}%
+ % this enables the ^{1,2} feature
+ \ifdim\mem@pn@lastkern=\multiplefootnotemarker%
+ \m@mmf@prepare% rerun
+ \fi%
+ \mem@multiple@marker{\notenumintext{\thepagenote}}%
+ }{}%
+ \fi%
\ifm@mpn@new@chap
\global\m@mpn@new@chapfalse
\addtonotes{\string\pagenotesubhead{\@chapapp}{\thechapter}{\pnchap}}%
\fi
\ifm@mpn@new@schap
\global\m@mpn@new@schapfalse
- \addtonotes{\string\pagenotesubhead{\@chapapp}{}{\pnschap}}%
+ \addtonotes{\string\pagenotesubheadstarred{\@chapapp}{}{\pnschap}}%
\fi
- \m@m@pnwrite\@notefile{}
- {\string\noteentry{\thepagenote}{#1}{#2}{\thepage}}%
+ \m@m@pnwrite\@notefile{}%
+ {\string\startnoteentry{\thepagenote}{#1}%
+ {pagenote\thepagenoteshadow-\thesheetsequence}}%
+ \def\next{#2}%
+ \begingroup%
+ \newlinechar='40%
+ \m@m@pnwrite\@notefile{}{\meaning\next}%
+ \endgroup%
+ \m@m@pnwrite\@notefile{}%
+ {\string\endnoteentry}%
\endgroup
\@esphack}
\def\pagenote{\@bsphack\begingroup \@sanitize\m@m@pagenote}
+\let\mem@footto@pagenote\pagenote
\newcommand{\m@m@pagenote}[2][]{\endgroup\@esphack}
\newcommand*{\pagetofootnote}{%
\let\memsavepagenote\pagenote
- \renewcommand{\pagenote}[2][]{\footnote{##2}}}
+ \renewcommand{\pagenote}[2][]{\footnote{##2}}
+ \ifmempagenotes\else%
+ \AtEndDocument{%
+ \ifmempagenotes%
+ \@memerror{The use of \string\pagetofootnote\space before
+ \string\makepagenote\space^^Jdoes not make
+ sense. \string\makepagenote\space make some redefinitions that
+ are not picked up if \string\pagetofootnote\space is issued
+ before \string\makepagenote
+ }{}
+ \fi
+ }
+ \fi
+}
\newcommand*{\foottopagenote}{%
\let\memsavefootnote\footnote
- \renewcommand*{\footnote}[2][]{\pagenote{##2}}}
+ % now also \footnotemark work
+ \letcountercounter{footnote}{pagenote}
+ % and this takes care of \footnotetext
+ \renewcommand\footnotetext[2][]{\mem@footto@pagenote{##2}}
+ \renewcommand{\footnote}[2][]{\pagenote{##2}}
+}
\newcommand{\addtonotes}[1]{\ifmempagenotes
\IfFileExists{\jobname.ent}{\m@m@pnwrite\@notefile{}{#1}}{\mempnofilewarn}%
@@ -10058,10 +10229,7 @@
\textsuperscript{#1}}
\newcommand{\notenuminnotes}[1]{%
{\normalfont #1.}\space}
-\newcommand{\noteentry}[4]{%
- \prenoteinnotes
- \noteidinnotes{#1}{#2}\pageinnotes{#4}\noteinnotes{#3}%
- \postnoteinnotes}
+ %\newcommand{\noteentry}[4]{} % not used any more!
\newcommand{\idtextinnotes}[1]{%
[#1]\space}
@@ -10071,45 +10239,88 @@
\newcommand{\pageinnotes}[1]{%
\ifm@mpnpageopt \printpageinnotes{#1}\fi}
\newcommand*{\printpageinnotes}[1]{%
- (\pagerefname\ #1)\space}
-\newcommand{\noteinnotes}[1]{#1}
+ (\pagerefname\ \pageref{#1})\space}
+\newcommand\printpageinnoteshyperref[1]{%
+(\hyperref[#1]{\pagerefname\ \pageref*{#1}})\space}
+\newcommand{\noteinnotes}[1]{#1} % not used anymore!
\newcommand{\prenoteinnotes}{\par\noindent}
\newcommand{\postnoteinnotes}{\par}
+\newcommand\prenotetext{}
+\newcommand\postnotetext{}
+
\providecommand*{\notesname}{Notes}
\newcommand*{\notedivision}{\chapter{\notesname}}
-\newcommand*{\printpagenotes}{\@ifstar{\@sprintpagenotes}{\@printpagenotes}}
+\newcommand*{\printpagenotes}{\@ifstar{\mem@printpagenotes{00}}{\mem@printpagenotes{01}}}
\newcommand*{\mempnofilewarn}{%
\ClassWarning{memoir}{There is no .ent file}}
-\newcommand*{\@sprintpagenotes}{%
- \ifmempagenotes
- \notedivision
-\IfFileExists{\jobname.ent}{%
- \immediate\closeout\@notefile
- \input{\jobname.ent}%
- \immediate\openout\@notefile=\jobname.ent%
- }{%
- \mempnofilewarn
-}%
-\fi}
-
-\newcommand*{\@printpagenotes}{%
+\newcommand\startnoteentrystart[3]{%
+ \prenoteinnotes%
+ \noteidinnotes{#1}{#2}%
+ \pageinnotes{#3}%
+ \prenotetext%
+}
+\def\endnoteentryend{\postnotetext\postnoteinnotes}
+\newcommand\mem@make@gt@safe{%
+ \edef\@tempa{`\string >}%
+ \ifnum\catcode\@tempa=12%
+ \let\@ResetGT\relax%
+ \else%
+ \edef\@ResetGT{\noexpand\catcode\@tempa=\the\catcode\@tempa}%
+ \@makeother\>%
+ \fi%
+}
+\newcommand\mem@printpagenotes[1]{%
\ifmempagenotes
\notedivision
\IfFileExists{\jobname.ent}{%
+ \begingroup
+ \mem@make@gt@safe%
+ \def\startnoteentry####1####2####3####4>{%
+ \begingroup
+ \@ResetGT
+ \startnoteentrystart{####1}{####2}{####3}%
+ }
+ \def\endnoteentry{\endnoteentryend\endgroup}
\immediate\closeout\@notefile
\input{\jobname.ent}%
- }{%
- \mempnofilewarn
- }
- \fi}
+ \if#1\immediate\openout\@notefile=\jobname.ent\fi%
+ \endgroup
+ }{%
+ \mempnofilewarn
+ }%
+ \fi%
+}
+
+ % \newcommand*{\@sprintpagenotes}{%
+ % \ifmempagenotes
+ % \notedivision
+ % \IfFileExists{\jobname.ent}{%
+ % \immediate\closeout\@notefile
+ % \input{\jobname.ent}%
+ % \immediate\openout\@notefile=\jobname.ent%
+ % }{%
+ % \mempnofilewarn
+ % }%
+ % \fi}
+
+ % \newcommand*{\@printpagenotes}{%
+ % \ifmempagenotes
+ % \notedivision
+ % \IfFileExists{\jobname.ent}{%
+ % \immediate\closeout\@notefile
+ % \input{\jobname.ent}%
+ % }{%
+ % \mempnofilewarn
+ % }
+ % \fi}
\newcommand*{\pagenotesubhead}[3]{%
\section*{#1 #2 #3}}
-
+\newcommand\pagenotesubheadstarred{\pagenotesubhead}
\newif\ifchangemarks\changemarksfalse
\newcommand*{\changemarks}{\changemarkstrue}
\newcommand*{\nochangemarks}{\changemarksfalse}
@@ -10243,6 +10454,7 @@
\let\tmarkmr\relax
\let\tmarkbm\relax}
+\newcommand*\trimmarkscolor{}
\newcommand*{\trimmarks}{%
\vbox to \z@{\vskip-1in \vskip\trimtop % top of logical page
\hb@xt@\z@{\hskip-1in
@@ -10257,11 +10469,11 @@
\fi
\vbox to \paperheight{%
\let\protect\relax % <- v1.4 addition
- \hb@xt@\paperwidth{\tmarktl\hfil\tmarktm\hfil\tmarktr}%
+ \hb@xt@\paperwidth{\trimmarkscolor\tmarktl\hfil\tmarktm\hfil\tmarktr}%
\vfil
- \hb@xt@\paperwidth{\tmarkml\hfil\tmarkmr}%
+ \hb@xt@\paperwidth{\trimmarkscolor\tmarkml\hfil\tmarkmr}%
\vfil
- \hb@xt@\paperwidth{\tmarkbl\hfil\tmarkbm\hfil\tmarkbr}}%
+ \hb@xt@\paperwidth{\trimmarkscolor\tmarkbl\hfil\tmarkbm\hfil\tmarkbr}}%
\hss}%
\vss}}
@@ -10272,7 +10484,7 @@
\setlength{\unitlength}{1bp}\thicklines
\put(-36,0){\line(1,0){24}}
\put(0,12){\line(0,1){24}}
- \put(3,27){\ttfamily\fontsize{8bp}{10bp}\selectfont\jobname\ \
+ \put(3,27){\normalfont\ttfamily\fontsize{8bp}{10bp}\selectfont\jobname\ \
\today\ \ \printtime\ \ Page \thepage}
\end{picture}}}
\renewcommand*{\tmarktm}{\registrationColour{%
@@ -10337,11 +10549,11 @@
\fi
\vbox to \paperheight{%
\let\protect\relax % <- v1.4 addition
- \hb@xt@\paperwidth{\tmarktl\hfil\tmarktm\hfil\tmarktr}%
+ \hb@xt@\paperwidth{\trimmarkscolor\tmarktl\hfil\tmarktm\hfil\tmarktr}%
\vfil
- \hb@xt@\paperwidth{\tmarkml\hfil\tmarkmr}%
+ \hb@xt@\paperwidth{\trimmarkscolor\tmarkml\hfil\tmarkmr}%
\vfil
- \hb@xt@\paperwidth{\tmarkbl\hfil\tmarkbm\hfil\tmarkbr}}%
+ \hb@xt@\paperwidth{\trimmarkscolor\tmarkbl\hfil\tmarkbm\hfil\tmarkbr}}%
\hss}%
\vss}}%
}}