summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4097 -> 4095 bytes
-rw-r--r--tex/context/base/context-version.pngbin105431 -> 105577 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/m-flow.lua2
-rw-r--r--tex/context/base/m-flow.mkvi7
-rw-r--r--tex/context/base/m-steps.tex4
-rw-r--r--tex/context/base/status-files.pdfbin23951 -> 23926 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin163152 -> 163152 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
12 files changed, 15 insertions, 8 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index b3a6e6616..3991691fa 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2011.10.03 12:59}
+\newcontextversion{2011.10.05 23:53}
%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/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 5e78ffb75..b5024f9d8 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{2011.10.03 12:59}
+\newcontextversion{2011.10.05 23:53}
%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/context-version.pdf b/tex/context/base/context-version.pdf
index 2356199fe..220bb77f4 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-version.png b/tex/context/base/context-version.png
index db19cead5..e7550b292 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index ca149be97..504b133b9 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.10.03 12:59}
+\edef\contextversion{2011.10.05 23:53}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index d2d91489b..add1251f3 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.10.03 12:59}
+\edef\contextversion{2011.10.05 23:53}
%D For those who want to use this:
diff --git a/tex/context/base/m-flow.lua b/tex/context/base/m-flow.lua
index ea04eef17..60598d9ce 100644
--- a/tex/context/base/m-flow.lua
+++ b/tex/context/base/m-flow.lua
@@ -93,7 +93,7 @@ table.setmetatableindex(validshapes,function(t,k)
if not v then
local n = tonumber(k)
if n then
- v = { "shape", n }
+ v = { kind = "shape", number = n }
else
v = rawget(t,"action")
end
diff --git a/tex/context/base/m-flow.mkvi b/tex/context/base/m-flow.mkvi
index 62b70bdaa..c0c08059b 100644
--- a/tex/context/base/m-flow.mkvi
+++ b/tex/context/base/m-flow.mkvi
@@ -426,6 +426,10 @@
% \setupFLOWcharts[dx=30pt,dy=30pt]
+\startMPinclusions
+ predefined_shapes[101] := fullcircle ;
+\stopMPinclusions
+
\startFLOWchart[demo]
\startFLOWcell[framecolor=darkgray]
\name {start}
@@ -438,7 +442,8 @@
\name {one}
% \destination{CloseDocument}
\location {2,2}
- \shape {action}
+% \shape {action}
+ \shape {101}
\text {first}
% \label [b] {\bfx bottom}
\connection [rt] {two}
diff --git a/tex/context/base/m-steps.tex b/tex/context/base/m-steps.tex
index 660629810..74a88e176 100644
--- a/tex/context/base/m-steps.tex
+++ b/tex/context/base/m-steps.tex
@@ -809,7 +809,9 @@
\@@STELalternative, get_step_table_line(\cellcounter),
\@@STELrulethickness, \MPcolor{\@@STELcolor} ) )}
-\protect \endinput
+\protect
+
+\continueifinputfile{m-steps.tex}
% A simple paragraph-flow test:
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index cc89cf9a6..e9cbfaa7b 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 9634937b1..8e1d9e7c6 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 981b8510d..4300963b5 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 : 10/05/11 23:32:57
+-- merge date : 10/05/11 23:53:43
do -- begin closure to overcome local limits and interference