summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4093 -> 4091 bytes
-rw-r--r--tex/context/base/context-version.pngbin106254 -> 106626 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/pack-rul.mkiv31
-rw-r--r--tex/context/base/status-files.pdfbin23890 -> 23888 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin162211 -> 162210 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
10 files changed, 22 insertions, 19 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 52fb50c69..64e8683b9 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.21 17:39}
+\newcontextversion{2011.08.21 18: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 d426ed4e0..d18ac6e38 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.21 17:39}
+\newcontextversion{2011.08.21 18: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
index 2150cb835..c04f17305 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index d8f365f7d..ce32261f6 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 61426070f..bac2a1d6b 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.21 17:39}
+\edef\contextversion{2011.08.21 18:42}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index fa40575fb..7db364025 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.21 17:39}
+\edef\contextversion{2011.08.21 18:42}
%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 00d8854f9..70d450c2e 100644
--- a/tex/context/base/pack-rul.mkiv
+++ b/tex/context/base/pack-rul.mkiv
@@ -2701,9 +2701,9 @@
\installcommandhandler \??kd {framedtext} \??kd
-\let\setupframedtexts\setupframedtext
+\installinheritedframed {framedtext}
-\presetlocalframed[\??kd]
+\let\setupframedtexts\setupframedtext
\setupframedtext
[\c!width=0.75\hsize,
@@ -2782,8 +2782,8 @@
% \insidefloattrue % ? better
\normalexpanded{\noexpand\switchtobodyfont[\framedtextparameter\c!bodyfont]}%
\startcolor[\framedtextparameter\c!color]%
- \localframed[\currentframedtexthash][\c!strut=\v!no]% todo: use delayedstrut
- \bgroup
+ \letframedtextparameter\c!strut\v!no
+ \inheritedframedtextframed\bgroup
\let\\=\endgraf
\framedtextparameter\c!inner % oud spul
\doif{\framedtextparameter\c!depthcorrection}\v!on\doftstartdepthcorrection
@@ -2890,15 +2890,18 @@
\def\dodoframedtext[#1]% beware!
{\normalexpanded{\noexpand\switchtobodyfont[\framedtextparameter\c!bodyfont]}%
- \localframed[\currentframedtexthash][\c!strut=\v!no,#1]%
+ \letframedtextparameter\c!strut\v!no
+ \iffirstargument
+ \setupcurrentframedtext[#1]%
+ \fi
+ \inheritedframedtextframed\bgroup
+ \blank[\v!disable]%
+ \let\\=\endgraf
+ \framedtextparameter\c!inner
+ \dosetframedtextattributes\c!style\c!color
\bgroup
- \blank[\v!disable]%
- \let\\=\endgraf
- \framedtextparameter\c!inner
- \dosetframedtextattributes\c!style\c!color
- \bgroup
- \aftergroup\docloseframedtext
- \let\next=}
+ \aftergroup\docloseframedtext
+ \let\next=}
\def\docloseframedtext
{\removelastskip
@@ -3276,8 +3279,6 @@
%D
%D \showsetup{setupbackground}
-\presetlocalframed[\??ag]
-
\def\dosetupbackground[#1]%
{\getparameters[\??ag][#1]%
\doifelse\@@agstate\v!start
@@ -3324,6 +3325,8 @@
%D lineheight. I'll probably forget to apply this trick
%D elsewhere.
+\presetlocalframed[\??ag]
+
\def\dostopbackground % improved version (i hope)
{\endgraf
\removelastskip
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 80ac0ab4b..2c6e9e21a 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index e35528060..a425dcf9c 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 48444f25b..4b34ca571 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/21/11 17:39:11
+-- merge date : 08/21/11 18:42:00
do -- begin closure to overcome local limits and interference