beta 2011.02.11 12:23

3 files changed, 30 insertions, 3 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 5b4fcda8e..6d901c197 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -5025,6 +5025,8 @@ if tex and tex.jobname or tex.formatname then
 
     local target       = "term and log"
 
+    logs.flush         = io.flush
+
     local formats      = { } setmetatable(formats,     valueiskey)
     local translations = { } setmetatable(translations,valueiskey)
 
@@ -5103,6 +5105,11 @@ if tex and tex.jobname or tex.formatname then
 
     settarget = function(whereto)
         target = targets[whereto or "both"] or targets.both
+        if target == "term" or target == "term and log" then
+            logs.flush = io.flush
+        else
+            logs.flush = ignore
+        end
     end
 
     local stack = { }
@@ -5128,6 +5135,8 @@ if tex and tex.jobname or tex.formatname then
 
 else
 
+    logs.flush = ignore
+
     writer = write_nl
 
     report = function(a,b,c,...)
@@ -5374,7 +5383,7 @@ function logs.stop_page_number()
     else
         report_pages("flushing page")
     end
-    io.flush()
+    logs.flush()
 end
 
 logs.report_job_stat = statistics and statistics.showjobstat
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 5b4fcda8e..6d901c197 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -5025,6 +5025,8 @@ if tex and tex.jobname or tex.formatname then
 
     local target       = "term and log"
 
+    logs.flush         = io.flush
+
     local formats      = { } setmetatable(formats,     valueiskey)
     local translations = { } setmetatable(translations,valueiskey)
 
@@ -5103,6 +5105,11 @@ if tex and tex.jobname or tex.formatname then
 
     settarget = function(whereto)
         target = targets[whereto or "both"] or targets.both
+        if target == "term" or target == "term and log" then
+            logs.flush = io.flush
+        else
+            logs.flush = ignore
+        end
     end
 
     local stack = { }
@@ -5128,6 +5135,8 @@ if tex and tex.jobname or tex.formatname then
 
 else
 
+    logs.flush = ignore
+
     writer = write_nl
 
     report = function(a,b,c,...)
@@ -5374,7 +5383,7 @@ function logs.stop_page_number()
     else
         report_pages("flushing page")
     end
-    io.flush()
+    logs.flush()
 end
 
 logs.report_job_stat = statistics and statistics.showjobstat
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 5b4fcda8e..6d901c197 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -5025,6 +5025,8 @@ if tex and tex.jobname or tex.formatname then
 
     local target       = "term and log"
 
+    logs.flush         = io.flush
+
     local formats      = { } setmetatable(formats,     valueiskey)
     local translations = { } setmetatable(translations,valueiskey)
 
@@ -5103,6 +5105,11 @@ if tex and tex.jobname or tex.formatname then
 
     settarget = function(whereto)
         target = targets[whereto or "both"] or targets.both
+        if target == "term" or target == "term and log" then
+            logs.flush = io.flush
+        else
+            logs.flush = ignore
+        end
     end
 
     local stack = { }
@@ -5128,6 +5135,8 @@ if tex and tex.jobname or tex.formatname then
 
 else
 
+    logs.flush = ignore
+
     writer = write_nl
 
     report = function(a,b,c,...)
@@ -5374,7 +5383,7 @@ function logs.stop_page_number()
     else
         report_pages("flushing page")
     end
-    io.flush()
+    logs.flush()
 end
 
 logs.report_job_stat = statistics and statistics.showjobstat