From f74c4055713ab52a11d12435eb04040ec6553129 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 6 Dec 2019 22:57:40 +0100 Subject: 2019-12-06 19:54:00 --- 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/context.mkxl | 2 +- tex/context/base/mkiv/font-ini.lua | 2 +- tex/context/base/mkiv/lpdf-ini.lua | 2 +- tex/context/base/mkiv/status-files.pdf | Bin 26578 -> 26605 bytes tex/context/base/mkiv/status-lua.pdf | Bin 269165 -> 269165 bytes tex/context/interface/mkiv/i-context.pdf | Bin 893995 -> 893980 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 61165 -> 61165 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 4 ++-- 12 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tex') diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 3821ec4a7..c68d0bd30 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{2019.12.05 18:44} +\newcontextversion{2019.12.06 19:45} %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 21d3808ea..cf49f51f0 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{2019.12.05 18:44} +\edef\contextversion{2019.12.06 19:45} %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 cfec9c098..32d0ff457 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{2019.12.05 18:44} +\newcontextversion{2019.12.06 19:45} %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 54f6ecc35..fa33068b2 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{2019.12.05 18:44} +\edef\contextversion{2019.12.06 19:45} \edef\contextkind {beta} %D Kind of special: diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl index e91fbc285..38e339ec8 100644 --- a/tex/context/base/mkiv/context.mkxl +++ b/tex/context/base/mkiv/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2019.12.05 18:44} +\edef\contextversion{2019.12.06 19:45} \edef\contextkind {beta} %D Kind of special: diff --git a/tex/context/base/mkiv/font-ini.lua b/tex/context/base/mkiv/font-ini.lua index 8fdac011d..8bab6d902 100644 --- a/tex/context/base/mkiv/font-ini.lua +++ b/tex/context/base/mkiv/font-ini.lua @@ -53,6 +53,6 @@ fonts.privateoffsets = { keepnames = false, -- when set to true names are always kept (not for context) } -if not tex.getfontoffamily then +if node and not tex.getfontoffamily then tex.getfontoffamily = node.family_font -- we moved this end diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua index b039daa58..2163e8748 100644 --- a/tex/context/base/mkiv/lpdf-ini.lua +++ b/tex/context/base/mkiv/lpdf-ini.lua @@ -1275,7 +1275,7 @@ do end end end - if ExtGState or ColorSpace or Pattern or Shading or Fonts then + if ExtGState or ColorSpace or Pattern or Shading or Font then local collected = pdfdictionary { ExtGState = ExtGState, ColorSpace = ColorSpace, diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 14160c825..251d59539 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 1fb3effab..24ef5be72 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 12d7ad595..e38499187 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 7695a653b..bdfaa028f 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 f81fee7a7..2b4755b3f 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/05/19 18:44:50 +-- merge date : 12/06/19 19:45:18 do -- begin closure to overcome local limits and interference @@ -8690,7 +8690,7 @@ fonts.privateoffsets={ mathbase=0xFF000, keepnames=false, } -if not tex.getfontoffamily then +if node and not tex.getfontoffamily then tex.getfontoffamily=node.family_font end -- cgit v1.2.3