beta 2012.03.12 10:15

31 files changed, 201 insertions, 31 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 7002a54cc..b9ccccb18 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.10 13:15}
+\newcontextversion{2012.03.12 10:15}
 
 %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 f9b8563d0..c1f987bc3 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.10 13:15}
+\newcontextversion{2012.03.12 10:15}
 
 %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 a6de5f299..51f153a17 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 551d21007..46a2f270b 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 6d787b083..6f22c4fe5 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.10 13:15}
+\edef\contextversion{2012.03.12 10:15}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 59da8a5a7..8de0012d0 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.10 13:15}
+\edef\contextversion{2012.03.12 10:15}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/file-mod.mkvi b/tex/context/base/file-mod.mkvi
index 2ca84b3f0..33d100402 100644
--- a/tex/context/base/file-mod.mkvi
+++ b/tex/context/base/file-mod.mkvi
@@ -74,21 +74,21 @@
    \pushmacro\currentmodulecategory
    \pushmacro\currentmoduleparameters
    \ifthirdargument
-     \def\currentmodulecategory  {#category}%
-     \def\currentmodule          {#name}%
-     \def\currentmoduleparameters{#parameters}%
+     \edef\currentmodulecategory  {#category}%
+     \edef\currentmodule          {#name}%
+     \def \currentmoduleparameters{#parameters}%
    \else\ifsecondargument
      \doifassignmentelse{#name}
-       {\let\currentmodulecategory  \empty
-        \def\currentmodule          {#category}%
-        \def\currentmoduleparameters{#name}}
-       {\def\currentmodulecategory  {#category}%
-        \def\currentmodule          {#name}%
-        \let\currentmoduleparameters\empty}%
+       {\let\currentmodulecategory   \empty
+        \edef\currentmodule          {#category}%
+        \edef\currentmoduleparameters{#name}}
+       {\edef\currentmodulecategory  {#category}%
+        \edef\currentmodule          {#name}%
+        \let \currentmoduleparameters\empty}%
    \else
-     \let\currentmodulecategory  \empty
-     \def\currentmodule          {#category}%
-     \let\currentmoduleparameters\empty
+     \let \currentmodulecategory  \empty
+     \edef\currentmodule          {#category}%
+     \let \currentmoduleparameters\empty
    \fi\fi
    \processcommacommand[\currentmodule]{\strc_modules_use_indeed\currentmodulecategory}%
    \popmacro\currentmoduleparameters
diff --git a/tex/context/base/mult-de.mkii b/tex/context/base/mult-de.mkii
index 98c60cb07..fb9c61d08 100644
--- a/tex/context/base/mult-de.mkii
+++ b/tex/context/base/mult-de.mkii
@@ -928,6 +928,7 @@
 \setinterfaceconstant{rotation}{rotation}
 \setinterfaceconstant{rule}{linie}
 \setinterfaceconstant{rulecolor}{linienfarbe}
+\setinterfaceconstant{rulecommand}{rulecommand}
 \setinterfaceconstant{rulethickness}{liniendicke}
 \setinterfaceconstant{samepage}{selbeseite}
 \setinterfaceconstant{sample}{muster}
diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mult-def.lua
index 1af1c969c..dc6f67189 100644
--- a/tex/context/base/mult-def.lua
+++ b/tex/context/base/mult-def.lua
@@ -9857,6 +9857,10 @@ return {
    ["pe"]="خط",
    ["ro"]="rigla",
   },
+  ["rulecommand"]={
+   ["en"]="rulecommand",
+   ["nl"]="lijncommando",
+  },
   ["rulecolor"]={
    ["cs"]="barvalinky",
    ["de"]="linienfarbe",
diff --git a/tex/context/base/mult-en.mkii b/tex/context/base/mult-en.mkii
index 681fb2a3a..252e81613 100644
--- a/tex/context/base/mult-en.mkii
+++ b/tex/context/base/mult-en.mkii
@@ -928,6 +928,7 @@
 \setinterfaceconstant{rotation}{rotation}
 \setinterfaceconstant{rule}{rule}
 \setinterfaceconstant{rulecolor}{rulecolor}
+\setinterfaceconstant{rulecommand}{rulecommand}
 \setinterfaceconstant{rulethickness}{rulethickness}
 \setinterfaceconstant{samepage}{samepage}
 \setinterfaceconstant{sample}{sample}
diff --git a/tex/context/base/mult-fr.mkii b/tex/context/base/mult-fr.mkii
index fa545c424..907cda0cc 100644
--- a/tex/context/base/mult-fr.mkii
+++ b/tex/context/base/mult-fr.mkii
@@ -928,6 +928,7 @@
 \setinterfaceconstant{rotation}{rotation}
 \setinterfaceconstant{rule}{ligne}
 \setinterfaceconstant{rulecolor}{couleurligne}
+\setinterfaceconstant{rulecommand}{rulecommand}
 \setinterfaceconstant{rulethickness}{epaisseurligne}
 \setinterfaceconstant{samepage}{memepage}
 \setinterfaceconstant{sample}{echantillon}
diff --git a/tex/context/base/mult-it.mkii b/tex/context/base/mult-it.mkii
index 34fa737e9..065736d15 100644
--- a/tex/context/base/mult-it.mkii
+++ b/tex/context/base/mult-it.mkii
@@ -928,6 +928,7 @@
 \setinterfaceconstant{rotation}{rotazione}
 \setinterfaceconstant{rule}{linea}
 \setinterfaceconstant{rulecolor}{colorelinea}
+\setinterfaceconstant{rulecommand}{rulecommand}
 \setinterfaceconstant{rulethickness}{spessorelinea}
 \setinterfaceconstant{samepage}{stessapagina}
 \setinterfaceconstant{sample}{campione}
diff --git a/tex/context/base/mult-nl.mkii b/tex/context/base/mult-nl.mkii
index 5d1d4dc12..56cbf0159 100644
--- a/tex/context/base/mult-nl.mkii
+++ b/tex/context/base/mult-nl.mkii
@@ -928,6 +928,7 @@
 \setinterfaceconstant{rotation}{rotatie}
 \setinterfaceconstant{rule}{lijn}
 \setinterfaceconstant{rulecolor}{lijnkleur}
+\setinterfaceconstant{rulecommand}{lijncommando}
 \setinterfaceconstant{rulethickness}{lijndikte}
 \setinterfaceconstant{samepage}{zelfdepagina}
 \setinterfaceconstant{sample}{monster}
diff --git a/tex/context/base/mult-pe.mkii b/tex/context/base/mult-pe.mkii
index 5c7da3b11..570dc6b8c 100644
--- a/tex/context/base/mult-pe.mkii
+++ b/tex/context/base/mult-pe.mkii
@@ -928,6 +928,7 @@
 \setinterfaceconstant{rotation}{دوران}
 \setinterfaceconstant{rule}{خط}
 \setinterfaceconstant{rulecolor}{رنگ‌خط}
+\setinterfaceconstant{rulecommand}{rulecommand}
 \setinterfaceconstant{rulethickness}{ضخامت‌خط}
 \setinterfaceconstant{samepage}{همان‌صفحه}
 \setinterfaceconstant{sample}{نمونه}
diff --git a/tex/context/base/mult-ro.mkii b/tex/context/base/mult-ro.mkii
index 2590b5eed..6e556a1db 100644
--- a/tex/context/base/mult-ro.mkii
+++ b/tex/context/base/mult-ro.mkii
@@ -928,6 +928,7 @@
 \setinterfaceconstant{rotation}{rotatie}
 \setinterfaceconstant{rule}{rigla}
 \setinterfaceconstant{rulecolor}{culoarerigla}
+\setinterfaceconstant{rulecommand}{rulecommand}
 \setinterfaceconstant{rulethickness}{grosimerigla}
 \setinterfaceconstant{samepage}{aceeasipagina}
 \setinterfaceconstant{sample}{exemplu}
diff --git a/tex/context/base/pack-com.mkiv b/tex/context/base/pack-com.mkiv
index 8a319d8e5..593f429b7 100644
--- a/tex/context/base/pack-com.mkiv
+++ b/tex/context/base/pack-com.mkiv
@@ -95,15 +95,18 @@
 
 \installcorenamespace{combinationlocation}
 
-\let\m_pack_combinations_rightfiller\hfil
-\let\m_pack_combinations_leftfiller \hfil
-\let\m_pack_combinations_valigner   \firstofoneargument
-
 \setvalue{\??combinationlocation\v!left  }{\let\m_pack_combinations_leftfiller\relax}
 \setvalue{\??combinationlocation\v!right }{\let\m_pack_combinations_rightfiller\relax}
 \setvalue{\??combinationlocation\v!top   }{\let\m_pack_combinations_valigner\depthonlybox}
 \setvalue{\??combinationlocation\v!middle}{\let\m_pack_combinations_valigner\halfwaybox}
 
+\def\pack_combinations_location_reset
+  {\let\m_pack_combinations_rightfiller\hfil
+   \let\m_pack_combinations_leftfiller \hfil
+   \let\m_pack_combinations_valigner   \firstofoneargument}
+
+\pack_combinations_location_reset
+
 \def\pack_combinations_location_step#1%
   {\csname\??combinationlocation#1\endcsname}
 
@@ -174,10 +177,8 @@
    \edef\p_align   {\combinationparameter\c!align}%
    \edef\p_distance{\combinationparameter\c!distance}%
    %
-   \let\m_pack_combinations_rightfiller\relax
-   \let\m_pack_combinations_leftfiller \relax
-   \let\m_pack_combinations_valigner   \vbox
-   \processcommacommand[\p_location]\pack_combinations_location_step
+   \pack_combinations_location_reset
+   \rawprocesscommacommand[\p_location]\pack_combinations_location_step
    %
    \dostarttagged\t!combination\currentcombination
    \vbox \ifx\p_height\v!fit\else to \p_height \fi \bgroup
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index ab474636a..f20fa1bc8 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 1b6bfafa3..fa9dbbeee 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi
index 002afa3da..32449f449 100644
--- a/tex/context/base/strc-flt.mkvi
+++ b/tex/context/base/strc-flt.mkvi
@@ -2071,7 +2071,7 @@
   {\doglobal\newcounter\noflocalfloats
    \initializeboxstack{localfloats}}
 
-\def\somelocalfloat[#1]%
+\def\somelocalfloat
   {\doglobal\increment\noflocalfloats
    \savebox{localfloats}{\noflocalfloats}{\box\floatbox}}
 
@@ -2091,7 +2091,7 @@
   {\getlocalfloats
    \resetlocalfloats}
 
-\def\getlocalfloat#1{\expanded{\foundbox{localfloats}{\number#1}}}
+\unexpanded\def\getlocalfloat#1{\expanded{\foundbox{localfloats}{\number#1}}}
 
 \def\forcelocalfloats{\let\forcedfloatmethod\v!local}
 
diff --git a/tex/context/base/strc-lst.mkvi b/tex/context/base/strc-lst.mkvi
index 6750cdbb5..9ecfbd76e 100644
--- a/tex/context/base/strc-lst.mkvi
+++ b/tex/context/base/strc-lst.mkvi
@@ -249,6 +249,7 @@
      {\listparameter\c!extras}%
      {\listparameter\c!order}%
  % \stoplistreferences
+   \par % todo: only when vertical list mode
    \endgroup
    \strc_lists_set_mode}
 
diff --git a/tex/context/base/strc-not.mkvi b/tex/context/base/strc-not.mkvi
index d05dbca77..a6face067 100644
--- a/tex/context/base/strc-not.mkvi
+++ b/tex/context/base/strc-not.mkvi
@@ -17,6 +17,8 @@
 
 \unprotect
 
+% todo: more p_strc_notations_* (outside trial loop)
+
 % todo: see if we can now use \insertpenalties (>0 == some left)
 
 \ifdefined\v!notation      \else \def\v!notation     {notation}      \fi
@@ -86,6 +88,7 @@
   %\c!titlecolor=,
    \c!numbercommand=\high,
   %\c!symbolcommand=\lowllap, % experiment
+  %\c!indicator=\v!no, % was \v!yes in mkii for page notes
    \c!width=\v!fit,
    \c!titledistance=.5em,
    \c!distance=.5em,
@@ -320,6 +323,7 @@
   %\c!color=,
   %\c!after=,
   %\c!rulecolor=,
+  %\c!rulecommand=,
    \c!rulethickness=\linewidth,
    \c!frame=\v!off,
    \c!distance=.125em, % in the text between symbols
@@ -577,6 +581,8 @@
    \strc_enumerations_text
    \endgroup}
 
+% in mkii the pointer only showed up in pagewise notes
+
 \unexpanded\def\strc_notes_inject_pointer % todo calculate once
   {\ifcase\ctxlua{structures.notes.deltapage("\currentnote",\currentnotenumber)}\relax
      % unknown
@@ -609,7 +615,8 @@
    \dostarttagged\t!descriptionsymbol\currentnote
    \dotagsetnotesymbol
    \noteparameter\c!textcommand{\ctxcommand{noteprefixednumber("\currentnote",\currentnotenumber)}}%
-   \strc_notes_inject_pointer % this can cycle so we need to make sure it has no advance width
+   % the next one can cycle so we need to make sure it has no advance width
+   \doif{\noteparameter\c!indicator}\v!yes\strc_notes_inject_pointer
    \egroup
    \endgroup
    \dostoptagged
@@ -749,8 +756,9 @@
 \def\currentnoterulecommand{\csname\??notecommand\currentnote\endcsname}
 \def\currentnoterulealign  {\csname\??notealign  \currentnote\endcsname}
 
+\def\currentnoterulecommandcommand{\noteparameter\c!rulecommand}
 \def\currentnoterulecommandnormal {\normalnoterule} % no let as it can be changed afterwards
-\def\currentnoterulecommandunknown{\noteparameter\c!rule}
+%def\currentnoterulecommandunknown{\noteparameter\c!rule}
 
 \def\letcurrentnoterulecommand{\expandafter\let\csname\??notecommand\currentnote\endcsname}
 \def\letcurrentnoterulealign  {\expandafter\let\csname\??notealign  \currentnote\endcsname}
@@ -761,18 +769,19 @@
 \to \everysynchronizenote
 
 \def\strc_notes_set_rule
-  {\letcurrentnoterulecommand\relax
+  {\letcurrentnoterulecommand\relax % so we default to nothing
    \processcommacommand[\noteparameter\c!rule]\strc_notes_set_rule_step}
 
 \def\strc_notes_set_rule_step#1%
   {\csname\??noterule\ifcsname\??noterule#1\endcsname#1\else\s!unknown\fi\endcsname}
 
+\setvalue{\??noterule\v!command}{\letcurrentnoterulecommand\currentnoterulecommandcommand}
 \setvalue{\??noterule     \v!on}{\letcurrentnoterulecommand\currentnoterulecommandnormal}
 \setvalue{\??noterule \v!normal}{\letcurrentnoterulecommand\currentnoterulecommandnormal}
 \setvalue{\??noterule   \v!left}{\letcurrentnoterulealign  \lefttoright}
 \setvalue{\??noterule  \v!right}{\letcurrentnoterulealign  \righttoleft}
 \setvalue{\??noterule    \v!off}{\letcurrentnoterulecommand\relax}
-\setvalue{\??noterule\s!unknown}{\letcurrentnoterulecommand\currentnoterulecommandunknown}
+%setvalue{\??noterule\s!unknown}{\letcurrentnoterulecommand\currentnoterulecommandunknown} % obsolete
 
 \appendtoks
     \strc_notes_set_rule
diff --git a/tex/context/base/type-imp-unfonts.mkiv b/tex/context/base/type-imp-unfonts.mkiv
new file mode 100644
index 000000000..2e1ca6c30
--- /dev/null
+++ b/tex/context/base/type-imp-unfonts.mkiv
@@ -0,0 +1,140 @@
+%D \module
+%D   [       file=type-imp-unfonts,
+%D        version=2012.03.11,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=UnFonts,
+%D         author=...,
+%D           date=\currentdate,
+%D      copyright=...]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\loadtypescriptfile[texgyre]
+\loadtypescriptfile[xits]
+
+\definefontfeature
+  [kr-default]
+  [mode=node,script=hang,lang=kor]
+
+\definefontfeature
+  [kr-slanted]
+  [mode=node,script=hang,lang=kor,slant=.2]
+
+\definefontfeature
+  [kr-latin-default]
+  [default]
+
+\definefontfeature
+  [kr-latin-slanted]
+  [krlatindefault]
+  [slant=.2]
+
+\definefontfeature
+  [kr-latin-slanted-mono]
+  [slant=.2]
+
+\definefontfeature
+  [kr-latin-smallcaps]
+  [krlatindefault]
+  [smcp=yes]
+
+\definefontfeature
+  [kr-latin-smallcaps-mono]
+  [cmcp=yes]
+
+\definefontfallback[kr-serif]           [texgyrepagella-regular*kr-latin-default]      [0x0000-0x0400][force=yes]
+\definefontfallback[kr-serifbold]       [texgyrepagella-bold*kr-latin-default]         [0x0000-0x0400][force=yes]
+\definefontfallback[kr-serifitalic]     [texgyrepagella-italic*kr-latin-default]       [0x0000-0x0400][force=yes]
+\definefontfallback[kr-serifbolditalic] [texgyrepagella-bolditalic*kr-latin-default]   [0x0000-0x0400][force=yes]
+\definefontfallback[kr-serifslanted]    [texgyrepagella-regular*kr-latin-slanted]      [0x0000-0x0400][force=yes]
+\definefontfallback[kr-serifboldslanted][texgyrepagella-bold*kr-latin-slanted]         [0x0000-0x0400][force=yes]
+\definefontfallback[kr-serifcaps]       [texgyrepagella-regular*kr-latin-smallcaps]    [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sans]            [texgyreheros-regular*kr-latin-default]        [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sansbold]        [texgyreheros-bold*kr-latin-default]           [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sansitalic]      [texgyreheros-italic*kr-latin-default]         [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sansbolditalic]  [texgyreheros-bolditalic*kr-latin-default]     [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sansslanted]     [texgyreheros-regular*kr-latin-slanted]        [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sansboldslanted] [texgyreheros-bold*kr-latin-slanted]           [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sanscaps]        [texgyreheros-regular*kr-latin-smallcaps]      [0x0000-0x0400][force=yes]
+\definefontfallback[kr-mono]            [texgyrecursor-regular]                        [0x0000-0x0400][force=yes]
+\definefontfallback[kr-monobold]        [texgyrecursor-bold]                           [0x0000-0x0400][force=yes]
+\definefontfallback[kr-monoitalic]      [texgyrecursor-italic]                         [0x0000-0x0400][force=yes]
+\definefontfallback[kr-monobolditalic]  [texgyrecursor-bolditalic]                     [0x0000-0x0400][force=yes]
+\definefontfallback[kr-monoslanted]     [texgyrecursor-regular*kr-latin-slanted-mono]  [0x0000-0x0400][force=yes]
+\definefontfallback[kr-monoboldslanted] [texgyrecursor-bold*kr-latin-slanted-mono]     [0x0000-0x0400][force=yes]
+\definefontfallback[kr-monocaps]        [texgyrecursor-regular*kr-latin-smallcaps-mono][0x0000-0x0400][force=yes]
+
+\starttypescriptcollection[unfonts]
+
+\starttypescript [serif] [unbatang]
+    \definefontsynonym [unbatang]           [file:unbatang]    [features=kr-default,fallbacks=kr-serif]
+    \definefontsynonym [unbatangbold]       [file:unbatangbold][features=kr-default,fallbacks=kr-serifbold]
+    \definefontsynonym [unbatangitalic]     [file:unbatang]    [features=kr-slanted,fallbacks=kr-serifitalic]
+    \definefontsynonym [unbatangbolditalic] [file:unbatangbold][features=kr-slanted,fallbacks=kr-serifbolditalic]
+    \definefontsynonym [unbatangslanted]    [file:unbatang]    [features=kr-slanted,fallbacks=kr-serifslanted]
+    \definefontsynonym [unbatangboldslanted][file:unbatangbold][features=kr-slanted,fallbacks=kr-serifboldslanted]
+    \definefontsynonym [unbatangcaps]       [file:unbatang]    [features=kr-default,fallbacks=kr-serifcaps]
+\stoptypescript
+
+\starttypescript [sans] [undotum]
+    \definefontsynonym[undotum]             [file:undotum]     [features=kr-default,fallbacks=kr-sans]
+    \definefontsynonym[undotumbold]         [file:undotumbold] [features=kr-default,fallbacks=kr-sansbold]
+    \definefontsynonym[undotumitalic]       [file:undotum]     [features=kr-slanted,fallbacks=kr-sansitalic]
+    \definefontsynonym[undotumbolditalic]   [file:undotumbold] [features=kr-slanted,fallbacks=kr-sansbolditalic]
+    \definefontsynonym[undotumslanted]      [file:undotum]     [features=kr-slanted,fallbacks=kr-sansslanted]
+    \definefontsynonym[undotumboldslanted]  [file:undotumbold] [features=kr-slanted,fallbacks=kr-sansboldslanted]
+    \definefontsynonym[undotumcaps]         [file:undotum]     [features=kr-default,fallbacks=kr-sanscaps]
+\stoptypescript
+
+\starttypescript [mono] [untype]
+    \definefontsynonym[untype]              [file:untaza]      [features=kr-default,fallbacks=kr-mono]
+    \definefontsynonym[untypebold]          [file:untaza]      [features=kr-default,fallbacks=kr-monobold]
+    \definefontsynonym[untypeitalic]        [file:untaza]      [features=kr-slanted,fallbacks=kr-monoitalic]
+    \definefontsynonym[untypebolditalic]    [file:untaza]      [features=kr-slanted,fallbacks=kr-monobolditalic]
+    \definefontsynonym[untypeslanted]       [file:untaza]      [features=kr-slanted,fallbacks=kr-monoslanted]
+    \definefontsynonym[untypeboldslanted]   [file:untaza]      [features=kr-slanted,fallbacks=kr-monoboldslanted]
+    \definefontsynonym[untypecaps]          [file:untaza]      [features=kr-default,fallbacks=kr-monocaps]
+\stoptypescript
+
+\starttypescript [serif] [unbatang] [name]
+    \definefontsynonym[Serif]           [unbatang]
+    \definefontsynonym[SerifBold]       [unbatangbold]
+    \definefontsynonym[SerifItalic]     [unbatangitalic]
+    \definefontsynonym[SerifBoldItalic] [unbatangbolditalic]
+    \definefontsynonym[SerifSlanted]    [unbatangslanted]
+    \definefontsynonym[SerifBoldSlanted][unbatangboldslanted]
+    \definefontsynonym[SerifCaps]       [unbatangcaps]
+\stoptypescript
+
+\starttypescript [sans] [undotum] [name]
+    \definefontsynonym[Sans]            [undotum]
+    \definefontsynonym[SansBold]        [undotumbold]
+    \definefontsynonym[SansItalic]      [undotumitalic]
+    \definefontsynonym[SansBoldItalic]  [undotumbolditalic]
+    \definefontsynonym[SansSlanted]     [undotumslanted]
+    \definefontsynonym[SansBoldSlanted] [undotumboldslanted]
+    \definefontsynonym[SansCaps]        [undotumcaps]
+\stoptypescript
+
+\starttypescript [mono] [untype] [name]
+    \definefontsynonym[Mono]            [untype]
+    \definefontsynonym[MonoBold]        [untypebold]
+    \definefontsynonym[MonoItalic]      [untypeitalic]
+    \definefontsynonym[MonoBoldItalic]  [untypebolditalic]
+    \definefontsynonym[MonoSlanted]     [untypeslanted]
+    \definefontsynonym[MonoBoldSlanted] [untypeboldslanted]
+    \definefontsynonym[MonoCaps]        [untypecaps]
+\stoptypescript
+
+% xits might get replaced with a texgyre times
+
+\starttypescript[unfonts]
+    \definetypeface [unfonts] [rm] [serif] [unbatang]
+    \definetypeface [unfonts] [ss] [sans]  [undotum]
+    \definetypeface [unfonts] [tt] [mono]  [untype]
+    \definetypeface [unfonts] [mm] [math]  [xits]
+\stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/interface/keys-cs.xml b/tex/context/interface/keys-cs.xml
index 3cc669006..5950694cf 100644
--- a/tex/context/interface/keys-cs.xml
+++ b/tex/context/interface/keys-cs.xml
@@ -934,6 +934,7 @@
 		<cd:constant name='rotation' value='rotace'/>
 		<cd:constant name='rule' value='linka'/>
 		<cd:constant name='rulecolor' value='barvalinky'/>
+		<cd:constant name='rulecommand' value='rulecommand'/>
 		<cd:constant name='rulethickness' value='tloustkalinky'/>
 		<cd:constant name='samepage' value='stejnastranka'/>
 		<cd:constant name='sample' value='vzor'/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index 4e6959fbe..7fd3f361c 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -934,6 +934,7 @@
 		<cd:constant name='rotation' value='rotation'/>
 		<cd:constant name='rule' value='linie'/>
 		<cd:constant name='rulecolor' value='linienfarbe'/>
+		<cd:constant name='rulecommand' value='rulecommand'/>
 		<cd:constant name='rulethickness' value='liniendicke'/>
 		<cd:constant name='samepage' value='selbeseite'/>
 		<cd:constant name='sample' value='muster'/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index 459a03ede..39438a222 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -934,6 +934,7 @@
 		<cd:constant name='rotation' value='rotation'/>
 		<cd:constant name='rule' value='rule'/>
 		<cd:constant name='rulecolor' value='rulecolor'/>
+		<cd:constant name='rulecommand' value='rulecommand'/>
 		<cd:constant name='rulethickness' value='rulethickness'/>
 		<cd:constant name='samepage' value='samepage'/>
 		<cd:constant name='sample' value='sample'/>
diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml
index f49db065b..f1b2efe88 100644
--- a/tex/context/interface/keys-fr.xml
+++ b/tex/context/interface/keys-fr.xml
@@ -934,6 +934,7 @@
 		<cd:constant name='rotation' value='rotation'/>
 		<cd:constant name='rule' value='ligne'/>
 		<cd:constant name='rulecolor' value='couleurligne'/>
+		<cd:constant name='rulecommand' value='rulecommand'/>
 		<cd:constant name='rulethickness' value='epaisseurligne'/>
 		<cd:constant name='samepage' value='memepage'/>
 		<cd:constant name='sample' value='echantillon'/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index 1fc70f2dc..fd1709034 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -934,6 +934,7 @@
 		<cd:constant name='rotation' value='rotazione'/>
 		<cd:constant name='rule' value='linea'/>
 		<cd:constant name='rulecolor' value='colorelinea'/>
+		<cd:constant name='rulecommand' value='rulecommand'/>
 		<cd:constant name='rulethickness' value='spessorelinea'/>
 		<cd:constant name='samepage' value='stessapagina'/>
 		<cd:constant name='sample' value='campione'/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index 275e910e2..b727157ec 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -934,6 +934,7 @@
 		<cd:constant name='rotation' value='rotatie'/>
 		<cd:constant name='rule' value='lijn'/>
 		<cd:constant name='rulecolor' value='lijnkleur'/>
+		<cd:constant name='rulecommand' value='lijncommando'/>
 		<cd:constant name='rulethickness' value='lijndikte'/>
 		<cd:constant name='samepage' value='zelfdepagina'/>
 		<cd:constant name='sample' value='monster'/>
diff --git a/tex/context/interface/keys-pe.xml b/tex/context/interface/keys-pe.xml
index 9a965882b..5bc66bf37 100644
--- a/tex/context/interface/keys-pe.xml
+++ b/tex/context/interface/keys-pe.xml
@@ -934,6 +934,7 @@
 		<cd:constant name='rotation' value='دوران'/>
 		<cd:constant name='rule' value='خط'/>
 		<cd:constant name='rulecolor' value='رنگ‌خط'/>
+		<cd:constant name='rulecommand' value='rulecommand'/>
 		<cd:constant name='rulethickness' value='ضخامت‌خط'/>
 		<cd:constant name='samepage' value='همان‌صفحه'/>
 		<cd:constant name='sample' value='نمونه'/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index 82ecda69f..9ce2f8512 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -934,6 +934,7 @@
 		<cd:constant name='rotation' value='rotatie'/>
 		<cd:constant name='rule' value='rigla'/>
 		<cd:constant name='rulecolor' value='culoarerigla'/>
+		<cd:constant name='rulecommand' value='rulecommand'/>
 		<cd:constant name='rulethickness' value='grosimerigla'/>
 		<cd:constant name='samepage' value='aceeasipagina'/>
 		<cd:constant name='sample' value='exemplu'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 622c4ba2d..6fade455d 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/10/12 13:15:30
+-- merge date  : 03/12/12 10:15:00
 
 do -- begin closure to overcome local limits and interference