15 files changed, 117 insertions, 112 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index e23aeccb6..2fb697335 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.29 11:28}
+\newcontextversion{2012.03.29 13:03}
 
 %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 ead24fc68..e58e7f97e 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.29 11:28}
+\newcontextversion{2012.03.29 13:03}
 
 %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 8a9098552..0144fcc3f 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 6458699b1..b63387590 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 0795e3eb6..c2de7b2f2 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.29 11:28}
+\edef\contextversion{2012.03.29 13:03}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 722093604..5ec716827 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.29 11:28}
+\edef\contextversion{2012.03.29 13:03}
 
 %D For those who want to use this:
 
@@ -209,7 +209,7 @@
 
 \loadmkvifile{typo-prc}
 
-\loadmarkfile{strc-ini}
+\loadmkvifile{strc-ini}
 \loadmarkfile{strc-tag}
 \loadmarkfile{strc-doc}
 \loadmarkfile{strc-num}
@@ -223,7 +223,7 @@
 \loadmarkfile{strc-def} % might happen later
 \loadmkvifile{strc-ref}
 \loadmarkfile{strc-reg}
-\loadmarkfile{strc-lev} % experiment
+\loadmkvifile{strc-lev} % experiment
 
 \loadmarkfile{spac-ali}
 \loadmarkfile{spac-hor}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index ddf5b66fe..1232d7905 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index f14c47f9e..41bbb974d 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/status-mkiv.lua b/tex/context/base/status-mkiv.lua
