beta 2011.10.12 16:42

15 files changed, 16 insertions, 16 deletions

diff --git a/tex/context/base/anch-pos.lua b/tex/context/base/anch-pos.lua
index dcecf3c79..3cebdd233 100644
--- a/tex/context/base/anch-pos.lua
+++ b/tex/context/base/anch-pos.lua
@@ -51,7 +51,7 @@ end
 function jobpositions.setdim(name,wd,ht,dp,plus) -- will be used when we move to sp allover
     if plus then
         tobesaved[name] = { texcount.realpageno, pdf.h, pdf.v, wd, ht, dp, plus }
-    elseif w then
+    elseif wd then
         tobesaved[name] = { texcount.realpageno, pdf.h, pdf.v, wd, ht, dp }
     else
         tobesaved[name] = { texcount.realpageno, pdf.h, pdf.v }
@@ -61,7 +61,7 @@ end
 function jobpositions.setall(name,p,x,y,wd,ht,dp,plus) -- will be used when we move to sp allover
     if plus then
         tobesaved[name] = { p, x, y, wd, ht, dp, plus }
-    elseif w then
+    elseif wd then
         tobesaved[name] = { p, x, y, wd, ht, dp }
     else
         tobesaved[name] = { p, x, y }
diff --git a/tex/context/base/anch-pos.mkiv b/tex/context/base/anch-pos.mkiv
index 45585cf03..bf7575ee3 100644
--- a/tex/context/base/anch-pos.mkiv
+++ b/tex/context/base/anch-pos.mkiv
@@ -132,13 +132,13 @@
 %    \normalexpanded{\ctxlatelua{_ptbs_['#1']={%
 %      \noexpand\realfolio,"\noexpand\lastsavedpositionx","\noexpand\lastsavedpositiony","#2","#3","#4","#5"}}}}
 
-\def\dosaveposition            #1#2#3#4{\normalexpanded{\ctxlua    {_plib_.setall("#1",#2,#3,#4)}}}
-\def\dosavepositionwhd   #1#2#3#4#5#6#7{\normalexpanded{\ctxlua    {_plib_.setall("#1",#2,#3,#4,#5,#6,#7)}}}
-\def\dosavepositionplus#1#2#3#4#5#6#7#8{\normalexpanded{\ctxlua    {_plib_.setall("#1",#2,#3,#4,#5,#6,#7,"#8")}}}
+\def\dosaveposition            #1#2#3#4{\normalexpanded{\ctxlua    {_plib_.setall("#1",\number#2,\number\dimexpr#3,\number\dimexpr#4)}}}
+\def\dosavepositionwhd   #1#2#3#4#5#6#7{\normalexpanded{\ctxlua    {_plib_.setall("#1",\number#2,\number\dimexpr#3,\number\dimexpr#4,\number\dimexpr#5,\number\dimexpr#6,\number\dimexpr#7)}}}
+\def\dosavepositionplus#1#2#3#4#5#6#7#8{\normalexpanded{\ctxlua    {_plib_.setall("#1",\number#2,\number\dimexpr#3,\number\dimexpr#4,\number\dimexpr#5,\number\dimexpr#6,\number\dimexpr#7,"#8")}}}
 
 \def\dosetposition                   #1{\normalexpanded{\ctxlatelua{_plib_.setdim("#1")}}}
-\def\dosetpositionwhd          #1#2#3#4{\normalexpanded{\ctxlatelua{_plib_.setdim("#1","#2","#3","#4")}}}
-\def\dosetpositionplus       #1#2#3#4#5{\normalexpanded{\ctxlatelua{_plib_.setdim("#1","#2","#3","#4","#5")}}}
+\def\dosetpositionwhd          #1#2#3#4{\normalexpanded{\ctxlatelua{_plib_.setdim("#1",\number\dimexpr#2,\number\dimexpr#3,\number\dimexpr#4)}}}
+\def\dosetpositionplus       #1#2#3#4#5{\normalexpanded{\ctxlatelua{_plib_.setdim("#1",\number\dimexpr#2,\number\dimexpr#3,\number\dimexpr#4,"#5")}}}
 
 % % %
 
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 49df33cd1..8e57d876f 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{2011.10.12 10:14}
+\newcontextversion{2011.10.12 16:42}
 
 %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 bf51178c4..ad5702458 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{2011.10.12 10:14}
+\newcontextversion{2011.10.12 16:42}
 
 %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 291952221..0bc4592ce 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 3359f9548..064aade26 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 4636d7a4e..ceb106492 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{2011.10.12 10:14}
+\edef\contextversion{2011.10.12 16:42}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 509e457b0..5a21958fe 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.10.12 10:14}
+\edef\contextversion{2011.10.12 16:42}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/core-uti.lua b/tex/context/base/core-uti.lua
index dc341334f..02dc1557b 100644
--- a/tex/context/base/core-uti.lua
+++ b/tex/context/base/core-uti.lua
@@ -34,7 +34,7 @@ local report_jobcontrol = logs.reporter("jobcontrol")
 job                     = job or { }
 local job               = job
 
-job.version             = 1.16
+job.version             = 1.17
 
 -- some day we will implement loading of other jobs and then we need
 -- job.jobs
diff --git a/tex/context/base/mult-chk.lua b/tex/context/base/mult-chk.lua
index ccac708b4..0c8d87a61 100644
--- a/tex/context/base/mult-chk.lua
+++ b/tex/context/base/mult-chk.lua
@@ -47,7 +47,7 @@ function interfaces.addvalidkeys(category,list)
     end
 end
 
--- weird code, looks incomplete ... probbably an experiment
+-- weird code, looks incomplete ... probably an experiment
 
 local prefix, category, keys
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 533df1129..38f7b8132 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 3ce4e99c2..10704da13 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/typo-mar.lua b/tex/context/base/typo-mar.lua
index 431523154..e9b10c22f 100644
--- a/tex/context/base/typo-mar.lua
+++ b/tex/context/base/typo-mar.lua
@@ -268,7 +268,7 @@ function margins.save(t)
     end
     if name and name ~= "" then
         if inlinestore then -- todo: inline store has to be done differently (not sparse)
-            local t = table.sortedkeys(store) for j=#t,1,-1 do local i = t[i]
+            local t = table.sortedkeys(store) for j=#t,1,-1 do local i = t[j]
                 local si = store[i]
                 if si.name == name then
                     local s = remove(store,i)
diff --git a/tex/context/base/typo-mar.mkiv b/tex/context/base/typo-mar.mkiv
index 99ed1ac0d..1ae33704c 100644
--- a/tex/context/base/typo-mar.mkiv
+++ b/tex/context/base/typo-mar.mkiv
@@ -206,7 +206,7 @@
          \let\currentmarginfirstheight\empty
        \else
          \dosetraggedcommand{\margindataparameter\c!align}%
-          % hbox is always needed
+         \setbox\nextbox\hbox\bgroup
            \vtop \bgroup
              \the\everymargindatacontent
              \dosetmargindataattributes\c!style\c!color
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 7d2846b28..c97bfabf2 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  : 10/12/11 10:14:56
+-- merge date  : 10/12/11 16:42:20
 
 do -- begin closure to overcome local limits and interference