diff options
| author | Marius <mariausol@gmail.com> | 2011-08-18 17:40:23 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2011-08-18 17:40:23 +0300 |
| commit | 5463542d926a6ca73d86251154cabc00a9333fa5 (patch) | |
| tree | 33c0104835277e96d6b0474466e75963fef16de4 /tex/context/base/typo-mar.mkiv | |
| parent | ee4f24d635e0db2029f026a1c098ae76d1e537d3 (diff) | |
| download | context-5463542d926a6ca73d86251154cabc00a9333fa5.tar.gz | |
beta 2011.08.18 16:00
Diffstat (limited to 'tex/context/base/typo-mar.mkiv')
| -rw-r--r-- | tex/context/base/typo-mar.mkiv | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tex/context/base/typo-mar.mkiv b/tex/context/base/typo-mar.mkiv index 8093f17c9..5275625b1 100644 --- a/tex/context/base/typo-mar.mkiv +++ b/tex/context/base/typo-mar.mkiv @@ -144,6 +144,7 @@ \begingroup %\settrue\inhibitmargindata % no flushing in here \def\currentmargindata{#name}% + \let\currentmarginframed\currentmargindata \dodoubleempty\domargindata} \appendtoks @@ -160,18 +161,18 @@ \unexpanded\def\domargindata[#dataparameters][#textparameters]#content% {\iffirstargument - \setupmargindata[\currentmargindata][#dataparameters]% + \setupcurrentmargindata[#dataparameters]% \fi \doifelsenothing{#content}\donefalse\donetrue \ifdone \edef\currentmargindatastrut{\margindataparameter\c!strut}% \the\everymargindatacontent \dostarttagged\t!margintext\currentmargindata - \ifcsname\??mf\currentmargindata\s!parent\endcsname + \ifcsname\currentmargindatahash\s!parent\endcsname \setbox\nextbox\hbox\bgroup \the\everymargindatacontent \dosetmargindataattributes\c!style\c!color - \localframedwithsettings[\??mf\currentmargindata][\c!location=\v!normal,#textparameters]\bgroup + \localframedwithsettings[\currentmarginframedhash][\c!location=\v!normal,#textparameters]\bgroup \ifx\currentmargindatastrut\empty \else \dosetupstrut[\currentmargindatastrut]% \fi |