index 19ef5e91d..86af98fbd 100644
--- a/tex/context/base/status-mkiv.lua
+++ b/tex/context/base/status-mkiv.lua
@@ -489,8 +489,8 @@ return {
         },
         {
             filename = "strc-ini",
-            marktype = "mkiv",
-            status   = "unknown",
+            marktype = "mkvi",
+            status   = "okay",
         },
         {
             filename = "strc-tag",
@@ -559,8 +559,8 @@ return {
         },
         {
             filename = "strc-lev",
-            marktype = "mkiv",
-            status   = "unknown",
+            marktype = "mkvi",
+            status   = "okay",
         },
         {
             filename = "spac-ali",
diff --git a/tex/context/base/strc-ini.mkiv b/tex/context/base/strc-ini.mkvi
index f4d95bf13..8488d1dab 100644
--- a/tex/context/base/strc-ini.mkiv
+++ b/tex/context/base/strc-ini.mkvi
@@ -70,12 +70,12 @@
 \unexpanded\def\defineconversionset{\dotripleempty\strc_sets_define_conversion_set}
 \unexpanded\def\defineprefixset    {\dotripleempty\strc_sets_define_prefix_set}
 
-% Low level versions (no optional checking):
+% Low level versions (no optional checking). The detokenize and escaping might go away.
 
-\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}}")}}
+\unexpanded\def\strc_sets_define_reset_set     [#name][#set][#default]{\ctxcommand{definestructureset("structure:resets",     "#name","\luaescapestring{\detokenize{#set}}","\luaescapestring{\detokenize{#default}}",true)}}
+\unexpanded\def\strc_sets_define_separator_set [#name][#set][#default]{\ctxcommand{definestructureset("structure:separators", "#name","\luaescapestring{\detokenize{#set}}","\luaescapestring{\detokenize{#default}}")}}
+\unexpanded\def\strc_sets_define_conversion_set[#name][#set][#default]{\ctxcommand{definestructureset("structure:conversions","#name","\luaescapestring{\detokenize{#set}}","\luaescapestring{\detokenize{#default}}")}}
+\unexpanded\def\strc_sets_define_prefix_set    [#name][#set][#default]{\ctxcommand{definestructureset("structure:prefixes",   "#name","\luaescapestring{\detokenize{#set}}","\luaescapestring{\detokenize{#default}}")}}
 
 \let\definestructureresetset     \defineresetset
 \let\definestructureseparatorset \defineseparatorset
diff --git a/tex/context/base/strc-lev.lua b/tex/context/base/strc-lev.lua
index b5580940c..4ca049d7a 100644
--- a/tex/context/base/strc-lev.lua
+++ b/tex/context/base/strc-lev.lua
@@ -18,11 +18,11 @@ local level, levels, categories = 0, sections.levels, { }
 
 storage.register("structures/sections/levels", levels, "structures.sections.levels")
 
-function sections.defineautolevels(category,list)
+function commands.definesectionlevels(category,list)
     levels[category] = utilities.parsers.settings_to_array(list)
 end
 
-function sections.startautolevel(category)
+function commands.startsectionlevel(category)
     category = category ~= "" and category or default
     level = level + 1
     local lc = levels[category]
@@ -34,7 +34,7 @@ function sections.startautolevel(category)
     insert(categories,category)
 end
 
-function sections.stopautolevel()
+function commands.stopsectionlevel()
     local category = remove(categories)
     if category then
         local lc = levels[category]
diff --git a/tex/context/base/strc-lev.mkiv b/tex/context/base/strc-lev.mkiv
deleted file mode 100644
index e25f549a2..000000000
--- a/tex/context/base/strc-lev.mkiv
+++ /dev/null
@@ -1,91 +0,0 @@
-%D \module
-%D   [       file=strc-lev,
-%D        version=2010.09.23,
-%D          title=\CONTEXT\ Structure Macros,
-%D       subtitle=Automatic Levels,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\writestatus{loading}{ConTeXt Structure Macros / Automatic Levels}
-
-%D This module is the result of a discussion between Alan Braslau and
-%D me. I used to have a private (\MKII) module for this but the new
-%D structure code in \MKIV\ is more suitable for this so now we have
-%D it as core functionality. For the moment this an experiment that
-%D Alan and I conduct so it might evolve.
-
-\registerctxluafile{strc-lev}{1.001}
-
-\unprotect
-
-\unexpanded\def\definestructurelevels{\dodoubleargument\dodefinestructurelevels}
-\unexpanded\def\startstructurelevel  {\dosingleempty\dostartstructurelevel}
-
-\unexpanded\def\dodefinestructurelevels[#1][#2]{\ctxlua{structures.sections.defineautolevels("#1","#2")}}
-\unexpanded\def\dostartstructurelevel      [#1]{\ctxlua{structures.sections.startautolevel("#1")}}
-\unexpanded\def\stopstructurelevel             {\ctxlua{structures.sections.stopautolevel()}}
-
-\unexpanded\def\nostarthead{\dotripleargument\nonostarthead}
-\unexpanded\def\nostophead {\dosingleargument\nonostophead }
-
-\unexpanded\def\dostartstructurelevel[#1]%
-  {\doifassignmentelse{#1}
-     {\ctxlua{structures.sections.startautolevel("\v!default")}[#1]}
-     {\ctxlua{structures.sections.startautolevel("#1")}}}
-
-\unexpanded\def\nonostarthead[#1][#2][#3]%
-  {\blank
-   \noindentation{\tttf[start missing structure level #1]}
-   \blank}
-
-\unexpanded\def\nonostophead[#1]%
-  {\blank
-   \noindentation{\tttf[stop missing structure level #1]}
-   \blank}
-
-\definestructurelevels
-  [\v!default]
-  [\v!chapter,
-   \v!section,
-   \v!subsection,
-   \v!subsubsection,
-   \v!subsubsubsection,
-   \v!subsubsubsubsection]
-
-\protect \endinput
-
-% \starttext
-%
-% \definehead[xxxxxxsection][subsubsection]
-% \setuphead [xxxxxxsection][color=red]
-%
-% \definestructurelevels[main][chapter,section,subsection,subsubsection]
-% \definestructurelevels[next][chapter,section,subsection,xxxxxxsection]
-%
-% \startstructurelevel [main] [title=first top level]
-%
-%     \startstructurelevel [main] [title=first lower level]
-%         \startstructurelevel [main] [title=second lower level]
-%             \startstructurelevel [main] [title=third lower level]
-%                 test
-%             \stopstructurelevel
-%         \stopstructurelevel
-%     \stopstructurelevel
-%
-%     \startstructurelevel [main] [title=first lower level]
-%         \startstructurelevel [main] [title=second lower level]
-%             \startstructurelevel [next] [title=third lower level]
-%                 test
-%             \stopstructurelevel
-%         \stopstructurelevel
-%     \stopstructurelevel
-%
-% \stopstructurelevel
-%
-% \stoptext
-
diff --git a/tex/context/base/strc-lev.mkvi b/tex/context/base/strc-lev.mkvi
new file mode 100644
index 000000000..04fd8e181
--- /dev/null
+++ b/tex/context/base/strc-lev.mkvi
@@ -0,0 +1,96 @@
+%D \module
+%D   [       file=strc-lev,
+%D        version=2010.09.23,
+%D          title=\CONTEXT\ Structure Macros,
+%D       subtitle=Automatic Levels,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\writestatus{loading}{ConTeXt Structure Macros / Automatic Levels}
+
+%D This module is the result of a discussion between Alan Braslau and
+%D me. I used to have a private (\MKII) module for this but the new
+%D structure code in \MKIV\ is more suitable for this so now we have
+%D it as core functionality. For the moment this an experiment that
+%D Alan and I conduct so it might evolve.
+
+\registerctxluafile{strc-lev}{1.001}
+
+\unprotect
+
+\unexpanded\def\definesectionlevels{\dodoubleargument\strc_levels_define}
+\unexpanded\def\startsectionlevel  {\dosingleempty   \strc_levels_start }
+
+\unexpanded\def\strc_levels_define[#category][#list]{\ctxcommand{definesectionlevels("#category","#list")}}
+\unexpanded\def\strc_levels_start        [#category]{\ctxcommand{startsectionlevel("#category")}}
+\unexpanded\def\stopsectionlevel                    {\ctxcommand{stopsectionlevel()}}
+
+\unexpanded\def\nostarthead{\dotripleargument\strc_levels_start_nop} % used at the lua end
+\unexpanded\def\nostophead {\dosingleargument\strc_levels_stop_nop } % used at the lua end
+
+\unexpanded\def\strc_levels_start[#category]%
+  {\doifassignmentelse{#category}
+     {\ctxcommand{startautolevel("\v!default")}[#category]}
+     {\ctxcommand{startautolevel("#category")}}}
+
+\unexpanded\def\strc_levels_start_nop[#category][#settings][#userdata]%
+  {\blank
+   \noindentation{\tttf[start missing section level #category]}
+   \blank}
+
+\unexpanded\def\strc_levels_stop_nop[#category]%
+  {\blank
+   \noindentation{\tttf[stop missing section level #category]}
+   \blank}
+
+\definesectionlevels
+  [\v!default]
+  [\v!chapter,
+   \v!section,
+   \v!subsection,
+   \v!subsubsection,
+   \v!subsubsubsection,
+   \v!subsubsubsubsection]
+
+
+\let\definestructurelevels\definesectionlevels
+\let\startstructurelevel  \startsectionlevel
+\let\stopstructurelevel   \stopsectionlevel
+
+\protect \endinput
+
+% \starttext
+%
+% \definehead[xxxxxxsection][subsubsection]
+% \setuphead [xxxxxxsection][color=red]
+%
+% \definesectionlevels[main][chapter,section,subsection,subsubsection]
+% \definesectionlevels[next][chapter,section,subsection,xxxxxxsection]
+%
+% \startsectionlevel [main] [title=first top level]
+%
+%     \startsectionlevel [main] [title=first lower level]
+%         \startsectionlevel [main] [title=second lower level]
+%             \startsectionlevel [main] [title=third lower level]
+%                 test
+%             \stopsectionlevel
+%         \stopsectionlevel
+%     \stopsectionlevel
+%
+%     \startsectionlevel [main] [title=first lower level]
+%         \startsectionlevel [main] [title=second lower level]
+%             \startsectionlevel [next] [title=third lower level]
+%                 test
+%             \stopsectionlevel
+%         \stopsectionlevel
+%     \stopsectionlevel
+%
+% \stopsectionlevel
+%
+% \stoptext
+
diff --git a/tex/context/base/strc-sec.mkiv b/tex/context/base/strc-sec.mkiv
index 3d7655776..511a8bbd2 100644
--- a/tex/context/base/strc-sec.mkiv
+++ b/tex/context/base/strc-sec.mkiv
@@ -249,7 +249,7 @@
 
 \unexpanded\def\dohandleheadown{\dodoubleempty\dodohandleheadown} % [ref] {nr} {title}
 \unexpanded\def\dohandleheadnop{\dodoubleempty\dodohandleheadnop} % [ref] {title}
-\unexpanded\def\dostarthead    {\dotripleempty\dodostarthead}     % [settings] [userdata]
+\unexpanded\def\dostarthead    {\dotripleempty\dodostarthead}     % [settings] [userdata] !!! also used at lua end
 
 \newconditional\currentstructureown
 
@@ -281,7 +281,7 @@
    \dohandlehead{#1}{#2}{#3}% name -- -- -- userdata (we might move the tagged to here)
    \headparameter\c!insidesection}
 
-\unexpanded\def\dostophead[#1]%
+\unexpanded\def\dostophead[#1]% !!! also used at lua end
   {\dostoptagged\dostoptagged
   %\globalpopmacro\currenthead % so we do a hard recover
    \xdef\currenthead{#1}% recover
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index cb89fcdbf..267c7547e 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/29/12 11:28:15
+-- merge date  : 03/29/12 13:03:16
 
 do -- begin closure to overcome local limits and interference