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

diff --git a/luamesh.sty b/luamesh.sty
index 006b254..7133ddb 100644
--- a/luamesh.sty
+++ b/luamesh.sty
@@ -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}
@@ -200,9 +200,9 @@
   % (x1,y1);(x2,y2);... or the name file containing the points
   \setkeys{tracePoints}{#1} %
   \def\MeshPoint{\luameshval@tp@meshpoint}%
-  \ifKV@buildMesh@tikz% if we are using tikz
+  \ifKV@tracePoints@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}
@@ -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%