1 files changed, 8 insertions, 4 deletions
diff --git a/tex/context/base/strc-not.mkvi b/tex/context/base/strc-not.mkvi
index 0a1ede550..4bfcc291d 100644
--- a/tex/context/base/strc-not.mkvi
+++ b/tex/context/base/strc-not.mkvi
@@ -184,7 +184,7 @@
      \iftrialtypesetting
        \strc_counters_save\currentconstructionnumber
      \fi
-     \strc_counters_increment_sub\currentconstructionnumber\currentconstructionlevel
+%      \strc_counters_increment_sub\currentconstructionnumber\currentconstructionlevel
    \else
      \setfalse\c_strc_constructions_number_state
    \fi
@@ -219,6 +219,7 @@
 \unexpanded\def\strc_notations_command#1%
   {\begingroup
    \strc_constructions_initialize{#1}%
+   \strc_counters_increment_sub\currentconstructionnumber\currentconstructionlevel
    \doifnextoptionalelse\strc_notations_command_yes\strc_notations_command_nop}
 
 \unexpanded\def\strc_notations_command_nop#1%
@@ -242,6 +243,7 @@
 \unexpanded\def\strc_notations_start#1#2%
   {\begingroup
    \strc_constructions_initialize{#1}%
+   \strc_counters_increment_sub\currentconstructionnumber\currentconstructionlevel
    \normalexpanded % not that efficient but also not that frequently used
      {\def\noexpand\strc_pickup_yes[##1]##2\csname\e!stop#2\endcsname{\strc_notations_command_yes[##1]{##2}}%
       \def\noexpand\strc_pickup_nop     ##1\csname\e!stop#2\endcsname{\strc_notations_command_nop     {##1}}}%
@@ -1017,9 +1019,10 @@
         \unexpanded\def\setnote    [#1]{\getvalue{#1}}
         \unexpanded\def\setnotetext[#1]{\global\settrue\c_strc_notes_skip\getvalue{#1}}
 
-\def\handlenoteinsert#1#2% tg, id
+\unexpanded\def\handlenoteinsert#1#2% tg, id
   {\begingroup
    \edef\currentnote{#1}%
+   \strc_constructions_initialize{#1}%
    \the\everybeforenoteinsert
    \insert\currentnoteins\bgroup
      \the\everyinsidenoteinsert\relax
@@ -1035,13 +1038,14 @@
    \the\everyafternoteinsert
    \endgroup}
 
-\def\betweennoteitself#1% tg
+\unexpanded\def\betweennoteitself#1% tg
   {\edef\currentnote{#1}%
    \doif{\noteparameter\c!paragraph}\v!yes\strc_notes_between_paragraphs}
 
-\def\handlenoteitself#1#2% tg, id
+\unexpanded\def\handlenoteitself#1#2% tg, id
   {\edef\currentnote{#1}%
    \edef\currentnotenumber{#2}%
+   \strc_constructions_initialize{#1}% not needed when called in handlenoteinsert
    \edef\currentconstructionlistentry{\ctxlua{tex.write(structures.notes.listindex("#1",#2))}}% index in list cache
    % as we can have collected notes (e.g. in tables) we need to recover
    % \currentdescriptionattribute and \currentdescriptionsynchronize