beta 2013.10.20 07:09

10 files changed, 67 insertions, 29 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 7546717a6..b625a0ff3 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{2013.10.15 13:52}
+\newcontextversion{2013.10.20 07:09}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index f8d6a51db..0909c6799 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index c8d5fd640..5f3866345 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.10.15 13:52}
+\edef\contextversion{2013.10.20 07:09}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/font-sel.lua b/tex/context/base/font-sel.lua
index 0c8985f4a..47268ade8 100644
--- a/tex/context/base/font-sel.lua
+++ b/tex/context/base/font-sel.lua
@@ -589,14 +589,16 @@ local function definemathfontfallback(data,alternative,index)
     if index == 1 then
         context.resetfontfallback( { fallback } )
     end
-    for _, entry in next, fontdata do
-        local filename   = entry["filename"]
-        local designsize = entry["designsize"] or 100
-        if designsize == 100 or designsize == 120 or designsize == 0 then
-            context.definefontfallback( { fallback }, { formatters["%s*%s"](filename,features) }, { range }, { rscale = rscale, check = check, force = force, offset = offset } )
-            break
+    if fontdata and #fontdata > 0 then
+        for _, entry in next, fontdata do
+            local filename   = entry["filename"]
+            local designsize = entry["designsize"] or 100
+            if designsize == 100 or designsize == 120 or designsize == 0 then
+                context.definefontfallback( { fallback }, { formatters["file:%s*%s"](filename,features) }, { range }, { rscale = rscale, check = check, force = force, offset = offset } )
+                break
+            end
         end
-    end        
+    end
 end
 
 local function definemathfallback(entry,index)
@@ -610,6 +612,7 @@ local function definemathfallback(entry,index)
         end
     end
     context.stopfontclass()
+    -- inspect(data)
 end
 
 local function definefallbackfont(index)
diff --git a/tex/context/base/font-sel.mkvi b/tex/context/base/font-sel.mkvi
index 718da1fa2..2c022473b 100644
--- a/tex/context/base/font-sel.mkvi
+++ b/tex/context/base/font-sel.mkvi
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=font-sel,
-%D      version=2013.10.14,
+%D      version=2013.10.19,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Selectfont,
 %D       author=Wolfgang Schuster,
@@ -115,11 +115,37 @@
      % unknown preset
    \fi}
 
