From 454cbb2a3d99b77ca2c255b9259fe1bb7612b2ec Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 7 Oct 2013 23:31:00 +0200 Subject: beta 2013.10.07 23:31 --- scripts/context/lua/mtx-update.lua | 10 +++++----- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4109 -> 4110 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/status-files.pdf | Bin 24520 -> 24519 bytes tex/context/base/status-lua.pdf | Bin 224671 -> 224679 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/context/lua/mtx-update.lua b/scripts/context/lua/mtx-update.lua index a26be483c..25a5ac527 100644 --- a/scripts/context/lua/mtx-update.lua +++ b/scripts/context/lua/mtx-update.lua @@ -253,7 +253,7 @@ function scripts.update.synchronize() bin = gsub(bin,"\\","/") - if not url:find("::$") then url = url .. "::" end + if not find(url,"::$") then url = url .. "::" end local ok = lfs.attributes(texroot,"mode") == "directory" if not ok and force then dir.mkdirs(texroot) @@ -314,10 +314,10 @@ function scripts.update.synchronize() os.execute(command) -- read output of rsync local data = io.loaddata(temp_file) or "" - -- for every line extract the filename - for chmod, s in data:gmatch("([d%-][rwx%-]+).-(%S+)[\n\r]") do + -- for every line extract the filename : drwxr-sr-x 18 2013/10/06 06:16:10 libertine + for chmod, s in gmatch(data,"([d%-][rwxst%-]+).-(%S+)[\n\r]") do -- skip "current" folder - if s ~= '.' and chmod:len() == 10 then + if s ~= '.' and #chmod >= 10 then folders[#folders+1] = s end end @@ -433,7 +433,7 @@ function scripts.update.synchronize() if not environment.argument("force") then dryrunflags = "--dry-run" end - if (destination:find("texmf$") or destination:find("texmf%-context$") or destination:find("texmf%-modules$")) and (not environment.argument("keep")) then + if (find(destination,"texmf$") or find(destination,"texmf%-context$") or find(destination,"texmf%-modules$")) and (not environment.argument("keep")) then deleteflags = states.get("rsync.flags.delete") end command = format("%s %s %s %s %s'%s' '%s'", bin, normalflags, deleteflags, dryrunflags, url, archives, destination) diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 03c066abb..ee4a28692 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.10.07 22:06} +\newcontextversion{2013.10.07 23:31} %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 3b273abfa..abfbcd64e 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 920e03081..cb46ecc14 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.10.07 22:06} +\edef\contextversion{2013.10.07 23:31} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 13ebd5715..89e383feb 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 c5d63ed66..6ead455d8 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 1a5fd0a34..4720633d1 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/07/13 22:06:08 +-- merge date : 10/07/13 23:31:19 do -- begin closure to overcome local limits and interference -- cgit v1.2.3