summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4075 -> 4071 bytes
-rw-r--r--tex/context/base/context-version.pngbin105858 -> 105572 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/pack-rul.mkiv8
-rw-r--r--tex/context/base/s-def-01.mkiv2
-rw-r--r--tex/context/base/status-files.pdfbin24313 -> 24317 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin172395 -> 172392 bytes
-rw-r--r--tex/context/base/strc-def.mkiv31
-rw-r--r--tex/context/base/strc-ini.mkiv33
-rw-r--r--tex/context/base/strc-itm.mkvi5
-rw-r--r--tex/context/base/strc-lst.mkvi22
-rw-r--r--tex/context/base/strc-mat.mkiv2
-rw-r--r--tex/context/base/strc-num.mkiv42
-rw-r--r--tex/context/base/strc-pag.mkiv8
-rw-r--r--tex/context/base/strc-ref.mkvi4
-rw-r--r--tex/context/base/typo-prc.mkvi2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
20 files changed, 101 insertions, 68 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index fbe0c0399..e23aeccb6 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2012.03.28 18:39}
+\newcontextversion{2012.03.29 11:28}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 826303060..ead24fc68 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2012.03.28 18:39}
+\newcontextversion{2012.03.29 11:28}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 8f8559e04..8a9098552 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 199b31e71..6458699b1 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 161552c08..0795e3eb6 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.03.28 18:39}
+\edef\contextversion{2012.03.29 11:28}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index e35bdb41e..722093604 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.03.28 18:39}
+\edef\contextversion{2012.03.29 11:28}
%D For those who want to use this:
diff --git a/tex/context/base/pack-rul.mkiv b/tex/context/base/pack-rul.mkiv
index c84205eac..29741d189 100644
--- a/tex/context/base/pack-rul.mkiv
+++ b/tex/context/base/pack-rul.mkiv
@@ -80,7 +80,7 @@
\def\doframedparentparameterhash#1#2{\ifx#1\relax \else\doframedparameterhash#1#2\fi}
\def\doframedparentparameter#1#2{\ifx#1\relax\doframedrootparameter#2\else\doframedparameter#1{#2}\fi}
-\def\doframedrootparameter #1{\ifcsname\??oi#1\endcsname\??oi#1\else\s!empty\fi}
+\def\doframedrootparameter #1{\ifcsname\??framed#1\endcsname\??framed#1\else\s!empty\fi}
\def\useframedstyleandcolor#1#2% style color
{\edef\currentstyleparameter{\framedparameter#1}%
@@ -110,7 +110,7 @@
\expandafter\noexpand\csname do#1parentparameter\endcsname
\expandafter\noexpand\csname do#1rootparameter\endcsname
\expandafter\noexpand\csname inherited#1framed\endcsname
- \noexpand\??oi}} % if needed we can have a variant
+ \noexpand\??framed}} % if needed we can have a variant
\unexpanded\def\doinstallinheritedframed#1#2#3#4#5#6#7#8%
{\def#5##1##2{\ifx##1\relax#6{##2}\else#4##1{##2}\fi}%
@@ -139,7 +139,7 @@
% for regular framed
\getparameters
- [\??oi]
+ [\??framed]
[\c!width=\v!fit,
\c!height=\v!broad,
%\c!lines=,
@@ -783,7 +783,7 @@
\def\defaultframeoffset{.25ex}
-\def\presetlocalframed [#1]{\letvalue {#1\s!parent}\??oi}
+\def\presetlocalframed [#1]{\letvalue {#1\s!parent}\??framed}
\def\inheritlocalframed[#1]#2[#3]{\setevalue{#1\s!parent}{#3}}
\presetlocalframed[\??ol]
diff --git a/tex/context/base/s-def-01.mkiv b/tex/context/base/s-def-01.mkiv
index c54cee764..1c8ee9469 100644
--- a/tex/context/base/s-def-01.mkiv
+++ b/tex/context/base/s-def-01.mkiv
@@ -3,7 +3,7 @@
\unprotect
\startsetups defaults:frontpart:pagenumbers:roman
- \definestructureconversionset[\c!frontpart:\c!pagenumber][][romannumerals]
+ \defineconversionset[\c!frontpart:\c!pagenumber][][romannumerals]
\setupuserpagenumber[\c!way=\v!byblock]
\stopsetups
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 9ce7732f4..ddf5b66fe 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 6de73ec84..f14c47f9e 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/strc-def.mkiv b/tex/context/base/strc-def.mkiv
index d3787ba45..c60ddfeb7 100644
--- a/tex/context/base/strc-def.mkiv
+++ b/tex/context/base/strc-def.mkiv
@@ -72,7 +72,7 @@
% \setupsectionblock[appendix][sectionconversionset=appendix]
% \setuphead[chapter][sectionconversionset=\sectionblockparameter\c!sectionconversionset] % \sectionblockparameter]
-% \definestructureresetset[default][0,1,1,0][1] % this will not reset parts and subsections
+% \defineresetset[default][0,1,1,0][1] % this will not reset parts and subsections
% \setuphead[part][sectionresetset=default]
% \starttext
% \placelist[chapter,section,subsection][criterium=all,width=3cm]
@@ -80,27 +80,28 @@
% \part{second} \chapter{gamma} \section{a} \section{b} \subsection{x} \subsection{y} \chapter{delta}
% \stoptext
-\definestructureseparatorset [\s!default] [] [.]
-\definestructureconversionset [\s!default] [] [numbers]
-\definestructureresetset [\s!default] [] [1] % each level
-\definestructureprefixset [\s!default] [section-1,section-2,section-3] []
+\defineseparatorset [\s!default] [] [.]
+\defineconversionset [\s!default] [] [numbers]
+\defineresetset [\s!default] [] [1] % each level
+\defineprefixset [\s!default] [section-1,section-2,section-3] []
-\definestructureconversionset [\v!pagenumber] [] [numbers]
+\defineconversionset [\v!pagenumber] [] [numbers]
-\definestructureprefixset [\v!all] [section-1,section-2,section-3,section-4,section-5,section-6,section-7,section-8] []
-\definestructureprefixset [\v!none] [] []
+\defineprefixset [\v!all] [section-1,section-2,section-3,section-4,section-5,section-6,section-7,section-8] []
+\defineprefixset [\v!none] [] []
-\definestructureprefixset [\v!part] [section-1] []
-\definestructureprefixset [\v!chapter] [section-2] []
+\defineprefixset [\v!part] [section-1] []
+\defineprefixset [\v!chapter] [section-2] []
-\definestructureseparatorset [\v!appendix:\s!default] [] [.]
-\definestructureconversionset [\v!appendix:\s!default] [Romannumerals,Characters] [numbers]
-\definestructureresetset [\v!appendix:\s!default] [] [1] % why was this 0
+\defineseparatorset [\v!appendix:\s!default] [] [.]
+\defineconversionset [\v!appendix:\s!default] [Romannumerals,Characters] [numbers]
+\defineresetset [\v!appendix:\s!default] [] [1] % why was this 0
-\setupuserpagenumber [\c!numberconversionset=\v!pagenumber]
+\setupuserpagenumber
+ [\c!numberconversionset=\v!pagenumber]
% \startsetups defaults:frontpart:pagenumbers:roman
-% \definestructureconversionset[\c!frontpart:\c!pagenumber][][romannumerals]
+% \defineconversionset[\c!frontpart:\c!pagenumber][][romannumerals]
% \setupuserpagenumber[\c!way=\v!byblock]
% \stopsetups
diff --git a/tex/context/base/strc-ini.mkiv b/tex/context/base/strc-ini.mkiv
index 29560be3f..f4d95bf13 100644
--- a/tex/context/base/strc-ini.mkiv
+++ b/tex/context/base/strc-ini.mkiv
@@ -65,18 +65,25 @@
% level of a number in sets. This is all handles at the \LUA\ end.
% References to such sets travel with the multipass information.
-\unexpanded\def\definestructureresetset {\dotripleempty\dodefinestructureresetset}
-\unexpanded\def\definestructureseparatorset {\dotripleempty\dodefinestructureseparatorset}
-\unexpanded\def\definestructureconversionset{\dotripleempty\dodefinestructureconversionset}
-\unexpanded\def\definestructureprefixset {\dotripleempty\dodefinestructureprefixset}
-
-\def\dodefinestructureresetset [#1][#2][#3]{\ctxcommand{definestructureset("structure:resets", "#1","\luaescapestring{\detokenize{#2}}","\luaescapestring{\detokenize{#3}}",true)}}
-\def\dodefinestructureseparatorset [#1][#2][#3]{\ctxcommand{definestructureset("structure:separators", "#1","\luaescapestring{\detokenize{#2}}","\luaescapestring{\detokenize{#3}}")}}
-\def\dodefinestructureconversionset[#1][#2][#3]{\ctxcommand{definestructureset("structure:conversions","#1","\luaescapestring{\detokenize{#2}}","\luaescapestring{\detokenize{#3}}")}}
-\def\dodefinestructureprefixset [#1][#2][#3]{\ctxcommand{definestructureset("structure:prefixes", "#1","\luaescapestring{\detokenize{#2}}","\luaescapestring{\detokenize{#3}}")}}
-
-% \definestructureseparatorset [weird][!,?,*][:] % tex content
-% \definestructureconversionset[weird][numbers,characters,romannumerals][numbers] % symbolic names
-% \definestructureresetset [weird][0,0,1][0] % numbers
+\unexpanded\def\defineresetset {\dotripleempty\strc_sets_define_reset_set}
+\unexpanded\def\defineseparatorset {\dotripleempty\strc_sets_define_separator_set}
+\unexpanded\def\defineconversionset{\dotripleempty\strc_sets_define_conversion_set}
+\unexpanded\def\defineprefixset {\dotripleempty\strc_sets_define_prefix_set}
+
+% Low level versions (no optional checking):
+
+\unexpanded\def\strc_sets_define_reset_set [#1][#2][#3]{\ctxcommand{definestructureset("structure:resets", "#1","\luaescapestring{\detokenize{#2}}","\luaescapestring{\detokenize{#3}}",true)}}
+\unexpanded\def\strc_sets_define_separator_set [#1][#2][#3]{\ctxcommand{definestructureset("structure:separators", "#1","\luaescapestring{\detokenize{#2}}","\luaescapestring{\detokenize{#3}}")}}
+\unexpanded\def\strc_sets_define_conversion_set[#1][#2][#3]{\ctxcommand{definestructureset("structure:conversions","#1","\luaescapestring{\detokenize{#2}}","\luaescapestring{\detokenize{#3}}")}}
+\unexpanded\def\strc_sets_define_prefix_set [#1][#2][#3]{\ctxcommand{definestructureset("structure:prefixes", "#1","\luaescapestring{\detokenize{#2}}","\luaescapestring{\detokenize{#3}}")}}
+
+\let\definestructureresetset \defineresetset
+\let\definestructureseparatorset \defineseparatorset
+\let\definestructureconversionset\defineconversionset
+\let\definestructureprefixset \defineprefixset
+
+% \defineseparatorset [weird][!,?,*][:] % tex content
+% \defineconversionset[weird][numbers,characters,romannumerals][numbers] % symbolic names
+% \defineresetset [weird][0,0,1][0] % numbers
\protect \endinput
diff --git a/tex/context/base/strc-itm.mkvi b/tex/context/base/strc-itm.mkvi
index 090dcd9ad..5f0cdf948 100644
--- a/tex/context/base/strc-itm.mkvi
+++ b/tex/context/base/strc-itm.mkvi
@@ -311,7 +311,7 @@ conversionset = "fixed::\currentitemgroupconversionset",
\let\currentparentitemgroup\currentitemgroup
\definestructurecounter[\v_strc_itemgroups_counter]%
% beware ... we cannot use _ as the conversion set is not expanded
-% \definestructureconversionset[\v_strc_itemgroups_counter][\currentitemgroupconversionset][\currentitemgroupsymbol]%
+ % \defineconversionset[\v_strc_itemgroups_counter][\currentitemgroupconversionset][\currentitemgroupsymbol]%
\to \everydefineitemgroup
%D Global states
@@ -616,7 +616,8 @@ conversionset = "fixed::\currentitemgroupconversionset",
%\c!numberconversion=\currentitemgroupsymbol,
\c!numbersegments=\currentitemgroupsegments]%
% there will be a fixedconversion key
- \normalexpanded{\definestructureconversionset[\v_strc_itemgroups_counter][\currentitemgroupconversionset][\currentitemgroupsymbol]}%
+ %\normalexpanded{\defineconversionset[\v_strc_itemgroups_counter][\currentitemgroupconversionset][\currentitemgroupsymbol]}%
+ \normalexpanded{\strc_sets_define_conversion_set[\v_strc_itemgroups_counter][\currentitemgroupconversionset][\currentitemgroupsymbol]}%
%
\convertedstructurecounter[\v_strc_itemgroups_counter]% [\number\currentitemlevel]%
\strc_itemgroups_insert_reference
diff --git a/tex/context/base/strc-lst.mkvi b/tex/context/base/strc-lst.mkvi
index 17babc2ae..2fdbc7cc9 100644
--- a/tex/context/base/strc-lst.mkvi
+++ b/tex/context/base/strc-lst.mkvi
@@ -26,8 +26,11 @@
\unprotect
+% To be added to mult-def.lua:
+
\ifdefined\c!renderingsetup \else \def\c!renderingsetup{renderingsetup} \fi % maybe not interfaced
\ifdefined\c!filler \else \def\c!filler {filler} \fi
+\ifdefined\v!interactive \else \def\v!interactive {interactive} \fi
%D Lists are mostly used for tables of contents but are in fact a rather generic
%D feature of \CONTEXT. We seperate between storage and rendering and the current
@@ -1129,6 +1132,25 @@
\listparameter\c!inbetween
\stopsetups
+%D This is a new one, similar to vertical and horizontal but better suited when
+%D no command is set (WS):
+
+\definelistalternative
+ [\v!interactive]
+ [\c!renderingsetup=\??listrenderings:interactive]
+
+\startsetups[\??listrenderings:interactive]
+ \edef\p_command{\listalternativeparameter\c!command}%
+ \ifx\p_command\empty
+ [\currentlist: \currentlistentrynumber\space -- \currentlistentrytitle\space -- \currentlistentrypagenumber]%
+ \else
+ \listparameter\c!before
+ \hbox \strc_lists_get_reference_attribute\v!all \strc_lists_get_destination_attribute {
+ \p_command\currentlistentrynumber\currentlistentrytitle\currentlistentrypagenumber
+ }
+ \listparameter\c!after
+ \fi
+\stopsetups
%D List elements are packaged in such a way that we can click on them
%D in an interactive document. Here are a few helpers.
diff --git a/tex/context/base/strc-mat.mkiv b/tex/context/base/strc-mat.mkiv
index 7658afc8b..276dd8d59 100644
--- a/tex/context/base/strc-mat.mkiv
+++ b/tex/context/base/strc-mat.mkiv
@@ -52,7 +52,7 @@
\definestructurecounter
[\v!formula]
-\definestructureconversionset
+\defineconversionset
[\v!formula]
[numbers,characters]
diff --git a/tex/context/base/strc-num.mkiv b/tex/context/base/strc-num.mkiv
index 2351389cd..5de5a7565 100644
--- a/tex/context/base/strc-num.mkiv
+++ b/tex/context/base/strc-num.mkiv
@@ -20,7 +20,9 @@
% work in progress
% to be checked: can we use the command handler code here?
-\unexpanded\def\setupstructurecountering{\dodoubleempty\getparameters[\??nn]}
+\installcorenamespace{counter}
+
+\unexpanded\def\setupstructurecountering{\dodoubleempty\getparameters[\??counter]}
\setupstructurecountering
[\c!way=\v!by\v!chapter,
@@ -37,8 +39,8 @@
[\c!prefixsegments=\autostructureprefixsegments\sharedstructurecounterparameter]
\def\strc_counters_the#1% we need a nicer name
- {\ifcsname\??nn#1\c!number\endcsname
- \expandafter\strc_counters_the\csname\??nn#1\c!number\endcsname
+ {\ifcsname\??counter#1\c!number\endcsname
+ \expandafter\strc_counters_the\csname\??counter#1\c!number\endcsname
\else
#1%
\fi}
@@ -48,12 +50,12 @@
\def\structurecounterparameter#1#2% this will become \named....
{\csname
- \ifcsname\??nn#1#2\endcsname
- \??nn#1#2%
- \else\ifcsname\??nn\strc_counters_the{#1}#2\endcsname
- \??nn\strc_counters_the{#1}#2%
- \else\ifcsname\??nn#2\endcsname
- \??nn#2%
+ \ifcsname\??counter#1#2\endcsname
+ \??counter#1#2%
+ \else\ifcsname\??counter\strc_counters_the{#1}#2\endcsname
+ \??counter\strc_counters_the{#1}#2%
+ \else\ifcsname\??counter#2\endcsname
+ \??counter#2%
\else
\s!empty
\fi\fi\fi
@@ -61,8 +63,8 @@
\def\sharedstructurecounterparameter#1%
{\csname
- \ifcsname\??nn#1\endcsname
- \??nn#1%
+ \ifcsname\??counter#1\endcsname
+ \??counter#1%
\else
\s!empty
\fi
@@ -70,7 +72,7 @@
\let\numberingparameter\sharedstructurecounterparameter
-% \def\structurecounterparameter #1#2{\csname\dostructurecounterparameter{\??nn#1}#2\endcsname}
+% \def\structurecounterparameter #1#2{\csname\dostructurecounterparameter{\??counter#1}#2\endcsname}
% \def\dostructurecounterparameter #1#2{\ifcsname#1#2\endcsname#1#2\else\expandafter\dostructurecounterparentparameter\csname#1\s!number\endcsname#2\fi}
% \def\dostructurecounterparentparameter#1#2{\ifx#1\relax\s!empty\else\dostructurecounterparameter#1#2\fi}
@@ -85,7 +87,7 @@
{\donodefinestructurecounter[#1][#2]}}}
\def\dododefinestructurecounter[#1][#2]%
- {\getparameters[\??nn#1][\s!counter=,#2]% counter is for internal purposes
+ {\getparameters[\??counter#1][\s!counter=,#2]% counter is for internal purposes
\ctxcommand{definestructurecounter {
name = "#1",
start = tonumber("\structurecounterparameter{#1}\c!start") or 0,
@@ -95,14 +97,14 @@
\docheckstructurecountersetup{#1}}
\def\donodefinestructurecounter[#1][#2]% inherit
- {\getparameters[\??nn#1][\c!number=#2]%
+ {\getparameters[\??counter#1][\c!number=#2]%
\docheckstructurecountersetup{#1}}
\unexpanded\def\setupstructurecounter
{\dodoubleargument\dosetupstructurecounter}
\def\dosetupstructurecounter[#1][#2]%
- {\getparameters[\??nn#1][\c!start=,#2]%
+ {\getparameters[\??counter#1][\c!start=,#2]%
\docheckstructurecountersetup{#1}}
% % % %
@@ -132,11 +134,11 @@
\def\docheckstructurecountersetup#1% does it have to happen here?
{% this can be done at the lua end / a bit messy here ... todo ...
- \ifcsname\??nn#1\c!number\endcsname
- \doifelsevalue {\??nn#1\c!number}{#1} {\letbeundefined{\??nn#1\c!number}}%
- {\doifvaluenothing{\??nn#1\c!number} {\letbeundefined{\??nn#1\c!number}}}%
+ \ifcsname\??counter#1\c!number\endcsname
+ \doifelsevalue {\??counter#1\c!number}{#1} {\letbeundefined{\??counter#1\c!number}}%
+ {\doifvaluenothing{\??counter#1\c!number} {\letbeundefined{\??counter#1\c!number}}}%
\fi
- \ifcsname\??nn#1\c!number\endcsname
+ \ifcsname\??counter#1\c!number\endcsname
% it's a clone
\else
\edef\currentstructurecounterlevel{\thenamedstructurecounterlevel{#1}}%
@@ -397,7 +399,7 @@
\def\strc_counters_converted[#1][#2]%
{\begingroup
- \ifsecondargument\getparameters[\??nn#1][#2]\fi
+ \ifsecondargument\getparameters[\??counter#1][#2]\fi
\ctxlua{structures.sections.prefixedconverted(
"\strc_counters_the{#1}",
{
diff --git a/tex/context/base/strc-pag.mkiv b/tex/context/base/strc-pag.mkiv
index 87671ea60..d54c5744a 100644
--- a/tex/context/base/strc-pag.mkiv
+++ b/tex/context/base/strc-pag.mkiv
@@ -43,8 +43,8 @@
% all get their own counter. After all, it's easier to combine them in
% a pseudo counterset than to deal with a complex set itself.
-% \definestructureprefixset [mine][section-1,section-2]
-% \definestructureseparatorset[mine][:]
+% \defineprefixset [mine][section-1,section-2]
+% \defineseparatorset[mine][:]
%
% \setupuserpagenumber
% [way=bypart,
@@ -52,8 +52,8 @@
% prefixset=mine,
% prefixseparatorset=mine]
-% \definestructureconversionset[frontpart:pagenumber][][romannumerals]
-% \definestructureconversionset[bodypart:pagenumber] [][numbers]
+% \defineconversionset[frontpart:pagenumber][][romannumerals]
+% \defineconversionset[bodypart:pagenumber] [][numbers]
%
% \setupuserpagenumber[way=byblock]
% \setupuserpagenumber[way=bychapter]
diff --git a/tex/context/base/strc-ref.mkvi b/tex/context/base/strc-ref.mkvi
index 88d491a31..65c0837d3 100644
--- a/tex/context/base/strc-ref.mkvi
+++ b/tex/context/base/strc-ref.mkvi
@@ -13,8 +13,8 @@
% todo: (1) configure references, (2) rendering => with presets
%
-% \definestructureconversionset[default][Character,number,Romannumerals,Character][number]
-% \definestructureseparatorset [default][.,.,--][.]
+% \defineconversionset[default][Character,number,Romannumerals,Character][number]
+% \defineseparatorset [default][.,.,--][.]
% \setuphead[subsection][sectionstopper=),sectionsegments=4:4]
% \setupreferencestructureprefix[default][prefixsegments=2:4]
% \setupreferencestructureprefix[figure][default][prefixsegments=3:4]
diff --git a/tex/context/base/typo-prc.mkvi b/tex/context/base/typo-prc.mkvi
index eb56894e8..de221f241 100644
--- a/tex/context/base/typo-prc.mkvi
+++ b/tex/context/base/typo-prc.mkvi
@@ -32,7 +32,7 @@
%D for instance:
%D
%D \starttyping
-%D \definestructureseparatorset [demosep] [demo->!,demo->?,demo->!,demo->?] [demo->@]
+%D \defineseparatorset [demosep] [demo->!,demo->?,demo->!,demo->?] [demo->@]
%D \stoptyping
%D
%D Here the \type {!} and \type {?} are just the seperator characters that end
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index bcbdfdfec..cb89fcdbf 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 03/28/12 18:39:15
+-- merge date : 03/29/12 11:28:15
do -- begin closure to overcome local limits and interference