diff options
author | Taco Hoekwater <taco@elvenkind.com> | 2010-05-24 14:05:02 +0000 |
---|---|---|
committer | Taco Hoekwater <taco@elvenkind.com> | 2010-05-24 14:05:02 +0000 |
commit | 57ea7dad48fbf2541c04e434c31bde655ada3ac4 (patch) | |
tree | 1f8b43bc7cb92939271e1f5bec610710be69097f /Master/texmf-dist/tex/context/base/strc-blk.mkiv | |
parent | 6ee41e1f1822657f7f23231ec56c0272de3855e3 (diff) |
here is context 2010.05.24 13:05
git-svn-id: svn://tug.org/texlive/trunk@18445 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/strc-blk.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/strc-blk.mkiv | 18 |
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 |