From 1314fbe93790c501dc436a5cf99f106b9e5c0f63 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 24 Feb 2019 15:12:57 +0000 Subject: Revert "ConTeXt version 2019.02.22 19:35" This reverts commit 5c6357cdb820b4f628d036ba7b2248f221d50c0b. git-svn-id: svn://tug.org/texlive/trunk@50112 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/context/base/mkiv/lpdf-mis.lua | 126 +++++++-------------- 1 file changed, 41 insertions(+), 85 deletions(-) (limited to 'Master/texmf-dist/tex/context/base/mkiv/lpdf-mis.lua') diff --git a/Master/texmf-dist/tex/context/base/mkiv/lpdf-mis.lua b/Master/texmf-dist/tex/context/base/mkiv/lpdf-mis.lua index 77f11918b46..6d1b09ca000 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/lpdf-mis.lua +++ b/Master/texmf-dist/tex/context/base/mkiv/lpdf-mis.lua @@ -18,6 +18,7 @@ if not modules then modules = { } end modules ['lpdf-mis'] = { local next, tostring, type = next, tostring, type local format, gsub, formatters = string.format, string.gsub, string.formatters local flattened = table.flattened +local texset, texget = tex.set, tex.get local backends, lpdf, nodes = backends, lpdf, nodes @@ -29,7 +30,7 @@ local nuts = nodes.nuts local copy_node = nuts.copy local nodepool = nuts.pool -local pageliteral = nodepool.pageliteral +local pdfpageliteral = nodepool.pdfpageliteral local register = nodepool.register local pdfdictionary = lpdf.dictionary @@ -53,8 +54,6 @@ local addtonames = lpdf.addtonames local pdfgetmetadata = lpdf.getmetadata -local texset = tex.set - local variables = interfaces.variables local v_stop = variables.stop @@ -73,18 +72,11 @@ local v_page = variables.page local v_paper = variables.paper local v_attachment = variables.attachment local v_layer = variables.layer -local v_lefttoright = variables.lefttoright -local v_righttoleft = variables.righttoleft -local v_title = variables.title - -local positive = register(pageliteral("/GSpositive gs")) -local negative = register(pageliteral("/GSnegative gs")) -local overprint = register(pageliteral("/GSoverprint gs")) -local knockout = register(pageliteral("/GSknockout gs")) - -local omitextraboxes = false -directives.register("backend.omitextraboxes", function(v) omitextraboxes = v end) +local positive = register(pdfpageliteral("/GSpositive gs")) +local negative = register(pdfpageliteral("/GSnegative gs")) +local overprint = register(pdfpageliteral("/GSoverprint gs")) +local knockout = register(pdfpageliteral("/GSknockout gs")) local function initializenegative() local a = pdfarray { 0, 1 } @@ -94,7 +86,7 @@ local function initializenegative() Range = a, Domain = a, } - local negative = pdfdictionary { Type = g, TR = pdfreference(pdfflushstreamobject("{ 1 exch sub }",d)) } -- can be shared + local negative = pdfdictionary { Type = g, TR = pdfreference(pdfflushstreamobject("{ 1 exch sub }",d)) } local positive = pdfdictionary { Type = g, TR = pdfconstant("Identity") } adddocumentextgstate("GSnegative", pdfreference(pdfflushobject(negative))) adddocumentextgstate("GSpositive", pdfreference(pdfflushobject(positive))) @@ -238,12 +230,6 @@ local function setupidentity() addtoinfo("ID", pdfstring(id), id) -- needed for pdf/x -- addtoinfo("ConTeXt.Version",version) - -- - local lmtx = codeinjections.lmtxmode() - if lmtx then - addtoinfo("ConTeXt.LMTX",formatters["%0.2f"](lmtx)) - end - -- addtoinfo("ConTeXt.Time",os.date("%Y-%m-%d %H:%M")) addtoinfo("ConTeXt.Jobname",jobname) addtoinfo("ConTeXt.Url","www.pragma-ade.com") @@ -268,9 +254,7 @@ local function flushjavascripts() local a = pdfarray() local pdf_javascript = pdfconstant("JavaScript") for i=1,#t do - local ti = t[i] - local name = ti[1] - local script = ti[2] + local name, script = t[i][1], t[i][2] local j = pdfdictionary { S = pdf_javascript, JS = pdfreference(pdfflushstreamobject(script)), @@ -320,26 +304,14 @@ local plusspecs = { [v_paper] = { paper = true, }, - [v_title] ={ - title = true, - }, - [v_lefttoright] ={ - direction = "L2R", - }, - [v_righttoleft] ={ - direction = "R2R", - }, } local pagespecs = { -- - [v_max] = plusspecs[v_max], - [v_bookmark] = plusspecs[v_bookmark], - [v_attachment] = plusspecs[v_attachment], - [v_layer] = plusspecs[v_layer], - [v_lefttoright] = plusspecs[v_lefttoright], - [v_righttoleft] = plusspecs[v_righttoleft], - [v_title] = plusspecs[v_title], + [v_max] = plusspecs[v_max], + [v_bookmark] = plusspecs[v_bookmark], + [v_attachment] = plusspecs[v_attachment], + [v_layer] = plusspecs[v_layer], -- [v_none] = { }, @@ -400,23 +372,21 @@ local cropoffset, bleedoffset, trimoffset, artoffset = 0, 0, 0, 0 local marked = false local copies = false -local getpagedimensions getpagedimensions = function() - getpagedimensions = backends.codeinjections.getpagedimensions - return getpagedimensions() -end - function codeinjections.setupcanvas(specification) local paperheight = specification.paperheight local paperwidth = specification.paperwidth local paperdouble = specification.doublesided - -- - paperwidth, paperheight = codeinjections.setpagedimensions(paperwidth,paperheight) - -- + if paperheight then + texset('global','pageheight',paperheight) + end + if paperwidth then + texset('global','pagewidth',paperwidth) + end pagespec = specification.mode or pagespec topoffset = specification.topoffset or 0 leftoffset = specification.leftoffset or 0 - height = specification.height or paperheight - width = specification.width or paperwidth + height = specification.height or texget("pageheight") + width = specification.width or texget("pagewidth") marked = specification.print -- copies = specification.copies @@ -463,15 +433,13 @@ local function documentspecification() end end end - -- maybe interfaces.variables - local layout = spec.layout - local mode = spec.mode - local fit = spec.fit - local fixed = spec.fixed - local duplex = spec.duplex - local paper = spec.paper - local title = spec.title - local direction = spec.direction + -- + local layout = spec.layout + local mode = spec.mode + local fit = spec.fit + local fixed = spec.fixed + local duplex = spec.duplex + local paper = spec.paper if layout then addtocatalog("PageLayout",pdfconstant(layout)) end @@ -490,42 +458,34 @@ local function documentspecification() prints = pdfarray(flattened(pages.toranges(marked))) end end - if fit or fixed or duplex or copies or paper or prints or title or direction then + if fit or fixed or duplex or copies or paper or prints then addtocatalog("ViewerPreferences",pdfdictionary { - FitWindow = fit and true or nil, - PrintScaling = fixed and pdfconstant("None") or nil, - Duplex = duplex and pdfconstant(duplex) or nil, - NumCopies = copies and copies or nil, - PickTrayByPDFSize = paper and true or nil, - PrintPageRange = prints or nil, - DisplayDocTitle = title and true or nil, - Direction = direction and pdfconstant(direction) or nil, + FitWindow = fit and true or nil, + PrintScaling = fixed and pdfconstant("None") or nil, + Duplex = duplex and pdfconstant(duplex) or nil, + NumCopies = copies and copies or nil, + PickTrayByPDFSize = paper and true or nil, + PrintPageRange = prints or nil, }) end addtoinfo ("Trapped", pdfconstant("False")) -- '/Trapped' in /Info, 'Trapped' in XMP addtocatalog("Version", pdfconstant(format("1.%s",pdfminorversion()))) - addtocatalog("Lang", pdfstring(tokens.getters.macro("currentmainlanguage"))) end -- temp hack: the mediabox is not under our control and has a precision of 5 digits local factor = number.dimenfactors.bp -local f_value = formatters["%.6F"] - -directives.register("pdf.stripzeros",function() - local f_value = formatters["%.6N"] -end) +local f_value = formatters["%0.6F"] local function boxvalue(n) -- we could share them return pdfverbose(f_value(factor * n)) end local function pagespecification() - local paperwidth, paperheight = codeinjections.getpagedimensions() local llx = leftoffset - local lly = paperheight + topoffset - height + local lly = texget("pageheight") + topoffset - height local urx = width - leftoffset - local ury = paperheight - topoffset + local ury = texget("pageheight") - topoffset -- boxes can be cached local function extrabox(WhatBox,offset,always) if offset ~= 0 or always then @@ -537,14 +497,10 @@ local function pagespecification() }) end end - if omitextraboxes then - -- only useful for testing / comparing - else - extrabox("CropBox",cropoffset,true) -- mandate for rendering - extrabox("TrimBox",trimoffset,true) -- mandate for pdf/x - extrabox("BleedBox",bleedoffset) -- optional - -- extrabox("ArtBox",artoffset) -- optional .. unclear what this is meant to do - end + extrabox("CropBox",cropoffset,true) -- mandate for rendering + extrabox("TrimBox",trimoffset,true) -- mandate for pdf/x + extrabox("BleedBox",bleedoffset) -- optional + -- extrabox("ArtBox",artoffset) -- optional .. unclear what this is meant to do end lpdf.registerpagefinalizer(pagespecification,"page specification") -- cgit v1.2.3