From 39fb4bb56f5c5644aba0603c01cbad112b66273c Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Wed, 9 Feb 2011 14:18:22 +0100 Subject: Make all variables in Lua scripts local. --- share/library/Logical/and.lua | 8 ++++---- share/library/Logical/not.lua | 8 ++++---- share/library/Logical/or.lua | 8 ++++---- share/library/Misc/ground.lua | 8 ++++---- share/library/Misc/lamp.lua | 8 ++++---- share/library/Misc/power-source.lua | 8 ++++---- share/library/Misc/switch.lua | 8 ++++---- share/library/Passive/capacitor.lua | 8 ++++---- share/library/Passive/diode.lua | 8 ++++---- share/library/Passive/inductor.lua | 12 ++++++------ share/library/Passive/resistor.lua | 8 ++++---- 11 files changed, 46 insertions(+), 46 deletions(-) diff --git a/share/library/Logical/and.lua b/share/library/Logical/and.lua index 57f7325..c169075 100644 --- a/share/library/Logical/and.lua +++ b/share/library/Logical/and.lua @@ -1,18 +1,18 @@ -- Symbol name -names = +local names = { en = "AND", cs = "AND" } -- Render area in base units (X1, Y1, X2, Y2) -area = {-4, -2, 5, 2} +local area = {-4, -2, 5, 2} -- Terminals -terminals = {{-4, -1}, {-4, 1}, {5, 0}} +local terminals = {{-4, -1}, {-4, 1}, {5, 0}} -- Rendering -render = function (cr) +local render = function (cr) -- The main shape cr.move_to (-2, -2) cr.line_to (1, -2) diff --git a/share/library/Logical/not.lua b/share/library/Logical/not.lua index 94117be..e37880e 100644 --- a/share/library/Logical/not.lua +++ b/share/library/Logical/not.lua @@ -1,18 +1,18 @@ -- Symbol name -names = +local names = { en = "NOT", cs = "NOT" } -- Render area in base units (X1, Y1, X2, Y2) -area = {-4, -2, 4, 2} +local area = {-4, -2, 4, 2} -- Terminals -terminals = {{-4, 0}, {4, 0}} +local terminals = {{-4, 0}, {4, 0}} -- Rendering -render = function (cr) +local render = function (cr) -- The triangle cr.move_to (-2, -2) cr.line_to (2, 0) diff --git a/share/library/Logical/or.lua b/share/library/Logical/or.lua index b0f76fc..49ccd6c 100644 --- a/share/library/Logical/or.lua +++ b/share/library/Logical/or.lua @@ -1,18 +1,18 @@ -- Symbol name -names = +local names = { en = "OR", cs = "OR" } -- Render area in base units (X1, Y1, X2, Y2) -area = {-4, -2, 5, 2} +local area = {-4, -2, 5, 2} -- Terminals -terminals = {{-4, -1}, {-4, 1}, {5, 0}} +local terminals = {{-4, -1}, {-4, 1}, {5, 0}} -- Rendering -render = function (cr) +local render = function (cr) -- The main shape cr.move_to (-2, -2) cr.line_to (0, -2) diff --git a/share/library/Misc/ground.lua b/share/library/Misc/ground.lua index fdcf593..0c36240 100644 --- a/share/library/Misc/ground.lua +++ b/share/library/Misc/ground.lua @@ -1,18 +1,18 @@ -- Symbol name -names = +local names = { en = "Ground", cs = "Zem" } -- Render area in base units (X1, Y1, X2, Y2) -area = {-1, -1, 1, 2} +local area = {-1, -1, 1, 2} -- Terminals -terminals = {{0, -1}} +local terminals = {{0, -1}} -- Rendering -render = function (cr) +local render = function (cr) -- The vertical line cr.move_to (0, -1) cr.line_to (0, 0.5) diff --git a/share/library/Misc/lamp.lua b/share/library/Misc/lamp.lua index b662cec..9ecf9ea 100644 --- a/share/library/Misc/lamp.lua +++ b/share/library/Misc/lamp.lua @@ -1,18 +1,18 @@ -- Symbol name -names = +local names = { en = "Lamp", cs = "Světelný zdroj" } -- Render area in base units (X1, Y1, X2, Y2) -area = {-2, -1, 2, 1} +local area = {-2, -1, 2, 1} -- Terminals -terminals = {{-2, 0}, {2, 0}} +local terminals = {{-2, 0}, {2, 0}} -- Rendering -render = function (cr) +local render = function (cr) -- The circle cr.save () diff --git a/share/library/Misc/power-source.lua b/share/library/Misc/power-source.lua index 8fd98bb..00a8498 100644 --- a/share/library/Misc/power-source.lua +++ b/share/library/Misc/power-source.lua @@ -1,18 +1,18 @@ -- Symbol name -names = +local names = { en = "Power source", cs = "Zdroj napětí" } -- Render area in base units (X1, Y1, X2, Y2) -area = {-1, -2, 1, 2} +local area = {-1, -2, 1, 2} -- Terminals -terminals = {{-1, 0}, {1, 0}} +local terminals = {{-1, 0}, {1, 0}} -- Rendering -render = function (cr) +local render = function (cr) -- The vertical lines cr.move_to (-0.2, -1) cr.line_to (-0.2, 1) diff --git a/share/library/Misc/switch.lua b/share/library/Misc/switch.lua index 9d59fdf..c4d031e 100644 --- a/share/library/Misc/switch.lua +++ b/share/library/Misc/switch.lua @@ -1,18 +1,18 @@ -- Symbol name -names = +local names = { en = "Switch", cs = "Spínač" } -- Render area in base units (X1, Y1, X2, Y2) -area = {-2, -1.5, 2, 0} +local area = {-2, -1.5, 2, 0} -- Terminals -terminals = {{-2, 0}, {2, 0}} +local terminals = {{-2, 0}, {2, 0}} -- Rendering -render_normal = function (cr) +local render_normal = function (cr) -- The switch contact cr.move_to (1.3, -1.3) cr.line_to (-1, 0) diff --git a/share/library/Passive/capacitor.lua b/share/library/Passive/capacitor.lua index 2263786..c6abc28 100644 --- a/share/library/Passive/capacitor.lua +++ b/share/library/Passive/capacitor.lua @@ -1,18 +1,18 @@ -- Symbol name -names = +local names = { en = "Capacitor", cs = "Kondenzátor" } -- Render area in base units (X1, Y1, X2, Y2) -area = {-2, -1, 2, 1} +local area = {-2, -1, 2, 1} -- Terminals -terminals = {{-2, 0}, {2, 0}} +local terminals = {{-2, 0}, {2, 0}} -- Rendering -render = function (cr) +local render = function (cr) -- The vertical lines cr.move_to (-0.2, -1) cr.line_to (-0.2, 1) diff --git a/share/library/Passive/diode.lua b/share/library/Passive/diode.lua index f363b45..06e9b16 100644 --- a/share/library/Passive/diode.lua +++ b/share/library/Passive/diode.lua @@ -1,18 +1,18 @@ -- Symbol name -names = +local names = { en = "Diode", cs = "Dioda" } -- Render area in base units (X1, Y1, X2, Y2) -area = {-2, -1, 2, 1} +local area = {-2, -1, 2, 1} -- Terminals -terminals = {{-2, 0}, {2, 0}} +local terminals = {{-2, 0}, {2, 0}} -- Rendering -render = function (cr) +local render_normal = function (cr) -- The triangle cr.move_to (-1, -1) cr.line_to (1, 0) diff --git a/share/library/Passive/inductor.lua b/share/library/Passive/inductor.lua index 91ba8c2..b94f357 100644 --- a/share/library/Passive/inductor.lua +++ b/share/library/Passive/inductor.lua @@ -1,24 +1,24 @@ -- Symbol names -names_normal = +local names_normal = { en = "Inductor", cs = "Cívka" } -names_core = +local names_core = { en = "Inductor with magnetic core", cs = "Cívka s magnetickým jádrem" } -- Render area in base units (X1, Y1, X2, Y2) -area = {-2, -1, 2, 0} +local area = {-2, -1, 2, 0} -- Terminals -terminals = {{-2, 0}, {2, 0}} +local terminals = {{-2, 0}, {2, 0}} -- Rendering -render_normal = function (cr) +local render_normal = function (cr) -- The arcs cr.arc (-1.5, 0, 0.5, math.pi, 0) cr.arc (-0.5, 0, 0.5, math.pi, 0) @@ -27,7 +27,7 @@ render_normal = function (cr) cr.stroke () end -render_core = function (cr) +local render_core = function (cr) render_normal (cr) -- The core diff --git a/share/library/Passive/resistor.lua b/share/library/Passive/resistor.lua index 6173e0c..262969b 100644 --- a/share/library/Passive/resistor.lua +++ b/share/library/Passive/resistor.lua @@ -1,18 +1,18 @@ -- Symbol name -names = +local names = { en = "Resistor", cs = "Rezistor" } -- Render area in base units (X1, Y1, X2, Y2) -area = {-2, -0.5, 2, 0.5} +local area = {-2, -0.5, 2, 0.5} -- Terminals -terminals = {{-2, 0}, {2, 0}} +local terminals = {{-2, 0}, {2, 0}} -- Rendering -render = function (cr) +local render = function (cr) -- The rectangle cr.move_to (-1.5, -0.5) cr.line_to (1.5, -0.5) -- cgit v1.2.3-70-g09d2