From f4d0ad2ba2c4ca5bfae469650e535fd46749b3f4 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Thu, 24 Nov 2016 12:55:35 +0100 Subject: 2016-11-24 12:10: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/meta-imp-nodes.mkiv | 34 +++++++++++++++++++++ tex/context/base/mkiv/mlib-lua.lua | 30 ++++++++++++++++++ tex/context/base/mkiv/mult-fun.lua | 15 +++++++-- tex/context/base/mkiv/node-ini.lua | 2 ++ tex/context/base/mkiv/status-files.pdf | Bin 25633 -> 25654 bytes tex/context/base/mkiv/status-lua.pdf | Bin 368494 -> 368575 bytes tex/context/interface/mkiv/i-context.pdf | Bin 803706 -> 803816 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 60766 -> 60766 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 13 files changed, 83 insertions(+), 8 deletions(-) create mode 100644 tex/context/base/mkiv/meta-imp-nodes.mkiv (limited to 'tex') diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index a2d4494c2..64462979d 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{2016.11.22 20:03} +\newcontextversion{2016.11.24 12:05} %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 76bba0781..c7d81e7b0 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{2016.11.22 20:03} +\edef\contextversion{2016.11.24 12:05} %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 e4c556665..f58ae0d1a 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{2016.11.22 20:03} +\newcontextversion{2016.11.24 12:05} %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 734fe35a2..8459165bf 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{2016.11.22 20:03} +\edef\contextversion{2016.11.24 12:05} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/meta-imp-nodes.mkiv b/tex/context/base/mkiv/meta-imp-nodes.mkiv new file mode 100644 index 000000000..2555fcaa2 --- /dev/null +++ b/tex/context/base/mkiv/meta-imp-nodes.mkiv @@ -0,0 +1,34 @@ +%D \module +%D [ file=meta-imp-nodes, +%D version=2016.11.23, +%D title=\METAPOST\ Graphics, +%D subtitle=Nodes, +%D author=Alan Braslau and Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D We might add more here. Also, the node module might get preloaded in +%D all instances. + +\unprotect + +\defineMPinstance + [nodes] + [\s!format=metafun, + \s!extensions=\v!yes, + \s!initializations=\v!yes, + \c!method=\s!double] + +\defineframed + [node] + [\c!frame=\v!off] + +\startMPdefinitions{nodes} + loadmodule "node" ; +\stopMPdefinitions + +\protect diff --git a/tex/context/base/mkiv/mlib-lua.lua b/tex/context/base/mkiv/mlib-lua.lua index 93ae74244..c5893ee90 100644 --- a/tex/context/base/mkiv/mlib-lua.lua +++ b/tex/context/base/mkiv/mlib-lua.lua @@ -419,3 +419,33 @@ function mp.report(a,b) report_message("%s : %s","message",a) end end + +-- + +local hashes = { } + +function mp.newhash() + for i=1,#hashes+1 do + if not hashes[i] then + hashes[i] = { } + mpprint(i) + return + end + end +end + +function mp.disposehash(n) + hashes[n] = nil +end + +function mp.inhash(n,key) + local h = hashes[n] + mpprint(h and h[key] or false) +end + +function mp.tohash(n,key) + local h = hashes[n] + if h then + h[key] = true + end +end diff --git a/tex/context/base/mkiv/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua index d6685527c..b04b7aae3 100644 --- a/tex/context/base/mkiv/mult-fun.lua +++ b/tex/context/base/mkiv/mult-fun.lua @@ -16,8 +16,13 @@ return { "maxdimensions", "drawoptionsfactor", "dq", "sq", + "crossingscale", "crossingoption", }, commands = { + "loadmodule", + -- + "dispose", + -- "transparency", -- "sqr", "log", "ln", "exp", "inv", "pow", "pi", "radian", @@ -39,6 +44,8 @@ return { "llmoved", "lrmoved", "urmoved", "ulmoved", "rightarrow", "leftarrow", "centerarrow", "boundingbox", "innerboundingbox", "outerboundingbox", "pushboundingbox", "popboundingbox", + "boundingradius", "boundingcircle", "boundingpoint", + "crossingunder", "insideof", "outsideof", "bottomboundary", "leftboundary", "topboundary", "rightboundary", "xsized", "ysized", "xysized", "sized", "xyscaled", "intersection_point", "intersection_found", "penpoint", @@ -58,7 +65,7 @@ return { "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", -- "lua", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", - "colordecimals", "ddecimal", "dddecimal", "ddddecimal", + "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "verbatim", "thelabel", "label", @@ -74,7 +81,7 @@ return { -- "define_sampled_linear_shade", "define_sampled_circular_shade", "space", "crlf", "dquote", "percent", "SPACE", "CRLF", "DQUOTE", "PERCENT", "grayscale", "greyscale", "withgray", "withgrey", - "colorpart", + "colorpart", "colorlike", "readfile", "clearxy", "unitvector", "center", -- redefined "epsed", "anchored", @@ -137,6 +144,8 @@ return { -- "shadedup", "shadeddown", "shadedleft", "shadedright", -- - "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", + "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", + -- + "circularpath", "squarepath", "linearpath", }, } diff --git a/tex/context/base/mkiv/node-ini.lua b/tex/context/base/mkiv/node-ini.lua index 65f76faea..46196e32d 100644 --- a/tex/context/base/mkiv/node-ini.lua +++ b/tex/context/base/mkiv/node-ini.lua @@ -12,6 +12,8 @@ modules.

--ldx]]-- -- this module is being reconstructed +-- +-- todo: datatype table per node type -- todo: query names with new node.subtypes diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index fe68167ac..49f91f277 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 f50a9aa88..14a32cdd0 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 161c42371..9fb2817ae 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 c42739e8c..8ded8acd6 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 28f6848ae..f41935acc 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 : 11/22/16 20:03:56 +-- merge date : 11/24/16 12:05:11 do -- begin closure to overcome local limits and interference -- cgit v1.2.3