beta 2012.07.19 17:52

10 files changed, 8 insertions, 7 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 0bf141f24..e6b0d555a 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.07.19 15:09}
+\newcontextversion{2012.07.19 17:52}
 
 %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 330395806..b7561d9fe 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.07.19 15:09}
+\newcontextversion{2012.07.19 17:52}
 
 %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 0a6d80f74..2d139e24e 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 ed77f9614..dbc393baa 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 23da48d6d..c59ca3c06 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.07.19 15:09}
+\edef\contextversion{2012.07.19 17:52}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 20a52a603..94d6d8343 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{2012.07.19 15:09}
+\edef\contextversion{2012.07.19 17:52}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/page-mul.mkiv b/tex/context/base/page-mul.mkiv
index 45a9dfa5c..098e91155 100644
--- a/tex/context/base/page-mul.mkiv
+++ b/tex/context/base/page-mul.mkiv
@@ -159,6 +159,7 @@
 
 \newbox        \b_page_mul_preceding
 \newdimen      \d_page_mul_preceding_height
+\newdimen      \d_page_mul_preceding_depth
 \newconditional\c_page_mul_preceding_present
 
 \newbox        \b_page_mul_preceding_rest_of_page
@@ -413,8 +414,8 @@
 \def\page_mul_flush_preceding_ongrid
   {\scratchdimen\dimexpr
      \savedpagetotal
-    -\ht\d_page_mul_preceding_height
-    -\dp\d_page_mul_preceding_depth
+    -\d_page_mul_preceding_height
+    -\d_page_mul_preceding_depth
     -\topskip
    \relax
    \box\b_page_mul_preceding
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index abb54ac7e..55b3277fe 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 7807d9756..0919a564f 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 9f64ade0c..c29f9563e 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  : 07/19/12 15:09:36
+-- merge date  : 07/19/12 17:52:05
 
 do -- begin closure to overcome local limits and interference