kicad 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d8cfc291b0619e083673bc0239c3423c6fc9decd02348d91e99ce884dd24d39
-  data.tar.gz: df0a12ac2396bbb27f4c843e76f6c7004e8ffd8e3577c4e824be32d8717b7d91
+  metadata.gz: e944bc881b0e7a99b42b633c9df21024d42b2e30e7b457ffa6ca1a796588c04e
+  data.tar.gz: 3e85ea51ff84ceeb5568caf53bb7c52b0e63a4dc5b1e9f2d477ac436e7227482
 SHA512:
-  metadata.gz: a1907a0652b06784809b3f5c1692c2cd46f187bf0178e1389597e1f56a1142ac66d0772b1964e2b5fa4eda7ffe4ec80c38b34522188b5644d83c310550ed0fb8
-  data.tar.gz: 7b268bcc9684f36967f36b205a93706128589261cddf51abea86de5dd55b71a431fd2a25b2de6d5da2d6f2b561901669f3f46f8ab925ae72fdc2af05b674ed26
+  metadata.gz: c89b5bae3031b0d8e20ac110a32332aa9fa28d4165fffd11c83babc20a147118df8b605563eda7ce20bd564beccfcdd9e5291f473ac038bec9c19fa55a189e00
+  data.tar.gz: b790349787e1c3badd597ffc4be397e472f41c55c2a7c189552bc9373ad2132102f71dbc20ec52291344bda9706f52cddfb9589d74b0357c82573b45bfc8260a

data/lib/kicad/ast.rb

@@ -16,6 +16,19 @@ module KiCad
         ")\n"
       end
 
+      # A replacement for a Node#emit that wants descendents compacted
+      def emit_compacting depth = 0
+        "\t"*depth + emit_compact + "\n"
+      end
+
+      def emit_compact
+        '(' +
+        [ @values.map{|v| String === v ? v.inspect : v.to_s },
+          @children.map{|c| c.emit_compact() }
+        ].flatten*' ' +
+        ')'
+      end
+
       # Define setter and getter methods for each value type this class allows
       def self.value_types vts
         i = 1   # @values[0] is always the class symbol
@@ -87,12 +100,21 @@ module KiCad
     end
 
     class Generator < Node
+      def emit depth = 0
+        emit_compacting depth
+      end
     end
 
     class GeneratorVersion < Node
+      def emit depth = 0
+        emit_compacting depth
+      end
     end
 
     class Version < Node
+      def emit depth = 0
+        emit_compacting depth
+      end
     end
 
     # Uncomment or add whatever class you need to customise:
@@ -100,6 +122,10 @@ module KiCad
     # Position Identifier
     class At < Node
       value_types :x => Float, :y => Float, :angle => Float
+
+      def emit depth = 0
+        emit_compacting depth
+      end
     end
 
     # Coordinate Point List
@@ -115,6 +141,10 @@ module KiCad
     # Stroke Definition
     class Stroke < Node
       child_types :width, :type, :color
+
+      def emit depth = 0
+        emit_compacting depth
+      end
     end
 
     class Width < Node
@@ -132,10 +162,26 @@ module KiCad
     # Text Effects
     class Effects < Node
       child_types :font, :justify, :hide
+
+      def emit depth = 0
+        if @children.size <= 1
+          emit_compacting depth
+        else
+          super
+        end
+      end
     end
 
     class Font < Node
       child_types :face, :size, :thickness, :bold, :italic, :line_spacing
+
+      def emit depth = 0
+        if @children.size <= 1
+          emit_compacting depth
+        else
+          super
+        end
+      end
     end
 
     class Face < Node
@@ -232,6 +278,11 @@ module KiCad
 
     class Fill < Node
       value_types :fill => [:no, :yes]
+      child_types :type
+
+      def emit depth = 0
+        emit_compacting depth
+      end
     end
 
     class Arc < Node
@@ -366,10 +417,18 @@ module KiCad
     class PinNumbers < Node
       # This is a child node, not as documented (a value in https://dev-docs.kicad.org/en/file-formats/sexpr-intro/)
       child_types :hide
+
+      def emit depth = 0
+        emit_compacting depth
+      end
     end
 
     class PinNames < Node
       child_types :offset, :hide
+
+      def emit depth = 0
+        emit_compacting depth
+      end
     end
 
     class InBom < Node

data/lib/kicad/version.rb

@@ -1,3 +1,3 @@
 module KiCad
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kicad
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Clifford Heath