From af60db62dbf468522f21a4ad4461f1a505d8161c Mon Sep 17 00:00:00 2001
From: Marius <mariausol@gmail.com>
Date: Wed, 15 May 2013 11:40:28 +0300
Subject: beta 2013.05.15 09:58
---
tex/context/base/cont-new.mkiv | 2 +-
tex/context/base/context-version.pdf | Bin 4135 -> 4135 bytes
tex/context/base/context.mkiv | 2 +-
tex/context/base/pack-rul.mkiv | 39 ++++++++++++++++-----
tex/context/base/status-files.pdf | Bin 24691 -> 24695 bytes
tex/context/base/status-lua.pdf | Bin 211603 -> 211639 bytes
tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +-
7 files changed, 34 insertions(+), 11 deletions(-)
(limited to 'tex')
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 00f23e8da..2fd5325d7 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.05.14 23:14}
+\newcontextversion{2013.05.15 09:58}
%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 81f3a9c99..e80a39ade 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 19bc5653d..8e8304ef3 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.05.14 23:14}
+\edef\contextversion{2013.05.15 09:58}
\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 7b040a400..f2b332b14 100644
--- a/tex/context/base/pack-rul.mkiv
+++ b/tex/context/base/pack-rul.mkiv
@@ -567,7 +567,7 @@
{\anch_mark_region_box\b_framed_normal}
\def\pack_framed_add_background
- {\setbox\b_framed_normal\hbox % was vbox
+ {\setbox\b_framed_normal\hbox % was vbox % see also *1*
{%\pack_framed_forgetall % can be relaxed
\boxmaxdepth\maxdimen
\framedbackgroundoffset\d_framed_backgroundoffset
@@ -1510,20 +1510,43 @@
% \framed[width=2cm,align=middle,location=middle] {location\\equals\\middle}
% B}
-\installframedlocator \v!hanging % best with strut=no
+% \installframedlocator \v!hanging % best with strut=no
+% {}
+% {\dp\b_framed_normal\ht\b_framed_normal
+% \ht\b_framed_normal\zeropoint}
+%
+% \installframedlocator \v!depth
+% {}
+% {\ht\b_framed_normal\dimexpr\ht\b_framed_normal-\strutdp\relax
+% \dp\b_framed_normal\strutdp
+% \box\b_framed_normal}
+%
+% \installframedlocator \v!height
+% {}
+% {\dp\b_framed_normal\dimexpr\ht\b_framed_normal-\strutht\relax
+% \ht\b_framed_normal\strutht
+% \box\b_framed_normal}
+
+\installframedlocator \v!hanging % best with strut=no *1* / see mail to list by SB
{}
- {\dp\b_framed_normal\ht\b_framed_normal
- \ht\b_framed_normal\zeropoint}
+ {\scratchdimen\ht\b_framed_normal
+ \setbox\b_framed_normal\hbox{\lower\scratchdimen\box\b_framed_normal}%
+ \dp\b_framed_normal\scratchdimen
+ \ht\b_framed_normal\zeropoint
+ \box\b_framed_normal}
-\installframedlocator \v!depth
+\installframedlocator \v!depth % *1*
{}
- {\ht\b_framed_normal\dimexpr\ht\b_framed_normal-\strutdp\relax
+ {\setbox\b_framed_normal\hbox{\lower\strutdp\box\b_framed_normal}%
+ \ht\b_framed_normal\dimexpr\ht\b_framed_normal-\strutdp\relax
\dp\b_framed_normal\strutdp
\box\b_framed_normal}
-\installframedlocator \v!height
+\installframedlocator \v!height % *1*
{}
- {\dp\b_framed_normal\dimexpr\ht\b_framed_normal-\strutht\relax
+ {\scratchdimen\dimexpr \ht\b_framed_normal - \strutht \relax
+ \setbox\b_framed_normal\hbox{\lower\scratchdimen\box\b_framed_normal}%
+ \dp\b_framed_normal\dimexpr\ht\b_framed_normal-\strutht\relax
\ht\b_framed_normal\strutht
\box\b_framed_normal}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 1a1a0ba90..b8adb2829 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 4d3b9e771..af5f201ca 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 14667bd89..37775d1f5 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 : 05/14/13 23:14:52
+-- merge date : 05/15/13 09:58:43
do -- begin closure to overcome local limits and interference
--
cgit v1.2.3