From 95538931c5aa680a8f8c491fa3f9bfedfc6a594f Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 20 Oct 2011 14:40:14 +0300 Subject: beta 2011.10.20 13:25 --- scripts/context/lua/mtxrun.lua | 6 +++--- scripts/context/stubs/mswin/mtxrun.lua | 6 +++--- scripts/context/stubs/unix/mtxrun | 6 +++--- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4108 -> 4096 bytes tex/context/base/context-version.png | Bin 105689 -> 106307 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/l-dir.lua | 6 +++--- tex/context/base/m-chart.lua | 19 ++++++++++++++++++- tex/context/base/page-app.mkiv | 12 ++++++++---- tex/context/base/status-files.pdf | Bin 24088 -> 23992 bytes tex/context/base/status-lua.pdf | Bin 163916 -> 163916 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 15 files changed, 43 insertions(+), 22 deletions(-) diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 8ee32ca2d..dd2ba551f 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -3239,13 +3239,13 @@ local function collectpattern(path,patt,recurse,result) local ok, scanner result = result or { } if path == "/" then - ok, scanner = xpcall(function() return walkdir(path..".") end, function() end) -- kepler safe + ok, scanner, first = xpcall(function() return walkdir(path..".") end, function() end) -- kepler safe else - ok, scanner = xpcall(function() return walkdir(path) end, function() end) -- kepler safe + ok, scanner, first = xpcall(function() return walkdir(path) end, function() end) -- kepler safe end if ok and type(scanner) == "function" then if not find(path,"/$") then path = path .. '/' end - for name in scanner do + for name in scanner, first do local full = path .. name local attr = attributes(full) local mode = attr.mode diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 8ee32ca2d..dd2ba551f 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -3239,13 +3239,13 @@ local function collectpattern(path,patt,recurse,result) local ok, scanner result = result or { } if path == "/" then - ok, scanner = xpcall(function() return walkdir(path..".") end, function() end) -- kepler safe + ok, scanner, first = xpcall(function() return walkdir(path..".") end, function() end) -- kepler safe else - ok, scanner = xpcall(function() return walkdir(path) end, function() end) -- kepler safe + ok, scanner, first = xpcall(function() return walkdir(path) end, function() end) -- kepler safe end if ok and type(scanner) == "function" then if not find(path,"/$") then path = path .. '/' end - for name in scanner do + for name in scanner, first do local full = path .. name local attr = attributes(full) local mode = attr.mode diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 8ee32ca2d..dd2ba551f 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -3239,13 +3239,13 @@ local function collectpattern(path,patt,recurse,result) local ok, scanner result = result or { } if path == "/" then - ok, scanner = xpcall(function() return walkdir(path..".") end, function() end) -- kepler safe + ok, scanner, first = xpcall(function() return walkdir(path..".") end, function() end) -- kepler safe else - ok, scanner = xpcall(function() return walkdir(path) end, function() end) -- kepler safe + ok, scanner, first = xpcall(function() return walkdir(path) end, function() end) -- kepler safe end if ok and type(scanner) == "function" then if not find(path,"/$") then path = path .. '/' end - for name in scanner do + for name in scanner, first do local full = path .. name local attr = attributes(full) local mode = attr.mode diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 7acf1051a..4adfaa39f 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.10.20 12:24} +\newcontextversion{2011.10.20 13:25} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 63e2e56b1..ca3e082ec 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{2011.10.20 12:24} +\newcontextversion{2011.10.20 13:25} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 33f27ab90..c39413995 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-version.png b/tex/context/base/context-version.png index 8a165ab0f..7897c85a0 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 547eb59d6..e2a7afbdf 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.10.20 12:24} +\edef\contextversion{2011.10.20 13:25} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index b37330032..e6063d376 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.10.20 12:24} +\edef\contextversion{2011.10.20 13:25} %D For those who want to use this: diff --git a/tex/context/base/l-dir.lua b/tex/context/base/l-dir.lua index 1d59b9220..ee831f98a 100644 --- a/tex/context/base/l-dir.lua +++ b/tex/context/base/l-dir.lua @@ -94,13 +94,13 @@ local function collectpattern(path,patt,recurse,result) local ok, scanner result = result or { } if path == "/" then - ok, scanner = xpcall(function() return walkdir(path..".") end, function() end) -- kepler safe + ok, scanner, first = xpcall(function() return walkdir(path..".") end, function() end) -- kepler safe else - ok, scanner = xpcall(function() return walkdir(path) end, function() end) -- kepler safe + ok, scanner, first = xpcall(function() return walkdir(path) end, function() end) -- kepler safe end if ok and type(scanner) == "function" then if not find(path,"/$") then path = path .. '/' end - for name in scanner do + for name in scanner, first do local full = path .. name local attr = attributes(full) local mode = attr.mode diff --git a/tex/context/base/m-chart.lua b/tex/context/base/m-chart.lua index 2b1761558..0378b2020 100644 --- a/tex/context/base/m-chart.lua +++ b/tex/context/base/m-chart.lua @@ -126,6 +126,23 @@ local validcommentlocations = { br = "rb", } +local validtextlocations = { + l = "l", left = "l", + r = "r", right = "r", + t = "t", top = "t", + b = "b", bottom = "b", + c = "c", center = "c", + m = "c", middle = "m", + lt = "lt", + rt = "rt", + lb = "lb", + rb = "rb", + tl = "lt", + tr = "rt", + bl = "lb", + br = "rb", +} + setmetatableindex(validshapes,function(t,k) local l = gsub(lower(k)," ","") local v = rawget(t,l) @@ -226,7 +243,7 @@ function commands.flow_set_destination(str) end function commands.flow_set_text(align,str) - temp.align = align + temp.align = validtextlocations[align] or align temp.text = str end diff --git a/tex/context/base/page-app.mkiv b/tex/context/base/page-app.mkiv index 79787b99b..810d26b95 100644 --- a/tex/context/base/page-app.mkiv +++ b/tex/context/base/page-app.mkiv @@ -34,6 +34,12 @@ \c!rightmargin=\!!zeropoint,\c!rightedge=\!!zeropoint, \c!header=\!!zeropoint,\c!footer=\!!zeropoint] +\definemakeup + [\??fp\s!dummy] + [\c!textstate=\v!empty, + \c!doublesided=\v!no, + \c!pagestate=\getvalue{\currentfittingpage\c!pagestate}] + \def\dostartfittingpage[#1][#2]% {\page % this is kind of tricky! there can be preceding page refs \autostarttext @@ -77,13 +83,11 @@ \s!default=>\def\fittingpapersize{\??fp\s!dummy}]% \expanded{\setuppapersize[\??fp\s!dummy][\fittingpapersize]}% \definelayout - [\v!page]% + [\??fp\s!dummy]% [\c!location=\v!middle, \c!width=\fittingwd, \c!height=\fittinght]% - \setuplayout - [\v!page]% - \startmakeup[\v!standard][\c!textstate=\v!empty,\c!doublesided=\v!no,\c!pagestate=\getvalue{\currentfittingpage\c!pagestate}]% + \startmakeup[\??fp\s!dummy]% \centerbox{\box\scratchbox}% \stopmakeup \stoplocallayout diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 5db5f3b9f..c11cdfba7 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 fbfb62e2d..3a1740a99 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 4fc509cd6..37d2a49f7 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 : 10/20/11 12:24:42 +-- merge date : 10/20/11 13:25:49 do -- begin closure to overcome local limits and interference -- cgit v1.2.3