diff options
Diffstat (limited to 'tex/context/base/mkxl')
| -rw-r--r-- | tex/context/base/mkxl/cont-new.mkxl | 2 | ||||
| -rw-r--r-- | tex/context/base/mkxl/context.mkxl | 2 | ||||
| -rw-r--r-- | tex/context/base/mkxl/driv-shp.lmt | 14 | ||||
| -rw-r--r-- | tex/context/base/mkxl/libs-imp-zint.mkxl | 8 | ||||
| -rw-r--r-- | tex/context/base/mkxl/node-ini.lmt | 12 | ||||
| -rw-r--r-- | tex/context/base/mkxl/node-rul.lmt | 9 |
6 files changed, 29 insertions, 18 deletions
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl index 38433e8ea..5306b33b4 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.09.17 09:58} +\newcontextversion{2021.09.26 16: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/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl index a51c7d895..c2b8528c1 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.09.17 09:58} +\immutable\edef\contextversion{2021.09.26 16:48} %overloadmode 1 % check frozen / warning %overloadmode 2 % check frozen / error diff --git a/tex/context/base/mkxl/driv-shp.lmt b/tex/context/base/mkxl/driv-shp.lmt index f0d037564..fed58dacf 100644 --- a/tex/context/base/mkxl/driv-shp.lmt +++ b/tex/context/base/mkxl/driv-shp.lmt @@ -98,7 +98,7 @@ local fontcharacters = nil local magicconstants = tex.magicconstants local maxdimen = magicconstants.maxdimen -local running = magicconstants.running +local runningrule = magicconstants.runningrule local pos_h = 0 local pos_v = 0 @@ -696,10 +696,10 @@ cur_h = cur_h + wd -- see new tabulate alignment code local width, height, depth = getwhd(leader) if getid(leader) == rule_code then if gluewidth > 0 then - if height == running then + if height == runningrule then height = boxheight end - if depth == running then + if depth == runningrule then depth = boxdepth end local total = height + depth @@ -873,10 +873,10 @@ cur_h = cur_h + wd -- see new tabulate alignment code elseif id == rule_code then local width, height, depth = getwhd(current) if width > 0 then - if height == running then + if height == runningrule then height = boxheight end - if depth == running then + if depth == runningrule then depth = boxdepth end local total = height + depth @@ -1031,7 +1031,7 @@ cur_h = cur_h + wd -- see new tabulate alignment code depth = 0 -- hm total = glueheight -- forgotten ... needs testing if total > 0 then - if width == running then + if width == runningrule then width = boxwidth end if width > 0 then @@ -1176,7 +1176,7 @@ cur_h = cur_h + wd -- see new tabulate alignment code local width, height, depth = getwhd(current) local total = height + depth if total > 0 then - if width == running then + if width == runningrule then width = boxwidth end if width > 0 then diff --git a/tex/context/base/mkxl/libs-imp-zint.mkxl b/tex/context/base/mkxl/libs-imp-zint.mkxl index 208dd9d34..b2c364379 100644 --- a/tex/context/base/mkxl/libs-imp-zint.mkxl +++ b/tex/context/base/mkxl/libs-imp-zint.mkxl @@ -49,7 +49,9 @@ \starttext -% \dorecurse{1000}{ +\dontcomplain + +\dorecurse{1}{ \startTEXpage \barcode[alternative=PDF417,text={Hans Hagen}]% \blank @@ -60,11 +62,11 @@ \barcode[alternative=isbn,text=9789490688011,width=3cm]% \blank \dontleavehmode - \barcode[alternative=qr code,text={This is ConTeXt MKIV}] + \barcode[alternative=qr code,text={This is ConTeXt MKIV : #1}] \barcode[alternative=qr code,text={This is ConTeXt LMTX}] \barcode[alternative=qr code,text={\cldloadfile{tufte}},width=3cm] \stopTEXpage -% } +} \stoptext diff --git a/tex/context/base/mkxl/node-ini.lmt b/tex/context/base/mkxl/node-ini.lmt index a0c447954..06e36147c 100644 --- a/tex/context/base/mkxl/node-ini.lmt +++ b/tex/context/base/mkxl/node-ini.lmt @@ -34,9 +34,19 @@ local getvalues = node.values tex.magicconstants = { -- we use tex.constants for something else running = -1073741824, -- null_flag maxdimen = 1073741823, -- max_dimen - trueinch = 4736286, + -- trueinch = 4736286, -- obsolete } +do + local c = status.getconstants() + local t = { } + for k, v in next, c do + t[gsub(k,"_","")] = v + end + + tex.magicconstants = table.setmetatableindex(t,c) +end + local listcodes = mark(getsubtypes("list")) local rulecodes = mark(getsubtypes("rule")) local dircodes = mark(getsubtypes("dir")) diff --git a/tex/context/base/mkxl/node-rul.lmt b/tex/context/base/mkxl/node-rul.lmt index a1857bd6e..4931569a7 100644 --- a/tex/context/base/mkxl/node-rul.lmt +++ b/tex/context/base/mkxl/node-rul.lmt @@ -126,8 +126,7 @@ local dimenfactor = fonts.helpers.dimenfactor local splitdimen = number.splitdimen local setmetatableindex = table.setmetatableindex -local magicconstants = tex.magicconstants -local running = magicconstants.running +local runningrule = tex.magicconstants.runningrule local striprange = nuts.striprange local processwords = nuts.processwords @@ -706,9 +705,9 @@ interfaces.implement { }, actions = function(t) local n = new_rule( - t.width or running, - t.height or running, - t.depth or running + t.width or runningrule, + t.height or runningrule, + t.depth or runningrule ) setattrlist(n,true) setoffsets(n,t.xoffset,t.yoffset) -- ,t.left, t.right |