beta 2012.05.08 23:00

15 files changed, 101 insertions, 89 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 8adf91336..6241a2f3e 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.05.08 13:45}
+\newcontextversion{2012.05.08 23:00}
 
 %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 1e3a5f322..ac8cfd1af 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.05.08 13:45}
+\newcontextversion{2012.05.08 23:00}
 
 %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 c0a61df16..8639cacf9 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 bc3de34f4..1742b5b42 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 7d71cb376..0a142a192 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.05.08 13:45}
+\edef\contextversion{2012.05.08 23:00}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index b37a01ad7..70c12126f 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.05.08 13:45}
+\edef\contextversion{2012.05.08 23:00}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/core-con.lua b/tex/context/base/core-con.lua
index 4bd51770a..571a850f4 100644
--- a/tex/context/base/core-con.lua
+++ b/tex/context/base/core-con.lua
@@ -61,11 +61,16 @@ local counters = allocate {
         0x0074, 0x0075, 0x0076, 0x007A, 0x017E
     },
     ['greek'] = { -- this should be the lowercase table
-        0x0391, 0x0392, 0x0393, 0x0394, 0x0395,
-        0x0396, 0x0397, 0x0398, 0x0399, 0x039A,
-        0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
-        0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5,
-        0x03A6, 0x03A7, 0x03A8, 0x03A9
+     -- 0x0391, 0x0392, 0x0393, 0x0394, 0x0395,
+     -- 0x0396, 0x0397, 0x0398, 0x0399, 0x039A,
+     -- 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+     -- 0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5,
+     -- 0x03A6, 0x03A7, 0x03A8, 0x03A9
+        0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5,
+        0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA,
+        0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+        0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5,
+        0x03C6, 0x03C7, 0x03C8, 0x03C9,
     },
     ['arabic'] = {
         0x0627, 0x0628, 0x062C, 0x062F, 0x0647,
diff --git a/tex/context/base/grph-inc.lua b/tex/context/base/grph-inc.lua
index a7c7bd86b..7377682a9 100644
--- a/tex/context/base/grph-inc.lua
+++ b/tex/context/base/grph-inc.lua
@@ -881,9 +881,10 @@ function checkers.generic(data)
     local figure = figures.loaded[hash]
     if figure == nil then
         figure = img.new {
-            filename = name,
-            page     = page,
-            pagebox  = dr.size,
+            filename        = name,
+            page            = page,
+            pagebox         = dr.size,
+         -- visiblefilename = "", -- this prohibits the full filename ending up in the file
         }
         codeinjections.setfigurecolorspace(data,figure)
         codeinjections.setfiguremask(data,figure)
diff --git a/tex/context/base/meta-ini.mkiv b/tex/context/base/meta-ini.mkiv
index d214a98a9..d2f5cd6cb 100644
--- a/tex/context/base/meta-ini.mkiv
+++ b/tex/context/base/meta-ini.mkiv
@@ -884,12 +884,16 @@
 
 % \setupcolors[state=stop,conversion=never] % quite tricky ... type mismatch
 
-% A temporary hack so that I can test an alternative in cont-loc. See ** in
-% colo-ini.lua (mpcolor).
+% A dirty trick, ** in colo-ini.lua (mpcolor).
+
+% \def\m_meta_colo_initializations{%
+%     OverlayLineColor:=\MPcolor{\overlaylinecolor};
+%     OverlayColor:=\MPcolor{\overlaycolor};
+% }
 
 \def\m_meta_colo_initializations{%
-    OverlayLineColor:=\MPcolor{\overlaylinecolor};
-    OverlayColor:=\MPcolor{\overlaycolor};
+    vardef OverlayLineColor=\MPcolor{\overlaylinecolor} enddef;
+    vardef OverlayColor=\MPcolor{\overlaycolor} enddef;
 }
 
 \startMPextensions
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index d8962020f..9b26595cf 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 d5dc702e7..c3a27cc4d 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-lst.lua b/tex/context/base/strc-lst.lua
index 25d046f4f..48aab78db 100644
--- a/tex/context/base/strc-lst.lua
+++ b/tex/context/base/strc-lst.lua
@@ -734,9 +734,9 @@ end
 function commands.savedlistprefixednumber(name,n)
     local data = cached[tonumber(n)]
     if data then
-        helpers.prefix(data,data.prefixdata)
         local numberdata = data.numberdata
         if numberdata then
+            helpers.prefix(data,data.prefixdata)
             sections.typesetnumber(numberdata,"number",numberdata or false)
         end
     end
diff --git a/tex/context/base/symb-ini.mkiv b/tex/context/base/symb-ini.mkiv
index af9c14c00..e957e68c1 100644
--- a/tex/context/base/symb-ini.mkiv
+++ b/tex/context/base/symb-ini.mkiv
@@ -300,7 +300,7 @@
 %D
 %D \showsetup{usesymbols}
 
-\def\usesymbols[#1]{\ctxcommand{usesymbols("#1")}}
+\unexpanded\def\usesymbols[#1]{\ctxcommand{usesymbols("#1")}}
 
 %D As longs as symbols are linked to levels or numbers, we can
 %D also use the conversion mechanism, but in for instance the
diff --git a/tex/context/base/type-imp-unfonts.mkiv b/tex/context/base/type-imp-unfonts.mkiv
index 2e1ca6c30..91ae3b230 100644
--- a/tex/context/base/type-imp-unfonts.mkiv
+++ b/tex/context/base/type-imp-unfonts.mkiv
@@ -3,14 +3,16 @@
 %D        version=2012.03.11,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=UnFonts,
-%D         author=...,
+%D         author=Dalyoung \& Hans,
 %D           date=\currentdate,
-%D      copyright=...]
+%D      copyright=Dalyoung \& Hans]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+% usage: \setupbodyfont[unfonts]
+
 \loadtypescriptfile[texgyre]
 \loadtypescriptfile[xits]
 
@@ -68,73 +70,73 @@
 
 \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
+    \starttypescript [\s!serif] [unbatang]
+        \definefontsynonym [unbatang]           [\s!file:unbatang]    [\s!features=kr-default,\s!fallbacks=kr-serif]
+        \definefontsynonym [unbatangbold]       [\s!file:unbatangbold][\s!features=kr-default,\s!fallbacks=kr-serifbold]
+        \definefontsynonym [unbatangitalic]     [\s!file:unbatang]    [\s!features=kr-slanted,\s!fallbacks=kr-serifitalic]
+        \definefontsynonym [unbatangbolditalic] [\s!file:unbatangbold][\s!features=kr-slanted,\s!fallbacks=kr-serifbolditalic]
+        \definefontsynonym [unbatangslanted]    [\s!file:unbatang]    [\s!features=kr-slanted,\s!fallbacks=kr-serifslanted]
+        \definefontsynonym [unbatangboldslanted][\s!file:unbatangbold][\s!features=kr-slanted,\s!fallbacks=kr-serifboldslanted]
+        \definefontsynonym [unbatangcaps]       [\s!file:unbatang]    [\s!features=kr-default,\s!fallbacks=kr-serifcaps]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [undotum]
+        \definefontsynonym[undotum]             [\s!file:undotum]     [\s!features=kr-default,\s!fallbacks=kr-sans]
+        \definefontsynonym[undotumbold]         [\s!file:undotumbold] [\s!features=kr-default,\s!fallbacks=kr-sansbold]
+        \definefontsynonym[undotumitalic]       [\s!file:undotum]     [\s!features=kr-slanted,\s!fallbacks=kr-sansitalic]
+        \definefontsynonym[undotumbolditalic]   [\s!file:undotumbold] [\s!features=kr-slanted,\s!fallbacks=kr-sansbolditalic]
+        \definefontsynonym[undotumslanted]      [\s!file:undotum]     [\s!features=kr-slanted,\s!fallbacks=kr-sansslanted]
+        \definefontsynonym[undotumboldslanted]  [\s!file:undotumbold] [\s!features=kr-slanted,\s!fallbacks=kr-sansboldslanted]
+        \definefontsynonym[undotumcaps]         [\s!file:undotum]     [\s!features=kr-default,\s!fallbacks=kr-sanscaps]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [untype]
+        \definefontsynonym[untype]              [\s!file:untaza]      [\s!features=kr-default,\s!fallbacks=kr-mono]
+        \definefontsynonym[untypebold]          [\s!file:untaza]      [\s!features=kr-default,\s!fallbacks=kr-monobold]
+        \definefontsynonym[untypeitalic]        [\s!file:untaza]      [\s!features=kr-slanted,\s!fallbacks=kr-monoitalic]
+        \definefontsynonym[untypebolditalic]    [\s!file:untaza]      [\s!features=kr-slanted,\s!fallbacks=kr-monobolditalic]
+        \definefontsynonym[untypeslanted]       [\s!file:untaza]      [\s!features=kr-slanted,\s!fallbacks=kr-monoslanted]
+        \definefontsynonym[untypeboldslanted]   [\s!file:untaza]      [\s!features=kr-slanted,\s!fallbacks=kr-monoboldslanted]
+        \definefontsynonym[untypecaps]          [\s!file:untaza]      [\s!features=kr-default,\s!fallbacks=kr-monocaps]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [unbatang] [\s!name]
+        \definefontsynonym[\s!Serif]           [unbatang]
+        \definefontsynonym[\s!SerifBold]       [unbatangbold]
+        \definefontsynonym[\s!SerifItalic]     [unbatangitalic]
+        \definefontsynonym[\s!SerifBoldItalic] [unbatangbolditalic]
+        \definefontsynonym[\s!SerifSlanted]    [unbatangslanted]
+        \definefontsynonym[\s!SerifBoldSlanted][unbatangboldslanted]
+        \definefontsynonym[\s!SerifCaps]       [unbatangcaps]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [undotum] [\s!name]
+        \definefontsynonym[\s!Sans]            [undotum]
+        \definefontsynonym[\s!SansBold]        [undotumbold]
+        \definefontsynonym[\s!SansItalic]      [undotumitalic]
+        \definefontsynonym[\s!SansBoldItalic]  [undotumbolditalic]
+        \definefontsynonym[\s!SansSlanted]     [undotumslanted]
+        \definefontsynonym[\s!SansBoldSlanted] [undotumboldslanted]
+        \definefontsynonym[\s!SansCaps]        [undotumcaps]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [untype] [\s!name]
+        \definefontsynonym[\s!Mono]            [untype]
+        \definefontsynonym[\s!MonoBold]        [untypebold]
+        \definefontsynonym[\s!MonoItalic]      [untypeitalic]
+        \definefontsynonym[\s!MonoBoldItalic]  [untypebolditalic]
+        \definefontsynonym[\s!MonoSlanted]     [untypeslanted]
+        \definefontsynonym[\s!MonoBoldSlanted] [untypeboldslanted]
+        \definefontsynonym[\s!MonoCaps]        [untypecaps]
+    \stoptypescript
+
+    % xits might get replaced with a pagella once we have it
+
+    \starttypescript[unfonts]
+        \definetypeface [unfonts] [\s!rm] [\s!serif] [unbatang]
+        \definetypeface [unfonts] [\s!ss] [\s!sans]  [undotum]
+        \definetypeface [unfonts] [\s!tt] [\s!mono]  [untype]
+        \definetypeface [unfonts] [\s!mm] [\s!math]  [xits]
+    \stoptypescript
 
 \stoptypescriptcollection
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e2c71a53a..50a0716a0 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  : 05/08/12 13:45:17
+-- merge date  : 05/08/12 23:00:24
 
 do -- begin closure to overcome local limits and interference