postsvg 0.2.2 → 0.3.0

data/lib/postsvg/visitors/ps_visitor/dictionary.rb

@@ -72,14 +72,10 @@ module Postsvg
 
         def visit_maxlength(op, _ctx)
           # PS dictionaries can grow dynamically; report current size.
-          @stack << dict_size(op.operand)
-        end
-
-        def dict_size(operand)
-          case operand
-          when Hash then operand.length
-          when Model::Literals::Dictionary then operand.entries.length
-          else 0
+          case op.operand
+          when Hash then @stack << op.operand.length
+          when Model::Literals::Dictionary then @stack << op.operand.entries.length
+          else @stack << 0
           end
         end
 

data/lib/postsvg/visitors/ps_visitor/font.rb

@@ -31,25 +31,15 @@ module Postsvg
         end
 
         def visit_scalefont(op, _ctx)
-          size = op.size.to_i
+          size = op.size.to_i || op.size.to_f
           font = @stack.pop
-          base = if font.is_a?(FontRef)
-                   font
-                 else
-                   FontRef.new(name: "Helvetica",
-                               size: nil)
-                 end
+          base = font.is_a?(FontRef) ? font : FontRef.new(name: "Helvetica", size: nil)
           @stack << FontRef.new(name: base.name, size: size.to_f)
         end
 
         def visit_setfont(_op, _ctx)
           font = @stack.pop
-          ref = if font.is_a?(FontRef)
-                  font
-                else
-                  FontRef.new(name: "Helvetica",
-                              size: 12.0)
-                end
+          ref = font.is_a?(FontRef) ? font : FontRef.new(name: "Helvetica", size: 12.0)
           @graphics.update(font_name: ref.name || "Helvetica",
                            font_size: ref.size || 12.0)
         end
@@ -77,7 +67,7 @@ module Postsvg
             y: -screen_pos[:y],
             font_family: @graphics.current.font_name,
             font_size: @graphics.current.font_size,
-            color: color || Postscript::Color::BLACK,
+            color: color || Postsvg::Color::BLACK,
             transform: "scale(1 -1)",
           )
           @path.reset

data/lib/postsvg/visitors/ps_visitor/graphics_state.rb

@@ -23,14 +23,12 @@ module Postsvg
         end
 
         def visit_setlinecap(op, _ctx)
-          name = { 0 => :butt, 1 => :round, 2 => :square }.fetch(op.cap_code,
-                                                                 :butt)
+          name = { 0 => :butt, 1 => :round, 2 => :square }.fetch(op.cap_code, :butt)
           @graphics.update(line_cap: name)
         end
 
         def visit_setlinejoin(op, _ctx)
-          name = { 0 => :miter, 1 => :round, 2 => :bevel }.fetch(op.join_code,
-                                                                 :miter)
+          name = { 0 => :miter, 1 => :round, 2 => :bevel }.fetch(op.join_code, :miter)
           @graphics.update(line_join: name)
         end
 
@@ -46,6 +44,8 @@ module Postsvg
               pattern.map { |v| FormatNumber.call(v.to_f) }.join(" ")
             when Numeric
               FormatNumber.call(pattern.to_f)
+            else
+              nil
             end
           @graphics.update(dash: dash_str)
         end

data/lib/postsvg/visitors/ps_visitor/painting.rb

@@ -66,7 +66,7 @@ module Postsvg
             line_cap: ctx.line_cap,
             line_join: ctx.line_join,
             dash: ctx.dash,
-            clip_path_id: clip_path_id
+            clip_path_id: clip_path_id,
           )
         end
 

data/lib/postsvg/visitors/ps_visitor/path.rb

@@ -23,8 +23,7 @@ module Postsvg
           pos = @graphics.current.last_text_position
           base_x = pos ? pos[:x] : 0
           base_y = pos ? pos[:y] : 0
-          @graphics.update(last_text_position: { x: base_x + op.dx,
-                                                 y: base_y + op.dy })
+          @graphics.update(last_text_position: { x: base_x + op.dx, y: base_y + op.dy })
         end
 
         def visit_lineto(op, _ctx)
