summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2014-01-02 21:20:26 +0200
committerMarius <mariausol@gmail.com>2014-01-02 21:20:26 +0200
commit5a15bfc6c723873dc0ad2bb0fdaa9b252f030339 (patch)
tree7576871dba6d77eed66a0a84bf87e31b663d8ff7 /tex
parente8a06e89017f7bd9907c73ae7a656d3a725fd064 (diff)
downloadcontext-5a15bfc6c723873dc0ad2bb0fdaa9b252f030339.tar.gz
stable 2014.01.02 20:05
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4096 -> 4113 bytes
-rw-r--r--tex/context/base/context.mkiv4
-rw-r--r--tex/context/base/meta-pdf.lua5
-rw-r--r--tex/context/base/status-files.pdfbin24524 -> 24544 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin228233 -> 228188 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
7 files changed, 9 insertions, 4 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index d1ed5972a..f6060b838 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.01.01 14:11}
+\newcontextversion{2014.01.02 20:05}
%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 c4f54879d..1b10c6818 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 9c2f652d3..26e0d4e62 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,8 +28,8 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2014.01.01 14:11}
-\edef\contextkind {beta}
+\edef\contextversion{2014.01.02 20:05}
+\edef\contextkind {current}
%D For those who want to use this:
diff --git a/tex/context/base/meta-pdf.lua b/tex/context/base/meta-pdf.lua
index c49ad92ae..46e20ad31 100644
--- a/tex/context/base/meta-pdf.lua
+++ b/tex/context/base/meta-pdf.lua
@@ -527,8 +527,13 @@ local captures_new = ( space + verbose + procset + preamble )^0
local function parse(m_data)
if find(m_data,"%%%%BeginResource: procset mpost") then
+ -- report_mptopdf("using sparse scanner, case 1")
+ lpegmatch(captures_new,m_data)
+ elseif find(m_data,"%%%%BeginProlog%s*%S+(.-)%%%%EndProlog") then
+ -- report_mptopdf("using sparse scanner, case 2")
lpegmatch(captures_new,m_data)
else
+ -- report_mptopdf("using verbose ps scanner")
lpegmatch(captures_old,m_data)
end
end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 1e398b8a0..354441a11 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 de6a11472..1f2ce679a 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 14a389922..59a4c0d3b 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 : 01/01/14 14:11:59
+-- merge date : 01/02/14 20:05:20
do -- begin closure to overcome local limits and interference