summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4348 -> 4344 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/spac-ver.lua13
-rw-r--r--tex/context/base/status-files.pdfbin24845 -> 24848 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin248316 -> 248319 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
7 files changed, 13 insertions, 6 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index bbbc8309d..e59aca503 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.06.22 15:51}
+\newcontextversion{2014.06.22 16:29}
%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 c26943bd0..448932606 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 cacb5fc44..172479e77 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.06.22 15:51}
+\edef\contextversion{2014.06.22 16:29}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/spac-ver.lua b/tex/context/base/spac-ver.lua
index cfcee0122..51d8f674e 100644
--- a/tex/context/base/spac-ver.lua
+++ b/tex/context/base/spac-ver.lua
@@ -888,7 +888,7 @@ local properties = nodes.properties.data
specialmethods[1] = function(pagehead,pagetail,start,penalty)
--
- if penalty < special_penalty_min or penalty > special_penalty_max then
+ if not pagehead or penalty < special_penalty_min or penalty > special_penalty_max then
return
end
local current = pagetail
@@ -1074,8 +1074,15 @@ local function collapser(head,where,what,trace,snap,a_snapmethod) -- maybe also
--
local function getpagelist()
if not pagehead then
- pagehead = tonut(texlists.page_head)
- pagetail = find_node_tail(pagehead) -- no texlists.page_tail yet-- no texlists.page_tail yet
+ pagehead = texlists.page_head
+ if pagehead then
+ pagehead = tonut(texlists.page_head)
+ pagetail = find_node_tail(pagehead) -- no texlists.page_tail yet-- no texlists.page_tail yet
+ else
+ pagetail = nil
+ end
+ else
+ pagetail = nil
end
return pagehead, pagetail
end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index bd8b18846..0ecd99ad8 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 3ea22494d..972214aef 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 7839b1e7d..a53a8c15b 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 : 06/22/14 15:51:56
+-- merge date : 06/22/14 16:29:33
do -- begin closure to overcome local limits and interference