beta 2013.11.05 09:50

11 files changed, 142 insertions, 45 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index a8702a739..3bff56b57 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.11.04 20:03}
+\newcontextversion{2013.11.05 09:50}
 
 %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 d5982f45d..895eedd2e 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 03b13e4c6..30ccafca8 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.11.04 20:03}
+\edef\contextversion{2013.11.05 09:50}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/font-gds.mkvi b/tex/context/base/font-gds.mkvi
index d4760a470..6d9798428 100644
--- a/tex/context/base/font-gds.mkvi
+++ b/tex/context/base/font-gds.mkvi
@@ -35,6 +35,14 @@
 \definecolor[colorscheme:2:2][m=.75]
 \definecolor[colorscheme:2:1][y=.75]
 
+\definecolor[colorscheme:3:1][r=.75]
+\definecolor[colorscheme:3:2][g=.75]
+\definecolor[colorscheme:3:3][b=.75]
+\definecolor[colorscheme:3:4][g=.75,b=.75]
+\definecolor[colorscheme:3:5][r=.75,b=.75]
+\definecolor[colorscheme:3:6][r=.75,g=.75]
+\definecolor[colorscheme:3:7][g=.75]
+
 \definesystemattribute[colorscheme][public]
 
 \unexpanded\def\loadfontgoodies[#filename]%
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index c8527223a..868cec117 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 7d6b5e895..4fd46f9d3 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv
index 97f601cc9..8e02432c9 100644
--- a/tex/context/base/syst-aux.mkiv
+++ b/tex/context/base/syst-aux.mkiv
@@ -6763,11 +6763,31 @@
 %D
 %D This one is for Mojca Miklavec, who made me aware of the fact that
 %D \type {page-imp.tex} was not the best place to hide it.
+%D
+%D \startbuffer
+%D \def\DoSomething#1{ [item #1] }
+%D
+%D \processranges[1,4:5]\DoSomething \par
+%D \dowithrange  {1,4:5}\DoSomething \par
+%D \stopbuffer
+%D
+%D \typebuffer \blank \getbuffer \blank
+
+\def\syst_helpers_with_range#1%
+  {\splitstring#1\at:\to\m_syst_helpers_range_from\and\m_syst_helpers_range_to
+   \ifx\m_syst_helpers_range_to\empty\let\m_syst_helpers_range_to\m_syst_helpers_range_from\fi
+   \dostepwiserecurse\m_syst_helpers_range_from\m_syst_helpers_range_to\plusone{\m_helpers_range_action{##1}}}%
+
+\unexpanded\def\processranges[#1]#2% #1= n:m,p,q:r
+  {\def\m_helpers_range_action{#2}%
+   \processcommacommand[#1]\syst_helpers_with_range}
+
+\unexpanded\def\dowithrange#1#2%
+  {\def\m_helpers_range_action{#2}%
+   \processcommacommand[#1]\syst_helpers_with_range}
 
-\unexpanded\def\dowithrange#1#2% #2 takes number
-  {\splitstring#1\at:\to\fromrange\and\torange
-   \ifx\torange\empty\let\torange\fromrange\fi
-   \dostepwiserecurse\fromrange\torange1{#2{\recurselevel}}}
+% \def\DoSomething#1{ [item #1] }
+% \dowithrange[1,4:5]\DoSomething
 
 %D \macros
 %D   {ignoreimplicitspaces}
diff --git a/tex/context/base/type-imp-mathdesign.mkiv b/tex/context/base/type-imp-mathdesign.mkiv
index 0f7f5cafd..00e753e75 100644
--- a/tex/context/base/type-imp-mathdesign.mkiv
+++ b/tex/context/base/type-imp-mathdesign.mkiv
@@ -1,9 +1,9 @@
 %D \module
 %D   [       file=type-imp-mathdesign,
-%D        version=2013.10.31,
+%D        version=2013.11.03,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Mathdesign,
-%D         author=Hans Hagen \& Wolfgang Schuster,
+%D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
 %C
@@ -13,30 +13,99 @@
 
 \starttypescriptcollection [mathdesign]
 
-    % Bitstream Charter
+    % Bistream Charter
 
-    \starttypescript [\s!math] [mdbch,mathdesignch,mathdesigncharter] [\s!all]
+    \starttypescript [\s!serif] [charter]
+        \definefontsynonym [Charter-Regular]     [\s!file:bchr8a.afm]
+        \definefontsynonym [Charter-Italic]      [\s!file:bchri8a.afm]
+        \definefontsynonym [Charter-Bold]        [\s!file:bchb8a.afm]
+        \definefontsynonym [Charter-BoldItalic]  [\s!file:bchbi8a.afm]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [charter] [\s!name]
+		\setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]            [Charter-Regular]
+        \definefontsynonym [\s!SerifItalic]      [Charter-Italic]
+        \definefontsynonym [\s!SerifBold]        [Charter-Bold]
+        \definefontsynonym [\s!SerifBoldItalic]  [Charter-BoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!math] [mdbch,mathdesignch,charter] [\s!all]
         \loadfontgoodies[mdbch-math]
         \definefontsynonym [\s!MathRoman]     [mdbchrm@mdbch-rm]
         \definefontsynonym [\s!MathRomanBold] [mdbchbf@mdbch-bf]
     \stoptypescript
 
+    \starttypescript [mathdesignch,charter]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [charter] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]  [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]  [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [charter] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
     % URW Garamond
 
-    \starttypescript [\s!math] [mdugm,mathdesigngm,mathdesigngaramond] [\s!all]
+    \starttypescript [\s!serif] [garamond]
+        \definefontsynonym [Garamond-Regular]     [\s!file:ugmr8a.afm]
+        \definefontsynonym [Garamond-Italic]      [\s!file:ugmri8a.afm]
+        \definefontsynonym [Garamond-Bold]        [\s!file:bchb8a.afm]
+        \definefontsynonym [Garamond-BoldItalic]  [\s!file:ugmmi8a.afm]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [garamond] [\s!name]
+		\setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]            [Garamond-Regular]
+        \definefontsynonym [\s!SerifItalic]      [Garamond-Italic]
+        \definefontsynonym [\s!SerifBold]        [Garamond-Bold]
+        \definefontsynonym [\s!SerifBoldItalic]  [Garamond-BoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!math] [mdugm,mathdesigngm,garamond] [\s!all]
         \loadfontgoodies[mdugm-math]
         \definefontsynonym [\s!MathRoman]     [mdugmrm@mdugm-rm]
         \definefontsynonym [\s!MathRomanBold] [mdugmbf@mdugm-bf]
     \stoptypescript
 
+    \starttypescript [mathdesigngm,garamond]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [garamond] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]   [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]   [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [garamond] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
     % Adobe Utopia
 
-    \starttypescript [\s!math] [mdput,mathdesignut,mathdesignutopia] [\s!all]
+    \starttypescript [\s!serif] [utopia]
+        \definefontsynonym [Utopia-Regular]     [\s!file:putr8a.afm]
+        \definefontsynonym [Utopia-Italic]      [\s!file:putri8a.afm]
+        \definefontsynonym [Utopia-Bold]        [\s!file:putb8a.afm]
+        \definefontsynonym [Utopia-BoldItalic]  [\s!file:putbi8a.afm]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [utopia] [\s!name]
+		\setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]            [Utopia-Regular]
+        \definefontsynonym [\s!SerifItalic]      [Utopia-Italic]
+        \definefontsynonym [\s!SerifBold]        [Utopia-Bold]
+        \definefontsynonym [\s!SerifBoldItalic]  [Utopia-BoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!math] [mdput,mathdesignut,utopia] [\s!all]
         \loadfontgoodies[mdput-math]
         \definefontsynonym [\s!MathRoman]     [mdputrm@mdput-rm]
         \definefontsynonym [\s!MathRomanBold] [mdputbf@mdput-bf]
     \stoptypescript
 
+    \starttypescript [mathdesignut,utopia]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [utopia] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern] [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern] [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [utopia] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
     % Charter ITC Std
 
     \starttypescript [\s!math] [mdici,mathdesignci] [\s!all]
diff --git a/tex/context/fonts/mdput-math.lfg b/tex/context/fonts/mdput-math.lfg
index 8f7b01833..7779ec152 100644
--- a/tex/context/fonts/mdput-math.lfg
+++ b/tex/context/fonts/mdput-math.lfg
@@ -12,25 +12,25 @@ return {
         virtuals = {
             ["mdput-rm"] = {
                 { name = "file:putr8a", features = "virtualmath", main = true },
-                { name = "mdugmr7m",  vector = "tex-mr", skewchar=0x7F },
-                { name = "mdugmri7m", vector = "tex-mi", skewchar=0x7F },
-                { name = "mdugmri7m", vector = "tex-it", skewchar=0x7F },
-                { name = "mdugmm7m",  vector = "tex-bf", skewchar=0x7F },
-                { name = "mdugmmi7m", vector = "tex-bi", skewchar=0x7F },
-                { name = "mdugmr7y",  vector = "tex-sy", skewchar=0x30, parameters = true },
-                { name = "mdugmr7v",  vector = "tex-ex", extension = true },
-                { name = "mdugmrma",  vector = "tex-ma" },
-                { name = "mdugmrmb",  vector = "tex-mb" },
+                { name = "mdputr7m",  vector = "tex-mr", skewchar=0x7F },
+                { name = "mdputri7m", vector = "tex-mi", skewchar=0x7F },
+                { name = "mdputri7m", vector = "tex-it", skewchar=0x7F },
+                { name = "mdputb7m",  vector = "tex-bf", skewchar=0x7F },
+                { name = "mdputbi7m", vector = "tex-bi", skewchar=0x7F },
+                { name = "mdputr7y",  vector = "tex-sy", skewchar=0x30, parameters = true },
+                { name = "mdputr7v",  vector = "tex-ex", extension = true },
+                { name = "mdputrma",  vector = "tex-ma" },
+                { name = "mdputrmb",  vector = "tex-mb" },
             },
             ["mdput-bf"] = {
                 { name = "file:putb8a", features = "virtualmath", main = true },
-                { name = "mdugmm7m",  vector = "tex-mr", skewchar=0x7F },
-                { name = "mdugmmi7m", vector = "tex-mi", skewchar=0x7F },
-                { name = "mdugmmi7m", vector = "tex-it", skewchar=0x7F },
-                { name = "mdugmm7y",  vector = "tex-sy", skewchar=0x30, parameters = true },
-                { name = "mdugmm7v",  vector = "tex-ex", extension = true },
-                { name = "mdugmmma",  vector = "tex-ma" },
-                { name = "mdugmmmb",  vector = "tex-mb" },
+                { name = "mdputb7m",  vector = "tex-mr", skewchar=0x7F },
+                { name = "mdputbi7m", vector = "tex-mi", skewchar=0x7F },
+                { name = "mdputbi7m", vector = "tex-it", skewchar=0x7F },
+                { name = "mdputb7y",  vector = "tex-sy", skewchar=0x30, parameters = true },
+                { name = "mdputb7v",  vector = "tex-ex", extension = true },
+                { name = "mdputbma",  vector = "tex-ma" },
+                { name = "mdputbmb",  vector = "tex-mb" },
             }
         }
     }
diff --git a/tex/context/fonts/mdugm-math.lfg b/tex/context/fonts/mdugm-math.lfg
index 7e99c4b85..293c99371 100644
--- a/tex/context/fonts/mdugm-math.lfg
+++ b/tex/context/fonts/mdugm-math.lfg
@@ -12,25 +12,25 @@ return {
         virtuals = {
             ["mdugm-rm"] = {
                 { name = "file:ugmr8a", features = "virtualmath", main = true },
-                { name = "mdputr7m",  vector = "tex-mr", skewchar=0x7F },
-                { name = "mdputri7m", vector = "tex-mi", skewchar=0x7F },
-                { name = "mdputri7m", vector = "tex-it", skewchar=0x7F },
-                { name = "mdputb7m",  vector = "tex-bf", skewchar=0x7F },
-                { name = "mdputbi7m", vector = "tex-bi", skewchar=0x7F },
-                { name = "mdputr7y",  vector = "tex-sy", skewchar=0x30, parameters = true },
-                { name = "mdputr7v",  vector = "tex-ex", extension = true },
-                { name = "mdputrma",  vector = "tex-ma" },
-                { name = "mdputrmb",  vector = "tex-mb" },
+                { name = "mdugmr7m",  vector = "tex-mr", skewchar=0x7F },
+                { name = "mdugmri7m", vector = "tex-mi", skewchar=0x7F },
+                { name = "mdugmri7m", vector = "tex-it", skewchar=0x7F },
+                { name = "mdugmm7m",  vector = "tex-bf", skewchar=0x7F },
+                { name = "mdugmmi7m", vector = "tex-bi", skewchar=0x7F },
+                { name = "mdugmr7y",  vector = "tex-sy", skewchar=0x30, parameters = true },
+                { name = "mdugmr7v",  vector = "tex-ex", extension = true },
+                { name = "mdugmrma",  vector = "tex-ma" },
+                { name = "mdugmrmb",  vector = "tex-mb" },
             },
             ["mdugm-bf"] = {
                 { name = "file:ugmm8a", features = "virtualmath", main = true },
-                { name = "mdputb7m",  vector = "tex-mr", skewchar=0x7F },
-                { name = "mdputbi7m", vector = "tex-mi", skewchar=0x7F },
-                { name = "mdputbi7m", vector = "tex-it", skewchar=0x7F },
-                { name = "mdputb7y",  vector = "tex-sy", skewchar=0x30, parameters = true },
-                { name = "mdputb7v",  vector = "tex-ex", extension = true },
-                { name = "mdputbma",  vector = "tex-ma" },
-                { name = "mdputbmb",  vector = "tex-mb" },
+                { name = "mdugmm7m",  vector = "tex-mr", skewchar=0x7F },
+                { name = "mdugmmi7m", vector = "tex-mi", skewchar=0x7F },
+                { name = "mdugmmi7m", vector = "tex-it", skewchar=0x7F },
+                { name = "mdugmm7y",  vector = "tex-sy", skewchar=0x30, parameters = true },
+                { name = "mdugmm7v",  vector = "tex-ex", extension = true },
+                { name = "mdugmmma",  vector = "tex-ma" },
+                { name = "mdugmmmb",  vector = "tex-mb" },
             }
         }
     }
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 6a5873dd9..8163ae8ad 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  : 11/04/13 20:03:17
+-- merge date  : 11/05/13 09:50:05
 
 do -- begin closure to overcome local limits and interference