diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/strc-con.mkvi')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/strc-con.mkvi | 83 |
1 files changed, 61 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/strc-con.mkvi b/Master/texmf-dist/tex/context/base/mkiv/strc-con.mkvi index 8c75eb6df5e..81e28f67fd5 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/strc-con.mkvi +++ b/Master/texmf-dist/tex/context/base/mkiv/strc-con.mkvi @@ -226,7 +226,7 @@ {\begingroup \iftrialtypesetting \else \currentconstructionsynchronize - \attribute\destinationattribute\currentconstructionattribute\relax + \c_attr_destination\currentconstructionattribute\relax \fi #1% \endgroup} @@ -235,7 +235,7 @@ {\begingroup \iftrialtypesetting \else \currentconstructionsynchronize - \attribute\destinationattribute\currentconstructionattribute\relax + \c_attr_destination\currentconstructionattribute\relax \fi \currentconstructiontext \endgroup} @@ -244,7 +244,7 @@ {\iftrialtypesetting \else \begingroup \currentconstructionsynchronize % reinstated - \attribute\destinationattribute\currentconstructionattribute\relax % todo, whole text + \c_attr_destination\currentconstructionattribute\relax % todo, whole text \signalcharacter \endgroup \fi#1} @@ -418,6 +418,8 @@ % \dostoptagged % tag \dostarttagged\t!constructioncontent\empty + %\freezeparagraphproperties + \updateparagraphshapes \ignorespaces} % args not needed \unexpanded\setvalue{\??constructionstophandler\v!construction}% @@ -433,7 +435,7 @@ \dorechecknextindentation} \unexpanded\def\boxedconstructionhead#1% - {\vtop + {\doifelse{\constructionalternativeparameter\c!alignbottom}{\v!yes}\vbox\vtop {\hsize\constructionsheadwidth \edef\p_strc_constructions_headalign{\constructionparameter\c!headalign}% \ifx\p_strc_constructions_headalign\empty \else @@ -618,7 +620,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!left:\v!none] - \let\\=\crlf + \let\\\crlf \noindent \strc_constructions_set_pure_box\v!flushleft \leftskip\dimexpr\leftconstructionskip+\constructionsheadwidth+\constructionsheaddistance\relax @@ -644,7 +646,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!right:\v!none] - \let\\=\crlf + \let\\\crlf \noindent \leftskip\leftconstructionskip \rightskip\dimexpr\rightconstructionskip+\constructionsheadwidth\relax @@ -670,7 +672,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!left:\v!margin]% - \let\\=\crlf + \let\\\crlf \noindent \strc_constructions_set_pure_box\v!flushleft \llap { @@ -685,7 +687,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!right:\v!margin]% - \let\\=\crlf + \let\\\crlf \noindent \strc_constructions_set_pure_box\v!flushright \rlap { @@ -700,7 +702,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!left:\v!hanging]% - \let\\=\crlf + \let\\\crlf \dontcomplain \advance\constructionsheadwidth \constructionsheaddistance \strc_constructions_set_hang_box\v!flushleft @@ -717,7 +719,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!right:\v!hanging]% - \let\\=\crlf + \let\\\crlf \dontcomplain \advance\constructionsheadwidth \constructionsheaddistance \strc_constructions_set_hang_box\v!flushright @@ -738,7 +740,7 @@ \startsetups[\??constructionrenderings:\v!top] % \strc_sectioning_prevent_page_break % commented per 31/5/2019 - \let\\=\space + \let\\\space \noindent \copy\constructionheadbox % why copy ? \par @@ -756,7 +758,7 @@ % why copy? historic reason? \startsetups[\??constructionrenderings:\v!margin] - \let\\=\crlf + \let\\\crlf \noindent \inmargin[\c!scope=\v!local]{\flushconstructionheadbox}% \useconstructionstyleandcolor\c!style\c!color @@ -764,7 +766,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!leftmargin] - \let\\=\crlf + \let\\\crlf \noindent \inleft[\c!scope=\v!local]{\flushconstructionheadbox}% \useconstructionstyleandcolor\c!style\c!color @@ -772,7 +774,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!rightmargin] - \let\\=\crlf + \let\\\crlf \noindent \inright[\c!scope=\v!local]{\flushconstructionheadbox}% \useconstructionstyleandcolor\c!style\c!color @@ -780,7 +782,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!innermargin] - \let\\=\crlf + \let\\\crlf \noindent \ininner[\c!scope=\v!local]{\flushconstructionheadbox}% \useconstructionstyleandcolor\c!style\c!color @@ -788,7 +790,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!outermargin] - \let\\=\crlf + \let\\\crlf \noindent \inouter[\c!scope=\v!local]{\flushconstructionheadbox}% \useconstructionstyleandcolor\c!style\c!color @@ -818,7 +820,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!serried:\v!fit] - \let\\=\crlf + \let\\\crlf \noindent \flushconstructionheadbox \nobreak @@ -828,7 +830,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!serried:\v!broad] - \let\\=\crlf + \let\\\crlf \noindent \flushconstructionheadbox \ifconditional\c_strc_constructions_distance_none \else @@ -847,7 +849,7 @@ \stopsetups \startsetups[\??constructionrenderings:\v!serried:\v!wide] - \let\\=\crlf + \let\\\crlf \noindent \hbox to \constructionsheadwidth { \flushconstructionheadbox @@ -861,7 +863,7 @@ \startsetups[\??constructionrenderings:\v!hanging] % tricky: leftskipadaption is somewhat unpredictable - \let\\=\crlf + \let\\\crlf \noindent \advance\leftskip-\leftskipadaption\relax \ifdim\leftskipadaption=\zeropoint @@ -919,6 +921,43 @@ \endgroup \stopsetups +\ifcase\contextlmtxmode \else + % just an empty check so that we can grep for contextlmtxmode in mkiv files +\fi + +% \definedescription[whatever][alternative=right:bottom] +% +% \startwhatever{just a small\\example} +% \input ward +% \stopwhatever + +\defineconstructionalternative + [\v!right:\v!bottom] + [%\c!width=7em, + %\c!distance=1em, + \c!alignbottom=\v!yes, + \c!renderingsetup=\??constructionrenderings:\v!right:\v!bottom] + +\startsetups[\??constructionrenderings:\v!right:\v!bottom] + \let\\\crlf + \noindent + \leftskip\leftconstructionskip + \rightskip\dimexpr\rightconstructionskip+\constructionsheadwidth+\constructionsheaddistance\relax + \parfillskip\zeropoint + \strc_constructions_set_pure_box\v!flushright + \directparwrapper \relax {% + \hfilll + \rlap + {\kern\constructionsheaddistance + \copy\constructionheadbox}% + }% + \useconstructionstyleandcolor\c!style\c!color + \ignorespaces +\stopsetups + +%D This next feature will get an lmtx implementation (probably by using a new generic +%D close mechanism). + % you can use \placeclosesymbol or \qed to place a symbol at the end of a % construction @@ -1013,7 +1052,7 @@ \begingroup \simplifycommands \xdef\currentconstructionbookmark{\detokenize\expandafter{\normalexpanded{\constructionparameter\c!title}}}% - \endgroup + \endgroup \fi \fi \fi \ifx\currentconstructionlist\empty @@ -1085,7 +1124,7 @@ \relax % \writestatus{constructions}{registering \currentconstruction: \number\scratchcounter}% \clf_setinternalreference - prefix {\referenceprefix}% + prefix {\currentconstructionreferenceprefix}% reference {\currentconstructionreference}% internal \locationcount view {\interactionparameter\c!focus}% |