From d8ce86dda9acef1bc636ad145aaaa2ae13b0f08a Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Tue, 12 Jan 2016 23:15:08 +0100 Subject: 2016-01-12 22:44:00 --- tex/context/base/context-version.pdf | Bin 4165 -> 4166 bytes tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/pack-rul.mkiv | 61 ++++++++++++++------- tex/context/base/mkiv/status-files.pdf | Bin 8943 -> 8943 bytes tex/context/base/mkiv/status-lua.pdf | Bin 258683 -> 258685 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 7 files changed, 44 insertions(+), 23 deletions(-) (limited to 'tex') diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 12fec2656..725401c5a 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/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 7c8effba7..37cf7f8e6 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2016.01.12 16:24} +\newcontextversion{2016.01.12 22:41} %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index f4ab0ffe2..85629ab15 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2016.01.12 16:24} +\edef\contextversion{2016.01.12 22:41} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/pack-rul.mkiv b/tex/context/base/mkiv/pack-rul.mkiv index 4484d7587..9737fb288 100644 --- a/tex/context/base/mkiv/pack-rul.mkiv +++ b/tex/context/base/mkiv/pack-rul.mkiv @@ -507,19 +507,19 @@ %D \macros %D {overlayfakebox} -% \unexpanded\def\overlayfakebox -% {\hpack -% {\setbox\scratchbox\emptyhbox -% \wd\scratchbox\d_overlay_width -% \ht\scratchbox\d_overlay_height -% \box\scratchbox}} - \unexpanded\def\overlayfakebox - {\hpack % redundant but needs testing - {\novrule - \s!width \d_overlay_width - \s!height\d_overlay_height - \s!depth \zeropoint}} + {\hpack + {\setbox\scratchbox\emptyhbox + \wd\scratchbox\d_overlay_width + \ht\scratchbox\d_overlay_height + \box\scratchbox}} + +% \unexpanded\def\overlayfakebox +% {\hpack % redundant but needs testing +% {\novrule +% \s!width \d_overlay_width +% \s!height\d_overlay_height +% \s!depth \zeropoint}} %D For testing we provide: @@ -698,19 +698,16 @@ \box\b_framed_extra}} \def\pack_framed_stroked_box_normal - {%\setbox\scratchbox\emptyhbox - %\wd\scratchbox\d_framed_target_wd - %\ht\scratchbox\d_framed_target_ht - %\dp\scratchbox\d_framed_target_dp + {\setbox\scratchbox\emptyhbox + \wd\scratchbox\d_framed_target_wd + \ht\scratchbox\d_framed_target_ht + \dp\scratchbox\d_framed_target_dp \setbox\scratchbox\vpack \bgroup \csname \??framedtop\p_framed_frame\framedparameter\c!topframe \endcsname \nointerlineskip % new (needed for fences) \hbox \bgroup \csname \??framedleft\p_framed_frame\framedparameter\c!leftframe \endcsname - \novrule - \s!width \d_framed_target_wd - \s!height\d_framed_target_ht - \s!depth \d_framed_target_dp + \box\scratchbox \csname \??framedright\p_framed_frame\framedparameter\c!rightframe \endcsname \egroup \nointerlineskip % new (needed for fences) @@ -721,6 +718,30 @@ \dp\scratchbox\d_framed_target_dp \box\scratchbox} +% \def\pack_framed_stroked_box_normal +% {%\setbox\scratchbox\emptyhbox +% %\wd\scratchbox\d_framed_target_wd +% %\ht\scratchbox\d_framed_target_ht +% %\dp\scratchbox\d_framed_target_dp +% \setbox\scratchbox\vpack \bgroup +% \csname \??framedtop\p_framed_frame\framedparameter\c!topframe \endcsname +% \nointerlineskip % new (needed for fences) +% \hbox \bgroup +% \csname \??framedleft\p_framed_frame\framedparameter\c!leftframe \endcsname +% \novrule +% \s!width \d_framed_target_wd +% \s!height\d_framed_target_ht +% \s!depth \d_framed_target_dp +% \csname \??framedright\p_framed_frame\framedparameter\c!rightframe \endcsname +% \egroup +% \nointerlineskip % new (needed for fences) +% \csname \??framedbottom\p_framed_frame\framedparameter\c!bottomframe\endcsname +% \egroup +% \wd\scratchbox\d_framed_target_wd +% \ht\scratchbox\d_framed_target_ht +% \dp\scratchbox\d_framed_target_dp +% \box\scratchbox} + \def\pack_framed_t_rule{\hrule\s!height\d_framed_linewidth\kern-\d_framed_linewidth} \def\pack_framed_b_rule{\kern-\d_framed_linewidth\hrule\s!height\d_framed_linewidth} \def\pack_framed_r_rule{\kern-\d_framed_linewidth\vrule\s!width\d_framed_linewidth} diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index a2a1ad229..8601106d9 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index 879e20632..ab004eed3 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/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 a978f455d..9f7707504 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 01/12/16 16:24:09 +-- merge date : 01/12/16 22:41:48 do -- begin closure to overcome local limits and interference -- cgit v1.2.3