From 5be028e9e8cad8e72967191716ba3974bb7832db Mon Sep 17 00:00:00 2001 From: Marius Date: Fri, 20 Sep 2013 01:40:28 +0300 Subject: beta 2013.09.20 00:32 --- tex/context/base/buff-ini.lua | 14 ++++++++------ tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4105 -> 4107 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/font-syn.lua | 2 +- tex/context/base/grph-fig.mkiv | 2 +- tex/context/base/status-files.pdf | Bin 24774 -> 24739 bytes tex/context/base/status-lua.log | 2 +- tex/context/base/util-tab.lua | 3 ++- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 10 files changed, 16 insertions(+), 13 deletions(-) (limited to 'tex') diff --git a/tex/context/base/buff-ini.lua b/tex/context/base/buff-ini.lua index 896584046..7a92b873e 100644 --- a/tex/context/base/buff-ini.lua +++ b/tex/context/base/buff-ini.lua @@ -27,6 +27,7 @@ local variables = interfaces.variables local settings_to_array = utilities.parsers.settings_to_array local formatters = string.formatters local addsuffix = file.addsuffix +local replacesuffix = file.replacesuffix local v_yes = variables.yes @@ -344,12 +345,13 @@ local last = 0 function commands.runbuffer(name,encapsulate) -- we used to compare the saved file with content local names = getnames(name) local filename = files[name] - if not filename then + local tobedone = not istypeset(names) + if tobedone or not filename then last = last + 1 filename = formatters["%s-typeset-buffer-%03i"](tex.jobname,last) files[name] = filename end - if not istypeset(names) then + if tobedone then if trace_run then report_typeset("changes in %a, processing forced",name) end @@ -361,15 +363,15 @@ function commands.runbuffer(name,encapsulate) -- we used to compare the saved fi if encapsulate then content = formatters["\\starttext\n%s\n\\stoptext\n"](content) end - report_typeset("\n") io.savedata(filename,content) - os.execute(formatters["context %s"](filename)) - report_typeset("\n") + local command = formatters["context %s"](filename) + report_typeset("running: %s\n",command) + os.execute(command) markastypeset(names) elseif trace_run then report_typeset("no changes in %a, not processed",name) end - context(addsuffix(filename,"pdf")) + context(replacesuffix(filename,"pdf")) end function commands.getbuffer(name) diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index ad20e4441..da3e9b66e 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.19 21:34} +\newcontextversion{2013.09.20 00:32} %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 0afdcfae2..81208541f 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 5e71076b7..d5dc4f1db 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.19 21:34} +\edef\contextversion{2013.09.20 00:32} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/font-syn.lua b/tex/context/base/font-syn.lua index 55c767745..34aeb0819 100644 --- a/tex/context/base/font-syn.lua +++ b/tex/context/base/font-syn.lua @@ -593,7 +593,7 @@ local function collectstatistics() if width then widths [width ] = (widths [width ] or 0) + 1 end if variant then variants[variant] = (variants[variant] or 0) + 1 end -- weird stuff - local angle = f_a(s.angle or 0) + local angle = f_a(tonumber(s.angle) or 0) angles[angle] = (angles[angles] or 0) + 1 -- extra stuff local pfmweight = f_w(s.pfmweight or 0) diff --git a/tex/context/base/grph-fig.mkiv b/tex/context/base/grph-fig.mkiv index f11c481e3..9b9333fa9 100644 --- a/tex/context/base/grph-fig.mkiv +++ b/tex/context/base/grph-fig.mkiv @@ -53,7 +53,7 @@ \fi\fi} \def\grph_buffers_typeset_indeed[#1][#2]% we could use the via files - {\doifnot{#1}{*}{\xdef\lasttypesetbuffer{\ctxcommand{runbuffer("#1")}}}% + {\doifnot{#1}{*}{\xdef\lasttypesetbuffer{\ctxcommand{runbuffer("#1",true)}}}% \ifcase\c_grph_buffers_mode % typesetonly \or diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 7a503129a..7a8e96de4 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.log b/tex/context/base/status-lua.log index d9f80fc04..325d8a435 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.19 21:34 MKIV beta fmt: 2013.9.19 int: english/english +ConTeXt ver: 2013.09.20 00:32 MKIV beta fmt: 2013.9.20 int: english/english system > 'cont-new.mkiv' loaded (cont-new.mkiv) diff --git a/tex/context/base/util-tab.lua b/tex/context/base/util-tab.lua index 6bba0850d..ae44269bb 100644 --- a/tex/context/base/util-tab.lua +++ b/tex/context/base/util-tab.lua @@ -340,9 +340,9 @@ function table.fastserialize(t,prefix) end for k, v in next, t do local tk = type(k) - local tv = type(v) if tk == "number" then if k > n or k < 0 then + local tv = type(v) if tv == "string" then m = m + 1 r[m] = f_indexed_string(k,v) elseif tv == "number" then @@ -355,6 +355,7 @@ function table.fastserialize(t,prefix) end end else + local tv = type(v) if tv == "string" then m = m + 1 r[m] = f_hashed_string(k,v) elseif tv == "number" then diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index c6650e781..9df3a35e4 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/19/13 21:34:56 +-- merge date : 09/20/13 00:32:07 do -- begin closure to overcome local limits and interference -- cgit v1.2.3