diff options
27 files changed, 68 insertions, 30 deletions
diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf Binary files differindex d309495df..e26a63165 100644 --- a/doc/context/documents/general/qrcs/setup-cs.pdf +++ b/doc/context/documents/general/qrcs/setup-cs.pdf diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf Binary files differindex 1ab5968ed..bf2114679 100644 --- a/doc/context/documents/general/qrcs/setup-de.pdf +++ b/doc/context/documents/general/qrcs/setup-de.pdf diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf Binary files differindex 9ec728d6f..56f1b02a0 100644 --- a/doc/context/documents/general/qrcs/setup-en.pdf +++ b/doc/context/documents/general/qrcs/setup-en.pdf diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf Binary files differindex 5b5a6b582..9c188ce53 100644 --- a/doc/context/documents/general/qrcs/setup-fr.pdf +++ b/doc/context/documents/general/qrcs/setup-fr.pdf diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf Binary files differindex 5780ee28e..47e23baef 100644 --- a/doc/context/documents/general/qrcs/setup-it.pdf +++ b/doc/context/documents/general/qrcs/setup-it.pdf diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf Binary files differindex bd9c7966b..9799f7635 100644 --- a/doc/context/documents/general/qrcs/setup-nl.pdf +++ b/doc/context/documents/general/qrcs/setup-nl.pdf diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf Binary files differindex cbad30f8f..a570ab195 100644 --- a/doc/context/documents/general/qrcs/setup-ro.pdf +++ b/doc/context/documents/general/qrcs/setup-ro.pdf diff --git a/metapost/context/base/mpiv/mp-luas.mpiv b/metapost/context/base/mpiv/mp-luas.mpiv index 52351753e..76d28f7f9 100644 --- a/metapost/context/base/mpiv/mp-luas.mpiv +++ b/metapost/context/base/mpiv/mp-luas.mpiv @@ -160,3 +160,6 @@ vardef positionatanchor(expr name) = currentpicture := currentpicture shifted - positionxy(name) ; enddef ; + +vardef texvar(expr name) = lua.mp.texvar(name) enddef ; +vardef texstr(expr name) = lua.mp.texstr(name) enddef ; diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 39d4f1284..0e6e6851f 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.02.20 15:10} +\newcontextversion{2017.02.20 17:55} %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 2c673c837..868227917 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.02.20 15:10} +\edef\contextversion{2017.02.20 17:55} %D For those who want to use this: diff --git a/tex/context/base/mkiv/anch-bck.mkvi b/tex/context/base/mkiv/anch-bck.mkvi index 1bd855203..207f64537 100644 --- a/tex/context/base/mkiv/anch-bck.mkvi +++ b/tex/context/base/mkiv/anch-bck.mkvi @@ -352,8 +352,8 @@ \definesystemattribute[textbackground][public] -\def\page_prepare_backgrounds#1% - {\clf_collectbackgrounds\realpageno#1\relax} +% \def\page_prepare_backgrounds#1% +% {\clf_collectbackgrounds\realpageno#1\relax} \def\anch_backgrounds_bpos {\ifconditional\c_anch_backgrounds_pos_no_shape diff --git a/tex/context/base/mkiv/anch-pgr.lua b/tex/context/base/mkiv/anch-pgr.lua index 5e111fcdf..8a63c5b54 100644 --- a/tex/context/base/mkiv/anch-pgr.lua +++ b/tex/context/base/mkiv/anch-pgr.lua @@ -188,7 +188,7 @@ local function registerbackground(name) } texsetattribute(a_textbackground,n) if not enabled then - nodes.tasks.enableaction("contributers", "nodes.handlers.bck") + nodes.tasks.enableaction("contributers", "nodes.handlers.textbackgrounds") enabled = true end else @@ -196,24 +196,22 @@ local function registerbackground(name) end end -local function collectbackgrounds(r,n) +-- local function collectbackgrounds(r,n) -- if enabled then -- local parent = getbox(n) -- local head = getlist(parent) -- realpage = r -- processranges(a_textbackground,flush,head) -- ,parent) -- end -end - -interfaces.implement { - name = "collectbackgrounds", - actions = collectbackgrounds, - arguments = { "integer", "integer" } -} - ----------------------------------------------------------------------------------------- +-- end +-- +-- interfaces.implement { +-- name = "collectbackgrounds", +-- actions = collectbackgrounds, +-- arguments = { "integer", "integer" } +-- } -nodes.handlers.bck = function(head,where,parent) -- we have hlistdir and local dir +nodes.handlers.textbackgrounds = function(head,where,parent) -- we have hlistdir and local dir -- todo enable action in register head = tonut(head) index = index + 1 @@ -221,11 +219,6 @@ nodes.handlers.bck = function(head,where,parent) -- we have hlistdir and local d return tonode(head), done end -nodes.tasks.appendaction("contributers", "normalizers", "nodes.handlers.bck") -nodes.tasks.disableaction("contributers", "nodes.handlers.bck") - ----------------------------------------------------------------------------------------- - interfaces.implement { name = "registerbackground", actions = registerbackground, diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index d2fb678d5..4c044c330 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.02.20 15:10} +\newcontextversion{2017.02.20 17:55} %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 c3c798b12..31d79390a 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.02.20 15:10} +\edef\contextversion{2017.02.20 17:55} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/font-ots.lua b/tex/context/base/mkiv/font-ots.lua index c8f3e3474..22dd082d1 100644 --- a/tex/context/base/mkiv/font-ots.lua +++ b/tex/context/base/mkiv/font-ots.lua @@ -3194,8 +3194,17 @@ local function testrun(disc,t_run,c_run,...) setlink(disc,next) else -- we stay inside the disc - setnext(posttail) + if posttail then + setnext(posttail) + else + post = nil + end setnext(replacetail) + if replacetail then + setnext(replacetail) + else + replace = nil + end setprev(next,disc) end -- pre, post, replace, pretail, posttail, replacetail = getdisc(disc,true) diff --git a/tex/context/base/mkiv/meta-ini.mkiv b/tex/context/base/mkiv/meta-ini.mkiv index 9264185fa..1d0fa11e0 100644 --- a/tex/context/base/mkiv/meta-ini.mkiv +++ b/tex/context/base/mkiv/meta-ini.mkiv @@ -315,6 +315,7 @@ definitions {\meta_flush_current_definitions}% figure {\MPaskedfigure}% method {\MPinstanceparameter\c!method}% + namespace {\??graphicvariable\currentmpvariableclass:}% \relax}% \meta_process_graphic_stop \meta_stop_current_graphic} diff --git a/tex/context/base/mkiv/mlib-ctx.lua b/tex/context/base/mkiv/mlib-ctx.lua index 7b1584d7e..96eb27cbd 100644 --- a/tex/context/base/mkiv/mlib-ctx.lua +++ b/tex/context/base/mkiv/mlib-ctx.lua @@ -216,6 +216,7 @@ implement { { "definitions" }, { "figure" }, { "method" }, + { "namespace" }, } } } @@ -305,6 +306,7 @@ implement { { "useextensions" }, { "inclusions" }, { "method" }, + { "namespace" }, }, } } diff --git a/tex/context/base/mkiv/mlib-lua.lua b/tex/context/base/mkiv/mlib-lua.lua index 4198a7339..9831efc20 100644 --- a/tex/context/base/mkiv/mlib-lua.lua +++ b/tex/context/base/mkiv/mlib-lua.lua @@ -631,3 +631,19 @@ do end end + +do + + local mprint = mp.print + local qprint = mp.quoted + local getmacro = tokens.getters.macro + + function mp.texvar(name) + mprint(getmacro(metapost.namespace .. name)) + end + + function mp.texstr(name) + qprint(getmacro(metapost.namespace .. name)) + end + +end diff --git a/tex/context/base/mkiv/mlib-pps.lua b/tex/context/base/mkiv/mlib-pps.lua index 8c7910d16..9fc8fec35 100644 --- a/tex/context/base/mkiv/mlib-pps.lua +++ b/tex/context/base/mkiv/mlib-pps.lua @@ -647,6 +647,7 @@ function metapost.graphic_base_pass(specification) -- name will change (see mlib local inclusions = specification.inclusions or "" local initializations = specification.initializations or "" local askedfig = specification.figure -- no default else no wrapper + metapost.namespace = specification.namespace or "" -- local askedfig, wrappit = checkaskedfig(askedfig) -- diff --git a/tex/context/base/mkiv/page-txt.mkvi b/tex/context/base/mkiv/page-txt.mkvi index ba5107885..b67e3aa74 100644 --- a/tex/context/base/mkiv/page-txt.mkvi +++ b/tex/context/base/mkiv/page-txt.mkvi @@ -846,9 +846,9 @@ \smashbox\b_page_layouts_element \box\b_page_layouts_element} -\ifdefined\page_prepare_backgrounds\else - \let\page_prepare_backgrounds\gobbleoneargument -\fi +% \ifdefined\page_prepare_backgrounds\else +% \let\page_prepare_backgrounds\gobbleoneargument +% \fi \def\page_insert_body#1#2% {\setbox\b_page_layouts_element\vpack @@ -858,7 +858,7 @@ \swapmargins \vskip\dimexpr\headerheight+\headerdistance+\textdistance\relax \dontleavehmode - \page_prepare_backgrounds{#2}% + %\page_prepare_backgrounds{#2}% \hbox to \makeupwidth {\begingroup \swapmargins diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 9f7079e28..1441c0e6c 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex 30bf8b4b4..cc2383ec2 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/task-ini.lua b/tex/context/base/mkiv/task-ini.lua index 14d0b6e74..d0c00f5c8 100644 --- a/tex/context/base/mkiv/task-ini.lua +++ b/tex/context/base/mkiv/task-ini.lua @@ -130,6 +130,7 @@ appendaction("finalizers", "lists", "builders.paragraphs.tag") appendaction("finalizers", "lists", "nodes.linefillers.handler") appendaction("contributers", "normalizers", "nodes.handlers.flattenline") +appendaction("contributers", "normalizers", "nodes.handlers.textbackgrounds") -- still experimental @@ -213,6 +214,7 @@ disableaction("finalizers", "builders.paragraphs.tag") disableaction("finalizers", "nodes.linefillers.handler") disableaction("contributers","nodes.handlers.flattenline") +disableaction("contributers","nodes.handlers.textbackgrounds") disableaction("math", "noads.handlers.showtree") disableaction("math", "noads.handlers.tags") diff --git a/tex/context/fonts/mkiv/type-imp-gentium.mkiv b/tex/context/fonts/mkiv/type-imp-gentium.mkiv index b2ad35a96..751ca87e7 100644 --- a/tex/context/fonts/mkiv/type-imp-gentium.mkiv +++ b/tex/context/fonts/mkiv/type-imp-gentium.mkiv @@ -7,6 +7,8 @@ %D date=\currentdate, %D copyright={Mojca and Thomas}] +% One probably has to enable the 'aalt' feature too. + \starttypescript [serif] [gentium] \definefontsynonym [Gentium-Roman] [file:GentiumPlus-R] [features=default] \definefontsynonym [Gentium-Italic] [file:GentiumPlus-I] [features=default] diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 9ec728d6f..56f1b02a0 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex dd1ffacc0..09945eaec 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index baf9b1a8f..e59c57a1c 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 : 02/20/17 15:10:11 +-- merge date : 02/20/17 17:55:09 do -- begin closure to overcome local limits and interference @@ -20997,8 +20997,17 @@ local function testrun(disc,t_run,c_run,...) end setlink(disc,next) else - setnext(posttail) + if posttail then + setnext(posttail) + else + post=nil + end setnext(replacetail) + if replacetail then + setnext(replacetail) + else + replace=nil + end setprev(next,disc) end end |