diff options
author | Marius <mariausol@gmail.com> | 2011-08-21 17:40:15 +0300 |
---|---|---|
committer | Marius <mariausol@gmail.com> | 2011-08-21 17:40:15 +0300 |
commit | 823ff9e44706f51d3153c409805a1dda01e4f0eb (patch) | |
tree | 3be8fb8d0702c16a6c747e330ed64c26acd5be85 /tex/context/base/typo-mar.mkiv | |
parent | 3397aae930bce1520617393e4668948bf1471188 (diff) | |
download | context-823ff9e44706f51d3153c409805a1dda01e4f0eb.tar.gz |
beta 2011.08.21 16:42
Diffstat (limited to 'tex/context/base/typo-mar.mkiv')
-rw-r--r-- | tex/context/base/typo-mar.mkiv | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tex/context/base/typo-mar.mkiv b/tex/context/base/typo-mar.mkiv index 5275625b1..4ca69d8c8 100644 --- a/tex/context/base/typo-mar.mkiv +++ b/tex/context/base/typo-mar.mkiv @@ -99,12 +99,11 @@ %D argument concerns the data, the second the framed. Not sharing the setup is %D on purpose: location, offset, alignment and other parameters might clash. -\def\??mc{@@mc} % margincategory -\def\??mf{@@mf} % marginframed - \installcommandhandler\??mc{margindata}\??mc \installcommandhandler\??mf{marginframed}\??mf +\installinheritedframed {marginframed} \??oi + \setupmargindata [\c!location=\v!left, % \c!align=, @@ -172,7 +171,8 @@ \setbox\nextbox\hbox\bgroup \the\everymargindatacontent \dosetmargindataattributes\c!style\c!color - \localframedwithsettings[\currentmarginframedhash][\c!location=\v!normal,#textparameters]\bgroup + \setupcurrentmarginframed[\c!location=\v!normal,#textparameters]% + \inheritedmarginframedframed\bgroup \ifx\currentmargindatastrut\empty \else \dosetupstrut[\currentmargindatastrut]% \fi |