From 2b42c7f229ff9dd02072ec7a70565417e1fccc53 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Tue, 21 Jan 2014 10:11:00 +0100 Subject: beta 2014.01.21 10:11 --- metapost/context/base/mp-base.mpii | 14 +++++++++++--- metapost/context/base/mp-base.mpiv | 8 +++++++- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4086 -> 4084 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/page-mak.mkvi | 4 ++-- tex/context/base/publ-tra.mkiv | 5 +++-- tex/context/base/status-files.pdf | Bin 24769 -> 24767 bytes tex/context/base/status-lua.pdf | Bin 231511 -> 231610 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 10 files changed, 26 insertions(+), 11 deletions(-) diff --git a/metapost/context/base/mp-base.mpii b/metapost/context/base/mp-base.mpii index 0f8104447..95cacb288 100644 --- a/metapost/context/base/mp-base.mpii +++ b/metapost/context/base/mp-base.mpii @@ -360,9 +360,17 @@ enddef; def filldraw expr c = addto currentpicture contour c withpen currentpen _op_ enddef; -def drawdot expr z = - addto currentpicture contour makepath currentpen shifted z - _op_ enddef; +% def drawdot expr z = +% addto currentpicture contour makepath currentpen shifted z +% _op_ enddef; + +def drawdot expr p = + if pair p : + addto currentpicture doublepath p withpen currentpen _op_ + else : + errmessage("drawdot only accepts a pair expression") + fi +enddef ; def unfill expr c = fill c withcolor background enddef; def undraw expr p = draw p withcolor background enddef; diff --git a/metapost/context/base/mp-base.mpiv b/metapost/context/base/mp-base.mpiv index 4d2e522a1..d5c7b8c21 100644 --- a/metapost/context/base/mp-base.mpiv +++ b/metapost/context/base/mp-base.mpiv @@ -609,7 +609,13 @@ enddef ; % % so ... -let drawdot = draw ; +def drawdot expr p = + if pair p : + addto currentpicture doublepath p withpen currentpen _op_ + else : + errmessage("drawdot only accepts a pair expression") + fi +enddef ; def unfill expr c = fill c withcolor background enddef ; def undraw expr p = draw p withcolor background enddef ; diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 3e00fa124..af9510e6e 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2014.01.21 00:35} +\newcontextversion{2014.01.21 10:11} %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/context-version.pdf b/tex/context/base/context-version.pdf index d773a32d5..0c821deda 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 997c6422d..f62721b67 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2014.01.21 00:35} +\edef\contextversion{2014.01.21 10:11} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/page-mak.mkvi b/tex/context/base/page-mak.mkvi index 708678878..0fde119f2 100644 --- a/tex/context/base/page-mak.mkvi +++ b/tex/context/base/page-mak.mkvi @@ -186,8 +186,8 @@ \c!textstate=\v!normal, \c!headerstate=\v!stop, \c!footerstate=\v!stop, - % \c!pagestate=\v!stop] % in manual ! ! ! - \c!pagestate=\v!start] + \c!pagestate=\v!stop] % in manual ! ! ! +% \c!pagestate=\v!start] \definemakeup [\v!standard] diff --git a/tex/context/base/publ-tra.mkiv b/tex/context/base/publ-tra.mkiv index 5f50d99f3..49fb6d962 100644 --- a/tex/context/base/publ-tra.mkiv +++ b/tex/context/base/publ-tra.mkiv @@ -11,12 +11,13 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +% todo: make this a runtime module +% todo: use the module interface + \writestatus{loading}{ConTeXt Publication Support / Tracing} \registerctxluafile{publ-tra}{1.001} -% todo: use the module interface - \unprotect \unexpanded\def\showbtxdatasetfields diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 5fb2325b2..81d0a7287 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index b64c5f130..6e0222616 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 945039150..7cb5503a7 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 : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 01/21/14 00:35:43 +-- merge date : 01/21/14 10:11:08 do -- begin closure to overcome local limits and interference -- cgit v1.2.3