diff options
| author | Hans Hagen <pragma@wxs.nl> | 2011-08-21 18:42:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2011-08-21 18:42:00 +0200 |
| commit | 5a562b27ffed58d4496cb1051f1e949902502763 (patch) | |
| tree | 9000df76013a0100205e1a3da1107a9e2869afc6 /tex/context/base/pack-rul.mkiv | |
| parent | 510b21576ce51fbf49e5c7bc02c099d779b0c47b (diff) | |
| download | context-5a562b27ffed58d4496cb1051f1e949902502763.tar.gz | |
beta 2011.08.21 18:42
Diffstat (limited to 'tex/context/base/pack-rul.mkiv')
| -rw-r--r-- | tex/context/base/pack-rul.mkiv | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/tex/context/base/pack-rul.mkiv b/tex/context/base/pack-rul.mkiv index 00d8854f9..70d450c2e 100644 --- a/tex/context/base/pack-rul.mkiv +++ b/tex/context/base/pack-rul.mkiv @@ -2701,9 +2701,9 @@ \installcommandhandler \??kd {framedtext} \??kd -\let\setupframedtexts\setupframedtext +\installinheritedframed {framedtext} -\presetlocalframed[\??kd] +\let\setupframedtexts\setupframedtext \setupframedtext [\c!width=0.75\hsize, @@ -2782,8 +2782,8 @@ % \insidefloattrue % ? better \normalexpanded{\noexpand\switchtobodyfont[\framedtextparameter\c!bodyfont]}% \startcolor[\framedtextparameter\c!color]% - \localframed[\currentframedtexthash][\c!strut=\v!no]% todo: use delayedstrut - \bgroup + \letframedtextparameter\c!strut\v!no + \inheritedframedtextframed\bgroup \let\\=\endgraf \framedtextparameter\c!inner % oud spul \doif{\framedtextparameter\c!depthcorrection}\v!on\doftstartdepthcorrection @@ -2890,15 +2890,18 @@ \def\dodoframedtext[#1]% beware! {\normalexpanded{\noexpand\switchtobodyfont[\framedtextparameter\c!bodyfont]}% - \localframed[\currentframedtexthash][\c!strut=\v!no,#1]% + \letframedtextparameter\c!strut\v!no + \iffirstargument + \setupcurrentframedtext[#1]% + \fi + \inheritedframedtextframed\bgroup + \blank[\v!disable]% + \let\\=\endgraf + \framedtextparameter\c!inner + \dosetframedtextattributes\c!style\c!color \bgroup - \blank[\v!disable]% - \let\\=\endgraf - \framedtextparameter\c!inner - \dosetframedtextattributes\c!style\c!color - \bgroup - \aftergroup\docloseframedtext - \let\next=} + \aftergroup\docloseframedtext + \let\next=} \def\docloseframedtext {\removelastskip @@ -3276,8 +3279,6 @@ %D %D \showsetup{setupbackground} -\presetlocalframed[\??ag] - \def\dosetupbackground[#1]% {\getparameters[\??ag][#1]% \doifelse\@@agstate\v!start @@ -3324,6 +3325,8 @@ %D lineheight. I'll probably forget to apply this trick %D elsewhere. +\presetlocalframed[\??ag] + \def\dostopbackground % improved version (i hope) {\endgraf \removelastskip |