From 6091f1997cb58861ee2d0c2b9000430e8238b631 Mon Sep 17 00:00:00 2001 From: Marius Date: Wed, 8 Jan 2014 16:40:26 +0200 Subject: beta 2014.01.08 15:36 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4121 -> 4119 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/data-use.lua | 4 +-- tex/context/base/lxml-tab.lua | 38 +++++++++++---------- tex/context/base/mult-def.mkiv | 1 + tex/context/base/s-abr-01.tex | 1 + tex/context/base/status-files.pdf | Bin 24602 -> 24607 bytes tex/context/base/status-lua.pdf | Bin 228407 -> 228424 bytes tex/context/base/x-set-11.mkiv | 4 +-- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 11 files changed, 29 insertions(+), 25 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index a98e7b765..ab1e7369d 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.07 17:03} +\newcontextversion{2014.01.08 15:36} %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 adb050050..3d07c88cf 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index e7be5d9f9..8e79041ff 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.01.07 17:03} +\edef\contextversion{2014.01.08 15:36} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/data-use.lua b/tex/context/base/data-use.lua index 9c15263bb..7598506e4 100644 --- a/tex/context/base/data-use.lua +++ b/tex/context/base/data-use.lua @@ -57,7 +57,7 @@ statistics.register("used cache path", function() return caches.usedpaths() end -- experiment (code will move) function statistics.savefmtstatus(texname,formatbanner,sourcefile) -- texname == formatname - local enginebanner = status.list().banner + local enginebanner = status.banner if formatbanner and enginebanner and sourcefile then local luvname = file.replacesuffix(texname,"luv") -- utilities.lua.suffixes.luv local luvdata = { @@ -75,7 +75,7 @@ end -- a remake function statistics.checkfmtstatus(texname) - local enginebanner = status.list().banner + local enginebanner = status.banner if enginebanner and texname then local luvname = file.replacesuffix(texname,"luv") -- utilities.lua.suffixes.luv if lfs.isfile(luvname) then diff --git a/tex/context/base/lxml-tab.lua b/tex/context/base/lxml-tab.lua index 3e10eb96d..23734d970 100644 --- a/tex/context/base/lxml-tab.lua +++ b/tex/context/base/lxml-tab.lua @@ -1016,25 +1016,27 @@ local function verbose_document(e,handlers) end local function serialize(e,handlers,...) - local initialize = handlers.initialize - local finalize = handlers.finalize - local functions = handlers.functions - if initialize then - local state = initialize(...) - if not state == true then - return state + if e then + local initialize = handlers.initialize + local finalize = handlers.finalize + local functions = handlers.functions + if initialize then + local state = initialize(...) + if not state == true then + return state + end + end + local etg = e.tg + if etg then + (functions[etg] or functions["@el@"])(e,handlers) + -- elseif type(e) == "string" then + -- functions["@tx@"](e,handlers) + else + functions["@dc@"](e,handlers) -- dc ? + end + if finalize then + return finalize() end - end - local etg = e.tg - if etg then - (functions[etg] or functions["@el@"])(e,handlers) - -- elseif type(e) == "string" then - -- functions["@tx@"](e,handlers) - else - functions["@dc@"](e,handlers) -- dc ? - end - if finalize then - return finalize() end end diff --git a/tex/context/base/mult-def.mkiv b/tex/context/base/mult-def.mkiv index db9fd8ee6..014016f9c 100644 --- a/tex/context/base/mult-def.mkiv +++ b/tex/context/base/mult-def.mkiv @@ -62,6 +62,7 @@ \def\c!group {group} \def\c!groupsuffix {groupsuffix} +\def\v!dataset {dataset} \def\v!compressseparator{compressseparator} \def\v!notation {notation} \def\v!endnote {endnote} diff --git a/tex/context/base/s-abr-01.tex b/tex/context/base/s-abr-01.tex index 7d8064b29..386f2ba57 100644 --- a/tex/context/base/s-abr-01.tex +++ b/tex/context/base/s-abr-01.tex @@ -34,6 +34,7 @@ %logo [FGA] {fga} %logo [FGBBS] {fgbbs} \logo [ACROBAT] {Acro\-bat} +\logo [APA] {apa} \logo [AFM] {afm} \logo [API] {api} \logo [ALEPH] {Aleph} % {\mathematics{\aleph}} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 395022905..7063ab6a5 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 2fdf82591..b8fd428ea 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/x-set-11.mkiv b/tex/context/base/x-set-11.mkiv index d4b43a9ee..1de683521 100644 --- a/tex/context/base/x-set-11.mkiv +++ b/tex/context/base/x-set-11.mkiv @@ -639,8 +639,8 @@ \doifmode{interface:setup:defaults} { \ifx\currentSETUPhash\empty \else \edef\currentSETUPvalue{\csname named\currentSETUPhash parameter\endcsname\empty{\xmlatt{#1}{name}}} - \ifx\currentSETUPvalue\empty - \space=\space + \ifx\currentSETUPvalue\empty \else + =\space \detokenize\expandafter{\currentSETUPvalue} \fi \fi diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index a3a2de5b1..e36d72840 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/07/14 17:03:56 +-- merge date : 01/08/14 15:36:15 do -- begin closure to overcome local limits and interference -- cgit v1.2.3