%\define@key{luamesh.sty}{mp}[]{\luameshmptrue}%
%\define@key{luamesh.sty}{tikz}[]{\luameshmpfalse}%
%
-\RequirePackage{etoolbox} % pour robustifier les commandes
+%\RequirePackage{etoolbox} % pour robustifier les commandes
%
%
%\ifluameshmp%
%\fi%
%
% load the lua code
-\directlua{dofile("luamesh.lua")}%
+\directlua{require("luamesh.lua")}%
%
%%
% for tikz (default value)
% (x1,y1);(x2,y2);... or the name file containing the points
% #3 : the code to place before the generated one
% #4 : the code to place after the generated one
- \setkeys{buildMesh}{#1} %
+ \setkeys{buildMeshInc}{#1} %
\def\MeshPoint{\luameshval@bmi@meshpoint}%
- \ifKV@buildMesh@tikz% if we are using tikz
+ \ifKV@buildMeshInc@tikz% if we are using tikz
\directlua{%
- buildMeshTikZ("#2","\luameshval@bmi@mode","\luameshval@bmi@print","\luameshval@bmi@bbox","full","\luameshval@bmi@scale","\luameshval@bmi@color")%
+ buildMeshTikZBWinc("#2","\luaescapestring{\unexpanded{#3}}","\luaescapestring{\unexpanded{#4}}","\luameshval@bmi@mode","\luameshval@bmi@print","\luameshval@bmi@bbox","\luameshval@bmi@scale","\luameshval@bmi@color","\luameshval@bmi@colorbbox")%
}%
\else % we are using MP
\mplibcolor{\luameshmpcolor}{\luameshval@bmi@color}
\mplibcolor{\luameshmpcolorBbox}{\luameshval@bmi@colorbbox}
\directlua{%
- buildMeshMPBWinc("#2","#3","#4","\luameshval@bmi@mode","\luameshval@bmi@print","\luameshval@bmi@bbox","\luameshval@bmi@scale")%
+ buildMeshMPBWinc("#2","\luaescapestring{\unexpanded{#3}}","\luaescapestring{\unexpanded{#4}}","\luameshval@bmi@mode","\luameshval@bmi@print","\luameshval@bmi@bbox","\luameshval@bmi@scale")%
}%
%
\fi%
\def\MeshPoint{\luameshval@bm@meshpoint}%
\ifKV@buildMesh@tikz% if we are using tikz
\directlua{%
- buildMeshTikZ("#2","\luameshval@bm@mode","\luameshval@bm@print","\luameshval@bm@bbox","full","\luameshval@bm@scale","\luameshval@bm@color")%
+ buildMeshTikZBW("#2","\luameshval@bm@mode","\luameshval@bm@print","\luameshval@bm@bbox","\luameshval@bm@scale","\luameshval@bm@color","\luameshval@bm@colorbbox")%
}%
\else % we are using MP
\mplibcolor{\luameshmpcolor}{\luameshval@bm@color}
}%
%
%
-%%%%%%%%%%%%%%%%% the trace Points macro
+%%%%%%%%%%%%%%%%% the draw Points macro
%% plot the list of points given in argument
% the engine
-\define@boolkey{tracePoints}{tikz}[true]{}%
+\define@boolkey{drawPoints}{tikz}[true]{}%
%% show the bounding box for delaunay
-\define@choicekey*{tracePoints}{bbox}[\val\nr]{none, show}{%
+\define@choicekey*{drawPoints}{bbox}[\val\nr]{none, show}{%
\ifcase\nr\relax%
\def\luameshval@tp@bbox{none}%
\or%
\fi%
}%
%% the scale
-\define@key{tracePoints}{scale}[1cm]{\def\luameshval@tp@scale{#1}}%
+\define@key{drawPoints}{scale}[1cm]{\def\luameshval@tp@scale{#1}}%
%% print points
-\define@choicekey*{tracePoints}{print}[\val\nr]{none, points}{%
+\define@choicekey*{drawPoints}{print}[\val\nr]{none, points}{%
\ifcase\nr\relax%
\def\luameshval@tp@print{none}%
\or%
\fi%
}%
%% the name of the point
-\define@key{tracePoints}{meshpoint}[P]{\def\luameshval@tp@meshpoint{#1}}%
+\define@key{drawPoints}{meshpoint}[P]{\def\luameshval@tp@meshpoint{#1}}%
%% the mode for reading the points
-\define@choicekey*{tracePoints}{mode}[\val\nr]{int, ext}{%
+\define@choicekey*{drawPoints}{mode}[\val\nr]{int, ext}{%
\ifcase\nr\relax%
\def\luameshval@tp@mode{int}%
\or%
\fi%
}%
%% the name of the color of drawing
-\define@key{tracePoints}{color}[black]{\def\luameshval@tp@color{#1}}%
+\define@key{drawPoints}{color}[black]{\def\luameshval@tp@color{#1}}%
%% the name of the color of drawing the bbox
-\define@key{tracePoints}{colorBbox}[black]{\def\luameshval@tp@colorbbox{#1}}%
+\define@key{drawPoints}{colorBbox}[black]{\def\luameshval@tp@colorbbox{#1}}%
%
-\presetkeys{tracePoints}{tikz=false,bbox=none,scale, meshpoint,mode=int,print=none,color,colorBbox}{}%
+\presetkeys{drawPoints}{tikz=false,bbox=none,scale, meshpoint,mode=int,print=none,color,colorBbox}{}%
%
-\newcommand{\tracePointsMesh}[2][]{%
+\newcommand{\drawPointsMesh}[2][]{%
% #1 : optionnal arguments
% #2 : the string containing the list of points
% (x1,y1);(x2,y2);... or the name file containing the points
- \setkeys{tracePoints}{#1} %
+ \setkeys{drawPoints}{#1} %
\def\MeshPoint{\luameshval@tp@meshpoint}%
- \ifKV@buildMesh@tikz% if we are using tikz
+ \ifKV@drawPoints@tikz% if we are using tikz
\directlua{%
- % buildMeshTikZ("#2","\luameshval@tp@mode","\luameshval@tp@print","\luameshval@tp@bbox","full","\luameshval@tp@scale","\luameshval@tp@color")%
+ printPointsTikZ("#2","\luameshval@tp@mode","\luameshval@tp@print","\luameshval@tp@bbox","\luameshval@tp@scale","\luameshval@tp@color","\luameshval@tp@colorbbox")%
}%
\else % we are using MP
\mplibcolor{\luameshmpcolor}{\luameshval@tp@color}
}%
%
-%%%%%%%%%%%%%%%% the trace Points macro inc with callbacks
+%%%%%%%%%%%%%%%% the draw Points macro inc with callbacks
%% engine of drawing
-\define@boolkey{tracePointsInc}{tikz}[true]{}%
+\define@boolkey{drawPointsInc}{tikz}[true]{}%
%% show the bounding box for delaunay
-\define@choicekey*{tracePointsInc}{bbox}[\val\nr]{none, show}{%
+\define@choicekey*{drawPointsInc}{bbox}[\val\nr]{none, show}{%
\ifcase\nr\relax%
\def\luameshval@tpi@bbox{none}%
\or%
\fi%
}%
%% the scale
-\define@key{tracePointsInc}{scale}[1cm]{\def\luameshval@tpi@scale{#1}}%
+\define@key{drawPointsInc}{scale}[1cm]{\def\luameshval@tpi@scale{#1}}%
%% print points
-\define@choicekey*{tracePointsInc}{print}[\val\nr]{none, points}{%
+\define@choicekey*{drawPointsInc}{print}[\val\nr]{none, points}{%
\ifcase\nr\relax%
\def\luameshval@tpi@print{none}%
\or%
\fi%
}%
%% the name of the point
-\define@key{tracePointsInc}{meshpoint}[P]{\def\luameshval@tpi@meshpoint{#1}}%
+\define@key{drawPointsInc}{meshpoint}[P]{\def\luameshval@tpi@meshpoint{#1}}%
%% the mode for reading the points
-\define@choicekey*{tracePointsInc}{mode}[\val\nr]{int, ext}{%
+\define@choicekey*{drawPointsInc}{mode}[\val\nr]{int, ext}{%
\ifcase\nr\relax%
\def\luameshval@tpi@mode{int}%
\or%
%
% color
%% the name of the color of drawing
-\define@key{tracePointsInc}{color}[black]{\def\luameshval@tpi@color{#1}}%
+\define@key{drawPointsInc}{color}[black]{\def\luameshval@tpi@color{#1}}%
%% the name of the color of drawing the bbox
-\define@key{tracePointsInc}{colorBbox}[black]{\def\luameshval@tpi@colorbbox{#1}}%
+\define@key{drawPointsInc}{colorBbox}[black]{\def\luameshval@tpi@colorbbox{#1}}%
%
-\presetkeys{tracePointsInc}{tikz=false,bbox=none,scale, meshpoint,mode=int,print=none,color,colorBbox}{}%
+\presetkeys{drawPointsInc}{tikz=false,bbox=none,scale, meshpoint,mode=int,print=none,color,colorBbox}{}%
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand*{\tracePointsMeshinc}[4][]{%
+\newcommand*{\drawPointsMeshinc}[4][]{%
% #1 : optionnal arguments
% #2 : the string containing the list of points
% (x1,y1);(x2,y2);... or the name file containing the points
% #3 : the code to place before the generated one
% #4 : the code to place after the generated one
- \setkeys{tracePointsInc}{#1} %
+ \setkeys{drawPointsInc}{#1} %
\def\MeshPoint{\luameshval@tpi@meshpoint}%
- \ifKV@tracePointsInc@tikz% if we are using tikz
+ \ifKV@drawPointsInc@tikz% if we are using tikz
\directlua{%
buildMeshTikZ("#2","\luameshval@tpi@mode","\luameshval@tpi@print","\luameshval@tpi@bbox","full","\luameshval@tpi@sc%ale","\luameshval@tpi@color")%
}%
\mplibcolor{\luameshmpcolor}{\luameshval@tpi@color}
\mplibcolor{\luameshmpcolorBbox}{\luameshval@tpi@colorbbox}
\directlua{%
- printPointsMPinc("#2","#3","#4","\luameshval@tpi@mode","\luameshval@tpi@print","\luameshval@tpi@bbox","\luameshval@tpi@scale")%
+ printPointsMPinc("#2","\luaescapestring{\unexpanded{#3}}","\luaescapestring{\unexpanded{#4}}","\luameshval@tpi@mode","\luameshval@tpi@print","\luameshval@tpi@bbox","\luameshval@tpi@scale")%
}%
\fi%
}%
% #1 : optionnal arguments
% #2 : the string containing the list of points
% (x1,y1);(x2,y2);... or the name file containing the points
- % #3 : the code to place before the generated one
- % #4 : the code to place after the generated one
\setkeys{MeshAddOneBW}{#1} %
\def\MeshPoint{\luameshval@ap@meshpoint}%
\def\NewPoint{\luameshval@ap@newpoint}%
- \ifKV@MeshAddOne@tikz% if we are using tikz
+ \ifKV@MeshAddOneBW@tikz% if we are using tikz
\directlua{%
- buildMeshTikZ("#2","\luameshval@ap@mode","\luameshval@ap@print","\luameshval@ap@bbox","full","\luameshval@ap@scale","\luameshval@ap@color")%
+ TeXOnePointTikZBW("#2","#3","\luameshval@ap@step","\luameshval@ap@scale","\luameshval@ap@mode","\luameshval@ap@bbox","\luameshval@ap@color","\luameshval@ap@colorback","\luameshval@ap@colornew","\luameshval@ap@colorcircle","\luameshval@ap@colorbbox")%
}%
\else % we are using MP
\mplibcolor{\luameshmpcolor}{\luameshval@ap@color}
\def\NewPoint{\luameshval@api@newpoint}%
\ifKV@MeshAddOneBWinc@tikz% if we are using tikz
\directlua{%
- buildMeshTikZ("#2","\luameshval@api@mode","\luameshval@api@print","\luameshval@api@bbox","\luameshval@api@scale","\luameshval@api@color")%
+ TeXOnePointTikZBWinc("#2","#3","\luaescapestring{\unexpanded{#4}}","\luaescapestring{\unexpanded{#5}}","\luameshval@ap@step","\luameshval@ap@scale","\luameshval@ap@mode","\luameshval@ap@bbox","\luameshval@ap@color","\luameshval@ap@colorback","\luameshval@ap@colornew","\luameshval@ap@colorcircle","\luameshval@ap@colorbbox")%
}%
\else % we are using MP
\mplibcolor{\luameshmpcolor}{\luameshval@api@color}
\mplibcolor{\luameshmpcolorCircle}{\luameshval@api@colorcircle}
\mplibcolor{\luameshmpcolorBbox}{\luameshval@api@colorbbox}
\directlua{%
- TeXOnePointMPBWinc("#2","#3","#4","#5","\luameshval@api@step","\luameshval@api@scale","\luameshval@api@mode","\luameshval@api@bbox")%
+ TeXOnePointMPBWinc("#2","#3","\luaescapestring{\unexpanded{#4}}","\luaescapestring{\unexpanded{#5}}","\luameshval@api@step","\luameshval@api@scale","\luameshval@api@mode","\luameshval@api@bbox")%
}%
%
\fi%