summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2013-10-14 01:20:14 +0300
committerMarius <mariausol@gmail.com>2013-10-14 01:20:14 +0300
commit8adfb82865390989ea7a92db77996b6c3c8212b3 (patch)
treeee87cf283933925fd53534d70dfe5265eafb42a0
parent0b81609fcce66141ded2226dd30a4d6e0569960e (diff)
downloadcontext-8adfb82865390989ea7a92db77996b6c3c8212b3.tar.gz
beta 2013.10.13 23:58
-rw-r--r--tex/context/base/back-exp.mkiv2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4114 -> 4115 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/pack-com.mkiv4
-rw-r--r--tex/context/base/status-files.pdfbin24511 -> 24517 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin224784 -> 224877 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
8 files changed, 6 insertions, 6 deletions
diff --git a/tex/context/base/back-exp.mkiv b/tex/context/base/back-exp.mkiv
index 9e65633d4..c7696d383 100644
--- a/tex/context/base/back-exp.mkiv
+++ b/tex/context/base/back-exp.mkiv
@@ -81,7 +81,7 @@
\to \everyenableelements
\appendtoks % frozen and assumed global per highlight class
- \unexpanded\def\dotaghighlight{\taggedctxcommand{settaghighlight("\currenthighlight","\highlightparameter\c!style",\number\attribute\colorattribute)}}%
+ \unexpanded\def\dotaghighlight{\taggedctxcommand{settaghighlight("\currenthighlight",\!!bs\highlightparameter\c!style\!!es,\number\attribute\colorattribute)}}%
\to \everyenableelements
\appendtoks % we can have differently scaled images
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 5a0616fcf..87d9d256d 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.10.13 23:38}
+\newcontextversion{2013.10.13 23: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 66c5f0491..1221a3d27 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.mkiv b/tex/context/base/context.mkiv
index 5205f78b8..631ca3797 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.10.13 23:38}
+\edef\contextversion{2013.10.13 23:58}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/pack-com.mkiv b/tex/context/base/pack-com.mkiv
index bb6e268bc..2c28d6b20 100644
--- a/tex/context/base/pack-com.mkiv
+++ b/tex/context/base/pack-com.mkiv
@@ -653,7 +653,7 @@
%
\global\setsystemmode{pairedbox}%
\pack_pairedboxes_before
- \dogotopar\pack_pairedboxes_first_pickup}
+ \assumelongusagecs\pack_pairedboxes_first_pickup}
\def\pack_pairedboxes_first_pickup
{\dowithnextboxcs\pack_pairedboxes_first\hbox
@@ -662,7 +662,7 @@
\def\pack_pairedboxes_first
{\pack_pairedboxes_between
- \dogotopar\pack_pairedboxes_second_pickup}
+ \assumelongusagecs\pack_pairedboxes_second_pickup}
\def\pack_pairedboxes_second_pickup
{\dowithnextboxcs\pack_pairedboxes_second\vbox
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index d4d4959b2..deeebb46f 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 7fcd0f4f0..4aac19a9a 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 5106d0769..b875f40c9 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 : 10/13/13 23:38:42
+-- merge date : 10/13/13 23:58:40
do -- begin closure to overcome local limits and interference