From 0dafe07d051a7cf5430ca0552bca8ee20800f41a Mon Sep 17 00:00:00 2001 From: Marius Date: Fri, 15 Mar 2013 01:20:18 +0200 Subject: beta 2013.03.15 00:17 --- tex/context/base/colo-icc.lua | 14 +++++++------- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4133 -> 4137 bytes tex/context/base/context-version.png | Bin 39995 -> 40279 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/data-tmp.lua | 5 +++-- tex/context/base/font-otb.lua | 4 ++-- tex/context/base/font-otn.lua | 4 ++-- tex/context/base/font-pre.mkiv | 4 ++++ tex/context/base/status-files.pdf | Bin 24773 -> 24771 bytes tex/context/base/status-lua.pdf | Bin 210153 -> 210117 bytes tex/context/base/util-sql-imp-library.lua | 5 +++-- tex/generic/context/luatex/luatex-fonts-merged.lua | 10 +++++----- 15 files changed, 30 insertions(+), 24 deletions(-) (limited to 'tex') diff --git a/tex/context/base/colo-icc.lua b/tex/context/base/colo-icc.lua index 157a03198..f7ed561c1 100644 --- a/tex/context/base/colo-icc.lua +++ b/tex/context/base/colo-icc.lua @@ -8,6 +8,7 @@ if not modules then modules = { } end modules ['colo-icc'] = { local char, byte, gsub, match, format, strip = string.char, string.byte, string.gsub, string.match, string.format, string.strip local readstring, readnumber = io.readstring, io.readnumber +local formatters = string.formatters local colors = attributes and attributes.colors or { } -- when used in mtxrun @@ -27,11 +28,13 @@ function colors.iccprofile(filename,verbose) end end if fullname == "" then - return nil, false, format("profile %a cannot be found",filename) + report_colors("profile %a cannot be found",filename) + return nil, false end local f = io.open(fullname,"rb") if not f then - return nil, false, format("profile %a cannot be loaded",fullname) + report_colors("profile %a cannot be loaded",fullname) + return nil, false end local header = { size = readnumber(f,4), @@ -112,9 +115,6 @@ function colors.iccprofile(filename,verbose) header = header, tags = tags, } - return profile, true, format("profile %a loaded",fullname) + report_colors("profile %a loaded",fullname) + return profile, true end - ---~ local profile, error, message = colors.iccprofile("ussheetfedcoated.icc") ---~ print(error,message) ---~ table.print(profile) diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 3c10a596a..05e6b96e7 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{2013.03.14 23:02} +\newcontextversion{2013.03.15 00:17} %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 be2b5e2c5..eeaa8c9c6 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.03.14 23:02} +\newcontextversion{2013.03.15 00:17} %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 b99817f88..8533f51c4 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 4890e14d2..a0e3d860a 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 07119341d..d39d51eff 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{2013.03.14 23:02} +\edef\contextversion{2013.03.15 00:17} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 4caf863ce..6b0bf8234 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.03.14 23:02} +\edef\contextversion{2013.03.15 00:17} %D For those who want to use this: diff --git a/tex/context/base/data-tmp.lua b/tex/context/base/data-tmp.lua index 6246bfb61..c9180dba6 100644 --- a/tex/context/base/data-tmp.lua +++ b/tex/context/base/data-tmp.lua @@ -26,6 +26,7 @@ local format, lower, gsub, concat = string.format, string.lower, string.gsub, ta local serialize, serializetofile = table.serialize, table.tofile local mkdirs, isdir = dir.mkdirs, lfs.isdir local addsuffix, is_writable, is_readable = file.addsuffix, file.is_writable, file.is_readable +local formatters = string.formatters local trace_locating = false trackers.register("resolvers.locating", function(v) trace_locating = v end) local trace_cache = false trackers.register("resolvers.cache", function(v) trace_cache = v end) @@ -169,10 +170,10 @@ function caches.usedpaths() for i=1,#readables do local readable = readables[i] if usedreadables[i] or readable == writable then - result[#result+1] = format("readable: %a (order %s)",readable,i) + result[#result+1] = formatters["readable: %a (order %s)"](readable,i) end end - result[#result+1] = format("writable: %a",writable) + result[#result+1] = formatters["writable: %a"](writable) return result else return writable diff --git a/tex/context/base/font-otb.lua b/tex/context/base/font-otb.lua index 3c38cad7f..0ae46c6f0 100644 --- a/tex/context/base/font-otb.lua +++ b/tex/context/base/font-otb.lua @@ -64,9 +64,9 @@ end local function cref(feature,lookupname) if lookupname then - return format("feature %a, lookup %a",feature,lookupname) + return formatters["feature %a, lookup %a"](feature,lookupname) else - return format("feature %a",feature) + return formatters["feature %a"](feature) end end diff --git a/tex/context/base/font-otn.lua b/tex/context/base/font-otn.lua index b6ee5a475..4a0052904 100644 --- a/tex/context/base/font-otn.lua +++ b/tex/context/base/font-otn.lua @@ -301,7 +301,7 @@ local function gref(n) -- currently the same as in font-otb end end -local function cref(kind,chainname,chainlookupname,lookupname,index) +local function cref(kind,chainname,chainlookupname,lookupname,index) -- not in the mood to alias f_ if index then return formatters["feature %a, chain %a, sub %a, lookup %a, index %a"](kind,chainname,chainlookupname,lookupname,index) elseif lookupname then @@ -316,7 +316,7 @@ local function cref(kind,chainname,chainlookupname,lookupname,index) end local function pref(kind,lookupname) - return format("feature %s, lookup %s",kind,lookupname) + return formatters["feature %a, lookup %a"](kind,lookupname) end -- We can assume that languages that use marks are not hyphenated. We can also assume diff --git a/tex/context/base/font-pre.mkiv b/tex/context/base/font-pre.mkiv index 21da2bf26..4230cafb6 100644 --- a/tex/context/base/font-pre.mkiv +++ b/tex/context/base/font-pre.mkiv @@ -48,6 +48,10 @@ tlig=yes, trep=yes] % texligatures=yes,texquotes=yes +% \definefontfeature +% [newstyle] +% [onum=no] + \definefontfeature % == default unless redefined [ligatures] [always] diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 3914e74be..769f3ecb9 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 8c8020263..b1551f6d8 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/util-sql-imp-library.lua b/tex/context/base/util-sql-imp-library.lua index 34b9b339d..15754e26a 100644 --- a/tex/context/base/util-sql-imp-library.lua +++ b/tex/context/base/util-sql-imp-library.lua @@ -80,6 +80,7 @@ local querysplitter = helpers.querysplitter local dataprepared = helpers.preparetemplate local serialize = sql.serialize local deserialize = sql.deserialize +local formatters = string.formatters local initialize = mysql.mysql @@ -109,11 +110,11 @@ local function fetched(specification,query,converter) if not connection then session = initialize() if not session then - return format("no session for %a",id) + return formatters["no session for %a"](id) end connection = connect(session,specification) if not connection then - return format("no connection for %a",id) + return formatters["no connection for %a"](id) end cache[id] = { session = session, connection = connection } end diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index dd5587d62..f9533f82f 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 : 03/14/13 23:02:19 +-- merge date : 03/15/13 00:17:23 do -- begin closure to overcome local limits and interference @@ -7001,9 +7001,9 @@ local function gref(descriptions,n) end local function cref(feature,lookupname) if lookupname then - return format("feature %a, lookup %a",feature,lookupname) + return formatters["feature %a, lookup %a"](feature,lookupname) else - return format("feature %a",feature) + return formatters["feature %a"](feature) end end local function report_alternate(feature,lookupname,descriptions,unicode,replacement,value,comment) @@ -8385,7 +8385,7 @@ local function gref(n) return "" end end -local function cref(kind,chainname,chainlookupname,lookupname,index) +local function cref(kind,chainname,chainlookupname,lookupname,index) if index then return formatters["feature %a, chain %a, sub %a, lookup %a, index %a"](kind,chainname,chainlookupname,lookupname,index) elseif lookupname then @@ -8399,7 +8399,7 @@ local function cref(kind,chainname,chainlookupname,lookupname,index) end end local function pref(kind,lookupname) - return format("feature %s, lookup %s",kind,lookupname) + return formatters["feature %a, lookup %a"](kind,lookupname) end local function copy_glyph(g) local components=g.components -- cgit v1.2.3