1 files changed, 92 insertions, 15 deletions
diff --git a/tex/context/base/l-os.lua b/tex/context/base/l-os.lua
index 05ca0acdc..7f3fd7caf 100644
--- a/tex/context/base/l-os.lua
+++ b/tex/context/base/l-os.lua
@@ -127,7 +127,13 @@ function io.popen  (...) ioflush() return iopopen(...) end
 
 function os.resultof(command)
     local handle = io.popen(command,"r")
-    return handle and handle:read("*all") or ""
+    if handle then
+        local result = handle:read("*all") or ""
+        handle:close()
+        return result
+    else
+        return ""
+    end
 end
 
 if not io.fileseparator then
@@ -172,19 +178,21 @@ if not os.times then -- ?
     end
 end
 
-os.gettimeofday = os.gettimeofday or os.clock
 
-local startuptime = os.gettimeofday()
+local gettimeofday = os.gettimeofday or os.clock
+os.gettimeofday    = gettimeofday
+
+local startuptime = gettimeofday()
 
 function os.runtime()
-    return os.gettimeofday() - startuptime
+    return gettimeofday() - startuptime
 end
 
---~ print(os.gettimeofday()-os.time())
---~ os.sleep(1.234)
---~ print (">>",os.runtime())
---~ print(os.date("%H:%M:%S",os.gettimeofday()))
---~ print(os.date("%H:%M:%S",os.time()))
+-- print(os.gettimeofday()-os.time())
+-- os.sleep(1.234)
+-- print (">>",os.runtime())
+-- print(os.date("%H:%M:%S",os.gettimeofday()))
+-- print(os.date("%H:%M:%S",os.time()))
 
 -- no need for function anymore as we have more clever code and helpers now
 -- this metatable trickery might as well disappear
@@ -380,31 +388,43 @@ end
 
 local timeformat = format("%%s%s",os.timezone(true))
 local dateformat = "!%Y-%m-%d %H:%M:%S"
+local lasttime   = nil
+local lastdate   = nil
 
 function os.fulltime(t,default)
-    t = tonumber(t) or 0
+    t = t and tonumber(t) or 0
     if t > 0 then
         -- valid time
     elseif default then
         return default
     else
-        t = nil
+        t = time()
+    end
+    if t ~= lasttime then
+        lasttime = t
+        lastdate = format(timeformat,date(dateformat))
     end
-    return format(timeformat,date(dateformat,t))
+    return lastdate
 end
 
 local dateformat = "%Y-%m-%d %H:%M:%S"
+local lasttime   = nil
+local lastdate   = nil
 
 function os.localtime(t,default)
-    t = tonumber(t) or 0
+    t = t and tonumber(t) or 0
     if t > 0 then
         -- valid time
     elseif default then
         return default
     else
-        t = nil
+        t = time()
     end
-    return date(dateformat,t)
+    if t ~= lasttime then
+        lasttime = t
+        lastdate = date(dateformat,t)
+    end
+    return lastdate
 end
 
 function os.converttime(t,default)
@@ -472,3 +492,60 @@ end
 -- print(os.which("inkscape"))
 -- print(os.which("gs.exe"))
 -- print(os.which("ps2pdf"))
+
+-- These are moved from core-con.lua (as I needed them elsewhere).
+
+local function isleapyear(year)
+    return (year % 400 == 0) or ((year % 100 ~= 0) and (year % 4 == 0))
+end
+
+os.isleapyear = isleapyear
+
+-- nicer:
+--
+-- local days = {
+--     [false] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
+--     [true]  = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
+-- }
+--
+-- local function nofdays(year,month)
+--     return days[isleapyear(year)][month]
+--     return month == 2 and isleapyear(year) and 29 or days[month]
+-- end
+--
+-- more efficient:
+
+local days = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
+
+local function nofdays(year,month)
+    if not month then
+        return isleapyear(year) and 365 or 364
+    else
+        return month == 2 and isleapyear(year) and 29 or days[month]
+    end
+end
+
+os.nofdays = nofdays
+
+function os.weekday(day,month,year)
+    return date("%w",time { year = year, month = month, day = day }) + 1
+end
+
+function os.validdate(year,month,day)
+    -- we assume that all three values are set
+    -- year is always ok, even if lua has a 1970 time limit
+    if month < 1 then
+        month = 1
+    elseif month > 12 then
+        month = 12
+    end
+    if day < 1 then
+        day = 1
+    else
+        local max = nofdays(year,month)
+        if day > max then
+            day = max
+        end
+    end
+    return year, month, day
+end