beta 2013.03.16 22:44

11 files changed, 13 insertions, 13 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 3ab0e9688..daa376384 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{2013.03.16 14:44}
+\newcontextversion{2013.03.16 22:44}
 
 %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 8b152ffc2..131e8b5ac 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.03.16 14:44}
+\newcontextversion{2013.03.16 22:44}
 
 %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 6efa6fe61..b5354d291 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 d2e38cf8a..6d0337de0 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 1543025f3..7bff5e943 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{2013.03.16 14:44}
+\edef\contextversion{2013.03.16 22:44}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 8f4e9590f..63e848a76 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.03.16 14:44}
+\edef\contextversion{2013.03.16 22:44}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/font-otd.lua b/tex/context/base/font-otd.lua
index 9a654fb6b..fceb0cf01 100644
--- a/tex/context/base/font-otd.lua
+++ b/tex/context/base/font-otd.lua
@@ -50,10 +50,10 @@ function otf.setdynamics(font,attribute)
         local dynamics = fontdynamics[font]
         dynamic = contextmerged[attribute] or 0
         local script, language
-        if dynamic == 2 then
+        if dynamic == 2 then -- merge
             language  = features.language or fontproperties[font].language or "dflt"
             script    = features.script   or fontproperties[font].script   or "dflt"
-        else
+        else -- if dynamic == 1 then -- replace
             language  = features.language or "dflt"
             script    = features.script   or "dflt"
         end
diff --git a/tex/context/base/lang-ini.mkiv b/tex/context/base/lang-ini.mkiv
index c6e9af394..3226c1255 100644
--- a/tex/context/base/lang-ini.mkiv
+++ b/tex/context/base/lang-ini.mkiv
@@ -387,12 +387,12 @@
 \let\dohyphens\relax
 
 \unexpanded\def\lang_basics_synchronize_min_max
-  { % these values are stored along with glyph nodes
-    \lefthyphenmin \numexpr0\languageparameter\s!lefthyphenmin +\hyphenminoffset\relax
-    \righthyphenmin\numexpr0\languageparameter\s!righthyphenmin+\hyphenminoffset\relax
-    % these values are stored with the language (global!)
-    \prehyphenchar \languageparameter\s!righthyphenchar\relax
-    \posthyphenchar\languageparameter\s!lefthyphenchar \relax}
+  {% these values are stored along with glyph nodes
+   \lefthyphenmin \numexpr0\languageparameter\s!lefthyphenmin +\hyphenminoffset\relax
+   \righthyphenmin\numexpr0\languageparameter\s!righthyphenmin+\hyphenminoffset\relax
+   % these values are stored with the language (global!)
+   \prehyphenchar \languageparameter\s!righthyphenchar\relax
+   \posthyphenchar\languageparameter\s!lefthyphenchar \relax}
 
 \appendtoks
     \lang_basics_synchronize_min_max
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 2fab5f861..204a6f2ba 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 307a4c0fc..1f12a5f7d 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 b29f8b17d..c535acd71 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  : 03/16/13 14:44:57
+-- merge date  : 03/16/13 22:44:21
 
 do -- begin closure to overcome local limits and interference