@@ -78,8 +77,8 @@ module Postsvg
 
           # If the current path is empty, the arc implicitly starts
           # with a moveto to its starting point.
-          if (@path.empty? || last_command_starts_with?("M")) && @path.empty?
-            @path.move_to(start_x, start_y)
+          if @path.empty? || last_command_starts_with?("M")
+            @path.move_to(start_x, start_y) if @path.empty?
           end
 
           delta = (angle2 - angle1) % 360
@@ -87,11 +86,7 @@ module Postsvg
           large_arc = delta > 180
 
           # SVG sweep flag is 1 when the arc is drawn clockwise.
-          svg_sweep = if sweep
-                        delta.positive? ? 1 : 0
-                      else
-                        0
-                      end
+          svg_sweep = sweep ? (delta.positive? ? 1 : 0) : 0
           if delta.abs < 1e-6
             # Full circle: emit two arcs.
             mid_angle = angle1 + 180

data/lib/postsvg.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "postscript"
 require "parslet"
 require "thor"
 require "nokogiri"
@@ -8,61 +7,57 @@ require "nokogiri"
 module Postsvg
   autoload :VERSION, "postsvg/version"
 
-  # ============================================================
-  # Posts created and managed by the +postscript+ gem.
-  # ============================================================
-  #
-  # `postscript` owns PS source parsing, the typed PS domain model,
-  # and the PS source serializer. The `Postscript` namespace is the
-  # canonical location; the aliases below keep existing user code
-  # working during the transition (deprecated, will be removed at
-  # postsvg 1.0).
-  #
-  # If you maintain postsvg, prefer `Postscript::*` in new code.
-
-  Source       = Postscript::Source
-  Model        = Postscript::Model
-  Serializer   = Postscript::Serializer
-  Matrix       = Postscript::Matrix
-  Color        = Postscript::Color
-  FormatNumber = Postscript::FormatNumber
-
-  ParseError              = Postscript::ParseError
-  LexError                = Postscript::LexError
-  SyntaxError             = Postscript::SyntaxError
-  StackUnderflowError     = Postscript::StackUnderflowError
-  UndefinedOperatorError  = Postscript::UndefinedOperatorError
-  RecursionLimitError     = Postscript::RecursionLimitError
-  RenderError             = Postscript::RenderError
-  SerializeError          = Postscript::SerializeError
-  ExitSignal              = Postscript::ExitSignal
-  QuitSignal              = Postscript::QuitSignal
-
-  # ============================================================
-  # Errors that originate in the SVG side (kept here, not in postscript).
-  # ============================================================
+  # Errors
   autoload :Error, "postsvg/errors"
+  autoload :ParseError, "postsvg/errors"
+  autoload :LexError, "postsvg/errors"
+  autoload :SyntaxError, "postsvg/errors"
+  autoload :RenderError, "postsvg/errors"
+  autoload :StackUnderflowError, "postsvg/errors"
+  autoload :UndefinedOperatorError, "postsvg/errors"
+  autoload :RecursionLimitError, "postsvg/errors"
+  autoload :SizeLimitError, "postsvg/errors"
   autoload :TranslationError, "postsvg/errors"
   autoload :UnsupportedElementError, "postsvg/errors"
   autoload :UnresolvedReferenceError, "postsvg/errors"
+  autoload :SerializeError, "postsvg/errors"
+  autoload :ConversionError, "postsvg/errors"
+  autoload :UnsupportedOperatorError, "postsvg/errors"
+  autoload :ExitSignal, "postsvg/errors"
+  autoload :QuitSignal, "postsvg/errors"
 
-  # Legacy alias for RenderError (postsvg 0.1 API).
-  ConversionError = RenderError
-  # Legacy alias for UndefinedOperatorError (postsvg 0.1 API).
-  UnsupportedOperatorError = UndefinedOperatorError
+  # Foundational value types
+  autoload :FormatNumber, "postsvg/format_number"
+  autoload :Matrix, "postsvg/matrix"
+  autoload :Color, "postsvg/color"
 
