beta 2012.06.06 09:36

10 files changed, 27 insertions, 27 deletions

diff --git a/tex/context/base/anch-pgr.lua b/tex/context/base/anch-pgr.lua
index 6143d166e..aabf018fc 100644
--- a/tex/context/base/anch-pgr.lua
+++ b/tex/context/base/anch-pgr.lua
@@ -47,7 +47,7 @@ end
 
 local eps = 2
 
-local function add(t,x,y,last)
+local function add(t,x,y,last,direction)
     local n = #t
     if n == 0 then
         t[n+1] = { x, y }
@@ -66,7 +66,7 @@ local function add(t,x,y,last)
             local tm = t[n-1]
             local px = tm[1]
             local py = tm[2]
-if y > ly then
+if (direction == "down" and y > ly) or (direction == "up" and y < ly) then
     -- move back from too much hang
 else
             if abs(lx-px) <= eps and abs(lx-x) <= eps then
@@ -149,16 +149,16 @@ local function shapes(r,rx,ry,rw,rh,rd,lytop,lybot,rytop,rybot,obeyhang)
                 -- ha < 0 hi > 0 : left  top
                 if ha < 0 then
                     if hi < 0 then -- right
-                        add(rightshape,rw     , py_ph)
-                        add(rightshape,rw + hi, py_ph)
-                        add(rightshape,rw + hi, py_ph + hang)
-                        add(rightshape,rw     , py_ph + hang)
+                        add(rightshape,rw, py_ph,"up")
+                        add(rightshape,rw + hi,py_ph,"up")
+                        add(rightshape,rw + hi,py_ph + hang,"up")
+                        add(rightshape,rw, py_ph + hang,"up")
                     else
                         -- left
-                        add(leftshape,rx,      py_ph)
-                        add(leftshape,rx + hi, py_ph)
-                        add(leftshape,rx + hi, py_ph + hang)
-                        add(leftshape,rx,      py_ph + hang)
+                        add(leftshape,rx,py_ph,"down")
+                        add(leftshape,rx + hi,py_ph,"down")
+                        add(leftshape,rx + hi,py_ph + hang,"down")
+                        add(leftshape,rx,py_ph + hang,"down")
                     end
                 else
                     -- maybe some day
@@ -173,17 +173,17 @@ local function shapes(r,rx,ry,rw,rh,rd,lytop,lybot,rytop,rybot,obeyhang)
                     local step = ph + pd
                     local size = #ps * step
                     local py_ph = py + ph
-                    add(leftshape,rx,py_ph)
-                    add(rightshape,rw,py_ph)
+                    add(leftshape,rx,py_ph,"up")
+                    add(rightshape,rw,py_ph,"down")
                     for i=1,#ps do
                         local p = ps[i]
                         local l = p[1]
                         local w = p[2]
-                        add(leftshape,rx + l, py_ph)
-                        add(rightshape,rx + l + w, py_ph)
+                        add(leftshape,rx + l, py_ph,"up")
+                        add(rightshape,rx + l + w, py_ph,"down")
                         py_ph = py_ph - step
-                        add(leftshape,rx + l, py_ph)
-                        add(rightshape,rx + l + w, py_ph)
+                        add(leftshape,rx + l, py_ph,"up")
+                        add(rightshape,rx + l + w, py_ph,"down")
                     end
                     extending = true
                 elseif extending then
@@ -192,10 +192,10 @@ local function shapes(r,rx,ry,rw,rh,rd,lytop,lybot,rytop,rybot,obeyhang)
                     local pd = p.d
                     local py_ph = py + ph
                     local py_pd = py - pd
-                    add(leftshape,leftshape[#leftshape][1],py_ph)
-                    add(rightshape,rightshape[#rightshape][1],py_ph)
-                    add(leftshape,rx,py_ph)  -- shouldn't this be py_pd
-                    add(rightshape,rw,py_ph) -- shouldn't this be py_pd
+                    add(leftshape,leftshape[#leftshape][1],py_ph,"up")
+                    add(rightshape,rightshape[#rightshape][1],py_ph,"down")
+                    add(leftshape,rx,py_ph,"up")  -- shouldn't this be py_pd
+                    add(rightshape,rw,py_ph,"down") -- shouldn't this be py_pd
                     extending = false
                 end
             end
@@ -207,8 +207,8 @@ local function shapes(r,rx,ry,rw,rh,rd,lytop,lybot,rytop,rybot,obeyhang)
         leftshape[#leftshape][2] = rd
         rightshape[#rightshape][2] = rw
     else
-        add(leftshape,rx,rd)
-        add(rightshape,rw,rd)
+        add(leftshape,rx,rd,"up")
+        add(rightshape,rw,rd,"down")
     end
     return clip(leftshape,lytop,lybot), clip(rightshape,rytop,rybot)
 end
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index c21bfa3ab..f4a693fb7 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.06.06 01:05}
+\newcontextversion{2012.06.06 09:36}
 
 %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 bf03831ef..974cfe41e 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.06.06 01:05}
+\newcontextversion{2012.06.06 09:36}
 
 %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 05a65df9e..6f63f4ece 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 df021a2b3..286d7d158 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 d2ba098e6..ba18c0827 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.06.06 01:05}
+\edef\contextversion{2012.06.06 09:36}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index b241d3702..a31392f28 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.06.06 01:05}
+\edef\contextversion{2012.06.06 09:36}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 4c0eaa861..24e9bc9f8 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 450288ff9..66197fd5a 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 55f168a32..ae13c3fbb 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  : 06/06/12 01:05:21
+-- merge date  : 06/06/12 09:36:27
 
 do -- begin closure to overcome local limits and interference