summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/context/third/gnuplot/example.plt (renamed from Master/texmf-dist/doc/context/third/gnuplot/examples/example.plt)0
-rw-r--r--Master/texmf-dist/doc/context/third/gnuplot/fullpage-example.pdf (renamed from Master/texmf-dist/doc/context/third/gnuplot/examples/fullpage-example.pdf)bin11414 -> 11414 bytes
-rw-r--r--Master/texmf-dist/doc/context/third/gnuplot/fullpage-example.tex (renamed from Master/texmf-dist/doc/context/third/gnuplot/examples/fullpage-example.tex)0
-rw-r--r--Master/texmf-dist/doc/context/third/gnuplot/gnuplot-context-doc.tex2
-rw-r--r--Master/texmf-dist/tex/context/third/gnuplot/t-gnuplot.tex19
5 files changed, 11 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/context/third/gnuplot/examples/example.plt b/Master/texmf-dist/doc/context/third/gnuplot/example.plt
index b81e8dce2f2..b81e8dce2f2 100644
--- a/Master/texmf-dist/doc/context/third/gnuplot/examples/example.plt
+++ b/Master/texmf-dist/doc/context/third/gnuplot/example.plt
diff --git a/Master/texmf-dist/doc/context/third/gnuplot/examples/fullpage-example.pdf b/Master/texmf-dist/doc/context/third/gnuplot/fullpage-example.pdf
index 216a21e6f05..216a21e6f05 100644
--- a/Master/texmf-dist/doc/context/third/gnuplot/examples/fullpage-example.pdf
+++ b/Master/texmf-dist/doc/context/third/gnuplot/fullpage-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/context/third/gnuplot/examples/fullpage-example.tex b/Master/texmf-dist/doc/context/third/gnuplot/fullpage-example.tex
index 9e99294055e..9e99294055e 100644
--- a/Master/texmf-dist/doc/context/third/gnuplot/examples/fullpage-example.tex
+++ b/Master/texmf-dist/doc/context/third/gnuplot/fullpage-example.tex
diff --git a/Master/texmf-dist/doc/context/third/gnuplot/gnuplot-context-doc.tex b/Master/texmf-dist/doc/context/third/gnuplot/gnuplot-context-doc.tex
index 69f208001a0..78fdad0df47 100644
--- a/Master/texmf-dist/doc/context/third/gnuplot/gnuplot-context-doc.tex
+++ b/Master/texmf-dist/doc/context/third/gnuplot/gnuplot-context-doc.tex
@@ -191,7 +191,7 @@ and compile the result with any of the following three commands (depending on yo
They are almost equivalent except that \XeTeX\ lacks some advanced features (some patterns). The only major difference is the choice of fonts. If you want to typeset Arabic labels or use system fonts, you will probably want to choose \LuaTeX\ or \XeTeX. If you are using many graphical elements (3D plots, images, \dots), you might want to go for \LuaTeX.
-You should get a {\sc pdf} document with two full-page plots that you can include into your document with \type{\externalfigure[examples/fullpage-example][page=2]} for example.
+You should get a {\sc pdf} document with two full-page plots that you can include into your document with \type{\externalfigure[fullpage-example][page=2]} for example.
\placefigure[force]{Second page from \type{fullpage-example}, included with \type+\externalfigure+}{\externalfigure[fullpage-example][page=2]}
diff --git a/Master/texmf-dist/tex/context/third/gnuplot/t-gnuplot.tex b/Master/texmf-dist/tex/context/third/gnuplot/t-gnuplot.tex
index 4ae87b61e60..f4db3cff236 100644
--- a/Master/texmf-dist/tex/context/third/gnuplot/t-gnuplot.tex
+++ b/Master/texmf-dist/tex/context/third/gnuplot/t-gnuplot.tex
@@ -1,6 +1,6 @@
%D \module
%D [ file=t-gnuplot,
-%D version=2011.02.10,
+%D version=2012.01.16,
%D title=\CONTEXT\ Extra Modules,
%D subtitle=\GNUPLOT\ Inclusion,
%D author={Hans Hagen, Taco Hoekwater, Mojca Miklavec, (Aditya Mahajan)},
@@ -102,13 +102,6 @@
%D \type+draw \sometxt{...} withcolor red+
\chardef\TeXtextcolormode\zerocount
-%D We have to make sure that runtime MP graphics are enabled,
-%D otherwise sizes of labels created by \type+\sometxt{}+ would be wrong
-%D if user didn't enable that option in \type{cont-usr.tex}.
-%D (Taco says it might be a bug, but let's not worry too much about it.
-%D If it will be resolved, we may delete this.)
-\runMPgraphicstrue
-
%D We need a \type{\strut} in front of labels for better vertical centering.
%D This might still fail for Zapfino and alike where \type{\strut} might be smaller
%D than the actual font height.
@@ -136,6 +129,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifx\directlua\undefined
%D The following patch has been written by Aditya and seems to work OK,
%D however it would be more clean to have this functionality in the core.
%D Redefining low-level macros might be a bit dangerous, esp. since
@@ -146,7 +140,6 @@
%D TODO: remind Hans to implement it in core ;)
%D and remove this patch from the module
%D
-\ifx\directlua\undefined
\long\def\redofiltersometxt[#1]%
{\doifnextcharelse[{\reredofiltersometxt[#1]}{\redodofiltersometxt[#1]}}
@@ -159,6 +152,14 @@
{\increment\txtcounter
\TeXtext[#1]\txtcounter{\switchtobodyfont[#2]\strut#3}%
\filtersometxt}
+
+%D In MKII we have to make sure that runtime MP graphics are enabled,
+%D otherwise sizes of labels created by \type+\sometxt{}+ would be wrong
+%D if user didn't enable that option in \type{cont-usr.tex}.
+%D (Taco says it might be a bug, but let's not worry too much about it.
+%D If it will be resolved, we may delete this.)
+\runMPgraphicstrue
+
\fi
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%