1 files changed, 15 insertions, 8 deletions
diff --git a/tex/context/base/mkiv/scrn-wid.mkvi b/tex/context/base/mkiv/scrn-wid.mkvi
index f19da57f7..c74125c72 100644
--- a/tex/context/base/mkiv/scrn-wid.mkvi
+++ b/tex/context/base/mkiv/scrn-wid.mkvi
@@ -13,7 +13,7 @@
 
 \writestatus{loading}{ConTeXt Interaction Macros / Widgets}
 
-\registerctxluafile{scrn-wid}{1.001}
+\registerctxluafile{scrn-wid}{}
 
 % todo: expansion in comments (default is expanded)
 % todo: check renderings ... acrobat crashes too easily on missing one
@@ -86,7 +86,7 @@
   %\c!method=, % \v!hidden = not in menu
   %\c!buffer=
    \c!symbol=,
-   \c!distance=1em,
+   \c!distance=\emwidth,
    \c!width=\v!fit,
    \c!height=\v!fit,
    \c!depth=\v!fit,
@@ -223,6 +223,12 @@
      tag        {\currentattachment}%
      registered {\currentattachmentregistered}%
      method     {\v!hidden}%
+     title      {\attachmentparameter\c!title}%
+     subtitle   {\attachmentparameter\c!subtitle}%
+     author     {\attachmentparameter\c!author}%
+     file       {\attachmentparameter\c!file}%
+     name       {\attachmentparameter\c!name}%
+     buffer     {\attachmentparameter\c!buffer}%
    \relax}
 
 \def\scrn_attachment_place
@@ -243,7 +249,7 @@
   {\global\setbox\b_scrn_attachment_collect\hbox\bgroup
      \ifvoid\b_scrn_attachment_collect\else
        \box\b_scrn_attachment_collect
-       \hskip\attachmentparameter\c!distance
+       \hskip\attachmentparameter\c!distance\relax
      \fi
      #content%
    \egroup}
@@ -366,7 +372,7 @@
 
 \setupcomment
   [\c!state=\v!start,
-   \c!distance=1em,
+   \c!distance=\emwidth,
    \c!color=\interactionparameter\c!color,
    \c!space=\v!no,
    \c!symbol=,
@@ -499,7 +505,7 @@
   {\global\setbox\b_scrn_comment_collect\hbox\bgroup
      \ifvoid\b_scrn_comment_collect\else
        \box\b_scrn_comment_collect
-       \hskip\commentparameter\c!distance
+       \hskip\commentparameter\c!distance\relax
      \fi
      \box\b_scrn_comment_link
    \egroup}
@@ -592,7 +598,7 @@
          option   {#option}%
       \relax
       \let\objectoffset\zeropoint
-      \setobject{IRO}{#tag}\hbox{\box\nextbox}%
+      \setobject{IRO}{#tag}\hpack{\box\nextbox}%
       \egroup}%
      \hbox}
 
@@ -649,7 +655,8 @@
  % \handlereferenceactions{\renderingwindowparameter\c!closepageaction}\dosetuprenderingclosepageaction
    \letrenderingwindowparameter\c!offset\v!overlay
    \inheritedrenderingwindowframed
-     {\vfill
+     {\vfilll
+      \dontleavehmode
       \clf_insertrenderingwindow
         label  {\currentrendering}%
         width  \d_scrn_rendering_width
@@ -696,7 +703,7 @@
 %    \iflocation
 %      \edef\currentlinkedlist{#1}%
 %      \ifcsname\??lk\currentlinkedlist\s!parent\endcsname
-%        \hskip\linkedlistparameter\c!distance
+%        \hskip\linkedlistparameter\c!distance\relax
 %        \clf_addlinklistelement{\currentlinkedlist}%
 %        \expanded{\ctxlatecommand{enhancelinkedlist("\currentlinkedlist",\currentlink)}}% can also be done at the lua end
 %        \dogotosomepage  {\??lk\currentlinkedlist}\gotobegincharacter \firstlink