From f58a2cb5d22c5931581274db1f0ec85ac903b747 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Mon, 28 Oct 2019 20:03:50 +0100
Subject: 2019-10-28 18:22:00

---
 tex/context/base/mkiv/strc-not.mkvi | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'tex/context/base/mkiv/strc-not.mkvi')

diff --git a/tex/context/base/mkiv/strc-not.mkvi b/tex/context/base/mkiv/strc-not.mkvi
index f11c831dd..48151c76e 100644
--- a/tex/context/base/mkiv/strc-not.mkvi
+++ b/tex/context/base/mkiv/strc-not.mkvi
@@ -943,11 +943,22 @@
 \letvalue{\??notepenalty\v!verystrict}\notepenaltyverystrict
 \letvalue{\??notepenalty             }\notepenaltytolerant
 
+% \def\strc_notes_set_width
+%   {\edef\p_width{\noteparameter\c!width}%
+%    \ifx\p_width\empty
+%      \setnoteparameter\c!width{\hsize}%
+%    \fi}
+
+\setupnotes
+  [\c!width=\v!auto]
+
 \def\strc_notes_set_width
   {\edef\p_width{\noteparameter\c!width}%
-   \ifx\p_width\empty
+   \ifx\p_width\v!auto
+     \setnoteparameter\c!width{\ifdim\hsize<\makeupwidth\hsize\else\makeupwidth\fi}%
+   \else\ifx\p_width\empty
      \setnoteparameter\c!width{\hsize}%
-   \fi}
+   \fi\fi}
 
 \appendtoks
     \strc_notes_set_width
@@ -1390,9 +1401,8 @@
 
 %D Nasty, the might be more:
 
-\appendtoks
-    \c_strc_itemgroups_nesting\zerocount
-\to \everyinsidenoteinsert
+\appendtoks \strc_itemgroups_push \to \everybeforenoteinsert
+\appendtoks \strc_itemgroups_pop  \to \everyafternoteinsert
 
 % maybe but better use [scope=local] here
 %
-- 
cgit v1.2.3