From 3ab20dbdfa095edd8c6bc00b8e3bdccd78900257 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sun, 28 May 2017 19:46:18 +0200 Subject: 2017-05-28 19:35: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/font-ini.lua | 2 +- tex/context/base/mkiv/font-lib.mkvi | 2 +- tex/context/base/mkiv/lpdf-mis.lua | 74 ++++++++++++--------- tex/context/base/mkiv/luat-cnf.lua | 2 +- tex/context/base/mkiv/status-files.pdf | Bin 25828 -> 25794 bytes tex/context/base/mkiv/status-lua.pdf | Bin 424659 -> 424658 bytes tex/context/interface/mkiv/i-context.pdf | Bin 846813 -> 846823 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 60772 -> 60771 bytes tex/context/modules/mkiv/x-asciimath.lua | 3 +- tex/generic/context/luatex/luatex-fonts-merged.lua | 4 +- 14 files changed, 52 insertions(+), 43 deletions(-) (limited to 'tex') diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 954f50c13..da22a37a1 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{2017.05.27 18:52} +\newcontextversion{2017.05.28 19:30} %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 e332fe5d7..b47be4275 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{2017.05.27 18:52} +\edef\contextversion{2017.05.28 19:30} %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 a59640f48..c98444273 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{2017.05.27 18:52} +\newcontextversion{2017.05.28 19:30} %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 a1160475a..ac0e03320 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2017.05.27 18:52} +\edef\contextversion{2017.05.28 19:30} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/font-ini.lua b/tex/context/base/mkiv/font-ini.lua index abc319484..708961b97 100644 --- a/tex/context/base/mkiv/font-ini.lua +++ b/tex/context/base/mkiv/font-ini.lua @@ -27,4 +27,4 @@ fonts.readers = { } fonts.definers = { methods = { } } fonts.loggers = { register = function() end } -fontloader.totable = fontloader.to_table -- not used +fontloader = nil diff --git a/tex/context/base/mkiv/font-lib.mkvi b/tex/context/base/mkiv/font-lib.mkvi index 7ae94c99b..4ba7a7de4 100644 --- a/tex/context/base/mkiv/font-lib.mkvi +++ b/tex/context/base/mkiv/font-lib.mkvi @@ -32,7 +32,7 @@ \registerctxluafile{font-ttf}{1.001} % cubic outlines %registerctxluafile{font-tmp}{1.001} % temporary placeholder \registerctxluafile{font-dsp}{1.001} % ... for this one -\registerctxluafile{font-off}{1.001} % the old loader +%registerctxluafile{font-off}{1.001} % the old loader \registerctxluafile{font-hsh}{1.001} % hashes used by context \registerctxluafile{font-nod}{1.001} diff --git a/tex/context/base/mkiv/lpdf-mis.lua b/tex/context/base/mkiv/lpdf-mis.lua index dc3f8560a..91dd08afd 100644 --- a/tex/context/base/mkiv/lpdf-mis.lua +++ b/tex/context/base/mkiv/lpdf-mis.lua @@ -65,6 +65,8 @@ local v_landscape = variables.landscape local v_portrait = variables.portrait local v_page = variables.page local v_paper = variables.paper +local v_attachment = variables.attachment +local v_layer = variables.layer local positive = register(pdfliteral("/GSpositive gs")) local negative = register(pdfliteral("/GSnegative gs")) @@ -261,15 +263,51 @@ lpdf.registerdocumentfinalizer(flushjavascripts,"javascripts") -- -- -- -local pagespecs = { - [v_none] = { - }, +local plusspecs = { [v_max] = { mode = "FullScreen", }, [v_bookmark] = { mode = "UseOutlines", }, + [v_attachment] = { + mode = "UseAttachments", + }, + [v_layer] = { + mode = "UseOC", + }, + [v_fit] = { + fit = true, + }, + [v_doublesided] = { + layout = "TwoColumnRight", + }, + [v_fixed] = { + fixed = true, + }, + [v_landscape] = { + duplex = "DuplexFlipShortEdge", + }, + [v_portrait] = { + duplex = "DuplexFlipLongEdge", + }, + [v_page] = { + duplex = "Simplex" , + }, + [v_paper] = { + paper = true, + }, +} + +local pagespecs = { + -- + [v_max] = plusspecs[v_max], + [v_bookmark] = plusspecs[v_bookmark], + [v_attachment] = plusspecs[v_attachment], + [v_layer] = plusspecs[v_layer], + -- + [v_none] = { + }, [v_fit] = { mode = "UseNone", fit = true, @@ -322,36 +360,6 @@ local pagespecs = { }, } -local plusspecs = { - [v_max] = { - mode = "FullScreen", - }, - [v_bookmark] = { - mode = "UseOutlines", - }, - [v_fit] = { - fit = true, - }, - [v_doublesided] = { - layout = "TwoColumnRight", - }, - [v_fixed] = { - fixed = true, - }, - [v_landscape] = { - duplex = "DuplexFlipShortEdge", - }, - [v_portrait] = { - duplex = "DuplexFlipLongEdge", - }, - [v_page] = { - duplex = "Simplex" , - }, - [v_paper] = { - paper = true, - }, -} - local pagespec, topoffset, leftoffset, height, width, doublesided = "default", 0, 0, 0, 0, false local cropoffset, bleedoffset, trimoffset, artoffset = 0, 0, 0, 0 local copies = false diff --git a/tex/context/base/mkiv/luat-cnf.lua b/tex/context/base/mkiv/luat-cnf.lua index 4f2c6569e..416ae34fa 100644 --- a/tex/context/base/mkiv/luat-cnf.lua +++ b/tex/context/base/mkiv/luat-cnf.lua @@ -67,7 +67,7 @@ function texconfig.init() "gzip", "zip", "zlib", "lfs", "ltn12", "mime", "socket", "md5", "fio", "unicode", "utf", }, extratex = { - "epdf", "fontloader", "kpse", "mplib", + "epdf", "kpse", "mplib", -- "fontloader", }, obsolete = { "fontloader", -- can be filled by luat-log diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 7e122efb5..35991ae80 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 f10b35e86..d55d283f5 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 d8fbecc32..ba034bb5c 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 1bcd2b2f9..a32a5e82d 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/context/modules/mkiv/x-asciimath.lua b/tex/context/modules/mkiv/x-asciimath.lua index 677d3519b..75f4b06fd 100644 --- a/tex/context/modules/mkiv/x-asciimath.lua +++ b/tex/context/modules/mkiv/x-asciimath.lua @@ -1277,7 +1277,8 @@ local function collapse_bars(t) -- problem: we can have a proper nesting local d = false for i=1,m do - if find(t[i],"\\left") then + local ti = t[i] + if type(ti) == "string" and find(ti,"\\left") then d = true break end diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 0c8e40ce4..67aa5972c 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 : 05/27/17 18:52:27 +-- merge date : 05/28/17 19:30:32 do -- begin closure to overcome local limits and interference @@ -7534,7 +7534,7 @@ fonts.analyzers={} fonts.readers={} fonts.definers={ methods={} } fonts.loggers={ register=function() end } -fontloader.totable=fontloader.to_table +fontloader=nil end -- closure -- cgit v1.2.3