From 854439d8d634733a79f5880a71b00c8c24c2ecc5 Mon Sep 17 00:00:00 2001 From: Marius Date: Mon, 20 Jan 2014 15:00:20 +0200 Subject: beta 2014.01.20 13:45 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4088 -> 4085 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/pack-rul.mkiv | 25 ++++++++++++++++++--- tex/context/base/publ-ini.mkiv | 20 ++++++++++++----- tex/context/base/status-files.pdf | Bin 24772 -> 24757 bytes tex/context/base/status-lua.pdf | Bin 229139 -> 229264 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 8 files changed, 39 insertions(+), 12 deletions(-) diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 886556d81..d96e455f1 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{2014.01.20 11:31} +\newcontextversion{2014.01.20 13:45} %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 fd721fd46..e05a5c5c3 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 0787ae987..a9b995838 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2014.01.20 11:31} +\edef\contextversion{2014.01.20 13:45} \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 377d39499..8fcf8f548 100644 --- a/tex/context/base/pack-rul.mkiv +++ b/tex/context/base/pack-rul.mkiv @@ -2564,10 +2564,25 @@ \inheritedframedtextframed\bgroup \let\\=\endgraf \framedtextparameter\c!inner % oud spul - \doif{\framedtextparameter\c!depthcorrection}\v!on\pack_framed_text_start_depth_correction + \edef\p_framed_text_depthcorrection{\framedtextparameter\c!depthcorrection}% + \ifx\p_framed_text_depthcorrection\v!on + \pack_framed_text_start_depth_correction + \else + \bgroup + \fi +\vskip-\strutdp % brrr why is this needed ... needs to be sorted out, see testcase 1 \doinhibitblank \setupindenting[\framedtextparameter\c!indenting]% - \useframedtextstyleandcolor\c!style\c!color} + \useframedtextstyleandcolor\c!style\c!color + \ignorespaces} + +% testcase 1: +% +% \showstruts +% \startframedtext[align={normal,tolerant},offset=0pt] \input tufte \stopframedtext +% \startframedtext[align={normal,tolerant},offset=0pt,depthcorrection=off] \input tufte \stopframedtext +% \startframedtext[align={normal,tolerant},offset=0pt,depthcorrection=off] \inframed{x} \stopframedtext +% \framed[align={normal,tolerant},offset=0pt]{\input tufte } %D The \type {none} option is handy for nested usage, as in the presentation %D styles, where we don't want interference. @@ -2577,7 +2592,11 @@ \unexpanded\def\pack_framed_text_stop % no \baselinecorrection, see faq docs {\endgraf \removelastskip - \doif{\framedtextparameter\c!depthcorrection}\v!on\pack_framed_text_stop_depth_correction + \ifx\p_framed_text_depthcorrection\v!on + \pack_framed_text_stop_depth_correction + \else + \egroup + \fi \stopboxedcontent \ifconditional\c_framed_text_location_none \egroup diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv index 3de7c5033..12e68ecf0 100644 --- a/tex/context/base/publ-ini.mkiv +++ b/tex/context/base/publ-ini.mkiv @@ -329,7 +329,7 @@ \edef\p_width{\btxrenderingparameter\c!width}% \ifx\p_width\v!auto \scratchcounter\btxcounter - \setbox\scratchbox\vbox{\ctxcommand{btxfetchlistentries("\currentbtxdataset")}}% + \setbox\scratchbox\vbox{\settrialtypesetting\ctxcommand{btxfetchlistentries("\currentbtxdataset")}}% \d_publ_number_width\wd\scratchbox \global\btxcounter\scratchcounter \else @@ -393,16 +393,24 @@ \unexpanded\def\publ_check_list_entry {\global\advance\btxcounter\plusone % todo, switch to font - \hbox{\btx_reference_inject}% + \hbox{\btx_reference_checked}% \par} \unexpanded\def\btx_reference_inject % we can use a faster \reference {\btxlistnumberbox\bgroup -% \btxlistvariantparameter\c!left -% {\tttf d>\currentbtxdataset:\currentbtxblock:\currentbtxtag}% - \ctxcommand{btxdestination("\currentbtxdataset","\currentbtxblock","\currentbtxtag","\number\btxcounter")}% + % \btxlistvariantparameter\c!left + \iftrialtypesetting\else + \ctxcommand{btxdestination("\currentbtxdataset","\currentbtxblock","\currentbtxtag","\number\btxcounter")}% + \fi + \btx_reference_inject_indeed + % \btxlistvariantparameter\c!right + \egroup} + +\unexpanded\def\btx_reference_checked + {\btxlistnumberbox\bgroup + % \btxlistvariantparameter\c!left \btx_reference_inject_indeed -% \btxlistvariantparameter\c!right + % \btxlistvariantparameter\c!right \egroup} \setuvalue{\??btxnumbering\v!short }{\btxlistvariant{short}} % these will be setups diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index a749e563f..f8a282660 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 de9ed3c93..003c5becd 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 d5b21a678..82c549ad2 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 : 01/20/14 11:31:50 +-- merge date : 01/20/14 13:45:11 do -- begin closure to overcome local limits and interference -- cgit v1.2.3