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/font-osd.lua | 18 | ||||
| -rw-r--r-- | tex/context/base/mkiv/math-noa.lua | 8 | ||||
| -rw-r--r-- | tex/context/base/mkiv/mult-def.lua | 4 | ||||
| -rw-r--r-- | tex/context/base/mkiv/mult-low.lua | 16 | ||||
| -rw-r--r-- | tex/context/base/mkiv/mult-prm.lua | 56 | ||||
| -rw-r--r-- | tex/context/base/mkiv/spac-hor.mkiv | 3 | ||||
| -rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 24781 -> 24749 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 257575 -> 257569 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/strc-enu.mkvi | 14 |
11 files changed, 102 insertions, 21 deletions
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 9180cc403..3dad09b1d 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.01.10 08:33} +\newcontextversion{2022.01.15 11:02} %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 0037516fe..23d886b1e 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.01.10 08:33} +\edef\contextversion{2022.01.15 11:02} %D Kind of special: diff --git a/tex/context/base/mkiv/font-osd.lua b/tex/context/base/mkiv/font-osd.lua index 16228b88b..34c047290 100644 --- a/tex/context/base/mkiv/font-osd.lua +++ b/tex/context/base/mkiv/font-osd.lua @@ -55,6 +55,11 @@ if not modules then modules = { } end modules ['font-osd'] = { -- script devanag -- By now we have yet another incremental improved version. In the end I might -- rewrite the code. -- +-- At the start of 2022 KauĊika spent a lot of time testing combinations of fonts +-- and scripts and in the process some more tracing was added as well as a mixed +-- conjuncts options that can deal with fuzzy fonts. The machinery does what it has +-- to do but some fonts expect more magic to be applied. +-- -- Hans Hagen, PRAGMA-ADE, Hasselt NL -- Todo: @@ -2551,11 +2556,12 @@ local function analyze_next_chars_one(c,font,variant) -- skip one dependent vowe end local function analyze_next_chars_two(c,font) - local n = getnext(c) + local n, v + n = getnext(c) if not n then return c end - local v = ischar(n,font) + v = ischar(n,font) if v and nukta[v] then c = n end @@ -2617,11 +2623,11 @@ local function analyze_next_chars_two(c,font) -- This shouldn't happen I guess. return end - local n = getnext(c) + n = getnext(c) if not n then return c end - local v = ischar(n,font) + v = ischar(n,font) if not v then return c end @@ -3099,6 +3105,10 @@ local function method_two(head,font,attr) current = getnext(current) end + -- if languages.indic then + -- head = languages.indic.handler(head) + -- end + return head, done end diff --git a/tex/context/base/mkiv/math-noa.lua b/tex/context/base/mkiv/math-noa.lua index 613530464..fd4b82215 100644 --- a/tex/context/base/mkiv/math-noa.lua +++ b/tex/context/base/mkiv/math-noa.lua @@ -185,7 +185,7 @@ local opdisplaylimitsnoad_code = noadcodes.opdisplaylimits local oplimitsnoad_code = noadcodes.oplimits local opnolimitsnoad_code = noadcodes.opnolimits local binnoad_code = noadcodes.bin -local relnode_code = noadcodes.rel +local relnoad_code = noadcodes.rel local opennoad_code = noadcodes.open local closenoad_code = noadcodes.close local punctnoad_code = noadcodes.punct @@ -1795,7 +1795,7 @@ do [oplimitsnoad_code] = true, [opnolimitsnoad_code] = true, [binnoad_code] = true, -- new - [relnode_code] = true, + [relnoad_code] = true, [opennoad_code] = true, -- new [closenoad_code] = true, -- new [punctnoad_code] = true, -- new @@ -2112,7 +2112,7 @@ do local classes = { } local colors = { - [relnode_code] = "trace:dr", + [relnoad_code] = "trace:dr", [ordnoad_code] = "trace:db", [binnoad_code] = "trace:dg", [opennoad_code] = "trace:dm", @@ -2171,7 +2171,7 @@ do local permitted = { ordinary = ordnoad_code, binary = binnoad_code, - relation = relnode_code, + relation = relnoad_code, punctuation = punctnoad_code, inner = innernoad_code, } diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua index 9992de8f6..d42132689 100644 --- a/tex/context/base/mkiv/mult-def.lua +++ b/tex/context/base/mkiv/mult-def.lua @@ -9223,6 +9223,10 @@ return { ["fr"]="separateurtete", ["nl"]="kopscheider", }, + ["headindenting"]={ + ["en"]="headindenting", + ["nl"]="kopinspringen", + }, ["headstyle"]={ ["cs"]="stylhlavicky", ["de"]="kopfstil", diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua index 979fef710..2be5115e0 100644 --- a/tex/context/base/mkiv/mult-low.lua +++ b/tex/context/base/mkiv/mult-low.lua @@ -467,27 +467,43 @@ return { -- "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing", "ordopenspacing", "ordclosespacing", "ordpunctspacing", "ordinnerspacing", + "ordfracspacing", "ordradspacing", -- "opordspacing", "opopspacing", "opbinspacing", "oprelspacing", "opopenspacing", "opclosespacing", "oppunctspacing", "opinnerspacing", + "opfracspacing", "opradspacing", -- "binordspacing", "binopspacing", "binbinspacing", "binrelspacing", "binopenspacing", "binclosespacing", "binpunctspacing", "bininnerspacing", + "binfracspacing", "binradspacing", -- "relordspacing", "relopspacing", "relbinspacing", "relrelspacing", "relopenspacing", "relclosespacing", "relpunctspacing", "relinnerspacing", + "relfracspacing", "relradspacing", -- "openordspacing", "openopspacing", "openbinspacing", "openrelspacing", "openopenspacing", "openclosespacing", "openpunctspacing", "openinnerspacing", + "openfracspacing", "openradspacing", -- "closeordspacing", "closeopspacing", "closebinspacing", "closerelspacing", "closeopenspacing", "closeclosespacing", "closepunctspacing", "closeinnerspacing", + "closefracspacing", "closeradspacing", -- "punctordspacing", "punctopspacing", "punctbinspacing", "punctrelspacing", "punctopenspacing", "punctclosespacing", "punctpunctspacing", "punctinnerspacing", + "punctfracspacing", "punctradspacing", -- "innerordspacing", "inneropspacing", "innerbinspacing", "innerrelspacing", "inneropenspacing", "innerclosespacing", "innerpunctspacing", "innerinnerspacing", + "innerfracspacing", "innerradspacing", + -- + "fracordspacing", "fracopspacing", "fracbinspacing", "fracrelspacing", + "fracopenspacing", "fracclosespacing", "fracpunctspacing", "fracinnerspacing", + "fracfracspacing", "fracradspacing", + -- + "radordspacing", "radopspacing", "radbinspacing", "radrelspacing", + "radopenspacing", "radclosespacing", "radpunctspacing", "radinnerspacing", + "radfracspacing", "radradspacing", -- "normalreqno", -- diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua index 2803448d9..d53e76b10 100644 --- a/tex/context/base/mkiv/mult-prm.lua +++ b/tex/context/base/mkiv/mult-prm.lua @@ -86,11 +86,13 @@ return { "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", + "Umathbinfracspacing", "Umathbininnerspacing", "Umathbinopenspacing", "Umathbinopspacing", "Umathbinordspacing", "Umathbinpunctspacing", + "Umathbinradspacing", "Umathbinrelspacing", "Umathbotaccentvariant", "Umathchar", @@ -103,11 +105,13 @@ return { "Umathclass", "Umathclosebinspacing", "Umathcloseclosespacing", + "Umathclosefracspacing", "Umathcloseinnerspacing", "Umathcloseopenspacing", "Umathcloseopspacing", "Umathcloseordspacing", "Umathclosepunctspacing", + "Umathcloseradspacing", "Umathcloserelspacing", "Umathcode", "Umathcodenum", @@ -117,9 +121,23 @@ return { "Umathdelimiterundervariant", "Umathdenominatorvariant", "Umathextrasubpreshift", + "Umathextrasubprespace", "Umathextrasubshift", + "Umathextrasubspace", "Umathextrasuppreshift", + "Umathextrasupprespace", "Umathextrasupshift", + "Umathextrasupspace", + "Umathfracbinspacing", + "Umathfracclosespacing", + "Umathfracfracspacing", + "Umathfracinnerspacing", + "Umathfracopenspacing", + "Umathfracopspacing", + "Umathfracordspacing", + "Umathfracpunctspacing", + "Umathfracradspacing", + "Umathfracrelspacing", "Umathfractiondelsize", "Umathfractiondenomdown", "Umathfractiondenomvgap", @@ -130,11 +148,13 @@ return { "Umathhextensiblevariant", "Umathinnerbinspacing", "Umathinnerclosespacing", + "Umathinnerfracspacing", "Umathinnerinnerspacing", "Umathinneropenspacing", "Umathinneropspacing", "Umathinnerordspacing", "Umathinnerpunctspacing", + "Umathinnerradspacing", "Umathinnerrelspacing", "Umathlimitabovebgap", "Umathlimitabovekern", @@ -152,28 +172,34 @@ return { "Umathopclosespacing", "Umathopenbinspacing", "Umathopenclosespacing", + "Umathopenfracspacing", "Umathopeninnerspacing", "Umathopenopenspacing", "Umathopenopspacing", "Umathopenordspacing", "Umathopenpunctspacing", + "Umathopenradspacing", "Umathopenrelspacing", "Umathopenupdepth", "Umathopenupheight", "Umathoperatorsize", + "Umathopfracspacing", "Umathopinnerspacing", "Umathopopenspacing", "Umathopopspacing", "Umathopordspacing", "Umathoppunctspacing", + "Umathopradspacing", "Umathoprelspacing", "Umathordbinspacing", "Umathordclosespacing", + "Umathordfracspacing", "Umathordinnerspacing", "Umathordopenspacing", "Umathordopspacing", "Umathordordspacing", "Umathordpunctspacing", + "Umathordradspacing", "Umathordrelspacing", "Umathoverbarkern", "Umathoverbarrule", @@ -186,13 +212,18 @@ return { "Umathphantom", "Umathpunctbinspacing", "Umathpunctclosespacing", + "Umathpunctfracspacing", "Umathpunctinnerspacing", "Umathpunctopenspacing", "Umathpunctopspacing", "Umathpunctordspacing", "Umathpunctpunctspacing", + "Umathpunctradspacing", "Umathpunctrelspacing", "Umathquad", + "Umathradbinspacing", + "Umathradclosespacing", + "Umathradfracspacing", "Umathradicaldegreeafter", "Umathradicaldegreebefore", "Umathradicaldegreeraise", @@ -200,13 +231,22 @@ return { "Umathradicalrule", "Umathradicalvariant", "Umathradicalvgap", + "Umathradinnerspacing", + "Umathradopenspacing", + "Umathradopspacing", + "Umathradordspacing", + "Umathradpunctspacing", + "Umathradradspacing", + "Umathradrelspacing", "Umathrelbinspacing", "Umathrelclosespacing", + "Umathrelfracspacing", "Umathrelinnerspacing", "Umathrelopenspacing", "Umathrelopspacing", "Umathrelordspacing", "Umathrelpunctspacing", + "Umathrelradspacing", "Umathrelrelspacing", "Umathskewedfractionhgap", "Umathskewedfractionvgap", @@ -284,6 +324,8 @@ return { "autoparagraphmode", "begincsname", "beginlocalcontrol", + "beginmathgroup", + "beginsimplegroup", "boundary", "boxanchor", "boxanchors", @@ -316,6 +358,8 @@ return { "edefcsname", "efcode", "endlocalcontrol", + "endmathgroup", + "endsimplegroup", "enforced", "etoks", "etoksapp", @@ -328,6 +372,7 @@ return { "expandafterspaces", "expandcstoken", "expanded", + "expandedafter", "expandedloop", "expandtoken", "explicitdiscretionary", @@ -469,9 +514,11 @@ return { "matheqnogapstep", "mathflattenmode", "mathfontcontrol", + "mathfrac", "mathlimitsmode", "mathnolimitsmode", "mathpenaltiesmode", + "mathrad", "mathrulesfam", "mathrulesmode", "mathrulethicknessmode", @@ -536,10 +583,14 @@ return { "tabsize", "textdirection", "thewithoutunit", + "todimension", + "tointeger", "tokenized", "toksapp", "tokspre", "tolerant", + "tomathstyle", + "toscaled", "tpack", "tracingadjusts", "tracingalignments", @@ -703,7 +754,6 @@ return { "baselineskip", "batchmode", "begingroup", - "beginsimplegroup", "belowdisplayshortskip", "belowdisplayskip", "binoppenalty", @@ -751,7 +801,6 @@ return { "endgroup", "endinput", "endlinechar", - "endsimplegroup", "eqno", "errhelp", "errmessage", @@ -964,14 +1013,11 @@ return { "thickmuskip", "thinmuskip", "time", - "todimension", - "tointeger", "toks", "toksdef", "tolerance", "topmark", "topskip", - "toscaled", "tracingcommands", "tracinglostchars", "tracingmacros", diff --git a/tex/context/base/mkiv/spac-hor.mkiv b/tex/context/base/mkiv/spac-hor.mkiv index 16a1a0d4e..5d9cef079 100644 --- a/tex/context/base/mkiv/spac-hor.mkiv +++ b/tex/context/base/mkiv/spac-hor.mkiv @@ -621,6 +621,7 @@ \unexpanded\def\thinspace {\kern .16667\emwidth} \unexpanded\def\negthinspace{\kern-.16667\emwidth} \unexpanded\def\enspace {\kern .5\emwidth} + \unexpanded\def\emspace {\kern \emwidth} \fi @@ -635,8 +636,6 @@ \unexpanded\def\negenspace{\kern-.5\emwidth} \unexpanded\def\negemspace{\kern- \emwidth} -\let\emspace\quad - \unexpanded\def\charspace{ } % the unexpandable \space (as space can also be delimiter for numbers) \unexpanded\def\quads diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex c0645fa90..05f7158b9 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 2b7f03fa1..8ab0cb237 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/strc-enu.mkvi b/tex/context/base/mkiv/strc-enu.mkvi index 4680a3981..a7c48d88e 100644 --- a/tex/context/base/mkiv/strc-enu.mkvi +++ b/tex/context/base/mkiv/strc-enu.mkvi @@ -305,16 +305,22 @@ \endgroup} \unexpanded\def\strc_enumerations_inject_symbol % todo check - {\constructionparameter\c!left + {\begingroup + \useconstructionstyleandcolor\c!numberstyle\c!symbolcolor + \constructionparameter\c!left \constructionparameter\c!symbol - \constructionparameter\c!right} + \constructionparameter\c!right + \endgroup} \unexpanded\def\strc_enumerations_inject_number - {\constructionparameter\c!left + {\begingroup + \useconstructionstyleandcolor\c!numberstyle\c!symbolcolor + \constructionparameter\c!left \constructionparameter\c!starter \clf_savedlistprefixednumber{\currentconstructionmain}\currentconstructionlistentry\relax \constructionparameter\c!stopper - \constructionparameter\c!right} + \constructionparameter\c!right + \endgroup} \unexpanded\def\strc_enumerations_inject_text_and_number {\constructionparameter\c!numbercommand |