\mplibcolor, nom de couleurs dans les fonctions, renommage de fonction (côté MP)...

[delaunay.git] / luamesh.sty

diff --git a/luamesh.sty b/luamesh.sty
index 2860881..9d394d9 100644 (file)
--- a/luamesh.sty
+++ b/luamesh.sty
@@ -23,20 +23,6 @@
 % load the lua code
 \directlua{dofile("luamesh.lua")}%
 %
-% global def (default value)
-\newcommand{\MeshPoint}{P}
-\newcommand{\NewPoint}{P}
-% for MetaPost (MP) (default value)
-% default scale u:=1cm;
-\newcommand\luaMeshScaleMP{1cm}
-% default color for the plot of a global mesh
-\newcommand\TeXCluaMeshMP{(0.,0.,0.)}
-% default color for a new element
-\newcommand\TeXCluaMeshNewMP{(0.5,0.1,0.1)}
-% defaut color for the background of new element
-\newcommand\TeXCluaMeshBackMP{(0.99,0.85,0.85)}
-% default color for circoncircle
-\newcommand\TeXCluaMeshCircleMP{(0.1,0.6,0.1)}
 %%
 % for tikz (default value)
 % default color for the plot of a global mesh
@@ -97,8 +83,8 @@
 \presetkeys{buildMesh}{tikz=false,bbox=none,scale, meshpoint,mode=int,print=none,picture=full,color}{}%
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% the difinition
-\newcommand{\buildMesh}[2][]{%
+% the difinition BW Bowyer and Watson algo
+\newcommand{\buildMeshBW}[2][]{%
   % #1 : the string containing the list of points
   % (x1,y1);(x2,y2);... or the name file containing the points
   \setkeys{buildMesh}{#1} %
@@ -109,7 +95,7 @@
   }%
   \else % we are using MP
   \directlua{%
-    buildMeshMP("#2","\luameshval@mode","\luameshval@print","\luameshval@bbox","full","\luameshval@scale","\luameshval@color")%
+    buildMeshMPBW("#2","\luameshval@mode","\luameshval@print","\luameshval@bbox","full","\luameshval@scale","\luameshval@color")%
   }%
   %
   \fi%
@@ -117,7 +103,7 @@
 %
 %%
 %
-%%the meshAddOnePoint commande
+%%the meshAddOnePointBW commande
 %%engine of drawing
 \newif\ifluameshengineMP%
 \define@boolkey{MeshAddOne}{tikz}[true]{}%
@@ -128,14 +114,6 @@
 %% the name of the new point
 \define@key{MeshAddOne}{newpoint}[P]{\def\luameshval@newpoint{#1}}%
 %% a complete picture or some code of the engine
-\define@choicekey*{MeshAddOne}{picture}[\val\nr]{full, simple}{%
-  \ifcase\nr\relax%
-  \def\luameshval@picture{full}%
-  \or%
-  \def\luameshval@picture{simple}%
-  \fi%
-}%
-%% a complete picture or some code of the engine
 \define@choicekey*{MeshAddOne}{step}[\val\nr]{badtriangles, cavity, newtriangles}{%
   \ifcase\nr\relax%
   \def\luameshval@step{badT}%
@@ -163,29 +141,91 @@
   \def\luameshval@mode{ext}%
   \fi%
 }%
+\define@choicekey*{MeshAddOne}{bbox}[\val\nr]{none, show}{%
+  \ifcase\nr\relax%
+  \def\luameshval@bbox{none}%
+  \or%
+  \def\luameshval@bbox{bbox}%
+  \fi%
+}%
+\presetkeys{MeshAddOne}{tikz=false,scale, meshpoint,newpoint,color,colorBack,colorNew,colorCircle,step=badtriangles,mode=int,bbox=none}{}%
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% the difinition BW Bowyer and Watson algo
+\newcommand*{\meshAddPointBW}[3][]{%
+  % #1 : the string containing the list of points
+  % (x1,y1);(x2,y2);... or the name file containing the points
+  \setkeys{MeshAddOne}{#1} %
+  \def\MeshPoint{\luameshval@meshpoint}%
+  \def\NewPoint{\luameshval@newpoint}%
+  \ifKV@MeshAddOne@tikz% if we are using tikz
+  \directlua{%
+    buildMeshTikZ("#2","\luameshval@mode","\luameshval@print","\luameshval@bbox","full","\luameshval@scale","\luameshval@color")%
+  }%
+  \else % we are using MP
+  \mplibcolor{\luameshmpcolor}{\luameshval@color}
+  \mplibcolor{\luameshmpcolorBack}{\luameshval@colorback}
+  \mplibcolor{\luameshmpcolorNew}{\luameshval@colornew}
+  \mplibcolor{\luameshmpcolorCircle}{\luameshval@colorcircle}
+  \directlua{%
+    TeXOnePointMPBW("#2","#3","\luameshval@step","\luameshval@scale","\luameshval@mode","\luameshval@bbox")%
+  }%
+  %
+  \fi%
+}%
+%%% the meshAddPointBWinc commande
+%% engine of drawing
+\newif\ifluameshengineMP%
+\define@boolkey{MeshAddOneBWinc}{tikz}[true]{}%
+%% the scale
+\define@key{MeshAddOneBWinc}{scale}[1cm]{\def\luameshval@scale{#1}}%
+%% the name of the points
+\define@key{MeshAddOneBWinc}{meshpoint}[P]{\def\luameshval@meshpoint{#1}}%
+%% the name of the new point
+\define@key{MeshAddOneBWinc}{newpoint}[P]{\def\luameshval@newpoint{#1}}%
 %% a complete picture or some code of the engine
-\define@choicekey*{MeshAddOne}{picture}[\val\nr]{full, embedded}{%
+\define@choicekey*{MeshAddOneBWinc}{step}[\val\nr]{badtriangles, cavity, newtriangles}{%
   \ifcase\nr\relax%
-  \def\luameshval@picture{full}%
+  \def\luameshval@step{badT}%
   \or%
-  \def\luameshval@picture{embedded}%
+  \def\luameshval@step{cavity}%
+  \or%
+  \def\luameshval@step{newT}%
   \fi%
 }%
-\define@choicekey*{MeshAddOne}{bbox}[\val\nr]{none, show}{%
+% color
+%% the color of drawing
+\define@key{MeshAddOneBWinc}{color}[black]{\def\luameshval@color{#1}}%
+%% the color of background of new element
+\define@key{MeshAddOneBWinc}{colorBack}[black!20]{\def\luameshval@colorback{#1}}%
+%% the color of new element
+\define@key{MeshAddOneBWinc}{colorNew}[red]{\def\luameshval@colornew{#1}}%
+%% the color of circoncircle
+\define@key{MeshAddOneBWinc}{colorCircle}[green]{\def\luameshval@colorcircle{#1}}%
+%
+%% a complete picture or some code of the engine
+\define@choicekey*{MeshAddOneBWinc}{mode}[\val\nr]{int, ext}{%
+  \ifcase\nr\relax%
+  \def\luameshval@mode{int}%
+  \or%
+  \def\luameshval@mode{ext}%
+  \fi%
+}%
+\define@choicekey*{MeshAddOneBWinc}{bbox}[\val\nr]{none, show}{%
   \ifcase\nr\relax%
   \def\luameshval@bbox{none}%
   \or%
   \def\luameshval@bbox{bbox}%
   \fi%
 }%
-\presetkeys{MeshAddOne}{tikz=false,scale, meshpoint,newpoint,color,colorBack,colorNew,colorCircle,step=badtriangles,mode=int,picture=full,bbox=none}{}%
+\presetkeys{MeshAddOneBWinc}{tikz=false,scale, meshpoint,newpoint,color,colorBack,colorNew,colorCircle,step=badtriangles,mode=int,bbox=none}{}%
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% the difinition
-\newcommand{\meshAddOnePoint}[3][]{%
+% the difinition BW embedded code between the 2 last arguments
+\newcommand*{\meshAddPointBWinc}[5][]{%
   % #1 : the string containing the list of points
   % (x1,y1);(x2,y2);... or the name file containing the points
-  \setkeys{MeshAddOne}{#1} %
+  \setkeys{MeshAddOneBWinc}{#1} %
   \def\MeshPoint{\luameshval@meshpoint}%
   \def\NewPoint{\luameshval@newpoint}%
   \ifKV@MeshAddOne@tikz% if we are using tikz
@@ -193,12 +233,12 @@
     buildMeshTikZ("#2","\luameshval@mode","\luameshval@print","\luameshval@bbox","full","\luameshval@scale","\luameshval@color")%
   }%
   \else % we are using MP
-  \mplibcolor{\mpcolorcolor}{\luameshval@color}
-  \mplibcolor{\mpcolorcolorBack}{\luameshval@colorback}
-  \mplibcolor{\mpcolorcolorNew}{\luameshval@colornew}
-  \mplibcolor{\mpcolorcolorCircle}{\luameshval@colorcircle}
+  \mplibcolor{\luameshmpcolor}{\luameshval@color}
+  \mplibcolor{\luameshmpcolorBack}{\luameshval@colorback}
+  \mplibcolor{\luameshmpcolorNew}{\luameshval@colornew}
+  \mplibcolor{\luameshmpcolorCircle}{\luameshval@colorcircle}
   \directlua{%
-    TeXOnePointMP("#2","#3","\luameshval@step","\luameshval@color","\luameshval@colorback","\luameshval@colornew","\luameshval@colorcircle","\luameshval@scale","\luameshval@mode","\luameshval@picture","\luameshval@bbox")%
+    TeXOnePointMPBWinc("#2","#3","#4","#5","\luameshval@step","\luameshval@scale","\luameshval@mode","\luameshval@bbox")%
   }%
   %
   \fi%