diff options
author | Hans Hagen <pragma@wxs.nl> | 2021-10-28 11:38:54 +0200 |
---|---|---|
committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2021-10-28 11:38:54 +0200 |
commit | c0e2193b6c379b34fbc589343d31f71e02513f03 (patch) | |
tree | 78e2d71def3ce80cf233c79279dcfddaac18a523 /tex/context/base/mkiv | |
parent | a23982bf3c6cc3c7e34c89a67004e2ef4c6103eb (diff) | |
download | context-c0e2193b6c379b34fbc589343d31f71e02513f03.tar.gz |
2021-10-28 10:19:00
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/core-con.lua | 4 | ||||
-rw-r--r-- | tex/context/base/mkiv/mult-low.lua | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 24705 -> 24701 bytes | |||
-rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 253744 -> 253854 bytes |
6 files changed, 6 insertions, 4 deletions
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index e5bd908d4..8c12216dd 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{2021.10.24 21:42} +\newcontextversion{2021.10.28 10:17} %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 146d9b365..6cc906cf4 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{2021.10.24 21:42} +\edef\contextversion{2021.10.28 10:17} %D Kind of special: diff --git a/tex/context/base/mkiv/core-con.lua b/tex/context/base/mkiv/core-con.lua index 289a34b0e..ea11ffcd0 100644 --- a/tex/context/base/mkiv/core-con.lua +++ b/tex/context/base/mkiv/core-con.lua @@ -2011,7 +2011,9 @@ function converters.totime(s) return s elseif type(s) == "string" then local t = lpegmatch(p,s) - if t.tzh then + if not t then + logs.report("system","invalid time specification %a",s) + elseif t.tzh then local localtzh, localtzm = ostimezone(true) t.hour = t.hour + localtzh - t.tzs * t.tzh t.min = t.min + localtzm - t.tzs * t.tzm diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua index ef9a33153..125434d9a 100644 --- a/tex/context/base/mkiv/mult-low.lua +++ b/tex/context/base/mkiv/mult-low.lua @@ -91,7 +91,7 @@ return { "localboxgroupcode", "splitoffgroupcode", "splitkeepgroupcode", "preamblegroupcode", "alignsetgroupcode", "finrowgroupcode", "discretionarygroupcode", -- - "markautomigrationcode", "insertautomigrationcode", "preautomigrationcode", "postautomigrationcode", + "markautomigrationcode", "insertautomigrationcode", "adjustautomigrationcode", "preautomigrationcode", "postautomigrationcode", -- "charnodecode", "hlistnodecode", "vlistnodecode", "rulenodecode", "insertnodecode", "marknodecode", "adjustnodecode", "ligaturenodecode", "discretionarynodecode", "whatsitnodecode", "mathnodecode", diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 894a4da54..4a0bc353d 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 fe34b4772..78253afaf 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf |