From 21021e09bf1d0883c92fcf688c8ed037d92128fe Mon Sep 17 00:00:00 2001 From: Marius Date: Wed, 5 Jun 2013 01:00:21 +0300 Subject: beta 2013.06.04 23:52 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4126 -> 4125 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/pack-rul.mkiv | 29 ++++++++++----- tex/context/base/page-mix.mkiv | 39 ++++++++++++++++++--- tex/context/base/status-files.pdf | Bin 24657 -> 24683 bytes tex/context/base/status-lua.pdf | Bin 212101 -> 212035 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 8 files changed, 57 insertions(+), 17 deletions(-) diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 07722a1be..3d46180c1 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{2013.06.04 21:26} +\newcontextversion{2013.06.04 23:52} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 3a764f786..2a86c5b8c 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 3f1d04775..8a4d44cde 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2013.06.04 21:26} +\edef\contextversion{2013.06.04 23:52} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/pack-rul.mkiv b/tex/context/base/pack-rul.mkiv index f2b332b14..e7db332b4 100644 --- a/tex/context/base/pack-rul.mkiv +++ b/tex/context/base/pack-rul.mkiv @@ -100,11 +100,11 @@ \expandafter\noexpand\csname do#1rootparameter\endcsname \expandafter\noexpand\csname setupcurrent#1\endcsname \expandafter\noexpand\csname inherited#1framed\endcsname - \noexpand\??framed}} % if needed we can have a variant + \expandafter\noexpand\csname inherited#1framedbox\endcsname}} % new \unexpanded\def\doinstallinheritedframed#1#2#3#4#5#6#7#8#9% {\def#5##1##2{\ifx##1\relax#6{##2}\else#4{##1}{##2}\fi}% - \def#6##1{\ifcsname#9:##1\endcsname#9:##1\else\s!empty\fi}% root + \def#6##1{\ifcsname\??framed:##1\endcsname\??framed:##1\else\s!empty\fi}% root \unexpanded\def#8% {\bgroup \bgroup @@ -113,7 +113,15 @@ \let\framedparameter #2% \let\framedparameterhash#3% \let\setupcurrentframed #7% - \pack_framed_process_indeed}} + \pack_framed_process_indeed}% + \unexpanded\def#9% + {\bgroup + \inframedtrue + \let\currentframed #1% + \let\framedparameter #2% + \let\framedparameterhash#3% + \let\setupcurrentframed #7% + \pack_framed_process_box_indeed}} \unexpanded\def\installframedcommandhandler#1#2#3% {\installcommandhandler{#1}{#2}{#3}% @@ -880,11 +888,8 @@ %D The next macro uses a box and takes its natural width and height so these %D can better be correct. -\unexpanded\def\localbackgroundframed#1#2#3% namespace component box - {\bgroup - \edef\currentframed{#1}% - \pack_framed_initialize - \setbox\b_framed_normal\box#3% +\unexpanded\def\pack_framed_process_box_indeed#1#2% component box (assumes parameters set and grouped usage) + {\setbox\b_framed_normal\box#2% could actually be \let\b_framed_normal#2 \edef\p_framed_region{\framedparameter\c!region}% \ifx\p_framed_region\v!yes % maybe later named \pack_framed_add_region @@ -907,12 +912,18 @@ \else \p_framed_backgroundoffset \fi - \edef\p_framed_component{#2}% + \edef\p_framed_component{#1}% \pack_framed_add_background \fi \box\b_framed_normal \egroup} +\unexpanded\def\localbackgroundframed#1% namespace component box + {\bgroup + \edef\currentframed{#1}% + \pack_framed_initialize + \pack_framed_process_box_indeed} % group ends here + \let\postprocessframebox\relax %D A nice example by Aditya: diff --git a/tex/context/base/page-mix.mkiv b/tex/context/base/page-mix.mkiv index abdcced1f..2328b8678 100644 --- a/tex/context/base/page-mix.mkiv +++ b/tex/context/base/page-mix.mkiv @@ -28,6 +28,7 @@ % top and bottom inserts % wide floats % move floats +% offsets (inner ones, so we change the hsize ... needed with backgrounds % luatex buglet: % @@ -55,7 +56,11 @@ \setupmixedcolumns [\c!distance=1.5\bodyfontsize, \c!n=\plustwo, + %\c!align=, % inherit + %\c!before=, + %\c!after=, %\c!rule=\v!none, + %\c!setups=, \c!frame=\v!off, \c!strut=\v!no, \c!offset=\v!overlay, @@ -478,7 +483,9 @@ % \page_mix_command_set_vsize \page_mix_command_set_hsize - \fi} + \fi + \usealignparameter\mixedcolumnsparameter + \usesetupsparameter\mixedcolumnsparameter} \setvalue{\??mixedcolumnsstop\s!otr}% {\par @@ -517,6 +524,28 @@ }}% \deadcycles\zerocount} +% \unexpanded\def\page_mix_routine_package +% {\ctxcommand{mixfinalize()}% +% \setbox\b_page_mix_collected\vbox \bgroup +% \ifvoid\b_page_mix_preceding \else +% \box\b_page_mix_preceding +% \global\d_page_mix_preceding_height\zeropoint +% \nointerlineskip +% \fi +% \hskip\d_page_mix_leftskip +% \page_mix_hbox to \d_page_mix_max_width \bgroup +% \letmixedcolumnsparameter\c!strut \v!no +% \letmixedcolumnsparameter\c!align \empty % probably not needed as we could use a simple variant +% \letmixedcolumnsparameter\c!setups\empty +% \dorecurse\c_page_mix_n_of_columns {% +% \inheritedmixedcolumnsframed{\page_mix_command_package_column}% +% \ifnum\recurselevel<\c_page_mix_n_of_columns +% \page_mix_command_inject_separator +% \fi +% }% +% \egroup +% \egroup} + \unexpanded\def\page_mix_routine_package {\ctxcommand{mixfinalize()}% \setbox\b_page_mix_collected\vbox \bgroup @@ -527,10 +556,10 @@ \fi \hskip\d_page_mix_leftskip \page_mix_hbox to \d_page_mix_max_width \bgroup - \letmixedcolumnsparameter\c!strut\v!no - % maybe use \c_page_mix_used_of_columns - \dorecurse\c_page_mix_n_of_columns {% - \inheritedmixedcolumnsframed{\page_mix_command_package_column}% + \dorecurse\c_page_mix_n_of_columns{% + \setbox\scratchbox\page_mix_command_package_column % needs packaging anyway + \inheritedmixedcolumnsframedbox\currentmixedcolumns\scratchbox + % \inheritedmixedcolumnsframed{\page_mix_command_package_column}% needs reset of strut, align, setups etc \ifnum\recurselevel<\c_page_mix_n_of_columns \page_mix_command_inject_separator \fi diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 7d9361d3e..ccecc78e4 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index b1227609f..c1acf2982 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 0c51568e0..53228d116 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 : 06/04/13 21:26:55 +-- merge date : 06/04/13 23:52:52 do -- begin closure to overcome local limits and interference -- cgit v1.2.3