diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/scrn-fld.mkvi')
-rw-r--r-- | Master/texmf-dist/tex/context/base/scrn-fld.mkvi | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/context/base/scrn-fld.mkvi b/Master/texmf-dist/tex/context/base/scrn-fld.mkvi index 87209909961..cc84b9c71f8 100644 --- a/Master/texmf-dist/tex/context/base/scrn-fld.mkvi +++ b/Master/texmf-dist/tex/context/base/scrn-fld.mkvi @@ -231,7 +231,6 @@ depth = \number\dimexpr\fieldbodyparameter\c!depth \relax, align = "\fieldbodyparameter\c!align", length = "\fieldbodyparameter\c!n", - style = "\fieldbodyparameter\c!style", fontstyle = "\fontstyle", fontalternative = "\fontalternative", fontsize = "\fontbody", @@ -241,7 +240,6 @@ \ifx\currentfieldbackgroundcolor\empty \else backgroundcolor = "\currentfieldbackgroundcolor", backgroundcolorvalue = "\currentfieldbackgroundcolorvalue", - \fi \ifx\currentfieldframecolor\empty \else framecolor = "\currentfieldframecolor", @@ -403,7 +401,7 @@ \setupfieldcontentframed [\c!align=\v!flushleft, \c!strut=\v!no, - \s!parent=\??ol] % needs checking + \s!parent=\??regularframed] % needs checking \setupfieldcontentframed % independent [\c!alternative=\v!normal, @@ -419,13 +417,13 @@ [\c!style=, \c!color=, \c!align=\v!flushleft, - \s!parent=\??ol] % needs checking + \s!parent=\??regularframed] % needs checking \setupfieldtotalframed [%\c!alternative={\v!label,\v!frame,\v!horizontal}, \c!strut=\v!no, \c!align=, - \s!parent=\??ol] % needs checking + \s!parent=\??regularframed] % needs checking % \setupcurrent @@ -616,9 +614,9 @@ \v!horizontal=>\settrue\fieldishorizontal, \v!vertical=>\settrue\fieldisvertical]% \ifconditional\fieldisvertical - \setupfieldtotalframed[\c!distance=\zeropoint,\c!inbetween=\vskip\@@localoffset,\c!align=\v!right,\c!width=20em]% + \setupfieldtotalframed[\c!distance=\zeropoint,\c!inbetween=\vskip\d_framed_local_offset,\c!align=\v!right,\c!width=20em]% \else\ifconditional\fieldishorizontal - \setupfieldtotalframed[\c!distance=\@@localoffset,\c!inbetween=,\c!align=\c!left,\c!height=10ex]% + \setupfieldtotalframed[\c!distance=\d_framed_local_offset,\c!inbetween=,\c!align=\c!left,\c!height=10ex]% \else \setupfieldtotalframed[\c!distance=\zeropoint,\c!inbetween=,\c!align=\c!left]% \fi\fi |