From f68f45f2c869c918074964cfe4cdad33e57aa6d8 Mon Sep 17 00:00:00 2001
From: Ulrike Fischer <fischer@troubleshooting-tex.de>
Date: Mon, 10 Feb 2025 17:01:36 +0100
Subject: [PATCH] more clean up

---
 luamml-patches-amsmath.sty | 18 +++++++++---------
 luamml-patches-kernel.sty  |  9 +++++----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/luamml-patches-amsmath.sty b/luamml-patches-amsmath.sty
index 6baf949..66ffdbe 100644
--- a/luamml-patches-amsmath.sty
+++ b/luamml-patches-amsmath.sty
@@ -410,12 +410,12 @@
         \def \arraystretch {1.2}
         \array {@{}l@{\quad \luamml_ignore:}l@{}}
     }
-  } %end package test
-
-\cs_set:Npn \bBigg@ #1 #2 {
-  {
-    \ensuremath {
-      \Uvextensible height~#1 \big@size axis~exact~#2
-    }
-  }
-}
+   \PackageInfo{luamml}{patching~\string\bBigg@}
+   \cs_set:Npn \bBigg@ #1 #2 {
+     {
+       \ensuremath {
+         \Uvextensible height~#1 \big@size axis~exact~#2
+       }
+     }
+   }
+} %end package test
diff --git a/luamml-patches-kernel.sty b/luamml-patches-kernel.sty
index 36824a8..bcd3064 100644
--- a/luamml-patches-kernel.sty
+++ b/luamml-patches-kernel.sty
@@ -52,8 +52,13 @@
        \finph@nt
      }
    }
+   \IfFileLoadedT {latex-lab-math.ltx} {
+  \RequirePackage{luamml-patches-lab-math}
+   }
  }
 
+% This is not moved to latex-lab for now. It doesn't work properly with structure elements
+% active: the content is outside of the math. 
 \@ifpackageloaded {unicode-math} {} {
   \cs_new:Npn \__luamml_kernel_define_character:Nnn #1#2#3 {
     \cs_set:cpx { \cs_to_str:N #1 ~ } {
@@ -77,7 +82,3 @@
   \__luamml_kernel_define_character:Nnn \longleftrightarrow {3} {27f7}
   \__luamml_kernel_define_character:Nnn \longmapsto {4} {27fc}
 }
-
-\IfFileLoadedT {latex-lab-math.ltx} {
-  \RequirePackage{luamml-patches-lab-math}
-}