summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2014-01-21 11:20:15 +0200
committerMarius <mariausol@gmail.com>2014-01-21 11:20:15 +0200
commit42dfe23e4991fe44dc2b3b61ee0a753fcfe4f74f (patch)
treec8a1e13af71de1b997432494bfdf89bff512df7e
parent7004566a3f05be822d9633027e5ff7d64768c99f (diff)
downloadcontext-42dfe23e4991fe44dc2b3b61ee0a753fcfe4f74f.tar.gz
beta 2014.01.21 10:11
-rw-r--r--metapost/context/base/mp-base.mpii14
-rw-r--r--metapost/context/base/mp-base.mpiv8
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4086 -> 4084 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/page-mak.mkvi4
-rw-r--r--tex/context/base/publ-tra.mkiv5
-rw-r--r--tex/context/base/status-files.pdfbin24769 -> 24767 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin231511 -> 231610 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
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
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files 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
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index b64c5f130..6e0222616 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files 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