kicad 0.9.5 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d8cfc291b0619e083673bc0239c3423c6fc9decd02348d91e99ce884dd24d39
-  data.tar.gz: df0a12ac2396bbb27f4c843e76f6c7004e8ffd8e3577c4e824be32d8717b7d91
+  metadata.gz: 18fb51abbed1c58f99dbd73f3f9af6b8cac11938f885eb69f1af2b767b41d084
+  data.tar.gz: 9379a13c657dfa54b433c02cba67392447a93146980d33299ffd73d8a61860ef
 SHA512:
-  metadata.gz: a1907a0652b06784809b3f5c1692c2cd46f187bf0178e1389597e1f56a1142ac66d0772b1964e2b5fa4eda7ffe4ec80c38b34522188b5644d83c310550ed0fb8
-  data.tar.gz: 7b268bcc9684f36967f36b205a93706128589261cddf51abea86de5dd55b71a431fd2a25b2de6d5da2d6f2b561901669f3f46f8ab925ae72fdc2af05b674ed26
+  metadata.gz: 9181bf9733dea2ab7483dfa622088c4604146def2cfcdd1eb249221f8a8a7b6e3dcab80cbb2075d6c3bca72cacd9d9d76e1bb3246e5c07c5210170963629de2e
+  data.tar.gz: 884bdd9984b362aee84d9a12af8843732c35d69f92836a349a1a2e1b31167226fb8985325c8b8977f8f14434c89c182b95f2ebcef8cea1efb8d4356a3d669463

data/bin/kicad_beautify.rb

@@ -0,0 +1,9 @@
+# ruby -w
+#
+# Pretty-printer for JLC libraries
+#
+require 'kicad'
+
+k = KiCad.load(ARGV[0]).value
+
+File.open('rewrite.kicad_sym', 'w') { |f| f.puts k.emit }

data/bin/kicad_dedup_symbols.rb

@@ -0,0 +1,36 @@
+# ruby -w
+#
+# Find duplicate symbol rendering in a Kicad library
+# Merged symbols must have same appearance and reference designator
+#
+require 'kicad'
+require 'debug'
+
+k = KiCad.load(ARGV[0]).value
+
+symbols_by_pretty = {}
+
+k.all_symbol.
+  each do |s|
+    child_symbols = s.all_symbol
+
+    # the key is the concatenated pretty-printed contents of all child symbols
+    key =
+      child_symbols.map do |c|
+        s['Reference'].inspect+':' +
+        c.children.filter{|e| KiCad::AST::Property === e}.map(&:emit).sort*" "
+      end.sort*"\n"
+
+    existing = symbols_by_pretty[key]
+    if existing
+      puts "#{s.id} is a dup of #{existing.id}"
+
+      # delete all child symbols, prepend extends:
+      s.children.delete_if{|c| child_symbols.include?(c)}
+      s.children.prepend(KiCad.parse("(extends #{existing.id.inspect})")&.value)
+    else
+      symbols_by_pretty[key] = s
+    end
+  end
+
+File.open('rewrite.kicad_sym', 'w') { |f| f.puts k.emit }

data/kicad.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 3.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  # spec.bindir        = "bin"
-  # spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.bindir        = "bin"
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", ">= 1.11"

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.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: kicad
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors:
 - Clifford Heath
 bindir: bin
 cert_chain: []
-date: 2025-05-11 00:00:00.000000000 Z
+date: 2025-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,9 @@ dependencies:
 description: Load and rewrite Kicad s-expression files into a tree structure for scripting
 email:
 - clifford.heath@gmail.com
-executables: []
+executables:
+- kicad_beautify.rb
+- kicad_dedup_symbols.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -89,6 +91,8 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- bin/kicad_beautify.rb
+- bin/kicad_dedup_symbols.rb
 - kicad.gemspec
 - lib/kicad.rb
 - lib/kicad/ast.rb