From 299ce010bd8f2f5a65e4fa5a033a122b318b8c83 Mon Sep 17 00:00:00 2001
From: Přemysl Janouch <p.janouch@gmail.com>
Date: Fri, 11 Feb 2011 18:37:00 +0100
Subject: Update the symbol library.

* Add bipolar, IGFET and JFET transistors.
* Add more variants to some symbols.
* Add a symbol for a simple terminal.
* Avoid unneccessary stroke() calls.
* Fix comments.
---
 share/library/Logical/and.lua | 8 +++-----
 share/library/Logical/not.lua | 8 +++-----
 share/library/Logical/or.lua  | 7 +++----
 3 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'share/library/Logical')

diff --git a/share/library/Logical/and.lua b/share/library/Logical/and.lua
index c169075..4da8aad 100644
--- a/share/library/Logical/and.lua
+++ b/share/library/Logical/and.lua
@@ -8,7 +8,7 @@ local names =
 -- Render area in base units (X1, Y1, X2, Y2)
 local area = {-4, -2, 5, 2}
 
--- Terminals
+-- Terminal points
 local terminals = {{-4, -1}, {-4, 1}, {5, 0}}
 
 -- Rendering
@@ -19,19 +19,17 @@ local render = function (cr)
 	cr.arc (1, 0, 2, math.pi * 1.5, math.pi * 0.5)
 	cr.line_to (-2, 2)
 	cr.close_path ()
-	cr.stroke ()
 
-	-- The contacts
+	-- The terminals
 	cr.move_to (-4, -1)
 	cr.line_to (-2, -1)
-	cr.stroke ()
 
 	cr.move_to (-4, 1)
 	cr.line_to (-2, 1)
-	cr.stroke ()
 
 	cr.move_to (3, 0)
 	cr.line_to (5, 0)
+
 	cr.stroke ()
 end
 
diff --git a/share/library/Logical/not.lua b/share/library/Logical/not.lua
index e37880e..89d2a2a 100644
--- a/share/library/Logical/not.lua
+++ b/share/library/Logical/not.lua
@@ -8,7 +8,7 @@ local names =
 -- Render area in base units (X1, Y1, X2, Y2)
 local area = {-4, -2, 4, 2}
 
--- Terminals
+-- Terminal points
 local terminals = {{-4, 0}, {4, 0}}
 
 -- Rendering
@@ -18,20 +18,18 @@ local render = function (cr)
 	cr.line_to (2, 0)
 	cr.line_to (-2, 2)
 	cr.close_path ()
-	cr.stroke ()
 
 	-- The circle
 	cr.new_sub_path ()
 	cr.arc (2.25, 0, 0.25, 0, 2 * math.pi)
-	cr.stroke ()
 
-	-- The contacts
+	-- The terminals
 	cr.move_to (-4, 0)
 	cr.line_to (-2, 0)
-	cr.stroke ()
 
 	cr.move_to (2.5, 0)
 	cr.line_to (4, 0)
+
 	cr.stroke ()
 end
 
diff --git a/share/library/Logical/or.lua b/share/library/Logical/or.lua
index 49ccd6c..96d4f76 100644
--- a/share/library/Logical/or.lua
+++ b/share/library/Logical/or.lua
@@ -8,7 +8,7 @@ local names =
 -- Render area in base units (X1, Y1, X2, Y2)
 local area = {-4, -2, 5, 2}
 
--- Terminals
+-- Terminal points
 local terminals = {{-4, -1}, {-4, 1}, {5, 0}}
 
 -- Rendering
@@ -22,7 +22,7 @@ local render = function (cr)
 	cr.curve_to (-1, 1, -1, -1, -2, -2)
 	cr.stroke ()
 
-	-- The contacts
+	-- The terminals
 	cr.save ()
 
 	-- Crop the contacts according to
@@ -36,12 +36,11 @@ local render = function (cr)
 
 	cr.move_to (-4, -1)
 	cr.line_to (-1, -1)
-	cr.stroke ()
 
 	cr.move_to (-4, 1)
 	cr.line_to (-1, 1)
-	cr.stroke ()
 
+	cr.stroke ()
 	cr.restore ()
 
 	cr.move_to (3, 0)
-- 
cgit v1.2.3-70-g09d2