From 979450762f4ef3b885fd63984c91165726494564 Mon Sep 17 00:00:00 2001 From: Hans Hagen <pragma@wxs.nl> Date: Wed, 19 Dec 2018 20:26:55 +0100 Subject: 2018-12-19 19:30:00 --- doc/context/documents/general/qrcs/setup-cs.pdf | Bin 905616 -> 905611 bytes doc/context/documents/general/qrcs/setup-de.pdf | Bin 905586 -> 905577 bytes doc/context/documents/general/qrcs/setup-en.pdf | Bin 913340 -> 913345 bytes doc/context/documents/general/qrcs/setup-fr.pdf | Bin 903788 -> 903781 bytes doc/context/documents/general/qrcs/setup-it.pdf | Bin 907580 -> 907582 bytes .../documents/general/qrcs/setup-mapping-cs.pdf | Bin 347666 -> 347663 bytes .../documents/general/qrcs/setup-mapping-de.pdf | Bin 435261 -> 435259 bytes .../documents/general/qrcs/setup-mapping-en.pdf | Bin 345198 -> 345195 bytes .../documents/general/qrcs/setup-mapping-fr.pdf | Bin 347977 -> 347972 bytes .../documents/general/qrcs/setup-mapping-it.pdf | Bin 346925 -> 346923 bytes .../documents/general/qrcs/setup-mapping-nl.pdf | Bin 345990 -> 345987 bytes .../documents/general/qrcs/setup-mapping-ro.pdf | Bin 549118 -> 549114 bytes doc/context/documents/general/qrcs/setup-nl.pdf | Bin 900224 -> 900227 bytes doc/context/documents/general/qrcs/setup-ro.pdf | Bin 903124 -> 903116 bytes tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/math-ini.mkiv | 4 +-- tex/context/base/mkiv/math-noa.lua | 34 +++++++++++++-------- tex/context/base/mkiv/status-files.pdf | Bin 26314 -> 26300 bytes tex/context/base/mkiv/status-lua.pdf | Bin 235069 -> 235065 bytes tex/context/interface/mkiv/i-context.pdf | Bin 913340 -> 913345 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 25099 -> 25093 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 25 files changed, 28 insertions(+), 20 deletions(-) diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf index 222df2923..a28262bc9 100644 Binary files a/doc/context/documents/general/qrcs/setup-cs.pdf and b/doc/context/documents/general/qrcs/setup-cs.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf index 39840543d..f125826c5 100644 Binary files a/doc/context/documents/general/qrcs/setup-de.pdf and b/doc/context/documents/general/qrcs/setup-de.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf index 972cfe4e4..06f7a694b 100644 Binary files a/doc/context/documents/general/qrcs/setup-en.pdf and b/doc/context/documents/general/qrcs/setup-en.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf index c0f0798d9..abfcfa575 100644 Binary files a/doc/context/documents/general/qrcs/setup-fr.pdf and b/doc/context/documents/general/qrcs/setup-fr.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf index 233bb2e86..96c7e3721 100644 Binary files a/doc/context/documents/general/qrcs/setup-it.pdf and b/doc/context/documents/general/qrcs/setup-it.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf index cf37e75cc..3ddf9866e 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf and b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-de.pdf b/doc/context/documents/general/qrcs/setup-mapping-de.pdf index 33c18fd59..76d73a092 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-de.pdf and b/doc/context/documents/general/qrcs/setup-mapping-de.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-en.pdf b/doc/context/documents/general/qrcs/setup-mapping-en.pdf index 161f154e2..bc878086f 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-en.pdf and b/doc/context/documents/general/qrcs/setup-mapping-en.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf index 6f8371a94..4d286cca3 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf and b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-it.pdf b/doc/context/documents/general/qrcs/setup-mapping-it.pdf index 1f4230314..eebf20357 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-it.pdf and b/doc/context/documents/general/qrcs/setup-mapping-it.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf index 5a90a40ad..e53aa448e 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf and b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf index 1ae4e35a3..3da091d26 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf and b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf index 96439c3fc..4b7854c85 100644 Binary files a/doc/context/documents/general/qrcs/setup-nl.pdf and b/doc/context/documents/general/qrcs/setup-nl.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf index 409314986..e79fedf36 100644 Binary files a/doc/context/documents/general/qrcs/setup-ro.pdf and b/doc/context/documents/general/qrcs/setup-ro.pdf differ diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 38a56df30..fa6af8829 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{2018.12.19 18:48} +\newcontextversion{2018.12.19 19:22} %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 ba45fd7fd..bd22d80fe 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{2018.12.19 18:48} +\edef\contextversion{2018.12.19 19:22} %D For those who want to use this: diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index fca09d204..8fe9caee7 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2018.12.19 18:48} +\newcontextversion{2018.12.19 19:22} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 26a200599..56dca3870 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -42,7 +42,7 @@ %D has to match \type {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2018.12.19 18:48} +\edef\contextversion{2018.12.19 19:22} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv index 02fbf7db5..2bc9817c1 100644 --- a/tex/context/base/mkiv/math-ini.mkiv +++ b/tex/context/base/mkiv/math-ini.mkiv @@ -2871,11 +2871,11 @@ %D Experiment \unexpanded\def\math_scripts_stack - {\mathunstackattribute\attributeunsetvalue} + {\attribute\mathunstackattribute\attributeunsetvalue} \unexpanded\def\math_scripts_unstack {\clf_enablescriptunstacking - \mathunstackattribute\plusone} + \attribute\mathunstackattribute\plusone} \appendtoks \let\stackscripts \math_scripts_stack diff --git a/tex/context/base/mkiv/math-noa.lua b/tex/context/base/mkiv/math-noa.lua index 5cf367fba..8d59b474b 100644 --- a/tex/context/base/mkiv/math-noa.lua +++ b/tex/context/base/mkiv/math-noa.lua @@ -64,6 +64,7 @@ local trace_kernpairs = false registertracker("math.kernpairs", function local trace_domains = false registertracker("math.domains", function(v) trace_domains = v end) local trace_families = false registertracker("math.families", function(v) trace_families = v end) local trace_fences = false registertracker("math.fences", function(v) trace_fences = v end) +local trace_unstacking = false registertracker("math.unstack", function(v) trace_unstacking = v end) local check_coverage = true registerdirective("math.checkcoverage", function(v) check_coverage = v end) @@ -81,6 +82,7 @@ local report_kernpairs = logreporter("mathematics","kernpairs") local report_domains = logreporter("mathematics","domains") local report_families = logreporter("mathematics","families") local report_fences = logreporter("mathematics","fences") +local report_unstacking = logreporter("mathematics","unstack") local a_mathrendering = privateattribute("mathrendering") local a_exportstatus = privateattribute("exportstatus") @@ -1152,19 +1154,25 @@ end do - local unstack = { } noads.processors.unstack = unstack - local enabled = false - - unstack[math_noad] = function(pointer,what,n,parent) - local sup = getsup(pointer) - local sub = getsub(pointer) - if sup and sub then - local nxt = getnext(pointer) - local new = new_noad(pointer) - setnucleus(new,new_submlist()) - setsub(pointer) - setsub(new,sub) - setlink(pointer,new,nxt) + local unstack = { } noads.processors.unstack = unstack + local enabled = false + local a_unstack = privateattribute("mathunstack") + + unstack[math_noad] = function(pointer) + if getattr(pointer,a_unstack) then + local sup = getsup(pointer) + local sub = getsub(pointer) + if sup and sub then + -- if trace_unstacking then + -- report_unstacking() -- todo ... what to show ... + -- end + local nxt = getnext(pointer) + local new = new_noad(pointer) + setnucleus(new,new_submlist()) + setsub(pointer) + setsub(new,sub) + setlink(pointer,new,nxt) + end end end diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 0a1fce1b6..b98120d35 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index d7867f11e..39ca462ff 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index 972cfe4e4..06f7a694b 100644 Binary files a/tex/context/interface/mkiv/i-context.pdf and b/tex/context/interface/mkiv/i-context.pdf differ diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf index 7e88b757a..7e234137e 100644 Binary files a/tex/context/interface/mkiv/i-readme.pdf and b/tex/context/interface/mkiv/i-readme.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index f0ca93b49..0c9bfcc38 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 : 12/19/18 18:48:37 +-- merge date : 12/19/18 19:22:22 do -- begin closure to overcome local limits and interference -- cgit v1.2.3