diff options
Diffstat (limited to 'tex')
26 files changed, 104 insertions, 74 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index dbf7190d6..83b16916a 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2021.01.29 19:41} +\newcontextversion{2021.02.01 13: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/mkii/context.mkii b/tex/context/base/mkii/context.mkii index 7702d079d..8dc76805c 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2021.01.29 19:41} +\edef\contextversion{2021.02.01 13:17} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-cs.mkii b/tex/context/base/mkii/mult-cs.mkii index d4b39ad3b..798779b96 100644 --- a/tex/context/base/mkii/mult-cs.mkii +++ b/tex/context/base/mkii/mult-cs.mkii @@ -774,6 +774,8 @@ \setinterfaceconstant{deepnumbercommand}{deepnumbercommand} \setinterfaceconstant{deeptextcommand}{deeptextcommand} \setinterfaceconstant{default}{implicitni} +\setinterfaceconstant{defaultheight}{defaultheight} +\setinterfaceconstant{defaultwidth}{defaultwidth} \setinterfaceconstant{define}{define} \setinterfaceconstant{delay}{prodleva} \setinterfaceconstant{depth}{hloubka} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 5eb0a9601..83ccdfaef 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.01.29 19:41} +\newcontextversion{2021.02.01 13: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 843c8cb33..66788f837 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -45,7 +45,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2021.01.29 19:41} +\edef\contextversion{2021.02.01 13:17} %D Kind of special: diff --git a/tex/context/base/mkiv/math-act.lua b/tex/context/base/mkiv/math-act.lua index a5cfa82de..e1ef751d7 100644 --- a/tex/context/base/mkiv/math-act.lua +++ b/tex/context/base/mkiv/math-act.lua @@ -228,8 +228,6 @@ sequencers.appendaction("mathparameters","system","mathematics.overloadparameter sequencers.appendaction("beforecopyingcharacters","system","mathematics.tweakbeforecopyingfont") sequencers.appendaction("aftercopyingcharacters", "system","mathematics.tweakaftercopyingfont") -local virtualized = mathematics.virtualized - -- no, it's a feature now (see good-mth): -- -- sequencers.appendaction("aftercopyingcharacters", "system","mathematics.overloaddimensions") @@ -245,6 +243,8 @@ mathematics.tweaks = tweaks -- these could go to math-fbk +-- local virtualized = mathematics.virtualized +-- -- local function accent_to_extensible(target,newchr,original,oldchr,height,depth,swap) -- local characters = target.characters -- -- if not characters[newchr] then -- xits needs an enforce @@ -602,10 +602,10 @@ function mathematics.finishfallbacks(target,specification,fallbacks) fonts = { } target.fonts = fonts end - -- + -- target.type = "virtual" target.properties.virtualized = true - -- + -- if #fonts == 0 then fonts[1] = { id = 0, size = size } -- self, will be resolved later end diff --git a/tex/context/base/mkiv/math-ini.lua b/tex/context/base/mkiv/math-ini.lua index 5475f6f73..19bf86802 100644 --- a/tex/context/base/mkiv/math-ini.lua +++ b/tex/context/base/mkiv/math-ini.lua @@ -684,7 +684,7 @@ function mathematics.big(tfmdata,unicode,n,method) end end end - elseif method == 3 then + elseif method >= 3 then local size = 1.33^n if method == 4 then size = tfmdata.parameters.size * size diff --git a/tex/context/base/mkiv/math-vfu.lua b/tex/context/base/mkiv/math-vfu.lua index 627f85e57..221bbff89 100644 --- a/tex/context/base/mkiv/math-vfu.lua +++ b/tex/context/base/mkiv/math-vfu.lua @@ -915,7 +915,7 @@ function vfmath.define(specification,set,goodies) else local vectorname = ss.vector if vectorname then - local offset = 0xFF000 + local offset = 0xFF000 -- todo: -- private local vector = mathencodings[vectorname] local rotcev = reverse[vectorname] local isextension = ss.extension @@ -923,11 +923,11 @@ function vfmath.define(specification,set,goodies) local fc = fs.characters local fd = fs.descriptions local si = shared[s] + local fontname = fs.properties.name or "unknown" local skewchar = ss.skewchar for unicode, index in next, vector do local fci = fc[index] if not fci then - local fontname = fs.properties.name or "unknown" local rf = reported[fontname] if not rf then rf = { } reported[fontname] = rf end local rv = rf[vectorname] diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua index f779bc230..e89571217 100644 --- a/tex/context/base/mkiv/mult-prm.lua +++ b/tex/context/base/mkiv/mult-prm.lua @@ -400,6 +400,7 @@ return { "noaligned", "noboundary", "nohrule", + "norelax", "normalizelinemode", "nospaces", "novrule", diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 5209919ea..4fa124525 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 6eab06ae2..022a29167 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl index 6e7b34537..92dddab22 100644 --- a/tex/context/base/mkxl/cont-new.mkxl +++ b/tex/context/base/mkxl/cont-new.mkxl @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2021.01.29 19:41} +\newcontextversion{2021.02.01 13: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/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl index 5d26d4fbe..78aa7bf93 100644 --- a/tex/context/base/mkxl/context.mkxl +++ b/tex/context/base/mkxl/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \immutable\edef\contextformat {\jobname} -\immutable\edef\contextversion{2021.01.29 19:41} +\immutable\edef\contextversion{2021.02.01 13:17} %overloadmode 1 % check frozen / warning %overloadmode 2 % check frozen / error diff --git a/tex/context/base/mkxl/font-con.lmt b/tex/context/base/mkxl/font-con.lmt index d737d28ce..bebc4e498 100644 --- a/tex/context/base/mkxl/font-con.lmt +++ b/tex/context/base/mkxl/font-con.lmt @@ -785,6 +785,8 @@ function constructors.scale(tfmdata,specification) -- properties.setitalics = hasitalics -- for postprocessing -- + -- if hasmath then properties.mode = "none" end -- possible optimization but it needs testing + -- constructors.aftercopyingcharacters(target,tfmdata) -- constructors.trytosharefont(target,tfmdata) diff --git a/tex/context/base/mkxl/font-pre.mkxl b/tex/context/base/mkxl/font-pre.mkxl index 884a6c913..311512bce 100644 --- a/tex/context/base/mkxl/font-pre.mkxl +++ b/tex/context/base/mkxl/font-pre.mkxl @@ -397,6 +397,7 @@ \definefontfeature [mathematics] [mode=base, + % mode=none, % better, maybe do this last kern=yes, % liga=yes, % makes no sense % tlig=yes, % makes no sense @@ -420,10 +421,8 @@ \mathnolimitsmode\plusone % font driven (only opentype) \fi -\ifdefined\mathitalicsmode - \mathitalicsmode\plusone % simple noads become zero - % \mathitalicsmode\plustwo % idem but inner is kept (for testing) -\fi +\mathitalicsmode\plusone % 1 : add to simple noad +%mathitalicsmode\plusthree % 2 : add italic kerns for diagnostics % \adaptfontfeature[*math*][mathnolimitsmode=1000] % only subscript diff --git a/tex/context/base/mkxl/math-act.lmt b/tex/context/base/mkxl/math-act.lmt index 3076f2ac9..9da799764 100644 --- a/tex/context/base/mkxl/math-act.lmt +++ b/tex/context/base/mkxl/math-act.lmt @@ -229,8 +229,6 @@ sequencers.appendaction("mathparameters","system","mathematics.overloadparameter sequencers.appendaction("beforecopyingcharacters","system","mathematics.tweakbeforecopyingfont") sequencers.appendaction("aftercopyingcharacters", "system","mathematics.tweakaftercopyingfont") -local virtualized = mathematics.virtualized - -- no, it's a feature now (see good-mth): -- -- sequencers.appendaction("aftercopyingcharacters", "system","mathematics.overloaddimensions") diff --git a/tex/context/base/mkxl/math-fen.mkxl b/tex/context/base/mkxl/math-fen.mkxl index 2e491f28b..ed680b948 100644 --- a/tex/context/base/mkxl/math-fen.mkxl +++ b/tex/context/base/mkxl/math-fen.mkxl @@ -124,15 +124,17 @@ \fi \orelse\ifx\p_factor\v!none #3% - \s!height\zeropoint - \s!depth\zeropoint + \s!height\zeropoint % redundant with "exact" + \s!depth\zeropoint % redundant with "exact" \ifempty\p_mathclass\else \s!class\p_mathclass \fi \s!axis + \s!exact % new % #2% \else - \scratchdimen\ifx\p_factor\v!fixed\scaledpoint\else\dimexpr\p_factor\bodyfontsize/2\relax\fi + %\scratchdimen\ifx\p_factor\v!fixed\scaledpoint\else\dimexpr\p_factor\bodyfontsize/2\relax\fi + \scratchdimen\ifx\p_factor\v!fixed\zeropoint\else\dimexpr\p_factor\bodyfontsize/2\relax\fi #3% \s!height\scratchdimen \s!depth\scratchdimen @@ -140,6 +142,7 @@ \s!class\p_mathclass \fi \s!axis + \s!exact \fi \Udelimiter#4\fam#1\relax \fi} @@ -223,6 +226,11 @@ {\advance\c_math_fenced_nesting\plusone \begingroup \edef\currentmathfence{#1}% +% under test: +\c_attr_mathsize\attributeunsetvalue +\letmathfenceparameter\c!size\empty +\letmathfenceparameter\c!factor\v!auto +% so far \ifparameter#2\or\setupcurrentmathfence[#2]\fi \math_fenced_fenced_common \edef\p_size{\mathfenceparameter\c!size}% @@ -598,15 +606,20 @@ % 3: htdp * 1.33^n % 4: size * 1.33^n -\setnewconstant\bigmathdelimitermethod \plusone +\setnewconstant\bigmathdelimitermethod \plustwo % \plusone \setnewconstant\bigmathdelimitervariant\plusthree -\protected\def\plainbigdelimiters % traditional method - {\bigmathdelimitermethod\plustwo} +\appendtoks + \bigmathdelimitermethod \mathfenceparameter\c!method\relax + \bigmathdelimitervariant\mathfenceparameter\c!alternative\relax +\to \everysetupmathfence -\plainbigdelimiters % is default for the moment but not so nice +\setupmathfence[\c!method=1,\c!alternative=2] -% \setconstant\bigmathdelimitermethod\plusone +% \protected\def\plainbigdelimiters % traditional method +% {\bigmathdelimitermethod\plustwo} +% +% \plainbigdelimiters % is default for the moment but not so nice \installcorenamespace{mathbig} diff --git a/tex/context/base/mkxl/math-noa.lmt b/tex/context/base/mkxl/math-noa.lmt index 92edbc441..118ab1826 100644 --- a/tex/context/base/mkxl/math-noa.lmt +++ b/tex/context/base/mkxl/math-noa.lmt @@ -854,7 +854,7 @@ do local chr = getchar(delimiter) if chr > 0 then local fam = getfam(delimiter) - local id = getfontoffamily(fam) + local id = getfontoffamily(fam) if id > 0 then local data = fontdata[id] local char = mathematics.big(data,chr,size,method) diff --git a/tex/context/base/mkxl/math-vfu.lmt b/tex/context/base/mkxl/math-vfu.lmt index daa6bbf5e..6584b0158 100644 --- a/tex/context/base/mkxl/math-vfu.lmt +++ b/tex/context/base/mkxl/math-vfu.lmt @@ -6,18 +6,10 @@ if not modules then modules = { } end modules ['math-vfu'] = { license = "see context related readme files" } --- All these math vectors .. thanks to Aditya and Mojca they become --- better and better. If you have problems with math fonts or miss --- characters report it to the ConTeXt mailing list. Also thanks to --- Boguslaw for finding a couple of errors. --- --- This mechanism will stay around. Even when we've switched to the --- real fonts, one can still say: --- --- \enablemode[lmmath,pxmath,txmath] --- --- to get the virtual counterparts. There are still areas where the --- virtuals are better. +-- All these math vectors .. thanks to Aditya and Mojca they become better and +-- better. If you have problems with math fonts or miss characters report it to the +-- ConTeXt mailing list. Also thanks to Boguslaw for finding a couple of errors. +-- This mechanism will eventually disappear. -- 20D6 -> 2190 -- 20D7 -> 2192 @@ -772,7 +764,10 @@ function vfmath.define(specification,set,goodies) local mathparameters = { } local descriptions = { } local metadata = { } - local properties = { } + local properties = { + hasitalics = true, + hasmath = true, + } local goodies = { } local main = { metadata = metadata, @@ -783,6 +778,9 @@ function vfmath.define(specification,set,goodies) mathparameters = mathparameters, fonts = fontlist, goodies = goodies, + -- + fullname = properties.fullname, + nomath = false, } -- for key, value in next, parent do @@ -818,21 +816,15 @@ function vfmath.define(specification,set,goodies) setmetatableindex(goodies,parent.goodies) end -- - properties.hasitalics = true - properties.hasmath = true - -- local fullname = properties.fullname -- parent via mt if fullname then unique = unique + 1 properties.fullname = fullname .. "-" .. unique end -- - -- we need to set some values in main as well (still?) - -- - main.fullname = properties.fullname - main.nomath = false - -- - parameters.x_height = parameters.x_height or 0 + if not parameters.x_height then + parameters.x_height = 0 + end -- local already_reported = false local parameters_done = false @@ -905,19 +897,22 @@ function vfmath.define(specification,set,goodies) local fc = fs.characters local fd = fs.descriptions local si = shared[s] + local fontname = fs.properties.name or "unknown" local skewchar = ss.skewchar - local indices = { } + local backmap = ss.backmap -- we need to know the original order because the loader has made a -- unicode font of it and weird glyphnames have spoiled that a bit - for unicode, character in next, fc do - indices[character.order or character.index or unicode] = unicode + if backmap then + backmap = { } + for unicode, character in next, fc do + backmap[character.order or character.index or unicode] = unicode + end end for unicode, i in next, vector do - -- so, here we have an extra remapping (compared to mkiv) - local index = indices[i] + -- So, here we can have an extra remapping (compared to mkiv). + local index = backmap and backmap[i] or i local fci = fc[index] if not fci then - local fontname = fs.properties.name or "unknown" local rf = reported[fontname] if not rf then rf = { } reported[fontname] = rf end local rv = rf[vectorname] @@ -927,9 +922,9 @@ function vfmath.define(specification,set,goodies) if trace_virtual then local d = chardata[unicode].description if index then - report_virtual("unicode slot %U has no index %H in vector %a for font %a (%S)",unicode,index,vectorname,fontname,d) + report_virtual("character %C has no index %H in vector %a for font %a (%S)",unicode,index,vectorname,fontname,d) else - report_virtual("unicode slot %U has no entry in vector %a for font %a (%S)",unicode,vectorname,fontname,d) + report_virtual("character %C has no entry in vector %a for font %a (%S)",unicode,vectorname,fontname,d) end elseif not already_reported then report_virtual("the mapping is incomplete for %a at %p",name,size) @@ -946,8 +941,15 @@ function vfmath.define(specification,set,goodies) local kerns = fci.kerns local width = fci.width local italic = fci.italic +-- if trace_virtual then +-- report_virtual("character %C uses index %H in vector %a for font %a, %s, %s", +-- unicode,index,vectorname,fontname, +-- kerns and "adding kerns" or "no kerns", +-- kerns and "adding italic" or "no italic" +-- ) +-- end if italic and italic > 0 then - -- int_a^b + -- int_a^b if isextension then width = width + italic -- for obscure reasons the integral as a width + italic correction end @@ -1097,6 +1099,9 @@ function vfmath.define(specification,set,goodies) mathematics.extras.copy(main) --not needed here (yet) end end +-- inspect(characters[0x1D465]) +-- inspect(fonts.encodings.math["tex-it"]) +-- inspect(fontlist) -- main.mathparameters = mathparameters -- still traditional ones -- This should change (some day) as it's the only place where we look forward, diff --git a/tex/context/base/mkxl/mult-sys.mkxl b/tex/context/base/mkxl/mult-sys.mkxl index efd39a4a5..9b48c7a99 100644 --- a/tex/context/base/mkxl/mult-sys.mkxl +++ b/tex/context/base/mkxl/mult-sys.mkxl @@ -108,6 +108,7 @@ \definesystemconstant {author} \definesystemconstant {auto} \definesystemconstant {axis} +\definesystemconstant {exact} \definesystemconstant {a} \definesystemconstant {bf} \definesystemconstant {big} diff --git a/tex/context/fonts/mkiv/px-math.lfg b/tex/context/fonts/mkiv/px-math.lfg index 08d208b3f..4000ae199 100644 --- a/tex/context/fonts/mkiv/px-math.lfg +++ b/tex/context/fonts/mkiv/px-math.lfg @@ -10,18 +10,18 @@ return { }, virtuals = { ["px-math"] = { --- { name = "texgyre-pagella-math-regular.otf", features = "virtualmath", main = true }, --- { name = "texgyrepagella-regular.otf", features = "virtualmath", vector = "tex-mr-missing" } , - { name = "texgyrepagella-regular.otf", features = "virtualmath" } , - { name = "rpxr.tfm", vector = "tex-mr" } , + { name = "texgyrepagella-regular.otf", features = "virtualmath" }, + { name = "texgyrepagella-regular.otf", features = "virtualmath", vector = "tex-mr-missing" }, + { name = "rpxr.tfm", vector = "tex-mr" }, { name = "rpxmi.tfm", vector = "tex-mi", skewchar=0x7F }, - { name = "rpxpplri.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "pxsy.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , + -- { name = "rpxpplri.tfm", vector = "tex-it", skewchar=0x7F, backmap = true }, -- backmap for lmtx + { name = "texgyrepagella-italic.otf", vector = "tex-it", skewchar=0x7F }, + { name = "pxsy.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, { name = "pxex.tfm", vector = "tex-ex", extension = true } , { name = "pxsya.tfm", vector = "tex-ma" }, { name = "pxsyb.tfm", vector = "tex-mb" }, - { name = "texgyrepagella-bold.otf", vector = "tex-bf", skewchar=0x7F } , - { name = "texgyrepagella-bolditalic.otf", vector = "tex-bi" } , + { name = "texgyrepagella-bold.otf", vector = "tex-bf", skewchar=0x7F }, + { name = "texgyrepagella-bolditalic.otf", vector = "tex-bi" }, { name = "lmsans10-regular.otf", vector = "tex-ss", optional=true }, { name = "lmmono10-regular.otf", vector = "tex-tt", optional=true }, }, diff --git a/tex/context/fonts/mkiv/tx-math.lfg b/tex/context/fonts/mkiv/tx-math.lfg index 2ad173486..58467129e 100644 --- a/tex/context/fonts/mkiv/tx-math.lfg +++ b/tex/context/fonts/mkiv/tx-math.lfg @@ -12,15 +12,15 @@ return { ["tx-math"] = { { name = "texgyretermes-regular.otf", features = "virtualmath", main = true }, { name = "texgyretermes-regular.otf", features = "virtualmath", vector = "tex-mr-missing" }, - { name = "rtxr.tfm", vector = "tex-mr" } , + { name = "rtxr.tfm", vector = "tex-mr" }, { name = "rtxptmri.tfm", vector = "tex-it", skewchar=0x7F }, { name = "rtxmi.tfm", vector = "tex-mi", skewchar=0x7F }, - { name = "txsy.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "txex.tfm", vector = "tex-ex", extension = true } , + { name = "txsy.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "txex.tfm", vector = "tex-ex", extension = true }, { name = "txsya.tfm", vector = "tex-ma" }, { name = "txsyb.tfm", vector = "tex-mb" }, - { name = "texgyretermes-bold.otf", vector = "tex-bf", skewchar=0x7F } , - { name = "texgyretermes-bolditalic.otf", vector = "tex-bi" } , + { name = "texgyretermes-bold.otf", vector = "tex-bf", skewchar=0x7F }, + { name = "texgyretermes-bolditalic.otf", vector = "tex-bi" }, { name = "lmsans10-regular.otf", vector = "tex-ss", optional=true }, { name = "lmmono10-regular.otf", vector = "tex-tt", optional=true }, } diff --git a/tex/context/fonts/mkiv/type-imp-euler.mkiv b/tex/context/fonts/mkiv/type-imp-euler.mkiv index e98a6e963..64961830c 100644 --- a/tex/context/fonts/mkiv/type-imp-euler.mkiv +++ b/tex/context/fonts/mkiv/type-imp-euler.mkiv @@ -48,7 +48,7 @@ \stoptypescript \starttypescript [\s!math] [eulernova] [\s!name] - \loadfontgoodies[euler-math] + % \loadfontgoodies[euler-math] \definefontsynonym [MathRoman] [\s!file:euler.otf] [\s!features={\s!math\mathsizesuffix,mathextra}] \stoptypescript diff --git a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv index 72d3b3588..01cbb869d 100644 --- a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv +++ b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv @@ -14,6 +14,13 @@ %D There are some weird ones that are never used .. all these Caps ... we can better %D split them into pagella-caps etc. +%D The tx and px font setups depend on the definitions in px-math.lfg and tx-math.lfg +%D and because these fonts (mappings, names) are not that stable you should not use +%D these variants. At some point I will remove this because we have \OPENTYPE\ fonts +%D that (mostly) work. The mechanism to construct virtual math fonts will probably stay +%D around but I won't waste time on sorting out all the (changing) font hassles. Also, +%D the T1 fonts involved are unlikely to be available. + \definefontfeature [mathcollapseitalics] [collapseitalics=yes] diff --git a/tex/context/interface/mkii/keys-cs.xml b/tex/context/interface/mkii/keys-cs.xml index 9765bf47f..3a7c187c6 100644 --- a/tex/context/interface/mkii/keys-cs.xml +++ b/tex/context/interface/mkii/keys-cs.xml @@ -780,6 +780,8 @@ <cd:constant name='deepnumbercommand' value='deepnumbercommand'/> <cd:constant name='deeptextcommand' value='deeptextcommand'/> <cd:constant name='default' value='implicitni'/> + <cd:constant name='defaultheight' value='defaultheight'/> + <cd:constant name='defaultwidth' value='defaultwidth'/> <cd:constant name='define' value='define'/> <cd:constant name='delay' value='prodleva'/> <cd:constant name='depth' value='hloubka'/> diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 9ae017ec9..2bc5323cb 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 2021-01-29 19:41 +-- merge date : 2021-02-01 13:17 do -- begin closure to overcome local limits and interference |