Change how Cairo is presented to Lua scripts.

Makes the whole thing a bit more stable and less weird.

3 files changed, 46 insertions, 46 deletions

diff --git a/share/library/Logical/and.lua b/share/library/Logical/and.lua
index da09cfe..8c4477f 100644
--- a/share/library/Logical/and.lua
+++ b/share/library/Logical/and.lua
@@ -17,23 +17,23 @@ local terminals = {{-4, -1}, {-4, 1}, {5, 0}}
 -- Rendering
 local render = function (cr)
 	-- The main shape
-	cr.move_to (-2, -2)
-	cr.line_to (1, -2)
-	cr.arc (1, 0, 2, math.pi * 1.5, math.pi * 0.5)
-	cr.line_to (-2, 2)
-	cr.close_path ()
+	cr:move_to (-2, -2)
+	cr:line_to (1, -2)
+	cr:arc (1, 0, 2, math.pi * 1.5, math.pi * 0.5)
+	cr:line_to (-2, 2)
+	cr:close_path ()
 
 	-- The terminals
-	cr.move_to (-4, -1)
-	cr.line_to (-2, -1)
+	cr:move_to (-4, -1)
+	cr:line_to (-2, -1)
 
-	cr.move_to (-4, 1)
-	cr.line_to (-2, 1)
+	cr:move_to (-4, 1)
+	cr:line_to (-2, 1)
 
-	cr.move_to (3, 0)
-	cr.line_to (5, 0)
+	cr:move_to (3, 0)
+	cr:line_to (5, 0)
 
-	cr.stroke ()
+	cr:stroke ()
 end
 
 -- Register the symbol
diff --git a/share/library/Logical/not.lua b/share/library/Logical/not.lua
index 8153e4a..44e4cc3 100644
--- a/share/library/Logical/not.lua
+++ b/share/library/Logical/not.lua
@@ -17,23 +17,23 @@ local terminals = {{-4, 0}, {4, 0}}
 -- Rendering
 local render = function (cr)
 	-- The triangle
-	cr.move_to (-2, -2)
-	cr.line_to (2, 0)
-	cr.line_to (-2, 2)
-	cr.close_path ()
+	cr:move_to (-2, -2)
+	cr:line_to (2, 0)
+	cr:line_to (-2, 2)
+	cr:close_path ()
 
 	-- The circle
-	cr.new_sub_path ()
-	cr.arc (2.25, 0, 0.25, 0, 2 * math.pi)
+	cr:new_sub_path ()
+	cr:arc (2.25, 0, 0.25, 0, 2 * math.pi)
 
 	-- The terminals
-	cr.move_to (-4, 0)
-	cr.line_to (-2, 0)
+	cr:move_to (-4, 0)
+	cr:line_to (-2, 0)
 
-	cr.move_to (2.5, 0)
-	cr.line_to (4, 0)
+	cr:move_to (2.5, 0)
+	cr:line_to (4, 0)
 
-	cr.stroke ()
+	cr:stroke ()
 end
 
 -- Register the symbol
diff --git a/share/library/Logical/or.lua b/share/library/Logical/or.lua
index a7ff4bf..18aabab 100644
--- a/share/library/Logical/or.lua
+++ b/share/library/Logical/or.lua
@@ -17,38 +17,38 @@ local terminals = {{-4, -1}, {-4, 1}, {5, 0}}
 -- Rendering
 local render = function (cr)
 	-- The main shape
-	cr.move_to (-2, -2)
-	cr.line_to (0, -2)
-	cr.curve_to (2, -2, 3, 0, 3, 0)
-	cr.curve_to (3, 0, 2, 2, 0, 2)
-	cr.line_to (-2, 2)
-	cr.curve_to (-1, 1, -1, -1, -2, -2)
-	cr.stroke ()
+	cr:move_to (-2, -2)
+	cr:line_to (0, -2)
+	cr:curve_to (2, -2, 3, 0, 3, 0)
+	cr:curve_to (3, 0, 2, 2, 0, 2)
+	cr:line_to (-2, 2)
+	cr:curve_to (-1, 1, -1, -1, -2, -2)
+	cr:stroke ()
 
 	-- The terminals
-	cr.save ()
+	cr:save ()
 
 	-- Crop the contacts according to
 	-- the left side of the main shape
-	cr.move_to (-4, 2)
-	cr.line_to (-2, 2)
-	cr.curve_to (-1, 1, -1, -1, -2, -2)
-	cr.line_to (-4, -2)
-	cr.close_path ()
-	cr.clip ()
+	cr:move_to (-4, 2)
+	cr:line_to (-2, 2)
+	cr:curve_to (-1, 1, -1, -1, -2, -2)
+	cr:line_to (-4, -2)
+	cr:close_path ()
+	cr:clip ()
 
-	cr.move_to (-4, -1)
-	cr.line_to (-1, -1)
+	cr:move_to (-4, -1)
+	cr:line_to (-1, -1)
 
-	cr.move_to (-4, 1)
-	cr.line_to (-1, 1)
+	cr:move_to (-4, 1)
+	cr:line_to (-1, 1)
 
-	cr.stroke ()
-	cr.restore ()
+	cr:stroke ()
+	cr:restore ()
 
-	cr.move_to (3, 0)
-	cr.line_to (5, 0)
-	cr.stroke ()
+	cr:move_to (3, 0)
+	cr:line_to (5, 0)
+	cr:stroke ()
 end
 
 -- Register the symbol