summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf-dist/metapost/context/third/gnuplot/mp-gnuplot.mp35
-rwxr-xr-xMaster/texmf-dist/tex/context/third/gnuplot/t-gnuplot.tex31
2 files changed, 50 insertions, 16 deletions
diff --git a/Master/texmf-dist/metapost/context/third/gnuplot/mp-gnuplot.mp b/Master/texmf-dist/metapost/context/third/gnuplot/mp-gnuplot.mp
index a83c7fd03c8..36c791c9373 100755
--- a/Master/texmf-dist/metapost/context/third/gnuplot/mp-gnuplot.mp
+++ b/Master/texmf-dist/metapost/context/third/gnuplot/mp-gnuplot.mp
@@ -436,6 +436,22 @@ boolean context_gnuplot ; context_gnuplot := true;
% you'll get 7pt, not 10pt (but using the scaled 10pt design size ;)
numeric gp_scale_text; gp_scale_text := 1;
+ % Returns an image with colored text according to current color
+ % This only makes sense for mkiv text. Mkii is handled with \sometxt
+ % and colors are working properly there. We could be using textext("")
+ % in the low level, but we redefined the command just before calling this funtion
+ % for text labels, so we really need something more low-level (rawtextext in this case)
+ vardef gp_colored_mkiv_text(expr str) =
+
+ % since withcolor doesn't work any more, we need to provide a workaround.
+ save r, g, b;
+ r = redpart gp_color_current;
+ g = greenpart gp_color_current;
+ b = bluepart gp_color_current;
+
+ rawtextext("\colored[r=" & decimal(r) & ",g=" & decimal(g) & ",b=" & decimal(b) & "]{" & str & "}")
+ enddef;
+
% Returns the (image of) text: vertically centered and horizontally aligned
% according to the parameter align, which can be one of:
% - gp_align_center
@@ -494,6 +510,8 @@ boolean context_gnuplot ; context_gnuplot := true;
save pict; picture pict;
begingroup;
+ % save the original meaning of textext
+ save textext;
save left, right, center;
left = gp_align_left;
@@ -537,9 +555,12 @@ boolean context_gnuplot ; context_gnuplot := true;
% while in mkiv it falls back to textext.drt,
% and that one has problems if comma gets redefined,
% so we need to change definition of comma back to its original value first
+ %
+ % this trick also comes in handy to handle colors & fonts properly
vardef textext@#(expr txt) =
let,=@;
- rawtextext(txt)
+
+ gp_colored_mkiv_text(txt)
enddef ;
% converts the whole argument into a picture
@@ -554,7 +575,7 @@ boolean context_gnuplot ; context_gnuplot := true;
let,=@;
endgroup;
- draw (gp_the_text(arg_align, pict) scaled gp_scale_text rotated arg_angle shifted pos) withcolor gp_color_current;
+ draw (gp_the_text(arg_align, pict) scaled gp_scale_text rotated arg_angle shifted pos) withcolor gp_color_current;
enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -846,8 +867,14 @@ boolean context_gnuplot ; context_gnuplot := true;
% TODO
pict := gp_point_pt[(n mod gp_num_points_with_metapost)];
else :
- pict := sometxt((n mod gp_num_points_with_tex) + 1 + 500);
- % XXX: 500 is a hack (see m/t-gnuplot.tex) and might need a fix
+ % MK IV; TODO: not sure if relying on context_mlib is safe
+ if known context_mlib :
+ pict := gp_colored_mkiv_text("\convertnumber{\currentGNUPLOTpointset}{" & decimal(n mod gp_num_points_with_tex + 1) & "}");
+ % MK II
+ else :
+ pict := sometxt((n mod gp_num_points_with_tex) + 1 + 500);
+ % XXX: 500 is a hack (see m/t-gnuplot.tex) and might need a fix
+ fi;
fi;
fi;
elseif picture n:
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 4f539ec18b7..33eb642ee0b 100755
--- a/Master/texmf-dist/tex/context/third/gnuplot/t-gnuplot.tex
+++ b/Master/texmf-dist/tex/context/third/gnuplot/t-gnuplot.tex
@@ -85,6 +85,8 @@
% % linewidth scale
% gp_scale_linewidth := \gp:term:context:linewidth;
+ gp_points_with := gp_points_with_\@@GNUPLOT@term@context@points;
+
\stopMPextensions
%D (hopefully) temporary solution for handling the color in expressions like
@@ -130,21 +132,25 @@
%D Redefining low-level macros might be a bit dangerous, esp. since
%D they tend to change over time.
%D
+%D At the moment the hack only works in MKII; for MKIV it needs to be fixed
+%D
%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]}}
-% \long\def\redofiltersometxt[#1]%
-% {\doifnextcharelse[{\reredofiltersometxt[#1]}{\redodofiltersometxt[#1]}}
-%
-% \long\def\redodofiltersometxt[#1]#2%
-% {\increment\txtcounter
-% \TeXtext[#1]\txtcounter{#2}%
-% \filtersometxt}
-%
-% \long\def\reredofiltersometxt[#1][#2]#3%
-% {\increment\txtcounter
-% \TeXtext[#1]\txtcounter{\switchtobodyfont[#2]\strut#3}%
-% \filtersometxt}
+\long\def\redodofiltersometxt[#1]#2%
+ {\increment\txtcounter
+ \TeXtext[#1]\txtcounter{#2}%
+ \filtersometxt}
+
+\long\def\reredofiltersometxt[#1][#2]#3%
+ {\increment\txtcounter
+ \TeXtext[#1]\txtcounter{\switchtobodyfont[#2]\strut#3}%
+ \filtersometxt}
+\fi
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -780,6 +786,7 @@
% \edef\gp:term:context:dashlength{\@@GNUPLOT@term@context@dashlength}
% % linewidth scale
% \edef\gp:term:context:linewidth{\@@GNUPLOT@term@context@linewidth}
+ % \doifsamestringelse{\@@GNUPLOT@term@context@points}{metapost}% tex or metapost
}
\setupGNUPLOTterminal