summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2013-09-12 13:20:25 +0300
committerMarius <mariausol@gmail.com>2013-09-12 13:20:25 +0300
commitc236e61b1b498a623796e31883731d90d34944d7 (patch)
tree2bd55cf077bf2f6362eebdc5d2db4969618406e0
parentecba7ee5768381e147782d6d73815b152f5c504a (diff)
downloadcontext-c236e61b1b498a623796e31883731d90d34944d7.tar.gz
beta 2013.09.12 12:19
-rw-r--r--tex/context/base/back-exp.lua2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4111 -> 4107 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/font-def.lua2
-rw-r--r--tex/context/base/status-files.pdfbin24781 -> 24765 bytes
-rw-r--r--tex/context/base/status-lua.log2
-rw-r--r--tex/context/base/typo-dha.lua4
-rw-r--r--tex/context/base/typo-drp.lua2
-rw-r--r--tex/context/base/typo-krn.lua2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua4
11 files changed, 11 insertions, 11 deletions
diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua
index efc62a786..18a339247 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/back-exp.lua
@@ -24,7 +24,7 @@ if not modules then modules = { } end modules ['back-exp'] = {
-- todo: delay loading (apart from basic tag stuff)
local next, type = next, type
-local format, concat, sub, gsub = string.format, string.concat, string.sub, string.gsub
+local format, concat, sub, gsub = string.format, table.concat, string.sub, string.gsub
local validstring = string.valid
local lpegmatch = lpeg.match
local utfchar, utfvalues = utf.char, utf.values
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 1a8290c6b..21271c9b1 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.12 11:48}
+\newcontextversion{2013.09.12 12:19}
%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 e05b9e104..6a3ae150a 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 a51acafeb..64f75949b 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.12 11:48}
+\edef\contextversion{2013.09.12 12:19}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/font-def.lua b/tex/context/base/font-def.lua
index bee02e8dc..700921090 100644
--- a/tex/context/base/font-def.lua
+++ b/tex/context/base/font-def.lua
@@ -112,7 +112,7 @@ addlookup("name")
addlookup("spec")
local function getspecification(str)
- return lpegmatch(splitter,str)
+ return lpegmatch(splitter,str or "") -- weird catch
end
definers.getspecification = getspecification
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 998484dde..c763d5c53 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 a6bd2f618..612ec1bd2 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.12 11:48 MKIV beta fmt: 2013.9.12 int: english/english
+ConTeXt ver: 2013.09.12 12:19 MKIV beta fmt: 2013.9.12 int: english/english
system > 'cont-new.mkiv' loaded
(cont-new.mkiv)
diff --git a/tex/context/base/typo-dha.lua b/tex/context/base/typo-dha.lua
index ed54276c6..d5ad66e7e 100644
--- a/tex/context/base/typo-dha.lua
+++ b/tex/context/base/typo-dha.lua
@@ -116,8 +116,8 @@ local function process(start)
local autodir = 0
local embedded = 0
local override = 0
- local pardir = 1
- local textdir = 1
+ local pardir = 0
+ local textdir = 0
local done = false
local finished = nil
local finidir = nil
diff --git a/tex/context/base/typo-drp.lua b/tex/context/base/typo-drp.lua
index 415712d46..903140dae 100644
--- a/tex/context/base/typo-drp.lua
+++ b/tex/context/base/typo-drp.lua
@@ -181,7 +181,7 @@ function initials.handler(head)
local start = head
local attr = nil
while start do
- attr = start[attribute]
+ attr = start[a_initial]
if attr then
break
elseif start.id == glyph then
diff --git a/tex/context/base/typo-krn.lua b/tex/context/base/typo-krn.lua
index 48c09f5ff..a7f17e280 100644
--- a/tex/context/base/typo-krn.lua
+++ b/tex/context/base/typo-krn.lua
@@ -320,7 +320,7 @@ function kerns.set(factor)
return factor
end
-local kerns.handler(head)
+function kerns.handler(head)
return do_process(head) -- no direct map, because else fourth argument is tail == true
end
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 261839531..d2034f231 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/12/13 11:48:29
+-- merge date : 09/12/13 12:19:43
do -- begin closure to overcome local limits and interference
@@ -12674,7 +12674,7 @@ addlookup("file")
addlookup("name")
addlookup("spec")
local function getspecification(str)
- return lpegmatch(splitter,str)
+ return lpegmatch(splitter,str or "")
end
definers.getspecification=getspecification
function definers.registersplit(symbol,action,verbosename)