X-Git-Url: https://melusine.eu.org/syracuse/G/git/?a=blobdiff_plain;f=luamesh.sty;h=5110cb3c84ed7d2ce6d13d97d2d764575f09f82b;hb=5921eb363f3873328cc96cb4321b2f6387b8f3f5;hp=006b254a81c408f720501d7a78fea5bd140c4b98;hpb=c1ef14a73d2abc89fce006d960288a9c8a0f82c3;p=delaunay.git

diff --git a/luamesh.sty b/luamesh.sty
index 006b254..5110cb3 100644
--- a/luamesh.sty
+++ b/luamesh.sty
@@ -11,7 +11,7 @@
 %\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%
@@ -21,7 +21,7 @@
 %\fi%
 %
 % load the lua code
-\directlua{dofile("luamesh.lua")}%
+\directlua{require("luamesh.lua")}%
 %
 %%
 % for tikz (default value)
@@ -80,17 +80,17 @@
   %      (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%
@@ -142,7 +142,7 @@
   \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}
@@ -155,12 +155,12 @@
 }%
 %
 %
-%%%%%%%%%%%%%%%%% 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%
@@ -168,9 +168,9 @@
   \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%
@@ -178,9 +178,9 @@
   \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%
@@ -188,21 +188,21 @@
   \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}
@@ -215,11 +215,11 @@
 }%
 %
 
-%%%%%%%%%%%%%%%% 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%
@@ -227,9 +227,9 @@
   \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%
@@ -237,9 +237,9 @@
   \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%
@@ -249,22 +249,22 @@
 %
 % 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")%
   }%
@@ -272,7 +272,7 @@
   \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%
 }%
@@ -331,14 +331,12 @@
   % #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}
@@ -412,7 +410,7 @@
   \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}
@@ -421,7 +419,7 @@
   \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%