From 0189223a1a40debb4cb3b146ce182eb806cd28f2 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Fri, 26 Apr 2019 00:56:11 +0200
Subject: 2019-04-25 10:44:00

---
 tex/context/base/mkiv/meta-ini.mkiv | 42 +++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 11 deletions(-)

(limited to 'tex/context/base/mkiv/meta-ini.mkiv')

diff --git a/tex/context/base/mkiv/meta-ini.mkiv b/tex/context/base/mkiv/meta-ini.mkiv
index 89c7699de..ef13affbb 100644
--- a/tex/context/base/mkiv/meta-ini.mkiv
+++ b/tex/context/base/mkiv/meta-ini.mkiv
@@ -574,17 +574,37 @@
 \def\meta_prepare_variable_dimension
   {\expandafter\edef\csname\m_meta_current_variable_template\endcsname{\the\dimexpr\m_meta_current_variable}}
 
-\def\meta_prepare_variable_yes
-  {\defconvertedcommand\ascii\m_meta_current_variable % otherwise problems
-   \doifelsecolor \ascii                              % with 2\bodyfontsize
-     {\meta_prepare_variable_color}
-     {\begingroup
-      \setbox\b_meta_variable_box\hpack{\scratchdimen\m_meta_current_variable sp}%
-      \ifzeropt\wd\b_meta_variable_box
-        \endgroup\meta_prepare_variable_number
-      \else
-        \endgroup\meta_prepare_variable_dimension
-      \fi}}
+
+\startmkivmode
+
+    \def\meta_prepare_variable_yes
+      {\defconvertedcommand\ascii\m_meta_current_variable % otherwise problems
+       \doifelsecolor \ascii                              % with 2\bodyfontsize
+         {\meta_prepare_variable_color}
+         {\begingroup
+          \setbox\b_meta_variable_box\hpack{\scratchdimen\m_meta_current_variable sp}%
+          \ifzeropt\wd\b_meta_variable_box
+            \endgroup\meta_prepare_variable_number
+          \else
+            \endgroup\meta_prepare_variable_dimension
+          \fi}}
+
+\stopmkivmode
+
+\startlmtxmode
+
+    \def\meta_prepare_variable_yes
+      {\ifdimen\m_meta_current_variable\or
+         \meta_prepare_variable_dimension
+       \else\ifnumber\m_meta_current_variable\or
+         \meta_prepare_variable_number
+       \else
+          \doifelsecolor\m_meta_current_variable
+            \meta_prepare_variable_color
+            \meta_prepare_variable_dimension
+       \fi\fi}
+
+\stoplmtxmode
 
 % \def\meta_prepare_variable_yes
 %   {\expandafter\edef\csname\m_meta_current_variable_template\endcsname
-- 
cgit v1.2.3