beta 2013.08.05 22:51

11 files changed, 62 insertions, 26 deletions

diff --git a/scripts/context/lua/mtx-context.lua b/scripts/context/lua/mtx-context.lua
index 87ed3475d..3934cec25 100644
--- a/scripts/context/lua/mtx-context.lua
+++ b/scripts/context/lua/mtx-context.lua
@@ -975,15 +975,29 @@ local obsolete_results = {
 }
 
 local temporary_runfiles = {
-    "tui", "tua", "tup", "ted", "tes", "top",
-    "log", "tmp", "run", "bck", "rlg",
-    "mpt", "mpx", "mpd", "mpo", "mpb", "ctl",
-    "synctex", "synctex.gz", "pgf",
-    "prep",
+    "tui",                             -- mkii two pass file
+    "tua",                             -- mkiv obsolete
+    "tup", "ted", "tes",               -- texexec
+    "top",                             -- mkii options file
+    "log",                             -- tex log file
+    "tmp",                             -- mkii buffer file
+    "run",                             -- mkii stub
+    "bck",                             -- backup (obsolete)
+    "rlg",                             -- resource log
+    "ctl",                             --
+    "mpt", "mpx", "mpd", "mpo", "mpb", -- metafun
+    "prep",                            -- context preprocessed
+    "synctex", "synctex.gz",           -- synctex
+    "pgf",                             -- tikz
+    "aux", "blg",                      -- bibtex
 }
 
 local persistent_runfiles = {
-    "tuo", "tub", "top", "tuc"
+    "tuo", -- mkii two pass file
+    "tub", -- mkii buffer file
+    "top", -- mkii options file
+    "tuc", -- mkiv two pass file
+    "bbl", -- bibtex
 }
 
 local special_runfiles = {
diff --git a/scripts/context/lua/mtx-rsync.lua b/scripts/context/lua/mtx-rsync.lua
index 70a82e929..53cabbe4f 100644
--- a/scripts/context/lua/mtx-rsync.lua
+++ b/scripts/context/lua/mtx-rsync.lua
@@ -92,19 +92,26 @@ else
     end
 end
 
-function rsynccommand(origin,target,dryrun,recurse,delete)
-    local command = "rsync -t -p "
+function rsynccommand(origin,target,dryrun,recurse,delete,exclude)
+    local command = "rsync -t -p"
     if dryrun then
-        command = command .. "-n "
+        command = command .. " -n"
     end
     if recurse then
-        command = command .. "-r "
+        command = command .. " -r"
     end
-    if delete then
-        if not recurse then
-            command = command .. "-d "
+    if type(exclude) == "table" then
+        for i=1,#exclude do
+            local e = exclude[i]
+            if e then
+                command = command .. ' --exclude "' .. e .. '"'
+            end
         end
-        command = command .. "--delete "
+    elseif type(exclude) == "string" then
+        command = command .. " --exclude-from " .. exclude
+    end
+    if delete and recurse then
+        command = command .. " --delete"
     end
     return format('%s %s %s',command,origin,target)
 end
@@ -115,7 +122,7 @@ local rsync   = scripts.rsync
 
 rsync.mode = "command"
 
-function rsync.run(origin,target,message,recurse,delete)
+function rsync.run(origin,target,message,recurse,delete,exclude)
     if type(origin) == "table" then
         origin = concat(origin,"/")
     end
@@ -133,15 +140,15 @@ function rsync.run(origin,target,message,recurse,delete)
         report_message(message)
     end
     if rsync.mode == "dryrun" then
-        local command = rsynccommand(origin,target,true,recurse,delete)
+        local command = rsynccommand(origin,target,true,recurse,delete,exclude)
         report_dryrun(command.."\n")
         os.execute(command)
     elseif rsync.mode == "force" then
-        local command = rsynccommand(origin,target,false,recurse,delete)
+        local command = rsynccommand(origin,target,false,recurse,delete,exclude)
         report_normal(command.."\n")
         os.execute(command)
     else
-        local command = rsynccommand(origin,target,true,recurse,delete)
+        local command = rsynccommand(origin,target,true,recurse,delete,exclude)
         report_command(command)
     end
 end
@@ -161,8 +168,9 @@ function rsync.job(list)
         local message = li.message
         local recurse = li.recurse
         local delete  = li.delete
+        local exclude = li.exclude
         if origin and #origin > 0 and target and #target > 0 then -- string or table
-            rsync.run(origin,target,message,recurse,delete)
+            rsync.run(origin,target,message,recurse,delete,exclude)
         else
             report_message("invalid job specification at index %s",i)
         end
diff --git a/tex/context/base/back-pdf.lua b/tex/context/base/back-pdf.lua
index f810151a8..dc6f6b06f 100644
--- a/tex/context/base/back-pdf.lua
+++ b/tex/context/base/back-pdf.lua
@@ -41,8 +41,8 @@ function commands.pdfstartrotation(a)
         insert(stack,false)
     else
         local s, c = sind(a), cosd(a)
-        context(pdfsetmatrix(f_rotation(c,s,-s,c)))
-        insert(stack,{ -c, -s, s, -c })
+        context(pdfsetmatrix(c,s,-s,c))
+        insert(stack,{ c, -s, s, c })
     end
 end
 
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 055a449cd..a5fdf91d7 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.08.05 10:01}
+\newcontextversion{2013.08.05 22:51}
 
 %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 dafe2c186..d1aaca936 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 09afdc8e4..abad00ead 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.08.05 10:01}
+\edef\contextversion{2013.08.05 22:51}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/lpdf-nod.lua b/tex/context/base/lpdf-nod.lua
index e820cd820..6b104d2fa 100644
--- a/tex/context/base/lpdf-nod.lua
+++ b/tex/context/base/lpdf-nod.lua
@@ -78,7 +78,21 @@ function nodepool.pdfsetmatrix(rx,sx,sy,ry,tx,ty)
         elseif ry == 0 then
             ry = 0.0001
         end
-        t.data = formatters["%s %s %s %s"](rx,sx or 0,sy or 0,ry) -- todo: tx ty
+        if not sx then
+            sx = 0
+        end
+        if not sy then
+            sy = 0
+        end
+        if sx == 0 and sy == 0 then
+            if rx == 1 and ry == 1 then
+                t.data = "1 0 0 1"
+            else
+                t.data = formatters["%0.6f 0 0 %0.6f"](rx,ry)
+            end
+        else
+            t.data = formatters["%0.6f %0.6f %0.6f %0.6f"](rx,sx,sy,ry)
+        end
     end
     return t
 end
diff --git a/tex/context/base/s-inf-03.pdf b/tex/context/base/s-inf-03.pdf
index 8a631462b..5a4ec2f39 100644
--- a/tex/context/base/s-inf-03.pdf
+++ b/tex/context/base/s-inf-03.pdf
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 5dd1312b6..e77908f5f 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log
index 063113e76..2de381436 100644
--- a/tex/context/base/status-lua.log
+++ b/tex/context/base/status-lua.log
@@ -1,6 +1,6 @@
 (cont-yes.mkiv
 
-ConTeXt  ver: 2013.08.05 10:01 MKIV beta  fmt: 2013.8.5  int: english/english
+ConTeXt  ver: 2013.08.05 22:51 MKIV beta  fmt: 2013.8.5  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index a8ae7835f..04c817c7b 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  : 08/05/13 10:01:32
+-- merge date  : 08/05/13 22:51:02
 
 do -- begin closure to overcome local limits and interference