15 files changed, 23 insertions, 14 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 5c49d7dac..6f341ac2f 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.01.25 13:09}
+\newcontextversion{2012.01.25 14:16}
 
 %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 d0c9d7ad0..ee45720fa 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.01.25 13:09}
+\newcontextversion{2012.01.25 14:16}
 
 %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 84d102600..a4d31a83c 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 54b64a16d..e0bdc7a46 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 cb22cd8c6..3b58fa307 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.01.25 13:09}
+\edef\contextversion{2012.01.25 14:16}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index fdefd19bd..ec46764c8 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.01.25 13:09}
+\edef\contextversion{2012.01.25 14:16}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/enco-ini.mkiv b/tex/context/base/enco-ini.mkiv
index d225f07af..a942d5110 100644
--- a/tex/context/base/enco-ini.mkiv
+++ b/tex/context/base/enco-ini.mkiv
@@ -232,7 +232,7 @@
 
 \unexpanded\def\fallbackcontrolspace
  %{\getglyph{ComputerModernMono}\textcontrolspace}
-  {\getglyph{LMTypewriter10-Regular}\textcontrolspace}
+  {\getglyph{LMTypewriter-Regular}\textcontrolspace}
 
 \unexpanded\def\normalcontrolspace
   {\iffontchar\font\textcontrolspace
diff --git a/tex/context/base/grph-inc.lua b/tex/context/base/grph-inc.lua
index db94c62e4..4e8f89298 100644
--- a/tex/context/base/grph-inc.lua
+++ b/tex/context/base/grph-inc.lua
@@ -479,7 +479,7 @@ local function register(askedname,specification)
                             report_inclusion("no need to convert '%s' (%s) from '%s' to '%s'",askedname,oldname,format,newformat)
                         end
                     end
-                    if io.exists(newname) then
+                    if io.exists(newname) and io.size(newname) > 0 then
                         specification.foundname = oldname
                         specification.fullname  = newname
                         specification.prefix    = prefix
@@ -498,7 +498,7 @@ local function register(askedname,specification)
                             end
                         end
                     elseif io.exists(oldname) then
-                        specification.fullname  = newname
+                        specification.fullname  = oldname -- was newname
                         specification.converted = false
                     end
                 end
diff --git a/tex/context/base/mult-ini.lua b/tex/context/base/mult-ini.lua
index edaa72459..d14f38ad5 100644
--- a/tex/context/base/mult-ini.lua
+++ b/tex/context/base/mult-ini.lua
@@ -154,10 +154,13 @@ local splitter = lpeg.splitat(",")
 function interfaces.showmessage(category,tag,arguments)
     local r = reporters[category]
     local f = formats[fulltag(category,tag)]
-    if type(arguments) == "string" and #arguments > 0 then
+    local t = type(arguments)
+    if t == "string" and #arguments > 0 then
         r(f,lpegmatch(splitter,arguments))
-    elseif arguments then
+    elseif t == "table" then
         r(f,unpack(arguments))
+    elseif arguments then
+        r(f,arguments)
     else
         r(f)
     end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index d635a95bc..5ca1a9c33 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 7f39e4205..7699fb29b 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/type-fbk.mkiv b/tex/context/base/type-fbk.mkiv
index e8413ec9f..fd91344da 100644
--- a/tex/context/base/type-fbk.mkiv
+++ b/tex/context/base/type-fbk.mkiv
@@ -17,7 +17,7 @@
 \definetypescriptprefix [sans]  [Sans]
 \definetypescriptprefix [mono]  [Mono]
 
-\definefontsynonym [DefaultFont] [\s!file:lmmonoprop10-regular] % was cmvtt10
+\definefontsynonym [DefaultFont] [\s!file:lmmonoproplt10-regular]
 
 \startsetups [font:fallback:serif]
     \definefontsynonym [Serif]            [DefaultFont]
@@ -26,7 +26,7 @@
     \definefontsynonym [SerifSlanted]     [SerifItalic]
     \definefontsynonym [SerifBoldItalic]  [Serif]
     \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic]
-    \definefontsynonym [SerifCaps]        [Serif]
+    \definefontsynonym [SerifCaps]        [Serif] [\s!features=smallcaps]
 \stopsetups
 
 \startsetups [font:fallback:sans]
@@ -36,7 +36,7 @@
     \definefontsynonym [SansSlanted]     [SansItalic]
     \definefontsynonym [SansBoldItalic]  [Sans]
     \definefontsynonym [SansBoldSlanted] [SansBoldItalic]
-    \definefontsynonym [SansCaps]        [Sans]
+    \definefontsynonym [SansCaps]        [Sans] [\s!features=smallcaps]
 \stopsetups
 
 \startsetups [font:fallback:mono]
@@ -46,7 +46,7 @@
     \definefontsynonym [MonoSlanted]     [MonoItalic]
     \definefontsynonym [MonoBoldItalic]  [Mono]
     \definefontsynonym [MonoBoldSlanted] [MonoBoldItalic]
-    \definefontsynonym [MonoCaps]        [Mono]
+    \definefontsynonym [MonoCaps]        [Mono] [\s!features=smallcaps]
 \stopsetups
 
 \starttypescript [serif,sans,mono] [fallback]
diff --git a/tex/context/base/type-imp-latinmodern.mkiv b/tex/context/base/type-imp-latinmodern.mkiv
index 55824597f..94195deca 100644
--- a/tex/context/base/type-imp-latinmodern.mkiv
+++ b/tex/context/base/type-imp-latinmodern.mkiv
@@ -142,6 +142,8 @@
         \definefontsynonym [MonoCapsSlanted]    [LMTypewriter-Light]        [\s!features=\s!none]
     \stoptypescript
 
+    % why not also [name]
+
     \starttypescript [\s!serif] [modern,latin-modern]
         \definefontsynonym [LMRoman-Regular]        [\s!file:lmroman10-regular]      [\s!features=\s!default]
         \definefontsynonym [LMRoman-Bold]           [\s!file:lmroman10-bold]         [\s!features=\s!default]
diff --git a/tex/context/base/type-set.mkiv b/tex/context/base/type-set.mkiv
index af08726e9..8a174c9b8 100644
--- a/tex/context/base/type-set.mkiv
+++ b/tex/context/base/type-set.mkiv
@@ -29,6 +29,10 @@
   % \usetypescriptfile[latinmodern]
     \usetypescriptfile[loc]
 
+    % we want these names preset
+
+    \usetypescript[serif,sans,mono,math] [latin-modern]
+
 \else
 
     \usetypescriptfile[def]
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b0ddd08c2..433aba544 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  : 01/25/12 13:09:37
+-- merge date  : 01/25/12 14:16:54
 
 do -- begin closure to overcome local limits and interference