v250111.1

Author: graham-trott

dist/easycoder-250110.1-py2.py3-none-any.whl renamed to dist/easycoder-250111.1-py2.py3-none-any.whl

@@ -10,4 +10,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250110.1"
+__version__ = "250111.1"

dist/easycoder-250110.1.tar.gz renamed to dist/easycoder-250111.1.tar.gz

@@ -18,6 +18,7 @@ class Program:
 
 	def __init__(self, argv):
 		global queue
+		print(f'EasyCoder version {version("easycoder")}')
 		if len(argv) == 0:
 			print('No script supplied')
 			exit()
@@ -106,7 +107,7 @@ def processClasses(self):
 			handler = clazz(self.compiler)
 			self.domains.append(handler)
 			self.domainIndex[handler.getName()] = handler
-	
+
 	# Get the domain list
 	def getDomains(self):
 		return self.domains
@@ -278,7 +279,7 @@ def tokenise(self, script):
 					script.tokens.append(Token(lino, token))
 					token = ''
 		return
-	
+
 	def releaseParent(self):
 		if self.parent.waiting and self.parent.program.running:
 			self.parent.waiting = False
@@ -288,7 +289,7 @@ def releaseParent(self):
 	def flush(self, pc):
 		global queue
 		self.pc = pc
-		while True:
+		while self.running:
 			command = self.code[self.pc]
 			domainName = command['domain']
 			if domainName == None:
@@ -323,7 +324,7 @@ def run(self, pc):
 		item.program = self
 		item.pc = pc
 		queue.append(item)
-	
+
 	def kill(self):
 		self.running = False
 
@@ -374,7 +375,7 @@ def compare(self, value1, value2):
 		if v1 < v2:
 			return -1
 		return 0
-	
+
 	# Set up a message handler
 	def onMessage(self, pc):
 		self.onMessagePC = pc
@@ -386,7 +387,6 @@ def handleMessage(self, message):
 
 # This is the program launcher
 def Main():
-	print(f'EasyCoder version {version("easycoder")}')
 	if (len(sys.argv) > 1):
 		Program(sys.argv[1]).start()
 	else:

easycoder/__init__.py

@@ -99,7 +99,7 @@ def r_render(self, command):
                 else: count += 1.0
             if count > max: max = count
         # Divide the keyboard width by the number of buttons to get the button size
-        # The basic key is always a square
+        # The basic key is a square (1:1)
         bs = w / max
         # Compute the keyboard height
         h = bs * nrows
@@ -114,6 +114,7 @@ def r_render(self, command):
         spec['height'] = h
         buttons = []
         list = []
+        spans = [0] * nrows
         by = h
         for r in range(0, nrows):
             by -= bs
@@ -134,6 +135,11 @@ def r_render(self, command):
                 buttons.append(button)
                 list.append(id)
                 bx += width
+            spans[r] = round(bx)
+        # Check the rows are all the same length
+        for r in range(1, nrows):
+            if spans[r] != spans[0]:
+                RuntimeError(self.program, f'Row {r} has a different span to previous row(s)')
         spec['#'] = list
         for n in range(0, len(list)):
             spec[list[n]] = buttons[n]

easycoder/ec_program.py

@@ -1,4 +1,3 @@
-
 [
     {
         "face": "plugins/keyboards/qwerty-0.png",