-  # ============================================================
-  # Rendering / SVG-side types owned by postsvg.
-  # ============================================================
+  # Source-reading layer (PS source -> Model::Program)
+  autoload :Source, "postsvg/source"
+
+  # PS domain model
+  autoload :Model, "postsvg/model"
+
+  # Graphics state
   autoload :GraphicsContext, "postsvg/graphics_context"
   autoload :GraphicsStack, "postsvg/graphics_stack"
   autoload :PathBuilder, "postsvg/path_builder"
+
+  # SVG emission (forward direction)
   autoload :SvgBuilder, "postsvg/svg_builder"
+
+  # Forward direction (PS -> SVG)
   autoload :Options, "postsvg/options"
   autoload :Renderer, "postsvg/renderer"
   autoload :Visitors, "postsvg/visitors"
+
+  # SVG domain model (reverse direction input)
   autoload :Svg, "postsvg/svg"
+
+  # Reverse direction (SVG -> PS)
   autoload :Translation, "postsvg/translation"
+  autoload :Serializer, "postsvg/serializer"
+
+  # CLI
   autoload :CLI, "postsvg/cli"
 
   # Legacy implementations retained on disk for reference. Not on the
@@ -78,7 +73,7 @@ module Postsvg
   class << self
     # PS/EPS source -> SVG string.
     def to_svg(source, **options)
-      program = Postscript::Source.parse(source)
+      program = Source.parse(source)
       Renderer.call(program, Options.new(**options))
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postsvg
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-29 00:00:00.000000000 Z
+date: 2026-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: postscript
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -188,19 +174,53 @@ files:
 - exe/postsvg
 - lib/postsvg.rb
 - lib/postsvg/cli.rb
+- lib/postsvg/color.rb
 - lib/postsvg/colors.rb
 - lib/postsvg/converter.rb
 - lib/postsvg/errors.rb
+- lib/postsvg/format_number.rb
 - lib/postsvg/graphics_context.rb
 - lib/postsvg/graphics_stack.rb
 - lib/postsvg/graphics_state.rb
 - lib/postsvg/interpreter.rb
+- lib/postsvg/matrix.rb
+- lib/postsvg/model.rb
+- lib/postsvg/model/literals.rb
+- lib/postsvg/model/literals/array.rb
+- lib/postsvg/model/literals/dictionary.rb
+- lib/postsvg/model/literals/hex.rb
+- lib/postsvg/model/literals/name.rb
+- lib/postsvg/model/literals/number.rb
+- lib/postsvg/model/literals/procedure.rb
+- lib/postsvg/model/literals/string.rb
+- lib/postsvg/model/operator.rb
+- lib/postsvg/model/operators.rb
+- lib/postsvg/model/operators/arithmetic.rb
+- lib/postsvg/model/operators/boolean.rb
+- lib/postsvg/model/operators/color.rb
+- lib/postsvg/model/operators/container.rb
+- lib/postsvg/model/operators/control_flow.rb
+- lib/postsvg/model/operators/device.rb
+- lib/postsvg/model/operators/dictionary.rb
+- lib/postsvg/model/operators/font.rb
+- lib/postsvg/model/operators/graphics_state.rb
+- lib/postsvg/model/operators/painting.rb
+- lib/postsvg/model/operators/path.rb
+- lib/postsvg/model/operators/stack.rb
+- lib/postsvg/model/operators/transformations.rb
+- lib/postsvg/model/program.rb
+- lib/postsvg/model/token.rb
 - lib/postsvg/options.rb
 - lib/postsvg/parser.rb
 - lib/postsvg/parser/postscript_parser.rb
 - lib/postsvg/parser/transform.rb
 - lib/postsvg/path_builder.rb
 - lib/postsvg/renderer.rb
+- lib/postsvg/serializer.rb
+- lib/postsvg/source.rb
+- lib/postsvg/source/ast_builder.rb
+- lib/postsvg/source/lexer.rb
+- lib/postsvg/source/operand_stack.rb
 - lib/postsvg/svg.rb
 - lib/postsvg/svg/attribute_parser.rb
 - lib/postsvg/svg/clip_path_registry.rb