1 files changed, 33 insertions, 10 deletions
diff --git a/tex/context/base/mkiv/strc-not.mkvi b/tex/context/base/mkiv/strc-not.mkvi
index db27cb5af..8952f0e9c 100644
--- a/tex/context/base/mkiv/strc-not.mkvi
+++ b/tex/context/base/mkiv/strc-not.mkvi
@@ -13,7 +13,7 @@
 
 \writestatus{loading}{ConTeXt Structure Macros / Note Handling}
 
-\registerctxluafile{strc-not}{1.001}
+\registerctxluafile{strc-not}{}
 
 \unprotect
 
@@ -1381,23 +1381,30 @@
      \penalty\zerocount % otherwise no split in columns, maybe just always (tex just adds it to accumulated)
    \fi}
 
-
 \appendtoks
   \strc_notes_set_penalties
-  \forgetall
+  \forgetall % again
   \strc_notes_set_bodyfont
   \redoconvertfont % to undo \undo calls in in headings etc
   \splittopskip\strutht  % not actually needed here
   \splitmaxdepth\strutdp % not actually needed here
-  % brrr
-%   \leftmargindistance \noteparameter\c!margindistance
-%   \rightmargindistance\leftmargindistance
-%   \ifnum\noteparameter\c!n=\zerocount % no ifcase new 31-07-99 ; always ?
-%     \doifnotinset{\noteparameter\c!width}{\v!fit,\v!broad}\setnotehsize % ?
-%   \fi
+  % not:
+% \leftmargindistance \noteparameter\c!margindistance
+% \rightmargindistance\leftmargindistance
+% \ifnum\noteparameter\c!n=\zerocount % no ifcase new 31-07-99 ; always ?
+%   \doifnotinset{\noteparameter\c!width}{\v!fit,\v!broad}\setnotehsize % ?
+% \fi
+  %
 \to \everyinsidenoteinsert
 
-\appendtoks % only needed when columns
+% maybe but better use [scope=local] here
+%
+% \appendtoks
+%     \setfalse\inhibitmargindata
+% \to \everyinsidenoteinsert
+
+\appendtoks
+    % only needed when columns (could be three \set...)
     \setsimplecolumnshsize[\c!distance=\noteparameter\c!columndistance,\c!n=\noteparameter\c!n,\c!width=\noteparameter\c!width]%
 \to \everyinsidenoteinsert
 
@@ -1550,11 +1557,27 @@
 
 \let\flushnotes\relax
 
+\unexpanded\def\startpostponingnotes % experimental, page-mix
+  {\ifconditional\postponingnotes\else
+     \global\settrue\postponingnotes
+    %\global\let\flushnotes\doflushnotes
+     \clf_postponenotes
+   \fi}
+
+\unexpanded\def\stoppostponingnotes % experimental, page-mix
+  {\doflushnotes}
+
 \unexpanded\def\doflushnotes
   {\ifconditional\postponingnotes
      \begingroup
      \let\flushnotes   \relax
      \let\postponenotes\relax
+     \ifconditional\postponednote
+       \ifhmode
+         % needed for tagging ... otherwise we get some weird node free error
+         \signalcharacter
+       \fi
+     \fi
      \clf_flushpostponednotes% this also resets the states !
      \global\setfalse\postponednote
      \global\setfalse\postponingnotes