diff options
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4186 -> 4190 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/publ-dat.lua | 9 | ||||
| -rw-r--r-- | tex/context/base/publ-imp-apa.mkvi | 4 | ||||
| -rw-r--r-- | tex/context/base/publ-ini.lua | 4 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24484 -> 24484 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 250250 -> 250292 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
9 files changed, 14 insertions, 9 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 8e1fc40e2..406cad1e8 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{2015.04.16 22:31} +\newcontextversion{2015.04.16 23:16} %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 Binary files differindex a56e6ab81..063fa19b3 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 23a86b773..2f650dfe4 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2015.04.16 22:31} +\edef\contextversion{2015.04.16 23:16} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/publ-dat.lua b/tex/context/base/publ-dat.lua index a6226a4fc..957322f7c 100644 --- a/tex/context/base/publ-dat.lua +++ b/tex/context/base/publ-dat.lua @@ -26,7 +26,7 @@ local chardata = characters.data local lowercase = characters.lower local lower, find, sub = string.lower, string.find, string.sub -local concat, copy = table.concat, table.copy +local concat, copy, tohash = table.concat, table.copy, table.tohash local next, type, rawget = next, type, rawget local utfchar = utf.char local lpegmatch, lpegpatterns = lpeg.match, lpeg.patterns @@ -294,9 +294,14 @@ local specifications = setmetatableindex(function(t,name) -- local virtual = specification.virtual if virtual == nil then -- so false is valid + virtual = { } + elseif virtual == false then + virtual = { } + elseif type(virtual) ~= table then virtual = virtuals - specification.virtual = virtual end + specification.virtual = virtual + specification.virtualfields = tohash(virtual) -- for category, data in next, categories do categories[category] = checkfield(specification,category,copy(data)) -- we make sure we have no clones diff --git a/tex/context/base/publ-imp-apa.mkvi b/tex/context/base/publ-imp-apa.mkvi index 1c2dc02db..a6b9ffa70 100644 --- a/tex/context/base/publ-imp-apa.mkvi +++ b/tex/context/base/publ-imp-apa.mkvi @@ -284,8 +284,8 @@ \definebtx [apa:cite:author:year] % todo [apa:cite:authoryear] - [\c!left=, - \c!right=] + [\c!left=(, + \c!right=)] \definebtx [apa:cite:author:years] % todo diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua index 425ff20f8..3716c07b7 100644 --- a/tex/context/base/publ-ini.lua +++ b/tex/context/base/publ-ini.lua @@ -1221,8 +1221,8 @@ do if ignoredfields and ignoredfields[field] then return false end - local virtual = catspec.virtual - if virtual and virtual[field] then + local virtualfields = currentspecification.virtualfields + if virtualfields and virtualfields[field] then return true end local sets = catspec.sets diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 09f173319..792d11412 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex 55fba3699..6334ced95 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 80048e034..0e289b235 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 : 04/16/15 22:31:05 +-- merge date : 04/16/15 23:16:42 do -- begin closure to overcome local limits and interference |