1 files changed, 55 insertions, 21 deletions
diff --git a/tex/context/modules/mkiv/m-tikz.mkiv b/tex/context/modules/mkiv/m-tikz.mkiv
index e04d53156..9267f90d4 100644
--- a/tex/context/modules/mkiv/m-tikz.mkiv
+++ b/tex/context/modules/mkiv/m-tikz.mkiv
@@ -7,35 +7,69 @@
     \protect
 \fi
 
-\ifcase\contextlmtxmode \else
-    \overloadmode\zerocount
-\fi
 
-\pushcatcodetable
+\pushoverloadmode
+
+    \pushcatcodetable
 
-    \setcatcodetable\texcatcodes
+        \setcatcodetable\texcatcodes
 
-    \catcode`\@=11
-    \catcode`\|=12
-    \catcode`\!=12
+        \catcode`\@=11
+        \catcode`\|=12
+        \catcode`\!=12
 
-    \input t-pgf.tex
-    \input t-pgffor.tex
-    \input tikz.code.tex
+        \input t-pgf.tex
+        \input t-pgffor.tex
+        \input tikz.code.tex
 
-\popcatcodetable
+    \popcatcodetable
 
-\protected\def\tikzerrormessage#1#2#3%
+\popoverloadmode
+
+\permanent\protected\def\tikzerrormessage#1#2#3%
   {\writestatus{#1}{#2}}
 
-\protected\def\starttikzpicture
-  {\begingroup
-   \ifdefined\PackageError\else \let\PackageError\tikzerrormessage \fi
-   \overloadmode\zerocount
-   \tikzpicture}
+\ifcase\contextlmtxmode
+
+    \let\starttikzsettings\relax
+    \let\stoptikzsettings \relax
+
+    \protected\def\starttikzpicture
+      {% \dontleavehmode
+       \begingroup
+       \ifdefined\PackageError\else \let\PackageError\tikzerrormessage \fi
+       \tikzpicture}
+
+    \protected\def\stoptikzpicture
+      {\endtikzpicture
+       \endgroup}
+
+\else
+
+    % for now:
 
-\protected\def\stoptikzpicture
-  {\endtikzpicture
-   \endgroup}
+    \overloadmode\zerocount
+
+    % but this will be mandate for settings outside the start .. stop
+
+    \permanent\protected\def\starttikzsettings
+      {\pushoverloadmode}
+
+    \permanent\protected\def\stoptikzsettings
+      {\popoverloadmode}
+
+    \permanent\protected\def\starttikzpicture
+      {\dontleavehmode
+       \hcontainer\bgroup
+     % \pushoverloadmode
+       \ifdefined\PackageError\else \let\PackageError\tikzerrormessage \fi
+       \tikzpicture}
+
+    \permanent\protected\def\stoptikzpicture
+      {\endtikzpicture
+     % \popoverloadmode
+       \egroup}
+
+\fi
 
 \stopmodule