1 files changed, 35 insertions, 13 deletions
diff --git a/tex/context/base/mkiv/grph-inc.mkiv b/tex/context/base/mkiv/grph-inc.mkiv
index 20e7c11a6..f2f626b28 100644
--- a/tex/context/base/mkiv/grph-inc.mkiv
+++ b/tex/context/base/mkiv/grph-inc.mkiv
@@ -197,19 +197,39 @@
 % label file settings
 % label file parent
 
+% \def\grph_include_use[#1][#2][#3][#4]%
+%   {\doifelsenothing{#1}
+%      {\doifsomething{#2}
+%         {\doifelseassignment{#3}
+%            {\grph_include_use_indeed{#2}{#2}{#3}{#4}}
+%            {\grph_include_use_indeed{#2}{#2}\empty{#4}}}}
+%      {\doifelsenothing{#2}
+%         {\doifelseassignment{#3}
+%            {\grph_include_use_indeed{#1}{#1}\empty{#3}}
+%            {\grph_include_use_indeed{#1}{#1}{#3}{#4}}}
+%         {\doifelseassignment{#3}
+%            {\grph_include_use_indeed{#1}{#2}\empty{#3}}
+%            {\grph_include_use_indeed{#1}{#2}{#3}{#4}}}}}
+
 \def\grph_include_use[#1][#2][#3][#4]%
   {\doifelsenothing{#1}
      {\doifsomething{#2}
-        {\doifelseassignment{#3}
-           {\grph_include_use_indeed{#2}{#2}{#3}{#4}}
-           {\grph_include_use_indeed{#2}{#2}\empty{#4}}}}
+        {\ifcondition\validassignment{#3}%
+           \grph_include_use_indeed{#2}{#2}{#3}{#4}%
+         \else
+           \grph_include_use_indeed{#2}{#2}\empty{#4}%
+         \fi}}%
      {\doifelsenothing{#2}
-        {\doifelseassignment{#3}
-           {\grph_include_use_indeed{#1}{#1}\empty{#3}}
-           {\grph_include_use_indeed{#1}{#1}{#3}{#4}}}
-        {\doifelseassignment{#3}
-           {\grph_include_use_indeed{#1}{#2}\empty{#3}}
-           {\grph_include_use_indeed{#1}{#2}{#3}{#4}}}}}
+        {\ifcondition\validassignment{#3}%
+           \grph_include_use_indeed{#1}{#1}\empty{#3}%
+         \else
+           \grph_include_use_indeed{#1}{#1}{#3}{#4}%
+         \fi}
+        {\ifcondition\validassignment{#3}%
+           \grph_include_use_indeed{#1}{#2}\empty{#3}
+         \else
+           \grph_include_use_indeed{#1}{#2}{#3}{#4}%
+         \fi}}}
 
 \def\grph_include_use_indeed#1#2#3#4%
   {\dodoglobal\setvalue{\??externalfigureinstance#1}{\grph_include_setup{#2}{#3}{#4}}%
@@ -221,8 +241,9 @@
   {\dotripleempty\grph_include_figure}
 
 \def\grph_include_figure[#1][#2][#3]%
-  {\docheckassignment{#2}%
-   \ifassignment
+% {\docheckassignment{#2}%
+%  \ifassignment
+  {\ifcondition\validassignment{#2}%
      \grph_include_place[#1][][#2]%
    \else
      \grph_include_place[#1][#2][#3]%
@@ -301,8 +322,9 @@
    %
    \edef\p_grph_include_label{#1}%
    \let\p_grph_include_name\p_grph_include_label
-   \docheckassignment{#2}%
-   \ifassignment
+ % \docheckassignment{#2}%
+ % \ifassignment
+   \ifcondition\validassignment{#2}%
      % [label] [settings]
      \let\p_grph_include_parent\p_grph_include_label
      \grph_include_place_inherit