diff options
| -rw-r--r-- | tex/context/base/cont-new.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4092 -> 4095 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 104764 -> 106558 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/scrn-but.mkvi | 192 | ||||
| -rw-r--r-- | tex/context/base/scrn-fld.mkvi | 64 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 23873 -> 23868 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 162210 -> 162210 bytes | |||
| -rw-r--r-- | tex/context/base/typo-mar.mkiv | 8 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
12 files changed, 170 insertions, 104 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 67293ba0e..6bbb35385 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.08.20 01:39} +\newcontextversion{2011.08.21 16:42} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 419cde1d3..d64d35449 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.08.20 01:39} +\newcontextversion{2011.08.21 16:42} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex b8c6d79f7..08f6455d4 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex 99232f0ca..b0c5e221d 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 78d85d19e..41dc4ce3d 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.08.20 01:39} +\edef\contextversion{2011.08.21 16:42} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 746d784d7..e61511f5e 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.08.20 01:39} +\edef\contextversion{2011.08.21 16:42} %D For those who want to use this: diff --git a/tex/context/base/scrn-but.mkvi b/tex/context/base/scrn-but.mkvi index 8a0203bb2..3e658a439 100644 --- a/tex/context/base/scrn-but.mkvi +++ b/tex/context/base/scrn-but.mkvi @@ -11,8 +11,6 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -% framed needs checking - % \restorestandardblank % better namespace for pos @@ -48,13 +46,13 @@ \installcommandhandler \??bt {button} \??bt -\let\setupbuttons\setupbutton +\installinheritedframed {button} \??oi -\presetlocalframed[\namedbuttonhash\empty] +\let\setupbuttons\setupbutton \appendtoks \setuevalue\currentbutton{\scrn_button_direct{\currentbutton}}% - \setevalue{\??bt:\currentbutton\s!parent}{\currentbuttonhash}% framed +% \setevalue{\??bt:\currentbutton\s!parent}{\currentbuttonhash}% framed \to \everydefinebutton \unexpanded\def\scrn_button_direct#tag% @@ -77,7 +75,13 @@ {\iffirstargument \setupcurrentbutton[#settings]% \fi - \scrn_button_make\??bt\currentbutton\buttonparameter{#text}{#action}% + \scrn_button_make + \buttonparameter + \inheritedbuttonframed + \letbuttonparameter + \setbuttonparameter + {#text}% + {#action}% \endgroup} \def\scrn_button_direct_ignore[#settings]#text[#destination]% @@ -150,13 +154,17 @@ \newconditional\scrn_button_skipped -\def\scrn_button_make#namespace#current#currentparameter#text#action% +\def\scrn_button_make#currentparameter#inheritedframed#letparameter#setparameter#text#action% {\begingroup \attribute\referenceattribute\attributeunsetvalue \global\setfalse\scrn_button_skipped - \chardef\locationboxpagestate\csname\??bt:\c!location:#currentparameter\c!samepage\endcsname + \chardef\locationboxpagestate\csname\??bt:\c!location:#currentparameter\c!samepage\endcsname % ?? bt: todo \doifreferencefoundelse{#action}\scrn_button_make_yes\scrn_button_make_nop - {#namespace}{#current}{#currentparameter}{#text}% + #currentparameter% + #inheritedframed% + #letparameter% + #setparameter + {#text}% \endgroup} \def\scrn_button_make_yes @@ -196,38 +204,32 @@ \expandafter\scrn_button_make_skipped \fi} -\def\scrn_button_make_framed#namespace#current#currentparameter#text% - {\directlocalframed[#namespace:#current]{\ignorespaces#text\removeunwantedspaces}} +\def\scrn_button_make_framed#currentparameter#inheritedframed#letparameter#setparameter#text% + {#inheritedframed{\ignorespaces#text\removeunwantedspaces}} -\def\scrn_button_make_skipped#namespace#current#currentparameter#text% +\def\scrn_button_make_skipped#currentparameter#inheritedframed#letparameter#setparameter#text% {\global\settrue\scrn_button_skipped} -\def\scrn_button_make_normal#namespace#current#currentparameter#text% +\def\scrn_button_make_normal#currentparameter#inheritedframed#letparameter#setparameter#text% {\ctxlua{structures.references.injectcurrentset(nil,nil)}% \hbox attr \referenceattribute \lastreferenceattribute - {\directlocalframed - [#namespace:#current]% - {\ignorespaces#text\removeunwantedspaces}}} + {#inheritedframed{\ignorespaces#text\removeunwantedspaces}}} -\def\scrn_button_make_contrast#namespace#current#currentparameter#text% +\def\scrn_button_make_contrast#currentparameter#inheritedframed#letparameter#setparameter#text% {\ctxlua{structures.references.injectcurrentset(nil,nil)}% \hbox attr \referenceattribute \lastreferenceattribute - {\localframedwithsettings - [#namespace:#current]% - [\c!foregroundcolor=#currentparameter\c!contrastcolor]% - {\ignorespaces#text\removeunwantedspaces}}} - -\def\scrn_button_make_empty#namespace#current#currentparameter#text% - {\localframedwithsettings - [#namespace:#current]% - [\c!empty=\v!yes]% - {\ignorespaces#text\removeunwantedspaces}} - -\def\scrn_button_make_nothing#namespace#current#currentparameter#text% - {\localframedwithsettings - [#namespace:#current]% - [\c!empty=\v!yes,\c!frame=,\c!background=]% - {\ignorespaces#text\removeunwantedspaces}} + {#setparameter\c!foregroundcolor{#currentparameter\c!contrastcolor}% + #inheritedframed{\ignorespaces#text\removeunwantedspaces}}} + +\def\scrn_button_make_empty#currentparameter#inheritedframed#letparameter#setparameter#text% + {#letparameter\c!empty\v!yes + #inheritedframed{\ignorespaces#text\removeunwantedspaces}} + +\def\scrn_button_make_nothing#currentparameter#inheritedframed#letparameter#setparameter#text% + {#letparameter\c!empty\v!yes + #letparameter\c!frame\empty + #letparameter\c!background\empty + #inheritedframed{\ignorespaces#text\removeunwantedspaces}} %D Menus: %D @@ -318,9 +320,9 @@ \installcommandhandler \??am {interactionmenu} \??am -\let\setupinteractionmenus\setupinteractionmenu +\installinheritedframed {interactionmenu} \??oi -\presetlocalframed[\namedinteractionmenuhash\empty] +\let\setupinteractionmenus\setupinteractionmenu \let\scrn_menu_action\relax @@ -329,23 +331,38 @@ \unexpanded\def\defineinteractionmenu {\dotripleempty\scrn_menu_define} +% \def\scrn_menu_define[#tag][#category][#settings]% category reflects location, settings can be parent +% {\ifthirdargument +% \doifassignmentelse{#settings}% +% {\scrn_menu_define_original[#tag][#category][\c!category=#category,#settings]}% child definition +% {\scrn_menu_define_original[#tag][#settings][\c!category=#category]}% % child definition +% \scrn_menu_register{#tag}{#category}% +% \setevalue{\??am:#tag\s!parent}{\namedinteractionmenuhash{#tag}}% framed +% \else\ifsecondargument +% \doifassignmentelse{#category}% +% {\scrn_menu_define_original[#tag][#category]% % root definition +% \setevalue{\??am:#tag\s!parent}{\namedinteractionmenuhash\empty}}% framed +% {\scrn_menu_define_original[#tag][#category][\c!category=#category]% % child definition +% \scrn_menu_register{#tag}{#category}% +% \setevalue{\??am:#tag\s!parent}{\namedinteractionmenuhash{#tag}}}% framed +% \else +% \scrn_menu_define_original[#tag]% % root definition +% \setevalue{\??am:#tag\s!parent}{\namedinteractionmenuhash\empty}% framed +% \fi\fi} + \def\scrn_menu_define[#tag][#category][#settings]% category reflects location, settings can be parent {\ifthirdargument \doifassignmentelse{#settings}% {\scrn_menu_define_original[#tag][#category][\c!category=#category,#settings]}% child definition {\scrn_menu_define_original[#tag][#settings][\c!category=#category]}% % child definition \scrn_menu_register{#tag}{#category}% - \setevalue{\??am:#tag\s!parent}{\namedinteractionmenuhash{#tag}}% framed \else\ifsecondargument \doifassignmentelse{#category}% - {\scrn_menu_define_original[#tag][#category]% % root definition - \setevalue{\??am:#tag\s!parent}{\namedinteractionmenuhash\empty}}% framed + {\scrn_menu_define_original[#tag][#category]}% % root definition {\scrn_menu_define_original[#tag][#category][\c!category=#category]% % child definition - \scrn_menu_register{#tag}{#category}% - \setevalue{\??am:#tag\s!parent}{\namedinteractionmenuhash{#tag}}}% framed - \else + \scrn_menu_register{#tag}{#category}}% + \else \scrn_menu_define_original[#tag]% % root definition - \setevalue{\??am:#tag\s!parent}{\namedinteractionmenuhash\empty}% framed \fi\fi} \def\scrn_menu_register#tag#category% @@ -670,10 +687,16 @@ \expandafter\scrn_button_make_position \else \expandafter\scrn_button_make - \fi\??am\currentinteractionmenu\interactionmenuparameter{#text}{#action}% + \fi + \interactionmenuparameter + \inheritedinteractionmenuframed + \letinteractionmenuparameter + \setinteractionmenuparameter + {#text}% + {#action}% \scrn_menu_action_stop} -\def\scrn_button_make_position#namespace#current#currentparameter#text#action% +\def\scrn_button_make_position#currentparameter#inheritedframed#letparameter#setparameter#text#action% {\global\advance\scrn_menu_position\plusone \doifreferencefoundelse{#action}% 0=not found, 1=same page, >1=elsewhere {\scrn_menu_page_mode\ifnum\currentreferencerealpage=\realpageno\plusone\else\plustwo\fi}% @@ -683,35 +706,44 @@ \to \scrn_menu_mp_data \hpos {\askedinteractionmenulocation:\number\scrn_menu_position}% - {\scrn_button_make{#namespace}{#current}{#currentparameter}{#text}{#action}}} + {\scrn_button_make + #currentparameter% + #inheritedframed% + #letparameter% + #setparameter% + {#text}% + {#action}}} \unexpanded\def\scrn_menu_got_start[#action]#text\stopgot {\scrn_menu_action_start \setupcurrentinteractionmenu[\c!frame=\v!off,\c!background=]% needs checking, was buttons - \scrn_button_make\??am\currentinteractionmenu\interactionmenuparameter{#text}{#action}% + \scrn_button_make + \interactionmenuparameter + \inheritedinteractionmenuframed + \letinteractionmenuparameter + \setinteractionmenuparameter + {#text}% + {#action}% \scrn_menu_action_stop} \unexpanded\def\scrn_menu_nop_start#text\stopnop {\scrn_menu_action_start - \localframedwithsettings - [\??am:\currentinteractionmenu]% - [\c!frame=\v!off,\c!background=,\c!empty=\v!yes]% - {\ignorespaces#text\removeunwantedspaces}% + \letinteractionmenuparameter\c!frame\v!off + \letinteractionmenuparameter\c!background\empty + \letinteractionmenuparameter\v!yes + \inheritedinteractionmenuframed{\ignorespaces#text\removeunwantedspaces}% \scrn_menu_action_stop} \unexpanded\def\scrn_menu_txt_start#text\stoptxt {\scrn_menu_action_start - \localframedwithsettings - [\??am:\currentinteractionmenu]% - [\c!frame=\v!off,\c!background=]% - {\ignorespaces#text\removeunwantedspaces}% + \letinteractionmenuparameter\c!frame\v!off + \letinteractionmenuparameter\c!background\empty + \inheritedinteractionmenuframed{\ignorespaces#text\removeunwantedspaces}% \scrn_menu_action_stop} \unexpanded\def\scrn_menu_rul_start#text\stoprul {\scrn_menu_action_start - \directlocalframed - [\??am:\currentinteractionmenu]% - {\ignorespaces#text\removeunwantedspaces}% + \inheritedinteractionmenuframed{\ignorespaces#text\removeunwantedspaces}% \scrn_menu_action_stop} \unexpanded\def\scrn_menu_com_start#text\stopcom @@ -757,7 +789,7 @@ \edef\currentinteractionmenu{#tag}% \doif{\interactionmenuparameter\c!state}\v!local {\letinteractionmenuparameter\c!state\v!start - \setinteractionmenuparameter\s!parent{\??am\askedinteractionmenulocation}% nice hack + % \setinteractionmenuparameter\s!parent{\??am\askedinteractionmenulocation}% nice hack \interactionmenuparameter\c!menu}% \endgroup} @@ -768,13 +800,9 @@ \def\scrn_menu_interaction_menu[#tag][#settings]% {\begingroup - \setupinteractionmenu[#tag][#settings]% -% \edef\currentinteractionmenu {#tag}% -% \edef\askedinteractionmenulocation {\interactionmenuparameter\c!category}% -% \edef\askedinteractionmenualternative{\interactionmenuparameter\c!alternative}% -% \def\scrn_menu_actions#dummy{\scrn_menu_package_indeed\currentinteractionmenu}% -% \csname\??am:\c!menu:\askedinteractionmenualternative\endcsname - \scrn_menu_insert{#tag}% + \edef\currentinteractionmenu{#tag}% + \setupcurrentinteractionmenu[#settings]% + \scrn_menu_insert{#tag}% \endgroup} %D Plugin handler: @@ -954,7 +982,8 @@ \scrn_menu_menu_button_a {#menutag}{#settings}{#text}{#action}% \else - \doifassignmentelse{#menutag}\scrn_menu_menu_button_b\scrn_menu_menu_button_c{#menutag}{#text}{#action}% + \doifassignmentelse{#menutag}\scrn_menu_menu_button_b\scrn_menu_menu_button_c + {#menutag}{#text}{#action}% \fi} \def\scrn_menu_menu_button_ignore[#menutag][#settings]#text[#action]% @@ -963,21 +992,42 @@ \def\scrn_menu_menu_button_a#tag#settings#text#action% {\doif{\interactionmenuparameter\c!state}\v!start {\dontleavehmode \begingroup - \setupinteractionmenu[#tag][#settings]% - \scrn_button_make\??am{#tag}\menuparameter{#text}{#action}% + \edef\currentinteractionmenu{#tag}% + \setupcurrentinteractionmenu[#settings]% + \scrn_button_make + \interactionmenuparameter + \inheritedinteractionmenuframed + \letinteractionmenuparameter + \setinteractionmenuparameter + {#text}% + {#action}% \endgroup}} \def\scrn_menu_menu_button_b#settings#text#action% {\doif{\buttonparameter\c!state}\v!start {\dontleavehmode \begingroup - \setupbuttons[#settings]% - \scrn_button_make\??bt\empty\buttonparameter{#text}{#action}% + \let\currentbutton\empty + \setupcurrentbutton[#settings]% + \scrn_button_make + \buttonparameter + \inheritedbuttonframed + \letbuttonparameter + \setbuttonparameter + {#text}% + {#action}% \endgroup}} \def\scrn_menu_menu_button_c#tag#text#action% {\doif{\interactionmenuparameter\c!state}\v!start {\dontleavehmode \begingroup - \scrn_button_make\??am{#tag}\menuparameter{#text}{#action}% + \edef\currentinteractionmenu{#tag}% + \scrn_button_make + \interactionmenuparameter + \inheritedinteractionmenuframed + \letinteractionmenuparameter + \setinteractionmenuparameter + {#text}% + {#action}% \endgroup}} %D Untested: diff --git a/tex/context/base/scrn-fld.mkvi b/tex/context/base/scrn-fld.mkvi index f296b6a55..e44a10195 100644 --- a/tex/context/base/scrn-fld.mkvi +++ b/tex/context/base/scrn-fld.mkvi @@ -391,10 +391,6 @@ \unexpanded\def\setupfield {\doquintupleempty\scrn_field_setup_field} \unexpanded\def\setupfields{\doquadrupleempty\scrn_field_setup_fields} -% \presetlocalframed[\??wl] -% \presetlocalframed[\??wc] -% \presetlocalframed[\??wt] - \setupfieldcontentframed [\c!align=\v!flushleft, \c!strut=\v!no, @@ -645,6 +641,8 @@ \installcommandhandler \??wh {tooltip} \??wh +\installinheritedframed {tooltip} \??oi + \setuptooltip [\c!location=\v!right, \c!frame=\v!off, @@ -652,8 +650,6 @@ \c!background=\v!color, \c!backgroundcolor=gray] -\presetlocalframed[\namedtooltiphash\empty] - \appendtoks \setuevalue\currenttooltip{\scrn_tooltip_direct{\currenttooltip}}% \to \everydefinetooltip @@ -675,10 +671,11 @@ \setbox\scrn_tooltip_box_anchor\hbox {\strut#anchortext}% \doifassignmentelse{#settings} - {\setuptooltip[\currenttooltip][#settings]}% - {\setuptooltip[\currenttooltip][\c!location=#settings]}% + {\setupcurrenttooltip[#settings]}% + {\setupcurrenttooltip[\c!location=#settings]}% \setbox\scrn_tooltip_box_text\hbox - {\localframed[\currenttooltiphash][\c!location=]{#tiptext}}% + {\lettooltipparameter\c!location\empty + \inheritedtooltipframed{#tiptext}}% \definesymbol [\currenttooltipname:txt] [\copy\scrn_tooltip_box_text]% @@ -908,7 +905,7 @@ \let\startpsh\scrn_menu_psh_start \let\stoppsh \relax \let\psh \scrn_menu_psh_direct -\everysetmenucommands +\to \everysetmenucommands %D Another goodie: (unchecked in \MKIV) @@ -944,6 +941,20 @@ \unexpanded\def\rollbutton {\dodoubleempty\scrn_rollbutton} +\def\scrn_rollbutton_symbol_m + {\scrn_rollbutton_symbol_indeed + \getinteractionmenuparameter + \inheritedinteractionmenuframed + \setinteractionmenuparameter + \dosetinteractionmenuattributes} + +\def\scrn_rollbutton_symbol_b + {\scrn_rollbutton_symbol_indeed + \getbuttonparameter + \inheritedbuttonframed + \setbuttonparameter + \dosetbuttonattributes} + \def\scrn_rollbutton[#tag][#settings]#text[#reference]% {\dontleavehmode \bgroup @@ -951,21 +962,24 @@ \doglobal\advance\scrn_rollbutton_n_symbol \iffirstargument \ifsecondargument - \getparameters[\??am#tag][#settings]% - \def\scrn_rollbutton_symbol{\scrn_rollbutton_symbol_indeed{\??am#tag}{#text}}% + \edef\currentinteractionmenu{#tag}% + \setupcurrentinteractionmenu[#settings]% + \let\scrn_rollbutton_symbol\scrn_rollbutton_symbol_m \else \doifassignmentelse{#tag} - {\getparameters[\??bt][#tag]% - \def\scrn_rollbutton_symbol{\scrn_rollbutton_symbol_indeed{\??bt}{#text}}} - {\def\scrn_rollbutton_symbol{\scrn_rollbutton_symbol_indeed{\??am#tag}{#text}}}% + {\let\currentbutton\empty + \setupcurrentbutton[#tag]% + \let\scrn_rollbutton_symbol\scrn_rollbutton_symbol_b}% + {\edef\currentinteractionmenu{#tag}% + \let\scrn_rollbutton_symbol\scrn_rollbutton_symbol_m}% \fi \else - \def\scrn_rollbutton_symbol{\set_location_box_indeed_indeed{\??bt}{#text}}% + \let\scrn_rollbutton_symbol\scrn_rollbutton_symbol_b \fi % todo: share symbols, tricky since different dimensions - \definesymbol[rollsymbol:\number\scrn_rollbutton_n_symbol:n][\scrn_rollbutton_symbol{n}]% - \definesymbol[rollsymbol:\number\scrn_rollbutton_n_symbol:r][\scrn_rollbutton_symbol{r}]% - \definesymbol[rollsymbol:\number\scrn_rollbutton_n_symbol:d][\scrn_rollbutton_symbol{d}]% + \definesymbol[rollsymbol:\number\scrn_rollbutton_n_symbol:n][\scrn_rollbutton_symbol{n}{#text}]% + \definesymbol[rollsymbol:\number\scrn_rollbutton_n_symbol:r][\scrn_rollbutton_symbol{r}{#text}]% + \definesymbol[rollsymbol:\number\scrn_rollbutton_n_symbol:d][\scrn_rollbutton_symbol{d}{#text}]% \setupfield [rollbutton] [\c!frame=\v!off, @@ -979,12 +993,14 @@ \fitfield[rollbutton:\number\scrn_rollbutton_n_button]% \egroup} -\unexpanded\def\scrn_rollbutton_symbol_indeed#namespace#text#what% +\unexpanded\def\scrn_rollbutton_symbol_indeed#getparameter#inheritedframed#setparameter#dosetattributes#what#text% {\definecolor[rollover][rollover:#what]% - \doifelse{#what}{n}{\doifelsevalue{#namespace\c!alternative}\v!hidden\phantom\hbox}\hbox - {\localframed[#namespace] - [\c!framecolor=rollover,\c!backgroundcolor=rollover,\c!color=rollover]% - {\dolocationattributes{#namespace}\c!style\c!color{#text}}}}% + \doifelse{#what}{n}% ? + {\doifelse{#getparameter\c!alternative}\v!hidden\phantom\hbox}\hbox + {#setparameter\c!framecolor {rollover}% + #setparameter\c!backgroundcolor{rollover}% + #setparameter\c!color {rollover}% + #inheritedframed{#dosetattributes\c!style\c!color{#text}}}} %D We plug into the menu system diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 02c9c5bc9..fbd70c042 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex b24a70205..b3b0b2935 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf 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 diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 432a83a8d..c170403ef 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 08/20/11 01:39:23 +-- merge date : 08/21/11 16:42:58 do -- begin closure to overcome local limits and interference |
