summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-09-20 19:25:00 +0200
committerHans Hagen <pragma@wxs.nl>2013-09-20 19:25:00 +0200
commita9777f06d45c449536da4ad1580444427de66e69 (patch)
treeb6ce9d5aca48c7e5ae9f536200b06af6f3e0d0bf /tex
parent8170fd30fcc1cd5610870af8e18fed35a64c5a39 (diff)
downloadcontext-a9777f06d45c449536da4ad1580444427de66e69.tar.gz
beta 2013.09.20 19:25
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4103 -> 4113 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/core-uti.lua2
-rw-r--r--tex/context/base/status-files.pdfbin24743 -> 24741 bytes
-rw-r--r--tex/context/base/status-lua.log2
-rw-r--r--tex/context/base/strc-itm.mkvi3
-rw-r--r--tex/context/base/strc-num.lua6
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
9 files changed, 10 insertions, 9 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 61ac09253..5abe7235b 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.09.20 14:01}
+\newcontextversion{2013.09.20 19:25}
%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 b0cb5c512..3df1382a4 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 e7f118fdc..829a4fb18 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.09.20 14:01}
+\edef\contextversion{2013.09.20 19:25}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/core-uti.lua b/tex/context/base/core-uti.lua
index b1e9061b3..a11fba309 100644
--- a/tex/context/base/core-uti.lua
+++ b/tex/context/base/core-uti.lua
@@ -141,7 +141,7 @@ local jobpacker = packers.new(packlist,job.packversion) -- jump number when chan
job.pack = true
-- job.pack = false
-directives.register("job.pack",function(v) pack = v end)
+directives.register("job.pack",function(v) job.pack = v end)
local _save_, _load_, _others_ = { }, { }, { } -- registers timing
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index cd0124e77..8433d8fe2 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.log b/tex/context/base/status-lua.log
index ea0c241c1..0980247f4 100644
--- a/tex/context/base/status-lua.log
+++ b/tex/context/base/status-lua.log
@@ -1,6 +1,6 @@
(cont-yes.mkiv
-ConTeXt ver: 2013.09.20 14:01 MKIV beta fmt: 2013.9.20 int: english/english
+ConTeXt ver: 2013.09.20 19:25 MKIV beta fmt: 2013.9.20 int: english/english
system > 'cont-new.mkiv' loaded
(cont-new.mkiv)
diff --git a/tex/context/base/strc-itm.mkvi b/tex/context/base/strc-itm.mkvi
index b4b19eb2d..8259fa38d 100644
--- a/tex/context/base/strc-itm.mkvi
+++ b/tex/context/base/strc-itm.mkvi
@@ -1204,7 +1204,8 @@
\def\strc_itemgroups_handle_lapped_item_positive
{\llap
- {\hbox to \d_strc_itemgroups_list_width
+ {\dontcomplain
+ \hbox to \d_strc_itemgroups_list_width
{\ifconditional\c_strc_itemgroups_sub
\llap{+\enspace}%
\fi
diff --git a/tex/context/base/strc-num.lua b/tex/context/base/strc-num.lua
index 866dc146c..67e9b1734 100644
--- a/tex/context/base/strc-num.lua
+++ b/tex/context/base/strc-num.lua
@@ -147,9 +147,9 @@ local function dummyconstructor(t,name,i)
end
setmetatableindex(constructor,function(t,k)
- if trace_counters then
- report_counters("unknown constructor %a",k)
- end
+ -- if trace_counters then
+ -- report_counters("unknown constructor %a",k)
+ -- end
return dummyconstructor
end)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 13a42a24f..1b3b5b968 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 : 09/20/13 14:01:24
+-- merge date : 09/20/13 19:25:59
do -- begin closure to overcome local limits and interference