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.pdfbin4147 -> 4140 bytes
-rw-r--r--tex/context/base/context-version.pngbin106541 -> 106190 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/m-chart.mkvi44
-rw-r--r--tex/context/base/m-graph.mkiv122
-rw-r--r--tex/context/base/status-files.pdfbin24568 -> 24584 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin195391 -> 195390 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
11 files changed, 50 insertions, 126 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 2d4158df1..017508a6f 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{2012.10.16 18:23}
+\newcontextversion{2012.10.16 22:12}
%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 6b172c1b3..b0c938c35 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{2012.10.16 18:23}
+\newcontextversion{2012.10.16 22:12}
%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 4aab958f5..1fb36e726 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 6a484eaa7..34013308e 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 b609ea75f..04ca4b0b4 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{2012.10.16 18:23}
+\edef\contextversion{2012.10.16 22:12}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 20c77c44d..36c86b936 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.10.16 18:23}
+\edef\contextversion{2012.10.16 22:12}
%D For those who want to use this:
diff --git a/tex/context/base/m-chart.mkvi b/tex/context/base/m-chart.mkvi
index 4fb57af97..cb6a1e8c8 100644
--- a/tex/context/base/m-chart.mkvi
+++ b/tex/context/base/m-chart.mkvi
@@ -449,21 +449,35 @@
% {\tx\FLOWx.\FLOWy}
% \stopsetups
-%D \starttyping
-%D \setupFLOWsplit
-%D [nx=5,ny=10,
-%D dx=0,dy=0,
-%D before=,
-%D after=\page]
-%D
-%D \FLOWcharts[mybigflow]
-%D \stoptyping
-%D
-%D \starttyping
-%D \splitfloat
-%D {\placefigure{What a big flowchart this is!}}
-%D {\FLOWcharts[mybigflow]}
-%D \stoptyping
+% %D \starttyping
+% %D \setupFLOWsplit
+% %D [nx=5,ny=10,
+% %D dx=0,dy=0,
+% %D before=,
+% %D after=\page]
+% %D
+% %D \FLOWcharts[mybigflow]
+% %D \stoptyping
+% %D
+% %D \starttyping
+% %D \splitfloat
+% %D {\placefigure{What a big flowchart this is!}}
+% %D {\FLOWcharts[mybigflow]}
+% %D \stoptyping
+
+% \setupFLOWsplit
+% [nx=5,
+% ny=8,
+% dx=1,
+% dy=1,
+% command=\framed,
+% before=\page,
+% after=\page]
+%
+% \FLOWchart[demo] \page
+% \FLOWchart[demo][split=yes] \page
+% \FLOWchart[demo][x=1,y=1,nx=5,ny=8] \page
+% \FLOWchart[demo][x=1,y=9,nx=5,ny=10] \page
\protect
diff --git a/tex/context/base/m-graph.mkiv b/tex/context/base/m-graph.mkiv
index 34e53cebe..8acbe1f8d 100644
--- a/tex/context/base/m-graph.mkiv
+++ b/tex/context/base/m-graph.mkiv
@@ -22,7 +22,6 @@
local function strip(n,e)
-- get rid of e(0)
- e = gsub(e,"^[+-]*0+$","")
-- get rid of e(+*)
e = gsub(e,"^+","")
-- remove leading zeros
@@ -55,117 +54,28 @@
% We could also delegate parsing using lower level plugins.
-\startMPinclusions
- % input string ;
- % input marith ;
- input graph.mp ;
-
- vardef roundd(expr x, d) =
- if abs d > 4 :
- if d > 0 :
- x
- else :
- 0
- fi
- elseif d > 0 :
- save i ; i = floor x ;
- i + round(Ten_to[d]*(x-i))/Ten_to[d]
- else :
- round(x/Ten_to[-d])*Ten_to[-d]
- fi
- enddef ;
-
- Ten_to0 = 1 ;
- Ten_to1 = 10 ;
- Ten_to2 = 100 ;
- Ten_to3 = 1000 ;
- Ten_to4 = 10000 ;
-
- def sFe_base =
- enddef ;
-
- picture Fe_plus ; Fe_plus := btex + etex ;
-
- vardef format (expr f,x) = dofmt_.Feform_(f,x) enddef ;
- vardef Mformat (expr f,x) = dofmt_.Meform (f,x) enddef ;
- vardef formatstr (expr f,x) = dofmt_.Feform_(f,x) enddef ;
- vardef Mformatstr(expr f,x) = dofmt_.Meform(f,x) enddef ;
-
- vardef escaped_format(expr s) =
- "" for n=1 upto length(s) : &
- if ASCII substring (n,n+1) of s = 37 :
- "@"
- else :
- substring (n,n+1) of s
- fi
- endfor
- enddef ;
-
- vardef dofmt_@\#(expr f, x) =
- textext("\MPgraphformat{" & escaped_format(f) & "}{" & (if string x : x else: decimal x fi) & "}")
- enddef ;
-
- % vardef format(expr f, x) =
- % textext("\MPgraphformatN{"&escaped_format(f)&"}{"&(if string x : x else: decimal x fi)&"}")
- % enddef;
- % vardef Mformat(expr f, x) =
- % format(f,x)
- % enddef;
-
- % string Autoform_x ; Autoform_x := "@.0e" ;
- % string Autoform_y ; Autoform_y := "@.0e" ;
-
- vardef autogrid(suffix tx, ty) text w =
- Gneedgr_ := false ;
- if str tx <> "" :
- for x=auto.x :
- tx (
- if string Autoform_x :
- if Autoform_x <> "" :
- Autoform_x
- else :
- Autoform
- fi
- else :
- Autoform
- fi,
- x) w ;
- endfor
- fi ;
- if str ty <> "" :
- for y=auto.y :
- ty (
- if string Autoform_y :
- if Autoform_y <> "" :
- Autoform_y
- else :
- Autoform
- fi
- else :
- Autoform
- fi,
- y) w ;
- endfor
- fi ;
- enddef ;
-
-\stopMPinclusions
+\startMPextensions
+ if unknown Fe_plus : picture Fe_plus ; Fe_plus := textext("+") ; fi ;
+ if unknown context_grap: input "mp-grap.mpiv" ; fi ;
+\stopMPextensions
\continueifinputfile{m-graph.mkiv}
\starttext
\startMPpage
- label(format("@g","1e-10"), (0, 0)) ;
- label(format("@g","1e+10"), (2cm, 0)) ;
- label(format("@g","1e-12"), (0, -0.5cm)) ;
- label(format("@g","1e+12"), (2cm,-0.5cm)) ;
- label(format("@g","1e-0"), (0, -1.0cm)) ;
- label(format("@g","1e+0"), (2cm,-1.0cm)) ;
- label(format("@g","1"), (0, -1.5cm)) ;
- label(format("@g","1"), (2cm,-1.5cm)) ;
- label(format("@g","1e-102"),(0, -2.0cm)) ;
- label(format("@g","1e+102"),(2cm,-2.0cm)) ;
+ label(format("@g","1e-8"), (0, 0)) ;
+ label(format("@g","1e+8"), (2cm, 0)) ;
+ label(format("@g","1e-10"), (0, -0.5cm)) ;
+ label(format("@g","1e+10"), (2cm,-0.5cm)) ;
+ label(format("@g","1e-12"), (0, -1.0cm)) ;
+ label(format("@g","1e+12"), (2cm,-1.0cm)) ;
+ label(format("@g","1e-0"), (0, -1.5cm)) ;
+ label(format("@g","1e+0"), (2cm,-1.5cm)) ;
+ label(format("@g","1"), (0, -2.0cm)) ;
+ label(format("@g","1"), (2cm,-2.0cm)) ;
+ label(format("@g","1e-102"),(0, -2.5cm)) ;
+ label(format("@g","1e+102"),(2cm,-2.5cm)) ;
\stopMPpage
% \startMPpage
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 24398b8a5..85d08b2dc 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 e7f6dfacc..3486f2ff0 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 e515cb588..04af40c84 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/16/12 18:23:55
+-- merge date : 10/16/12 22:12:54
do -- begin closure to overcome local limits and interference