summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/strc-blk.mkiv
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/strc-blk.mkiv')
-rw-r--r--Master/texmf-dist/tex/context/base/strc-blk.mkiv18
1 files changed, 10 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/context/base/strc-blk.mkiv b/Master/texmf-dist/tex/context/base/strc-blk.mkiv
index 90d2ff9ab05..8aa8568407f 100644
--- a/Master/texmf-dist/tex/context/base/strc-blk.mkiv
+++ b/Master/texmf-dist/tex/context/base/strc-blk.mkiv
@@ -25,15 +25,15 @@
\def\blockparameter#1#2{\ifcsname\??tb#1#2\endcsname\csname\??tb#1#2\endcsname\fi}
-\def\setupblockparameters{\dodoubleargument \dosetupblock} % fast one (for compatibility)
-\def\setupblock {\dodoubleargumentwithset\dosetupblock} % handles set
+\unexpanded\def\setupblockparameters{\dodoubleargument \dosetupblock} % fast one (for compatibility)
+\unexpanded\def\setupblock {\dodoubleargumentwithset\dosetupblock} % handles set
\def\dosetupblock[#1]{\getparameters[\??tb#1]} % [#1][#2]}
-\def\defineblock
- {\dosingleargument\dodefineblock}
+\unexpanded\def\defineblock[#1]%
+ {\processcommalist[#1]\dodefineblock}
-\def\dodefineblock[#1]%
+\def\dodefineblock#1%
{\getparameters
[\??tb#1]
[\c!before=\blank,
@@ -59,11 +59,13 @@
% order matters: \c!before (think of: \c!before=\startitemize)
+% no \endgroups
+
\let\doblocksetups\gobbleoneargument
\def\dostartnormalblock#1% name
{\bgroup
-\visibletrue
+ \visibletrue
\edef\currentblock{#1}%
\doblocksetups\currentblock
\let\doblocksetups\gobbleoneargument
@@ -83,7 +85,7 @@
{\ctxlua{structure.blocks.setstate("#1","#2","#3")}}
\def\doselectblocks[#1][#2][#3][#4]% state name tag setups
- {\begingroup
+ {\bgroup
\doifassignmentelse{#3}
{\getparameters[\??tb\??tb][\c!criterium=\v!text,#3]%
\def\doblocksetups##1{\getparameters[\??tb##1][#3]}%
@@ -91,7 +93,7 @@
{\getparameters[\??tb\??tb][\c!criterium=\v!text,#4]%
\def\doblocksetups##1{\getparameters[\??tb##1][#4]}%
\ctxlua{structure.blocks.select("#1","#2","#3","\@@tb@@tbcriterium")}}%
- \endgroup}
+ \egroup}
% hide: save, if [+] also hidden execute
% keep: save and normal execute