diff options
Diffstat (limited to 'tex/context/base/mkiv')
| -rw-r--r-- | tex/context/base/mkiv/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/mult-def.lua | 6 | ||||
| -rw-r--r-- | tex/context/base/mkiv/mult-fun.lua | 13 | ||||
| -rw-r--r-- | tex/context/base/mkiv/mult-low.lua | 1 | ||||
| -rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 24636 -> 24641 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 257224 -> 257295 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/util-prs.lua | 13 | ||||
| -rw-r--r-- | tex/context/base/mkiv/util-tbs.lua | 21 |
9 files changed, 50 insertions, 8 deletions
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 094648239..558b0481a 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2022.04.20 19:15} +\newcontextversion{2022.05.02 15:48} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 1165bfced..fa7ba1e2a 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -49,7 +49,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2022.04.20 19:15} +\edef\contextversion{2022.05.02 15:48} %D Kind of special: diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua index 0a8b71e30..dee5de585 100644 --- a/tex/context/base/mkiv/mult-def.lua +++ b/tex/context/base/mkiv/mult-def.lua @@ -11738,6 +11738,12 @@ return { ["en"]="smallcapsfont", ["fr"]="policepetitescaps", }, + ["snap"]={ + ["en"]="snap", + }, + ["snapstep"]={ + ["en"]="snapstep", + }, ["solution"]={ ["en"]="solution", ["fr"]="solution", diff --git a/tex/context/base/mkiv/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua index 4ec5bd55e..128e5b51e 100644 --- a/tex/context/base/mkiv/mult-fun.lua +++ b/tex/context/base/mkiv/mult-fun.lua @@ -16,7 +16,7 @@ return { "maxdimensions", "drawoptionsfactor", "dq", "sq", - "crossingscale", "crossingoption", + "crossingscale", "crossingoption", "crossingdebug", "contextlmtxmode", "metafunversion", "minifunversion", -- -- for the moment we put these here as they need to stand out @@ -47,6 +47,8 @@ return { "localanchorbox", "localanchorcell", "localanchorspan", "anchorbox", "anchorcell", "anchorspan", "matrixbox", "matrixcell", "matrixspan", + -- + "pensilcolor", "pensilstep", }, commands = { "loadfile", "loadimage", "loadmodule", @@ -95,7 +97,7 @@ return { "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", - "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", + "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "infotext", "rawmadetext", "validtexbox", "onetimetextext", "rawfmttext", "thefmttext", "fmttext", "onetimefmttext", "notcached", "keepcached", "verbatim", @@ -192,6 +194,7 @@ return { "positionpath", "positioncurve", "positionxy", "positionparagraph", "positioncolumn", "positionwhd", "positionpage", "positionregion", "positionbox", "positionx", "positiony", "positionanchor", "positioninregion", "positionatanchor", + "positioncolumnbox", "overlaycolumnbox", "positioncolumnatx", -- "getposboxes", "getmultipars", "getpospage", "getposparagraph", "getposcolumn", "getposregion", @@ -214,7 +217,7 @@ return { -- "comment", "report", "lua", "lualist", "mp", "MP", "luacall", -- - "mirrored", "mirroredabout", + "mirrored", "mirroredabout", "xslanted", "yslanted", -- "scriptindex", "newscriptindex", -- @@ -225,5 +228,9 @@ return { -- "withtolerance", -- + "hatched", "withdashes", + "processpath", "pencilled", + "sortedintersectiontimes", "intersectionpath", "firstintersectionpath", "secondintersectionpath", + "intersectionsfound", "cutbeforefirst", "cutafterfirst", "cutbeforelast", "cutafterlast", }, } diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua index e345195d5..1c5b4be5e 100644 --- a/tex/context/base/mkiv/mult-low.lua +++ b/tex/context/base/mkiv/mult-low.lua @@ -209,6 +209,7 @@ return { -- "nopreslackclassoptioncode", "nopostslackclassoptioncode", "lefttopkernclassoptioncode", "righttopkernclassoptioncode", "leftbottomkernclassoptioncode", "rightbottomkernclassoptioncode", + "lookaheadforendclassoptioncode", "defaultmathclassoptions", -- "noligaturingglyphoptioncode", "nokerningglyphoptioncode", "noleftligatureglyphoptioncode", "noleftkernglyphoptioncode", "norightligatureglyphoptioncode", "norightkernglyphoptioncode", diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex f6ca25caa..683f2d822 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex bdb717f7d..7bef77ee0 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/util-prs.lua b/tex/context/base/mkiv/util-prs.lua index 204611dbe..6c2a15adf 100644 --- a/tex/context/base/mkiv/util-prs.lua +++ b/tex/context/base/mkiv/util-prs.lua @@ -806,11 +806,20 @@ local pattern = Cf( Ct("") * ( Cg(Cc("day") * cardinal) * S("-/") * Cg(Cc("month") * cardinal) * S("-/") * Cg(Cc("year") * p_year) + ) + + ( Cg(Cc("year") * p_year) + * S("-/") * Cg(Cc("month") * cardinal) + ) + + ( Cg(Cc("month") * cardinal) + * S("-/") * Cg(Cc("year") * p_year) ) ) - * P(" ") * Cg(Cc("hour") * cardinal) + * ( + P(" ") * Cg(Cc("hour") * cardinal) * P(":") * Cg(Cc("min") * cardinal) * (P(":") * Cg(Cc("sec") * cardinal))^-1 + + P(-1) ) + , rawset) lpegpatterns.splittime = pattern @@ -819,6 +828,8 @@ function parsers.totime(str) return lpegmatch(pattern,str) end +-- inspect(parsers.totime("2019-03-05")) +-- inspect(parsers.totime("2019-03-05 12:12:12")) -- print(os.time(parsers.totime("2019-03-05 12:12:12"))) -- print(os.time(parsers.totime("2019/03/05 12:12:12"))) -- print(os.time(parsers.totime("05-03-2019 12:12:12"))) diff --git a/tex/context/base/mkiv/util-tbs.lua b/tex/context/base/mkiv/util-tbs.lua index 140e43a03..339abcfcc 100644 --- a/tex/context/base/mkiv/util-tbs.lua +++ b/tex/context/base/mkiv/util-tbs.lua @@ -57,7 +57,7 @@ end do - local find, gmatch = string.find, string.gmatch + local find, gmatch, formatters = string.find, string.gmatch, string.formatters local P, C, Ct, Cc, R = lpeg.P, lpeg.C, lpeg.Ct, lpeg.Cc, lpeg.R @@ -72,7 +72,7 @@ do local specifier = Ct ((entry + (separator + index + test))^1) - function tablestore.field(namespace,name,default) + local function field(namespace,name,default) local data = loaded[namespace] or current if data then -- if find(name,"%[") then @@ -111,4 +111,21 @@ do end end + + function length(namespace,name,default) + local data = field(namespace,name) + return type(data) == "table" and #data or 0 + end + + function formatted(namespace,name,fmt) + local data = field(namespace,name) + if data then + return formatters[fmt](data) + end + end + + tablestore.field = field + tablestore.length = length + tablestore.formatted = formatted + end |