-\definefontfamilypreset [r:chinese]  [\c!range={cjkcompatibilityforms,cjkcompatibilityideographs,cjkcompatibilityideographssupplement,cjkradicalssupplement,cjkstrokes,cjksymbolsandpunctuation,cjkunifiedideographs,cjkunifiedideographsextensiona,cjkunifiedideographsextensionb,halfwidthandfullwidthforms,verticalforms,bopomofo,bopomofoextended}]
-\definefontfamilypreset [r:japanese] [\c!range={cjkcompatibilityforms,cjkcompatibilityideographs,cjkcompatibilityideographssupplement,cjkradicalssupplement,cjkstrokes,cjksymbolsandpunctuation,cjkunifiedideographs,cjkunifiedideographsextensiona,cjkunifiedideographsextensionb,halfwidthandfullwidthforms,verticalforms,hiragana,katakana}]
-\definefontfamilypreset [r:korean]   [\c!range={cjkcompatibilityforms,cjkcompatibilityideographs,cjkcompatibilityideographssupplement,cjkradicalssupplement,cjkstrokes,cjksymbolsandpunctuation,cjkunifiedideographs,cjkunifiedideographsextensiona,cjkunifiedideographsextensionb,halfwidthandfullwidthforms,verticalforms,hangulcompatibilityjamo,hanguljamo,hanguljamoextendeda,hanguljamoextendedb,hangulsyllables}]
-\definefontfamilypreset [r:cyrillic] [\c!range={cyrillic,cyrillicextendeda,cyrillicextendedb,cyrillicsupplement}]
-\definefontfamilypreset [r:greek]    [\c!range={greekandcoptic,greekextended,ancientgreeknumbers}]
+\definefontfamilypreset [range:chinese]  [\c!range={cjkcompatibilityforms,cjkcompatibilityideographs,cjkcompatibilityideographssupplement,cjkradicalssupplement,cjkstrokes,cjksymbolsandpunctuation,cjkunifiedideographs,cjkunifiedideographsextensiona,cjkunifiedideographsextensionb,halfwidthandfullwidthforms,verticalforms,bopomofo,bopomofoextended}]
+\definefontfamilypreset [range:japanese] [\c!range={cjkcompatibilityforms,cjkcompatibilityideographs,cjkcompatibilityideographssupplement,cjkradicalssupplement,cjkstrokes,cjksymbolsandpunctuation,cjkunifiedideographs,cjkunifiedideographsextensiona,cjkunifiedideographsextensionb,halfwidthandfullwidthforms,verticalforms,hiragana,katakana}]
+\definefontfamilypreset [range:korean]   [\c!range={cjkcompatibilityforms,cjkcompatibilityideographs,cjkcompatibilityideographssupplement,cjkradicalssupplement,cjkstrokes,cjksymbolsandpunctuation,cjkunifiedideographs,cjkunifiedideographsextensiona,cjkunifiedideographsextensionb,halfwidthandfullwidthforms,verticalforms,hangulcompatibilityjamo,hanguljamo,hanguljamoextendeda,hanguljamoextendedb,hangulsyllables}]
+\definefontfamilypreset [range:cyrillic] [\c!range={cyrillic,cyrillicextendeda,cyrillicextendedb,cyrillicsupplement}]
+\definefontfamilypreset [range:greek]    [\c!range={greekandcoptic,greekextended,ancientgreeknumbers}]
+
+\definefontfamilypreset [math:digitsnormal]             [\c!range=digitsnormal]
+\definefontfamilypreset [math:digitsbold]               [\c!range=digitsnormal,\c!offset=digitsbold,\s!tf=style:bold]
+
+\definefontfamilypreset [math:uppercasenormal]          [\c!range=uppercasenormal]
+\definefontfamilypreset [math:uppercaseitalic]          [\c!range=uppercasenormal,\c!offset=uppercaseitalic,    \s!tf=style:italic]
+\definefontfamilypreset [math:uppercasebold]            [\c!range=uppercasenormal,\c!offset=uppercasebold,      \s!tf=style:bold]
+\definefontfamilypreset [math:uppercasebolditalic]      [\c!range=uppercasenormal,\c!offset=uppercasebolditalic,\s!tf=style:bolditalic]
+
+\definefontfamilypreset [math:lowercasenormal]          [\c!range=lowercasenormal]
+\definefontfamilypreset [math:lowercaseitalic]          [\c!range=lowercasenormal,\c!offset=lowercaseitalic,    \s!tf=style:italic]
+\definefontfamilypreset [math:lowercasebold]            [\c!range=lowercasenormal,\c!offset=lowercasebold,      \s!tf=style:bold]
+\definefontfamilypreset [math:lowercasebolditalic]      [\c!range=lowercasenormal,\c!offset=lowercasebolditalic,\s!tf=style:bolditalic]
+
+\definefontfamilypreset [math:mathematicaloperators]    [\c!range=mathematicaloperators]
+
+\definefontfamilypreset [math:lowercasegreeknormal]     [\c!range=lowercasegreeknormal]
+\definefontfamilypreset [math:lowercasegreekitalic]     [\c!range=lowercasegreeknormal,\c!offset=lowercasegreekitalic,    \s!tf=style:italic]
+\definefontfamilypreset [math:lowercasegreekbold]       [\c!range=lowercasegreeknormal,\c!offset=lowercasegreekbold,      \s!tf=style:bold]
+\definefontfamilypreset [math:lowercasegreekbolditalic] [\c!range=lowercasegreeknormal,\c!offset=lowercasegreekbolditalic,\s!tf=style:bolditalic]
+
+\definefontfamilypreset [math:uppercasegreeknormal]     [\c!range=uppercasegreeknormal]
+\definefontfamilypreset [math:uppercasegreekitalic]     [\c!range=uppercasegreeknormal,\c!offset=uppercasegreekitalic,    \s!tf=style:italic]
+\definefontfamilypreset [math:uppercasegreekbold]       [\c!range=uppercasegreeknormal,\c!offset=uppercasegreekbold,      \s!tf=style:bold]
+\definefontfamilypreset [math:uppercasegreekbolditalic] [\c!range=uppercasegreeknormal,\c!offset=uppercasegreekbolditalic,\s!tf=style:bolditalic]
+
 
 %D \macros
 %D   {defineselectfontalternative}
