diff options
author | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
commit | 1314fbe93790c501dc436a5cf99f106b9e5c0f63 (patch) | |
tree | 04dc7734c8be8ffe385d41f4388826ef5857b6f9 /Master/texmf-dist/tex/context/base/mkiv/scrn-wid.mkvi | |
parent | eb80ce7b34f59896a1dfee5ca422495394d6677f (diff) |
Revert "ConTeXt version 2019.02.22 19:35"
This reverts commit 5c6357cdb820b4f628d036ba7b2248f221d50c0b.
git-svn-id: svn://tug.org/texlive/trunk@50112 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/scrn-wid.mkvi')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/scrn-wid.mkvi | 97 |
1 files changed, 28 insertions, 69 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/scrn-wid.mkvi b/Master/texmf-dist/tex/context/base/mkiv/scrn-wid.mkvi index d1571ca656d..c74125c72b6 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/scrn-wid.mkvi +++ b/Master/texmf-dist/tex/context/base/mkiv/scrn-wid.mkvi @@ -212,10 +212,11 @@ name {\attachmentparameter\c!name}% buffer {\attachmentparameter\c!buffer}% \relax + \setbox\b_scrn_attachment_link\hbox{\scrn_attachment_place}% \wd\b_scrn_attachment_link\currentattachmentwidth \ht\b_scrn_attachment_link\currentattachmentheight \dp\b_scrn_attachment_link\currentattachmentdepth - \expandnamespaceparameter\??attachmentlocation\attachmentparameter\c!location\s!unknown} + \box\b_scrn_attachment_link} \setvalue{\??attachmentmethod\v!hidden}% {\clf_insertattachment @@ -230,48 +231,29 @@ buffer {\attachmentparameter\c!buffer}% \relax} -\unexpanded\def\scrn_attachment_flush_traced - {\hpack\bgroup - \blackrule % can be a fast one - [ \c!color=trace:r, - \c!width=\wd\b_scrn_attachment_link, - \c!height=\ht\b_scrn_attachment_link, - \c!depth=\dp\b_scrn_attachment_link]% - \kern-\wd\b_scrn_attachment_link - \box\b_scrn_attachment_link - \egroup} - -\unexpanded\def\scrn_attachment_flush_normal - {\box\b_scrn_attachment_link} - -\installtextracker - {attachments.anchors} - {\let\scrn_attachment_flush\scrn_attachment_flush_traced} - {\let\scrn_attachment_flush\scrn_attachment_flush_normal} - -\let\scrn_attachment_flush\scrn_attachment_flush_normal - -\setvalue{\??attachmentlocation\v!inmargin }{\inmargin {\scrn_attachment_flush}} -\setvalue{\??attachmentlocation\v!leftedge }{\inleftedge {\scrn_attachment_flush}} -\setvalue{\??attachmentlocation\v!rightedge }{\inrightedge {\scrn_attachment_flush}} -\setvalue{\??attachmentlocation\v!leftmargin }{\inleftmargin {\scrn_attachment_flush}} -\setvalue{\??attachmentlocation\v!rightmargin}{\inrightmargin{\scrn_attachment_flush}} -\setvalue{\??attachmentlocation\v!high }{\high {\scrn_attachment_flush}} - -\setvalue{\??attachmentlocation\v!none}% +\def\scrn_attachment_place + {\executeifdefined + {\??attachmentlocation\attachmentparameter\c!location}\hbox + {\box\b_scrn_attachment_link}} + +\setvalue{\??attachmentlocation\v!inmargin }{\inmargin } +\setvalue{\??attachmentlocation\v!leftedge }{\inleftedge } +\setvalue{\??attachmentlocation\v!rightedge }{\inrightedge } +\setvalue{\??attachmentlocation\v!leftmargin }{\inleftmargin } +\setvalue{\??attachmentlocation\v!rightmargin}{\inrightmargin} +\setvalue{\??attachmentlocation\v!high }{\high} +\setvalue{\??attachmentlocation\v!none }{\scrn_attachment_collect} +%setvalue{\??attachmentlocation\v!text }{\gobblenextargument} % gobbles the box + +\def\scrn_attachment_collect#content% {\global\setbox\b_scrn_attachment_collect\hbox\bgroup \ifvoid\b_scrn_attachment_collect\else \box\b_scrn_attachment_collect \hskip\attachmentparameter\c!distance\relax \fi - \scrn_attachment_flush + #content% \egroup} -\setvalue{\??attachmentlocation\s!unknown}% - {\ifvoid\b_scrn_attachment_collect\else - \box\b_scrn_attachment_collect - \fi} - \unexpanded\def\placeattachments {\ifvoid\b_scrn_attachment_collect\else \box\b_scrn_attachment_collect @@ -335,7 +317,7 @@ % % test % -% \startcomment[symbol=Help] +% \startcomment[symbol=Balloon] % Do we want this kind of rubish? % \stopcomment % @@ -378,9 +360,6 @@ % % test -%D The implementation is mostly the same as for attachments but sharing code -%D will not make it cleaner. - \installcorenamespace{comment} \installcorenamespace{commentlocation} @@ -510,37 +489,17 @@ \dp\b_scrn_comment_link\currentcommentdepth \expandnamespaceparameter\??commentlocation\commentparameter\c!location\s!unknown} -\letvalue{\??commentmethods\v!hidden}\donothing - -\unexpanded\def\scrn_comment_flush_traced - {\hpack\bgroup - \blackrule % can be a fast one - [ \c!color=trace:y, - \c!width=\wd\b_scrn_comment_link, - \c!height=\ht\b_scrn_comment_link, - \c!depth=\dp\b_scrn_comment_link]% - \kern-\wd\b_scrn_comment_link - \box\b_scrn_comment_link - \egroup} - -\unexpanded\def\scrn_comment_flush_normal - {\box\b_scrn_comment_link} - -\installtextracker - {comments.anchors} - {\let\scrn_comment_flush\scrn_comment_flush_traced} - {\let\scrn_comment_flush\scrn_comment_flush_normal} - -\let\scrn_comment_flush\scrn_comment_flush_normal +\setvalue{\??commentmethods\v!hidden}% + {} % todo: dedicated margin classes -\setvalue{\??commentlocation\v!inmargin }{\inmargin {\scrn_comment_flush}} -\setvalue{\??commentlocation\v!leftedge }{\inleftedge {\scrn_comment_flush}} -\setvalue{\??commentlocation\v!rightedge }{\inrightedge {\scrn_comment_flush}} -\setvalue{\??commentlocation\v!leftmargin }{\inleftmargin {\scrn_comment_flush}} -\setvalue{\??commentlocation\v!rightmargin}{\inrightmargin{\scrn_comment_flush}} -\setvalue{\??commentlocation\v!high }{\high {\scrn_comment_flush}} +\setvalue{\??commentlocation\v!inmargin }{\inmargin {\box\b_scrn_comment_link}} +\setvalue{\??commentlocation\v!leftedge }{\inleftedge {\box\b_scrn_comment_link}} +\setvalue{\??commentlocation\v!rightedge }{\inrightedge {\box\b_scrn_comment_link}} +\setvalue{\??commentlocation\v!leftmargin }{\inleftmargin {\box\b_scrn_comment_link}} +\setvalue{\??commentlocation\v!rightmargin}{\inrightmargin{\box\b_scrn_comment_link}} +\setvalue{\??commentlocation\v!high }{\high {\box\b_scrn_comment_link}} \setvalue{\??commentlocation\v!none}% {\global\setbox\b_scrn_comment_collect\hbox\bgroup @@ -548,7 +507,7 @@ \box\b_scrn_comment_collect \hskip\commentparameter\c!distance\relax \fi - \scrn_comment_flush + \box\b_scrn_comment_link \egroup} \setvalue{\??commentlocation\s!unknown}% |