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.mkiv21
1 files changed, 11 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/context/base/strc-blk.mkiv b/Master/texmf-dist/tex/context/base/strc-blk.mkiv
index 8aa8568407f..f625fa44849 100644
--- a/Master/texmf-dist/tex/context/base/strc-blk.mkiv
+++ b/Master/texmf-dist/tex/context/base/strc-blk.mkiv
@@ -23,7 +23,7 @@
% check functionality
% alternative files (needs further integration elsewhere)
-\def\blockparameter#1#2{\ifcsname\??tb#1#2\endcsname\csname\??tb#1#2\endcsname\fi}
+\def\namedblockparameter#1#2{\ifcsname\??tb#1#2\endcsname\csname\??tb#1#2\endcsname\fi}
\unexpanded\def\setupblockparameters{\dodoubleargument \dosetupblock} % fast one (for compatibility)
\unexpanded\def\setupblock {\dodoubleargumentwithset\dosetupblock} % handles set
@@ -41,13 +41,14 @@
\c!inner=,
\c!style=,
\c!file=]% todo
- \ctxlua{structure.blocks.define("#1")}%
- \setvalue{\e!begin#1}{\dodoubleempty\dobeginofblock[#1]}%
+ \ctxlua{structures.blocks.define("#1")}%
+ \setuvalue{\e!begin#1}{\dodoubleempty\dobeginofblock[#1]}%
\letvalue{\e!end#1}\relax}
\long\def\dobeginofblock[#1][#2]%
{\normalexpanded{\noexpand\dodowithbuffer{@block@}{\e!begin#1}{\e!end#1}}
- {}{\ctxlua{structure.blocks.save("#1","#2","@block@")}}}% before after
+ {}% before
+ {\ctxlua{structures.blocks.save("#1","#2","@block@")}}}% after
\def\dostarthiddenblock
{\startnointerference
@@ -69,30 +70,30 @@
\edef\currentblock{#1}%
\doblocksetups\currentblock
\let\doblocksetups\gobbleoneargument
- \blockparameter\currentblock\c!before
+ \namedblockparameter\currentblock\c!before
\dosetfontattribute{\??tb\currentblock}\c!style
\dosetcolorattribute{\??tb\currentblock}\c!color
- \blockparameter\currentblock\c!inner
+ \namedblockparameter\currentblock\c!inner
\ignorespaces}
\def\dostopnormalblock
{\removeunwantedspaces
- \blockparameter\currentblock\c!after
+ \namedblockparameter\currentblock\c!after
\par % todo: alternative = text, paragraph
\egroup}
\def\dosetblockstate[#1][#2][#3]% state name tag
- {\ctxlua{structure.blocks.setstate("#1","#2","#3")}}
+ {\ctxlua{structures.blocks.setstate("#1","#2","#3")}}
\def\doselectblocks[#1][#2][#3][#4]% state name tag setups
{\bgroup
\doifassignmentelse{#3}
{\getparameters[\??tb\??tb][\c!criterium=\v!text,#3]%
\def\doblocksetups##1{\getparameters[\??tb##1][#3]}%
- \ctxlua{structure.blocks.select("#1","#2","","\@@tb@@tbcriterium")}}
+ \ctxlua{structures.blocks.select("#1","#2","","\@@tb@@tbcriterium")}}
{\getparameters[\??tb\??tb][\c!criterium=\v!text,#4]%
\def\doblocksetups##1{\getparameters[\??tb##1][#4]}%
- \ctxlua{structure.blocks.select("#1","#2","#3","\@@tb@@tbcriterium")}}%
+ \ctxlua{structures.blocks.select("#1","#2","#3","\@@tb@@tbcriterium")}}%
\egroup}
% hide: save, if [+] also hidden execute