Merge pull request #517 from voldyman/master

[#509] svg2rects.py can now handle multiple scripts

diff --git a/devtools/svg2rects.py b/devtools/svg2rects.py
index d36ec7a3b1070df13f459f2fc46c29eb26003823..9cd867a9c61b5ad8062fea4424afeb2a3d8cf6d6 100644 (file)
--- a/devtools/svg2rects.py
+++ b/devtools/svg2rects.py
@@ -149,15 +149,15 @@ def save_scripts(svg_root, output_file):
         h = script.attrib['height']
         color = color_from_style(script.attrib['style'])
         output_file.write("%s %s %s %s %s\n" % (x, y, w, h, color))
-        # TODO(#509): script may have more than one child
-        [title] = [child for child in script]
-        command_line = title.text.split()
-        with open(command_line[0], 'r') as script_file:
-            script_lines = script_file.read().splitlines()
-            output_file.write("%d\n" % (len(script_lines) + 1))
-            output_file.write("(set args %s)\n" % list_as_sexpr(command_line[1:]))
-            for script_line in script_lines:
-                output_file.write("%s\n" % script_line)
+
+        for title in script:
+            command_line = title.text.split()
+            with open(command_line[0], 'r') as script_file:
+                script_lines = script_file.read().splitlines()
+                output_file.write("%d\n" % (len(script_lines) + 1))
+                output_file.write("(set args %s)\n" % list_as_sexpr(command_line[1:]))
+                for script_line in script_lines:
+                    output_file.write("%s\n" % script_line)
 
 def svg2rects(svg_file_name, output_file_name):
     svg_tree = ET.parse(svg_file_name)

diff --git a/src/system/line_stream.c b/src/system/line_stream.c
index 312f61889cc752a76a362c06df3c0103ebf50d12..352c3c86ff9327759ed41016cd522f66afc523fb 100644 (file)
--- a/src/system/line_stream.c
+++ b/src/system/line_stream.c
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "error.h"
 #include "line_stream.h"
 #include "lt.h"
 #include "lt/lt_adapters.h"