2016-04-16 15:32:00

1 files changed, 75 insertions, 47 deletions

diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua
index 24c602729..332f3d230 100644
--- a/tex/context/base/mkiv/mult-def.lua
+++ b/tex/context/base/mkiv/mult-def.lua
@@ -17200,6 +17200,15 @@ return {
    ["nl"]="naam",
    ["ro"]="csname",
   },
+  ["cd:delimiter"]={
+   ["cs"]="delimiter",
+   ["de"]="delimiter",
+   ["en"]="delimiter",
+   ["fr"]="delimiter",
+   ["it"]="delimiter",
+   ["nl"]="delimiter",
+   ["ro"]="delimiter",
+  },
   ["cd:destination"]={
    ["cs"]="destination",
    ["de"]="destination",
@@ -17623,52 +17632,71 @@ return {
    ["nl"]="xmlsetup",
    ["ro"]="xmlsetup",
   },
-  ["s:sign"]                    = { en = "[-+]" },
-  ["s:noargument"]              = { en = "\\..." },
-  ["s:oneargument"]             = { en = "\\...#1" },
-  ["s:twoarguments"]            = { en = "\\...#1#2" },
-  ["s:threearguments"]          = { en = "\\...#1#2#3" },
-  ["s:braces"]                  = { en = "{...}" },
-  ["l:braces"]                  = { en = "{...,...}" },
-  ["s:brackets"]                = { en = "[...]" },
-  ["l:brackets"]                = { en = "[...,...]" },
-  ["s:index"]                   = { en = "[...]" },
-  ["l:index"]                   = { en = "[..+...+..]" },
-  ["s:math"]                    = { en = "$...$" },
-  ["s:inlinemath"]              = { en = "$...$" },
-  ["s:displaymath"]             = { en = "$$...$$" },
-  ["s:template"]                = { en = "[|...|]" },
-  ["l:template"]                = { en = "[|...|...|]" },
-  ["s:twowords"]                = { en = "[..+..]" },
-  ["s:threewords"]              = { en = "[..+..+..]" },
-  ["s:angle"]                   = { en = "<<...>>" },
-  ["s:reference"]               = { en = "[...]" },
-  ["l:reference"]               = { en = "[...,...]" },
-  ["s:position"]                = { en = "(...)" },
-  ["l:position"]                = { en = "(...,...)" },
-  ["s:triplet"]                 = { en = "[x:y:z=]" },
-  ["l:triplet"]                 = { en = "[x:y:z=,..]" },
-  ["s:word"]                    = { en = "{...}" },
-  ["l:word"]                    = { en = "{.. ... ..}" },
-  ["s:content"]                 = { en = "{...}" },
-  ["l:content"]                 = { en = "{.. ... ..}" },
-  ["s:textual"]                 = { en = "..." },
-  ["l:textual"]                 = { en = ".. ... .." },
-  ["s:none"]                    = { en = "..." },
-  ["l:none"]                    = { en = ".. ... .." },
-  ["s:macro"]                   = { en = "\\... " },
-  ["s:to"]                      = { en = "\\to " },
-  ["s:destination"]             = { en = "[{..[ref]}]" },
-  ["l:destination"]             = { en = "[..,{..[ref,..]},..]" },
-  ["s:nothing"]                 = { en = "..." },
-  ["s:file"]                    = { en = " ... " },
-  ["s:bracedassignment"]        = { en = "{..=..}" },
-  ["l:bracedassignment"]        = { en = "{..,..=..,..}" },
-  ["s:bracketedassignment"]     = { en = "[..=..]" },
-  ["l:bracketedassignment"]     = { en = "[..,..=..,..]" },
-  ["s:parenthesizedassignment"] = { en = "[..=..]" },
-  ["l:parenthesizedassignment"] = { en = "[..,..=..,..]" },
-  ["s:apply"]                   = { en = "[..=>..]" },
-  ["l:apply"]                   = { en = "[..,..=>..,..]" },
+  ["cd:sign-s"]                    = { en = "[-+]" },
+  ["cd:sign-l"]                    = { en = "[-+]" },
+  ["cd:csname-s"]                  = { en = "\\..." },
+  ["cd:csname-l"]                  = { en = "\\..." },
+  ["cd:noargument-s"]              = { en = "\\..." },
+  ["cd:noargument-l"]              = { en = "\\..." },
+  ["cd:oneargument-s"]             = { en = "\\...#1" },
+  ["cd:oneargument-l"]             = { en = "\\...#1" },
+  ["cd:twoarguments-s"]            = { en = "\\...#1#2" },
+  ["cd:twoarguments-l"]            = { en = "\\...#1#2" },
+  ["cd:threearguments-s"]          = { en = "\\...#1#2#3" },
+  ["cd:threearguments-l"]          = { en = "\\...#1#2#3" },
+  ["cd:braces-s"]                  = { en = "{...}", lua = '"..."' },
+  ["cd:braces-l"]                  = { en = "{...,...}", lua = '".. ... .."' },
+  ["cd:brackets-s"]                = { en = "[...]", lua = "{ ... }" },
+  ["cd:brackets-l"]                = { en = "[...,...]", lua = "{..., ...}" },
+  ["cd:index-s"]                   = { en = "[...]" },
+  ["cd:index-l"]                   = { en = "[..+...+..]" },
+  ["cd:math-s"]                    = { en = "$...$" },
+  ["cd:math-l"]                    = { en = "$...$" },
+  ["cd:inlinemath-s"]              = { en = "$...$" },
+  ["cd:inlinemath-l"]              = { en = "$...$" },
+  ["cd:displaymath-s"]             = { en = "$$...$$" },
+  ["cd:displaymath-l"]             = { en = "$$...$$" },
+  ["cd:template-s"]                = { en = "[|...|]" },
+  ["cd:template-l"]                = { en = "[|...|...|]" },
+  ["cd:twowords-s"]                = { en = "[..+..]" },
+  ["cd:twowords-l"]                = { en = "[..+..]" },
+  ["cd:threewords-s"]              = { en = "[..+..+..]" },
+  ["cd:threewords-l"]              = { en = "[..+..+..]" },
+  ["cd:angle-s"]                   = { en = "<<...>>" },
+  ["cd:angle-l"]                   = { en = "<<...>>" },
+  ["cd:reference-s"]               = { en = "[...]", lua = "{ ... }" },
+  ["cd:reference-l"]               = { en = "[...,...]", lua = "{..., ...}" },
+  ["cd:position-s"]                = { en = "(...)" },
+  ["cd:position-l"]                = { en = "(...,...)" },
+  ["cd:triplet-s"]                 = { en = "[x:y:z]" },
+  ["cd:triplet-l"]                 = { en = "[x:y:z,..]" },
+  ["cd:word-s"]                    = { en = "{...}", lua = '"..."' },
+  ["cd:word-l"]                    = { en = "{.. ... ..}", lua = '".. ... .."' },
+  ["cd:content-s"]                 = { en = "{...}", lua = '"..."' },
+  ["cd:content-l"]                 = { en = "{.. ... ..}", lua = '".. ... .."' },
+  ["cd:textual-s"]                 = { en = "..." },
+  ["cd:textual-l"]                 = { en = ".. ... .." },
+  ["cd:none-s"]                    = { en = "..." },
+  ["cd:none-l"]                    = { en = ".. ... .." },
+  ["cd:macro-s"]                   = { en = "\\... " },
+  ["cd:macro-l"]                   = { en = "\\... " },
+  ["cd:to-s"]                      = { en = "\\to " },
+  ["cd:to-l"]                      = { en = "\\to " },
+  ["cd:destination-s"]             = { en = "[{..[ref]}]" },
+  ["cd:destination-l"]             = { en = "[..,{..[ref,..]},..]" },
+  ["cd:nothing-s"]                 = { en = "..." },
+  ["cd:nothing-l"]                 = { en = "..." },
+  ["cd:file-s"]                    = { en = " ... " },
+  ["cd:file-l"]                    = { en = " ... " },
+  ["cd:assignment-s"]              = { en = "[..=..]", lua = "{ ..=.. } " },
+  ["cd:assignment-l"]              = { en = "[..,..=..,..]", lua = "{ ..,..=..,.. } " },
+  ["cd:assignmentbraces-s"]        = { en = "{..=..}" },
+  ["cd:assignmentbraces-l"]        = { en = "{..,..=..,..}" },
+  ["cd:assignmentbrackets-s"]      = { en = "[..=..]", lua = "{ ..=.. } " },
+  ["cd:assignmentbrackets-l"]      = { en = "[..,..=..,..]", lua = "{ ..,..=..,.. } " },
+  ["cd:assignmentparentheses-s"]   = { en = "(..=..)" },
+  ["cd:assignmentparentheses-l"]   = { en = "(..,..=..,..)" },
+  ["cd:apply-s"]                   = { en = "[..=>..]" },
+  ["cd:apply-l"]                   = { en = "[..,..=>..,..]" },
  }
 }