beta 2013.08.29 21:48

9 files changed, 14 insertions, 8 deletions

diff --git a/context/data/scite/scite-ctx.lua b/context/data/scite/scite-ctx.lua
index 6bfe2cdd8..7d0cea69e 100644
--- a/context/data/scite/scite-ctx.lua
+++ b/context/data/scite/scite-ctx.lua
@@ -4,6 +4,7 @@
 -- remark    : part of the context distribution, my first lua code
 
 -- todo: name space for local functions
+-- todo: the spell checking code is for the built-in lexer, the lpeg one uses its own
 
 -- loading: scite-ctx.properties
 
@@ -32,7 +33,8 @@
 --     document=document_text|\
 --     quote=quote_text|\
 --     compound=compound_text|\
---     check=check_text
+--     check=check_text\|
+--     strip=toggle_strip
 --
 -- ctx.spellcheck.language=auto
 -- ctx.spellcheck.wordsize=4
diff --git a/context/data/scite/scite-ctx.properties b/context/data/scite/scite-ctx.properties
index 4bef0e21d..bb94f95c9 100644
--- a/context/data/scite/scite-ctx.properties
+++ b/context/data/scite/scite-ctx.properties
@@ -75,7 +75,8 @@ ctx.helpinfo=\
     Ctrl  + M     wrap text (auto indent)|\
     Ctrl  + R     reset spelling results|\
     Ctrl  + I     insert template|\
-    Ctrl  + E     open log file
+    Ctrl  + E     open log file|\
+    Ctrl  + +     toggle language stripe
 
 command.name.21.$(file.patterns.context)=CTX Action List
 command.subsystem.21.$(file.patterns.context)=3
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index a33c1c93f..bf4d51289 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.08.29 20:45}
+\newcontextversion{2013.08.29 21:48}
 
 %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 b61f77a54..903c6d6ca 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 e7b7d92e0..88523fa54 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.08.29 20:45}
+\edef\contextversion{2013.08.29 21:48}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/meta-ini.mkiv b/tex/context/base/meta-ini.mkiv
index e3e694448..78d17b95d 100644
--- a/tex/context/base/meta-ini.mkiv
+++ b/tex/context/base/meta-ini.mkiv
@@ -429,9 +429,12 @@
    \hskip\cldcontext{fonts.hashes.parameters[font.current()].designsize}sp\relax
    \endgroup}
 
+\definefontsynonym[MetafunDefault][Regular*default]
+
 \startMPinitializations % scale is not yet ok
-    defaultfont:="\truefontname{Regular}";
-    defaultscale:=\the\bodyfontsize/10pt;
+    defaultfont:="\truefontname{MetafunDefault}";
+  % defaultscale:=\the\bodyfontsize/10pt; % only when hard coded 10pt
+    defaultscale:=1;
 \stopMPinitializations
 
 % watch out, this is a type1 font because mp can only handle 8 bit fonts
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 88393860d..0c9d228dd 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log
index 2afe02313..1d830b041 100644
--- a/tex/context/base/status-lua.log
+++ b/tex/context/base/status-lua.log
@@ -1,6 +1,6 @@
 (cont-yes.mkiv
 
-ConTeXt  ver: 2013.08.29 20:45 MKIV beta  fmt: 2013.8.29  int: english/english
+ConTeXt  ver: 2013.08.29 21:48 MKIV beta  fmt: 2013.8.29  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 88b45182e..09dcdce26 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  : 08/29/13 20:45:59
+-- merge date  : 08/29/13 21:48:07
 
 do -- begin closure to overcome local limits and interference