beta 2012.03.30 13:55

12 files changed, 20 insertions, 23 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 19e021c74..78cffbe6d 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.03.29 22:00}
+\newcontextversion{2012.03.30 13:55}
 
 %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 11a45c874..c867a49d3 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.03.29 22:00}
+\newcontextversion{2012.03.30 13:55}
 
 %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 0666489e4..f6208d7ce 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 f78eb0e7a..6c34340db 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 e678549e4..20209608d 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.03.29 22:00}
+\edef\contextversion{2012.03.30 13:55}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 660ef5826..6426583b4 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.03.29 22:00}
+\edef\contextversion{2012.03.30 13:55}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/spac-def.mkiv b/tex/context/base/spac-def.mkiv
index 0444fa9ef..4cd7b1d1c 100644
--- a/tex/context/base/spac-def.mkiv
+++ b/tex/context/base/spac-def.mkiv
@@ -80,14 +80,13 @@
 \setupindenting
   [\v!none]
 
-\setupvspacing % == \setupblank
-  [\v!standard,
-   \v!big]
-
-\definevspacing[\v!default]  [\v!big]      % todo: needs to adapt to \setupblank
-\definevspacing[\v!before]   [\v!default]  % but we need to avoid circular references
-\definevspacing[\v!inbetween][\v!default]  % then
-\definevspacing[\v!after]    [\v!before]
+\setupblank
+  [\v!big] % alternatively [\v!standard]
+
+\defineblank[\v!default]  [\v!big]      % todo: needs to adapt to \setupblank
+\defineblank[\v!before]   [\v!default]  % but we need to avoid circular references
+\defineblank[\v!inbetween][\v!default]  % then
+\defineblank[\v!after]    [\v!before]
 
 \setupinterlinespace
   [\c!minheight=\zeropoint, % only special purpose
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 95cb2a282..82e143583 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 bd58ddcad..15ca607e9 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-num.lua b/tex/context/base/strc-num.lua
index b74864600..0715a9e49 100644
--- a/tex/context/base/strc-num.lua
+++ b/tex/context/base/strc-num.lua
@@ -337,18 +337,16 @@ function counters.setown(name,n,value)
     end
 end
 
-function counters.restart(name,n,newstart)
+function counters.restart(name,n,newstart,noreset)
     local cd = counterdata[name]
     if cd then
         newstart = tonumber(newstart)
         if newstart then
             local d = allocate(name,n)
-if d.start == newstart then
-    -- nothing, else we do it too often in a synchronize
-else
             d.start = newstart
-            counters.reset(name,n)
-end
+            if not noreset then
+                counters.reset(name,n) -- hm
+            end
         end
     end
 end
@@ -513,7 +511,7 @@ function commands.doifnotcounter (name) commands.doifnot (counterdata[name]) end
 function commands.incrementedcounter(...) context(counters.add(...)) end
 
 function commands.checkcountersetup(name,level,start,state)
-    counters.restart(name,1,start)
+    counters.restart(name,1,start,true) -- no reset
     counters.setstate(name,state)
     counters.setlevel(name,level)
     sections.setchecker(name,level,counters.reset)
diff --git a/tex/context/base/strc-pag.mkiv b/tex/context/base/strc-pag.mkiv
index 467ff3df4..e3828464c 100644
--- a/tex/context/base/strc-pag.mkiv
+++ b/tex/context/base/strc-pag.mkiv
@@ -124,7 +124,7 @@
 \to \everyshipout
 
 \def\pushpagestate{\setxvalue{\??nm:\s!userpage:\c!state}{\counterparameter\s!userpage\c!state}}
-\def\poppagestate {\normalexpanded{\noexpand\setuppagenumber[\c!state=\getvalue{\??nm:\s!userpage:\c!state}]}}
+\def\poppagestate {\normalexpanded{\setuppagenumber[\c!state=\getvalue{\??nm:\s!userpage:\c!state}]}}
 
 \setuppagenumber
   [\c!way=\v!by\v!text,
@@ -415,7 +415,7 @@
 \appendtoks
     \edef\askeduserpagenumber{\counterparameter\s!userpage\c!number}%
     \ifx\askeduserpagenumber\empty \else
-      \normalexpanded{\noexpand\setuppagenumber[\c!start=\counterparameter\s!userpage\c!number,\c!number=]}%
+      \normalexpanded{\setuppagenumber[\c!start=\counterparameter\s!userpage\c!number,\c!number=]}%
       \userpageno\strc_counters_raw\s!userpage
     \fi
 \to \everysetupuserpagenumber % todo: set state: none, start, stop, reset
@@ -423,7 +423,7 @@
 \appendtoks
     \edef\askedsubpagenumber{\counterparameter\s!subpage\c!number}%
     \ifx\askedsubpagenumber\empty \else
-      \normalexpanded{\noexpand\setupsubpagenumber[\c!start=\counterparameter\s!subpage\c!number,\c!number=]}%
+      \normalexpanded{\setupsubpagenumber[\c!start=\counterparameter\s!subpage\c!number,\c!number=]}%
       \subpageno\strc_counters_raw\s!subpage\relax
     \fi
 \to \everysetupsubpagenumber % todo: set state: none, start, stop, reset
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e9774e8f9..bb0c91522 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/29/12 22:00:09
+-- merge date  : 03/30/12 13:55:29
 
 do -- begin closure to overcome local limits and interference