1 files changed, 14 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/context/base/strc-not.mkvi b/Master/texmf-dist/tex/context/base/strc-not.mkvi
index 5f1f041e35e..20a664420be 100644
--- a/Master/texmf-dist/tex/context/base/strc-not.mkvi
+++ b/Master/texmf-dist/tex/context/base/strc-not.mkvi
@@ -242,7 +242,7 @@
   {\strc_constructions_register[\c!label={\descriptionparameter\c!text},\c!reference=,\c!title={#1},\c!bookmark=,\c!list=][]%
    \csname\??constructionnotehandler\currentconstructionhandler\endcsname
    \strc_constructions_finalize
-   \endgroup}
+   \normalexpanded{\endgroup\noteparameter\c!next}}
 
 \unexpanded\def\strc_notations_command_yes[#1]%
   {\doifassignmentelse{#1}\strc_notations_command_assignment\strc_notations_command_argument[#1]}
@@ -251,13 +251,13 @@
   {\strc_constructions_register[\c!label={\descriptionparameter\c!text},\c!reference=,\c!title=,\c!bookmark=,\c!list=,#1][]%
    \csname\??constructionnotehandler\currentconstructionhandler\endcsname
    \strc_constructions_finalize
-   \endgroup}
+   \normalexpanded{\endgroup\noteparameter\c!next}}
 
 \unexpanded\def\strc_notations_command_argument[#1]#2%
   {\strc_constructions_register[\c!label={\descriptionparameter\c!text},\c!reference={#1},\c!title={#2},\c!bookmark=,\c!list=][]%
    \csname\??constructionnotehandler\currentconstructionhandler\endcsname
    \strc_constructions_finalize
-   \endgroup}
+   \normalexpanded{\endgroup\noteparameter\c!next}}
 
 \unexpanded\def\strc_notations_start#1#2%
   {\begingroup
@@ -272,13 +272,13 @@
   {\strc_constructions_register[\c!label={\descriptionparameter\c!text},\c!reference={#1},\c!title={#2},\c!bookmark=,\c!list=][]%
    \csname\??constructionnotehandler\currentconstructionhandler\endcsname
    \strc_constructions_finalize
-   \endgroup}
+   \normalexpanded{\endgroup\noteparameter\c!next}}
 
 \unexpanded\def\strc_notations_start_nop#1%
   {\strc_constructions_register[\c!label={\descriptionparameter\c!text},\c!reference=,\c!title={#1},\c!bookmark=,\c!list=][]%
    \csname\??constructionnotehandler\currentconstructionhandler\endcsname
    \strc_constructions_finalize
-   \endgroup}
+   \normalexpanded{\endgroup\noteparameter\c!next}}
 
 \unexpanded\def\strc_notations_stop
   {}
@@ -863,7 +863,7 @@
 \installcorenamespace{notepositionvariant}
 \installcorenamespace{notelocation}
 
-% \newconditional\c_strc_notes_delayed
+\newconditional\c_strc_notes_delayed
 
 \setvalue{\??notelocation\v!page       }{\letvalue{\??notelocationvariant\currentnote}\strc_notes_set_location_page}
 \setvalue{\??notelocation\v!columns    }{\letvalue{\??notelocationvariant\currentnote}\strc_notes_set_location_columns}
@@ -910,7 +910,7 @@
    \fi}
 
 \def\strc_notes_set_location_page
-  {%\setfalse\c_strc_notes_delayed
+  {\setfalse\c_strc_notes_delayed
    \strc_notes_set_distance
    \strc_notes_set_columns
    \global\count\currentnoteins\numexpr\plusthousand/\c_strc_notes_columns\relax
@@ -918,7 +918,7 @@
    \global\skip \currentnoteins\s_strc_notes_distance}
 
 \def\strc_notes_set_location_columns
-  {%\setfalse\c_strc_notes_delayed
+  {\setfalse\c_strc_notes_delayed
    \strc_notes_set_distance
    \strc_notes_set_columns
    \ifnum\currentnofcolumns=\zerocount
@@ -929,7 +929,7 @@
    \global\skip \currentnoteins\s_strc_notes_distance}
 
 \def\strc_notes_set_location_firstcolumn
-  {%\setfalse\c_strc_notes_delayed
+  {\setfalse\c_strc_notes_delayed
    \strc_notes_set_distance
    \strc_notes_set_columns
    \global\count\currentnoteins\plusthousand
@@ -939,7 +939,7 @@
 \let\strc_notes_set_location_lastcolumn\strc_notes_set_location_firstcolumn
 
 \def\strc_notes_set_location_text % we don't use inserts anyway (e.g. endnotes)
-  {%\settrue\c_strc_notes_delayed
+  {\settrue\c_strc_notes_delayed
    \ctxlua{structures.notes.setstate("\currentnote","store")}%
    \global\dimen\currentnoteins\maxdimen
    \global\count\currentnoteins\zerocount
@@ -1185,9 +1185,10 @@
   {\strc_notes_process\strc_notes_place_inserts}
 
 \def\strc_notes_place_inserts
-  {%\ifconditional\c_strc_notes_delayed \else
-  \ifdim\ht\currentnoteins>\zeropoint % or a faster delayed test
-     \strc_notes_place_inserts_indeed
+  {\ifconditional\c_strc_notes_delayed \else
+     \ifdim\ht\currentnoteins>\zeropoint % or a faster delayed test
+       \strc_notes_place_inserts_indeed
+     \fi
    \fi}
 
 \def\strc_notes_place_inserts_indeed