From 8ae17f2c95dc1d7a5595f9f2d8ec91e61cd37e28 Mon Sep 17 00:00:00 2001
From: Marius <mariausol@gmail.com>
Date: Tue, 25 Sep 2012 23:00:14 +0300
Subject: beta 2012.09.25 21:44

---
 scripts/context/lua/mtxrun.lua         | 7 ++++++-
 scripts/context/stubs/mswin/mtxrun.lua | 7 ++++++-
 scripts/context/stubs/unix/mtxrun      | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 360a99fdc..0d8f3ac50 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -4133,7 +4133,9 @@ function boolean.tonumber(b)
 end
 
 function toboolean(str,tolerant)
-    if tolerant then
+    if str == true or str == false then
+        return str
+    elseif tolerant then
         local tstr = type(str)
         if tstr == "string" then
             return str == "true" or str == "yes" or str == "on" or str == "1" or str == "t"
@@ -4894,6 +4896,9 @@ function table.fastserialize(t,prefix)
 end
 
 function table.deserialize(str)
+    if not str or str == "" then
+        return
+    end
     local code = loadstring(str)
     if not code then
         return
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 360a99fdc..0d8f3ac50 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -4133,7 +4133,9 @@ function boolean.tonumber(b)
 end
 
 function toboolean(str,tolerant)
-    if tolerant then
+    if str == true or str == false then
+        return str
+    elseif tolerant then
         local tstr = type(str)
         if tstr == "string" then
             return str == "true" or str == "yes" or str == "on" or str == "1" or str == "t"
@@ -4894,6 +4896,9 @@ function table.fastserialize(t,prefix)
 end
 
 function table.deserialize(str)
+    if not str or str == "" then
+        return
+    end
     local code = loadstring(str)
     if not code then
         return
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 360a99fdc..0d8f3ac50 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -4133,7 +4133,9 @@ function boolean.tonumber(b)
 end
 
 function toboolean(str,tolerant)
-    if tolerant then
+    if str == true or str == false then
+        return str
+    elseif tolerant then
         local tstr = type(str)
         if tstr == "string" then
             return str == "true" or str == "yes" or str == "on" or str == "1" or str == "t"
@@ -4894,6 +4896,9 @@ function table.fastserialize(t,prefix)
 end
 
 function table.deserialize(str)
+    if not str or str == "" then
+        return
+    end
     local code = loadstring(str)
     if not code then
         return
-- 
cgit v1.2.3