From eda07bb8527bbb5d411be813ccd1e916c83e9d5b Mon Sep 17 00:00:00 2001 From: Marius Date: Mon, 14 May 2012 17:20:13 +0300 Subject: beta 2012.05.14 16:00 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4073 -> 4076 bytes tex/context/base/context-version.png | Bin 105608 -> 105890 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/l-io.lua | 5 +++++ tex/context/base/luat-mac.lua | 6 ++++++ tex/context/base/status-files.pdf | Bin 24330 -> 24332 bytes tex/context/base/status-lua.pdf | Bin 178784 -> 178785 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 7 ++++++- 11 files changed, 21 insertions(+), 5 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 59c540b93..400df7282 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{2012.05.14 09:19} +\newcontextversion{2012.05.14 16:00} %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 d04de763b..772d5780a 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{2012.05.14 09:19} +\newcontextversion{2012.05.14 16:00} %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 4fe170955..69902446d 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 be09ece3b..044c6d782 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 e0433384f..5ab89d934 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{2012.05.14 09:19} +\edef\contextversion{2012.05.14 16:00} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index bebc6dee7..fcbe7872c 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -23,7 +23,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2012.05.14 09:19} +\edef\contextversion{2012.05.14 16:00} %D For those who want to use this: diff --git a/tex/context/base/l-io.lua b/tex/context/base/l-io.lua index a740996c6..4f27dc1dc 100644 --- a/tex/context/base/l-io.lua +++ b/tex/context/base/l-io.lua @@ -252,3 +252,8 @@ function io.readstring(f,n,m) local str = gsub(f:read(n),"%z","") return str end + +-- + +if not io.i_limiter then function io.i_limiter() end end -- dummy so we can test safely +if not io.o_limiter then function io.o_limiter() end end -- dummy so we can test safely diff --git a/tex/context/base/luat-mac.lua b/tex/context/base/luat-mac.lua index f7ab63045..75d52781c 100644 --- a/tex/context/base/luat-mac.lua +++ b/tex/context/base/luat-mac.lua @@ -14,6 +14,12 @@ if not modules then modules = { } end modules ['luat-mac'] = { -- -- \def\foo#1{\expandafter\normaldef\csname#1\endcsname} +-- todo: +-- +-- \def\dosomething#content{%%%<= fine with “#1” +-- % { %%% Open unbalanced brace breaks macros. +-- } + local P, V, S, R, C, Cs, Cmt, Carg = lpeg.P, lpeg.V, lpeg.S, lpeg.R, lpeg.C, lpeg.Cs, lpeg.Cmt, lpeg.Carg local lpegmatch, patterns = lpeg.match, lpeg.patterns diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 0ab6170e3..071753577 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 ec6d3a5cb..fd66c594f 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 a8de54f84..cdef91b38 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 : 05/14/12 09:19:00 +-- merge date : 05/14/12 16:00:55 do -- begin closure to overcome local limits and interference @@ -2700,6 +2700,11 @@ function io.readstring(f,n,m) return str end +-- + +if not io.i_limiter then function io.i_limiter() end end -- dummy so we can test safely +if not io.o_limiter then function io.o_limiter() end end -- dummy so we can test safely + end -- closure do -- begin closure to overcome local limits and interference -- cgit v1.2.3