diff --git a/tex/context/base/lxml-tex.lua b/tex/context/base/lxml-tex.lua
index 09ffa2851..2cbdfc886 100644
--- a/tex/context/base/lxml-tex.lua
+++ b/tex/context/base/lxml-tex.lua
@@ -1575,12 +1575,17 @@ statistics.register("xml load time", function()
 end)
 
 statistics.register("lxml preparation time", function()
-    local calls, cached = xml.lpathcalls(), xml.lpathcached()
-    if calls > 0 or cached > 0 then
-        return format("%s seconds, %s nodes, %s lpath calls, %s cached calls",
-            statistics.elapsedtime(lxml), nofindices, calls, cached)
+    if noffiles > 0 or nofconverted > 0 then
+        local calls  = xml.lpathcalls()
+        local cached = xml.lpathcached()
+        if calls > 0 or cached > 0 then
+            return format("%s seconds, %s nodes, %s lpath calls, %s cached calls",
+                statistics.elapsedtime(lxml), nofindices, calls, cached)
+        else
+            return nil
+        end
     else
-        return nil
+        -- pretty close to zero so not worth mentioning
     end
 end)
 
diff --git a/tex/context/base/meta-fnt.lua b/tex/context/base/meta-fnt.lua
index 3d13b0b34..cf47f0c92 100644
--- a/tex/context/base/meta-fnt.lua
+++ b/tex/context/base/meta-fnt.lua
@@ -199,20 +199,24 @@ vffonts.combiner.commands.metapost = build
 vffonts.combiner.commands.metafont = build
 
 statistics.register("metapost font generation", function()
-    local time = statistics.elapsedtime(flusher)
     if total > 0 then
-        return format("%i glyphs, %.3f seconds runtime, %i glyphs/second", total, time, total/time)
-    else
-        return format("%i glyphs, %.3f seconds runtime", total, time)
+        local time = statistics.elapsedtime(flusher)
+        if total > 0 then
+            return format("%i glyphs, %.3f seconds runtime, %i glyphs/second", total, time, total/time)
+        else
+            return format("%i glyphs, %.3f seconds runtime", total, time)
+        end
     end
 end)
 
 statistics.register("metapost font loading",function()
-    local time = statistics.elapsedtime(metapost.fonts)
     if variants > 0 then
-        return format("%.3f seconds, %i instances, %0.3f instances/second", time, variants, variants/time)
-    else
-        return format("%.3f seconds, %i instances", time, variants)
+        local time = statistics.elapsedtime(metapost.fonts)
+        if variants > 0 then
+            return format("%.3f seconds, %i instances, %0.3f instances/second", time, variants, variants/time)
+        else
+            return format("%.3f seconds, %i instances", time, variants)
+        end
     end
 end)
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index deaf92e71..e2c3f3255 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 e3dfc12ac..82a45e683 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 8fe2ad9c1..17c5b6b22 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  : 10/15/13 13:52:35
+-- merge date  : 10/20/13 07:09:03
 
 do -- begin closure to overcome local limits and interference