postsvg 0.3.0 → 0.3.1

data/CLAUDE.md

@@ -4,7 +4,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## What this is
 
-`postsvg` is a pure-Ruby bidirectional converter between PostScript/EPS and SVG. Both directions are implemented in the 0.2.x line; the SVg→PS direction is newer. The PS side uses a hand-written lexer + stack-machine interpreter; the SVG side uses Nokogiri. There is no Ghostscript, Inkscape, or other external renderer.
+`postsvg` is a pure-Ruby bidirectional converter between PostScript/EPS and SVG. Both directions are implemented in the 0.2.x line; the SVg→PS direction is newer. The PS side uses a hand-written lexer + stack-machine interpreter; the SVG side uses leptris. There is no Ghostscript, Inkscape, or other external renderer.
 
 Code architecture mirrors `emfsvg`: a typed `Model::Program` value object is the single source of truth, with a Renderer / Visitor visiting it to emit SVG, and a Serializer walking it to emit PS.
 
@@ -27,6 +27,30 @@ bundle exec ruby exe/postsvg batch     INPUT_DIR         [OUTPUT_DIR]
 bundle exec ruby exe/postsvg version
 ```
 
+## Round-trip contract
+
+The `round_trip` tag selects the model comparison, SVG summary comparison,
+and byte-pinned emitted-PostScript golden checks:
+
+```bash
+bundle exec rspec --tag round_trip
+bundle exec rake round_trip:regenerate_goldens
+```
+
+These specs also run in the normal CI suite. The regeneration task rewrites
+the `.ps.golden` beside every SVG listed in
+`spec/fixtures/round_trip/manifest.yml`. Regenerate only for intentional output
+changes, inspect the diffs, and include them in a reviewed PR; never edit
+goldens by hand.
+
+Manifest `known_gap` and `non_goal` markers are **strict pending**, scoped to
+the `model` or `svg` leg. They do not skip comparisons: an unexpected pass
+fails the suite and requires reviewing/removing the marker. `known_gap`
+identifies a bug requiring follow-up; `non_goal` records intentional loss
+(currently gradient paint flattening). Unmarked legs must pass, and golden
+checks apply even to marked fixtures. See the README Round-trip section for
+the supported subset, comparison precision and parser-callable parity hook.
+
 ## Architecture
 
 ```
@@ -54,7 +78,7 @@ PS/EPS bytes ──▶│ Postsvg::Lexer       │
                 │                 │
                 ▼                 │
         SVG string               │
-                │ Nokogiri       │
+                │ leptris        │
                 ▼                 │
       ┌─────────────────┐         │
       │ Postsvg::       │         │
@@ -163,7 +187,7 @@ Errors: `Postsvg::ParseError`, `LexError`, `SyntaxError`, `RenderError`, `StackU
 
 ## Dependencies
 
-- `parslet`, `thor`, `nokogiri`, `lutaml/canon` (dev only, for XML matcher in integration specs) — see `Gemfile`.
+- `parslet`, `thor`, `leptris`, `lutaml/canon` (dev only, for XML matcher in integration specs) — see `Gemfile`.
 
 ## Limitations
 

data/Gemfile

@@ -4,8 +4,8 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "canon", github: "lutaml/canon", branch: "main"
-gem "nokogiri"
+gem "canon"
+gem "leptris", ">= 1.9.399.0"
 gem "rake"
 gem "rspec"
 gem "rubocop"

data/README.adoc

@@ -225,8 +225,9 @@ equivalent PS `arc` operator.
 
 === Round-trip
 
-The same `Model::Program` value object sits behind both directions, so
-round-trip is a function composition:
+The round-trip contract covers a pinned SVG corpus, with per-fixture
+expectations in link:spec/fixtures/round_trip/manifest.yml[manifest.yml].
+The conversion is a function composition:
 
 [source,ruby]
 ----
@@ -236,10 +237,67 @@ original_svg = File.read("input.svg")
 ps = Postsvg.to_ps(original_svg)
 round_tripped_svg = Postsvg.to_svg(ps)
 
-# round_tripped_svg preserves the geometry of original_svg for the
-# supported subset of SVG elements.
 ----
 
+The gate checks two legs independently:
+
+* *Normalized model diff*: `RoundTrip::Harness` compares the program built
+  from SVG with the program parsed from its serialized PostScript. The
+  normalizer compares operators and operand values, rounding floats to the
+  serializer's four decimal places.
+* *SVG summary diff*: `RoundTrip::SvgSummary` compares the original SVG with
+  the returned SVG as painted geometry in document coordinates. It checks
+  fill, stroke, stroke width, line caps and joins, transforms, and text
+  content, position, font family and size. Numbers are rounded to two decimal
+  places; equivalent shape/path spellings and the renderer's Y-flip wrapper
+  are normalized. This is not a byte-for-byte SVG or pixel-rendering test.
+
+Covered families are shapes (rectangles, polygons, polylines, line and curve
+paths), line strokes, arcs (circles, ellipses and path arcs), gray/RGB fills,
+combined fill and stroke, stroke styles, text, transforms (translation,
+rotation, matrices and nested groups), and gradients. Coverage does not mean
+every family preserves everything: the manifest records known SVG-leg gaps
+for polyline fill, path arcs and matrix shear. Text checks do not promise font
+metrics or glyph fidelity. Features outside the corpus are not guaranteed by
+this gate.
+
+The manifest is authoritative for exceptions on each leg. `known_gap` marks
+a bug; `non_goal` marks intentional loss. Linear and radial gradient `url()`
+paint is intentionally flattened to a plain fill (currently black), so gradient
+preservation is a non-goal even though the model leg passes. Both markers are
+strict pending: the comparison still runs, and an unexpected pass fails so
+the marker must be reviewed and removed when appropriate.
+
+The `round_trip` spec tag selects the contract and emitted-PostScript golden
+checks, which also run in the normal CI spec suite. Every manifest fixture has
+a byte-pinned `.ps.golden`; even marked fixtures must match their golden.
+For an intentional output change, regenerate with:
+
+[source,sh]
+----
+bundle exec rake round_trip:regenerate_goldens
+----
+
+Review the resulting diffs and submit them with the change in a reviewed PR.
+Do not edit goldens by hand or regenerate them merely to silence a regression.
+
+For `postscript#4` parser parity, the test-support hook
+`RoundTrip::Harness.call(svg, parser: candidate_parser)` accepts a callable
+that receives serialized PS source and returns a compatible program. It
+defaults to `Postscript::Source.parse` and returns an empty diff on a match,
+or indexed expected/actual normalized records on a mismatch. This lets a
+candidate parser reuse the same model contract without changing the public
+conversion API.
+
+The model contract also runs every manifest fixture with
+`Postscript::Source.parse(source, engine: :native)`, comparing normalized
+programs against both Ruby parsing and the emitted model. Run it with
+`bundle exec rspec spec/postsvg/round_trip_contract_spec.rb --tag native`.
+When the installed postscript lacks the native API or its optional parsanol
+native engine is unavailable, examples skip with an explicit reason. These
+skips do not establish native parity; see
+`spec/fixtures/round_trip/README.adoc` for prerequisites and marker behavior.
+
 == Command-line interface
 
 [[cli]]

data/Rakefile

@@ -3,12 +3,29 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"
+require "yaml"
 
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
 task default: %i[spec rubocop]
 
+namespace :round_trip do
+  desc "Regenerate pinned PostScript output for the round-trip corpus"
+  task :regenerate_goldens do
+    require "postsvg"
+
+    root = File.expand_path("spec/fixtures/round_trip", __dir__)
+    manifest = YAML.safe_load_file(File.join(root, "manifest.yml"))
+
+    manifest.fetch("fixtures").each do |entry|
+      svg_path = File.join(root, entry.fetch("file"))
+      golden_path = svg_path.sub(/\.svg\z/, ".ps.golden")
+      File.binwrite(golden_path, Postsvg.to_ps(File.read(svg_path)))
+    end
+  end
+end
+
 # Link checking tasks
 namespace :check do
   desc "Check internal documentation links only (recommended for CI)"

data/gemfiles/native-parity/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+eval_gemfile "../../Gemfile"
+
+# Drop this CI-only overlay once postscript releases NativeEngine and
+# parsanol/parsanol-ruby#354 ships a fix for previously baked grammars.
+gem "parsanol", "1.3.109"
+gem "postscript", git: "https://github.com/claricle/postscript.git", branch: "main"

data/lib/postsvg/cli.rb

@@ -8,7 +8,8 @@ module Postsvg
   class CLI < Thor
     package_name "postsvg"
 
-    desc "convert INPUT [OUTPUT]", "Convert PostScript/EPS file to SVG (legacy alias for to-svg)"
+    desc "convert INPUT [OUTPUT]",
+         "Convert PostScript/EPS file to SVG (legacy alias for to-svg)"
     long_desc <<~DESC
       Convert a PostScript (.ps) or Encapsulated PostScript (.eps) file to SVG.
 
@@ -20,7 +21,8 @@ module Postsvg
         $ postsvg convert input.eps > output.svg
     DESC
     def convert(input_path, output_path = nil)
-      handle_input(input_path, output_path, method(:read_ps_to_svg), direction: "PS/EPS -> SVG")
+      handle_input(input_path, output_path, method(:read_ps_to_svg),
+                   direction: "PS/EPS -> SVG")
     end
 
     desc "to-svg INPUT [OUTPUT]", "Convert PostScript/EPS to SVG"
@@ -42,7 +44,8 @@ module Postsvg
         $ postsvg to-ps input.svg > output.ps
     DESC
     def to_ps(input_path, output_path = nil)
-      handle_input(input_path, output_path, method(:read_svg_to_ps), direction: "SVG -> PS")
+      handle_input(input_path, output_path, method(:read_svg_to_ps),
+                   direction: "SVG -> PS")
     end
 
     desc "to-eps INPUT [OUTPUT]", "Convert SVG to Encapsulated PostScript"
@@ -51,10 +54,12 @@ module Postsvg
       suitable for embedding.
     DESC
     def to_eps(input_path, output_path = nil)
-      handle_input(input_path, output_path, method(:read_svg_to_eps), direction: "SVG -> EPS")
+      handle_input(input_path, output_path, method(:read_svg_to_eps),
+                   direction: "SVG -> EPS")
     end
 
-    desc "batch INPUT_DIR [OUTPUT_DIR]", "Convert all PS/EPS/SVG files in a directory"
+    desc "batch INPUT_DIR [OUTPUT_DIR]",
+         "Convert all PS/EPS/SVG files in a directory"
     long_desc <<~DESC
       Auto-detects direction by file extension:
 

data/lib/postsvg/graphics_context.rb

@@ -60,7 +60,8 @@ module Postsvg
         font_name: overrides.fetch(:font_name, @font_name),
         font_size: overrides.fetch(:font_size, @font_size),
         clip_paths: overrides.fetch(:clip_paths, @clip_paths),
-        last_text_position: overrides.fetch(:last_text_position, @last_text_position),
+        last_text_position: overrides.fetch(:last_text_position,
+                                            @last_text_position),
         fill_rule: overrides.fetch(:fill_rule, @fill_rule),
       )
     end

data/lib/postsvg/interpreter.rb

@@ -334,9 +334,8 @@ module Postsvg
     end
 
     def flush_path(mode)
-      # rubocop:disable Style/ZeroLengthPredicate
+      # rubocop:disable-next Style/ZeroLengthPredicate
       return if @path.length.zero?
-      # rubocop:enable Style/ZeroLengthPredicate
 
       d = @path.to_path
       path_str = emit_svg_path(d, @g_state, mode)

data/lib/postsvg/options.rb

@@ -22,7 +22,7 @@ module Postsvg
       {
         eps: @eps, width: @width, height: @height,
         viewbox_override: @viewbox_override, verbose: @verbose,
-        page_size: @page_size,
+        page_size: @page_size
       }
     end
   end

data/lib/postsvg/parser/postscript_parser.rb

@@ -38,7 +38,7 @@ module Postsvg
         (str("\\") >> any) | (str(")").absent? >> any)
       end
       rule(:string) do
-        (str("(") >> string_char.repeat.as(:string) >> str(")"))
+        str("(") >> string_char.repeat.as(:string) >> str(")")
       end
 
       # Operators and keywords
@@ -49,16 +49,16 @@ module Postsvg
 
       # Arrays
       rule(:array) do
-        (str("[") >> whitespace? >>
-         value.repeat.as(:array) >>
-         whitespace? >> str("]"))
+        str("[") >> whitespace? >>
+          value.repeat.as(:array) >>
+          whitespace? >> str("]")
       end
 
       # Procedures (code blocks in curly braces)
       rule(:procedure) do
-        (str("{") >> whitespace? >>
-         statement.repeat.as(:procedure) >>
-         whitespace? >> str("}"))
+        str("{") >> whitespace? >>
+          statement.repeat.as(:procedure) >>
+          whitespace? >> str("}")
       end
 
       # Values

data/lib/postsvg/renderer.rb

@@ -13,7 +13,10 @@ module Postsvg
     attr_reader :program, :options, :builder, :visitor
 
     def initialize(program, options)
-      raise ArgumentError, "program must be a Model::Program" unless program.is_a?(Model::Program)
+      unless program.is_a?(Model::Program)
+        raise ArgumentError,
+              "program must be a Model::Program"
+      end
 
       @program = program
       @options = options
@@ -25,7 +28,7 @@ module Postsvg
       open_svg
       wrap_y_flip do
         visitor.visit_program(program)
-      rescue Postsvg::QuitSignal
+      rescue Postscript::QuitSignal
         # PS +quit+ ends program execution; suppress and finalize SVG.
       end
       builder.close_svg
@@ -62,7 +65,8 @@ module Postsvg
         [viewbox, width, height]
       else
         width, height = options.page_size
-        ["0 0 #{FormatNumber.call(width)} #{FormatNumber.call(height)}", width, height]
+        ["0 0 #{FormatNumber.call(width)} #{FormatNumber.call(height)}", width,
+         height]
       end
     end
 

data/lib/postsvg/svg/clip_path_registry.rb

@@ -34,7 +34,9 @@ module Postsvg
           # Concatenate the d attributes of all child <path> elements
           # in document order. Other shape children are converted to
           # path data lazily; for now we only support <path>.
-          ds = node.xpath(".//*[local-name()='path']").map { |p| p["d"] }.compact
+          ds = node.xpath(".//*[local-name()='path']").filter_map do |p|
+            p["d"]
+          end
           registry[id] = ds.join(" ") unless ds.empty?
         end
         new(registry)

data/lib/postsvg/svg/element.rb

@@ -6,7 +6,7 @@ module Postsvg
     # carry typed semantic fields; the base provides a uniform interface
     # for the translation layer's dispatch.
     #
-    # Element instances are immutable: built once from a Nokogiri node
+    # Element instances are immutable: built once from a leptris node
     # via the .from_node factory. The node is not retained.
     #
     # Every element exposes `children`, `transform`, `clip_path_id`,
@@ -62,7 +62,9 @@ module Postsvg
           return subclass.from_node(node) if subclass
 
           OpenElement.new(name: node.name,
-                          children: node.element_children.map { |c| from_node(c) })
+                          children: node.element_children.map do |c|
+                            from_node(c)
+                          end)
         end
       end
     end

data/lib/postsvg/svg/elements/ellipse.rb

@@ -9,7 +9,8 @@ module Postsvg
 
         attr_reader :cx, :cy, :rx, :ry, :fill, :stroke_paint, :stroke
 
-        def initialize(cx:, cy:, rx:, ry:, fill:, stroke_paint:, stroke:, **rest)
+        def initialize(cx:, cy:, rx:, ry:, fill:, stroke_paint:, stroke:,
+**rest)
           super(**rest)
           @cx = cx
           @cy = cy

data/lib/postsvg/svg/elements/svg.rb

@@ -9,7 +9,8 @@ module Postsvg
 
         attr_reader :viewbox, :width, :height, :children
 
-        def initialize(viewbox: nil, width: nil, height: nil, children: [], **rest)
+        def initialize(viewbox: nil, width: nil, height: nil, children: [],
+**rest)
           super(**rest)
           @viewbox = viewbox
           @width = width

data/lib/postsvg/svg/paint.rb

@@ -15,7 +15,7 @@ module Postsvg
         end
 
         color = begin
-          ::Postsvg::Color.parse(text.to_s)
+          ::Postscript::Color.parse(text.to_s)
         rescue ArgumentError
           nil
         end

data/lib/postsvg/svg/parser.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "leptris"
 
 module Postsvg
   module Svg
-    # Parses an SVG document via Nokogiri and produces an Svg::Document.
+    # Parses an SVG document via leptris and produces an Svg::Document.
     # Pure: no I/O, no global state.
     class Parser
       def self.call(svg_string)
-        doc = Nokogiri::XML(svg_string, &:noblanks)
+        doc = Leptris::XML.parse(svg_string, options: Leptris::XML::ParseOptions.noblanks)
         root = doc.root
         raise TranslationError, "no root element in SVG" unless root
 

data/lib/postsvg/svg/path_data/parser.rb

@@ -10,7 +10,7 @@ module Postsvg
         module_function
 
         COMMAND_RE = /([MmLlHhVvCcSsQqTtAaZz])/
-        ARG_RE = /(-?\d+(?:\.\d+)?(?:[eE][-+]?\d+)?)/.freeze
+        ARG_RE = /(-?\d+(?:\.\d+)?(?:[eE][-+]?\d+)?)/
 
         def parse(text)
           return [] if text.nil? || text.empty?
@@ -36,7 +36,11 @@ module Postsvg
               commands << Command.new(opcode: opcode, args: args)
               i += consumed
               # After moveto, implicit lineto for subsequent tuples.
-              opcode = (opcode == "M") ? "L" : (opcode == "m" ? "l" : opcode)
+              opcode = if opcode == "M"
+                         "L"
+                       else
+                         (opcode == "m" ? "l" : opcode)
+                       end
               # For H/V/Z, no implicit repetition.
               break if %w[H V Z h v z].include?(opcode)
             end
@@ -57,12 +61,12 @@ module Postsvg
         end
 
         def tokenize(text)
-          text.to_s.gsub(/-/, " -")
-               .scan(/([MmLlHhVvCcSsQqTtAaZz])|(-?\d+(?:\.\d+)?(?:[eE][-+]?\d+)?)/)
-               .flatten.compact
+          text.to_s.gsub("-", " -")
+            .scan(/([MmLlHhVvCcSsQqTtAaZz])|(-?\d+(?:\.\d+)?(?:[eE][-+]?\d+)?)/)
+            .flatten.compact
         end
 
-        NUMBER_ONLY_RE = /\A-?\d+(?:\.\d+)?(?:[eE][-+]?\d+)?\z/.freeze
+        NUMBER_ONLY_RE = /\A-?\d+(?:\.\d+)?(?:[eE][-+]?\d+)?\z/
 
         def take_args(tokens, start, count)
           args = []

data/lib/postsvg/svg/stroke.rb

@@ -14,10 +14,12 @@ module Postsvg
           if dasharray_raw && dasharray_raw != "none"
             AttributeParser.number_list(dasharray_raw)
           end
-        dashoffset = AttributeParser.number(node["stroke-dashoffset"], default: 0.0)
+        dashoffset = AttributeParser.number(node["stroke-dashoffset"],
+                                            default: 0.0)
         linecap = (node["stroke-linecap"] || "butt").to_sym
         linejoin = (node["stroke-linejoin"] || "miter").to_sym
-        miterlimit = AttributeParser.number(node["stroke-miterlimit"], default: 10.0)
+        miterlimit = AttributeParser.number(node["stroke-miterlimit"],
+                                            default: 10.0)
         new(width: width, dasharray: dasharray, dashoffset: dashoffset,
             linecap: linecap, linejoin: linejoin, miterlimit: miterlimit)
       end

data/lib/postsvg/svg/transform_list.rb

@@ -3,7 +3,7 @@
 module Postsvg
   module Svg
     # Parsed SVG transform attribute. Produces a list of
-    # Postsvg::Matrix instances that, multiplied in order, give the
+    # Postscript::Matrix instances that, multiplied in order, give the
     # composite CTM for the element.
     class TransformList
       attr_reader :matrices

data/lib/postsvg/svg.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Postsvg
-  # SVG domain model. Built once from a Nokogiri-parsed document;
+  # SVG domain model. Built once from a leptris-parsed document;
   # consumed by the Translation layer (SVG -> PS).
   #
   # Svg::* value objects know nothing about PostScript. Their job is

data/lib/postsvg/svg_builder.rb

@@ -11,9 +11,9 @@ module Postsvg
   # - <defs> block orders clipPaths, gradients, then patterns by
   #   registration order so output is reproducible.
   class SvgBuilder
-    CLIP_PREFIX = "clip".freeze
-    GRADIENT_PREFIX = "grad".freeze
-    PATTERN_PREFIX = "pattern".freeze
+    CLIP_PREFIX = "clip"
+    GRADIENT_PREFIX = "grad"
+    PATTERN_PREFIX = "pattern"
 
     def initialize
       @buffer = String.new(capacity: 4096)
@@ -132,7 +132,7 @@ module Postsvg
     def path(d:, mode:, color: nil, stroke_color: nil,
              stroke_width: nil, line_cap: nil, line_join: nil,
              dash: nil, clip_path_id: nil, fill_id: nil)
-      attrs = +"d=\"#{d}\""
+      attrs = "d=\"#{d}\""
 
       attrs << case mode
                when :fill
@@ -140,7 +140,8 @@ module Postsvg
                when :stroke
                  %( fill="none" stroke="#{color_attr(stroke_color || color)}")
                when :fill_and_stroke
-                 "#{fill_attr(color, fill_id)} stroke=\"#{color_attr(stroke_color || color)}\""
+                 "#{fill_attr(color,
+                              fill_id)} stroke=\"#{color_attr(stroke_color || color)}\""
                else
                  %( fill="none" stroke="none")
                end
@@ -184,7 +185,10 @@ module Postsvg
 
     def close_svg
       raise RenderError, "svg not open" unless @svg_open
-      raise RenderError, "unclosed groups: #{@group_depth}" if @group_depth.positive?
+      if @group_depth.positive?
+        raise RenderError,
+              "unclosed groups: #{@group_depth}"
+      end
 
       @buffer << "<defs>\n" unless @clip_paths.empty? && @gradients.empty? && @patterns.empty?
       @buffer << @defs_buffer
@@ -239,11 +243,11 @@ module Postsvg
 
     def escape(text)
       text.to_s
-          .gsub("&", "&amp;")
-          .gsub("<", "&lt;")
-          .gsub(">", "&gt;")
-          .gsub('"', "&quot;")
-          .gsub("'", "&#39;")
+        .gsub("&", "&amp;")
+        .gsub("<", "&lt;")
+        .gsub(">", "&gt;")
+        .gsub('"', "&quot;")
+        .gsub("'", "&#39;")
     end
   end
 end

data/lib/postsvg/translation/arc_converter.rb

@@ -11,7 +11,7 @@ module Postsvg
 
       module_function
 
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
+      # rubocop:disable-next Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
       def endpoint_to_center(x1:, y1:, rx:, ry:, x_axis_rotation:,
                              large_arc:, sweep:, x2:, y2:)
         rx = rx.abs
@@ -26,8 +26,8 @@ module Postsvg
         # Step 1: rotate and scale (x1,y1) into the unit-circle frame.
         dx = (x1 - x2) / 2.0
         dy = (y1 - y2) / 2.0
-        x1p =  cos_phi * dx + sin_phi * dy
-        y1p = -sin_phi * dx + cos_phi * dy
+        x1p = (cos_phi * dx) + (sin_phi * dy)
+        y1p = (-sin_phi * dx) + (cos_phi * dy)
 
         # Ensure radii are large enough; if not, scale them up.
         rx_sq = rx * rx
@@ -44,17 +44,17 @@ module Postsvg
         end
 
         # Step 2: compute center (cx', cy') in the rotated frame.
-        sign = (large_arc == sweep) ? -1 : 1
-        num = rx_sq * ry_sq - rx_sq * y1p_sq - ry_sq * x1p_sq
-        den = rx_sq * y1p_sq + ry_sq * x1p_sq
+        sign = large_arc == sweep ? -1 : 1
+        num = (rx_sq * ry_sq) - (rx_sq * y1p_sq) - (ry_sq * x1p_sq)
+        den = (rx_sq * y1p_sq) + (ry_sq * x1p_sq)
         den = EPSILON if den.abs < EPSILON
         coef = sign * Math.sqrt([num / den, 0.0].max)
         cxp =  coef * (rx * y1p) / ry
         cyp = -coef * (ry * x1p) / rx
 
         # Step 3: rotate (cx', cy') back into original frame.
-        cx = cos_phi * cxp - sin_phi * cyp + (x1 + x2) / 2.0
-        cy = sin_phi * cxp + cos_phi * cyp + (y1 + y2) / 2.0
+        cx = (cos_phi * cxp) - (sin_phi * cyp) + ((x1 + x2) / 2.0)
+        cy = (sin_phi * cxp) + (cos_phi * cyp) + ((y1 + y2) / 2.0)
 
         # Step 4: compute angles.
         ux = (x1p - cxp) / rx
@@ -70,16 +70,25 @@ module Postsvg
 
         [cx, cy, rx, ry, phi, theta1 * 180.0 / Math::PI, theta2 * 180.0 / Math::PI]
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
 
       def angle_between(ux, uy, vx, vy)
-        dot = ux * vx + uy * vy
-        len = Math.sqrt((ux * ux + uy * uy) * (vx * vx + vy * vy))
+        len = vector_length(ux, uy, vx, vy)
         return 0.0 if len < EPSILON
 
-        cos_val = (dot / len).clamp(-1.0, 1.0)
-        sign = (ux * vy - uy * vx).negative? ? -1.0 : 1.0
-        sign * Math.acos(cos_val)
+        cos_val = (dot_product(ux, uy, vx, vy) / len).clamp(-1.0, 1.0)
+        cross_sign(ux, uy, vx, vy) * Math.acos(cos_val)
+      end
+
+      def vector_length(ux, uy, vx, vy)
+        Math.sqrt(((ux * ux) + (uy * uy)) * ((vx * vx) + (vy * vy)))
+      end
+
+      def dot_product(ux, uy, vx, vy)
+        (ux * vx) + (uy * vy)
+      end
+
+      def cross_sign(ux, uy, vx, vy)
+        ((ux * vy) - (uy * vx)).negative? ? -1.0 : 1.0
       end
     end
   end

data/lib/postsvg/translation/bounding_box.rb

@@ -27,11 +27,14 @@ module Postsvg
       def expand(x_range, y_range)
         return self if x_range.nil? || y_range.nil?
 
-        new_min_x = [(empty? ? x_range.begin : @min_x), x_range.begin].compact.min
+        new_min_x = [(empty? ? x_range.begin : @min_x),
+                     x_range.begin].compact.min
         new_max_x = [(empty? ? x_range.end : @max_x), x_range.end].compact.max
-        new_min_y = [(empty? ? y_range.begin : @min_y), y_range.begin].compact.min
+        new_min_y = [(empty? ? y_range.begin : @min_y),
+                     y_range.begin].compact.min
         new_max_y = [(empty? ? y_range.end : @max_y), y_range.end].compact.max
-        BoundingBox.new(min_x: new_min_x, min_y: new_min_y, max_x: new_max_x, max_y: new_max_y)
+        BoundingBox.new(min_x: new_min_x, min_y: new_min_y, max_x: new_max_x,
+                        max_y: new_max_y)
       end
 
       def to_a
@@ -51,7 +54,7 @@ module Postsvg
 
         "%s %s %s %s" % [
           FormatNumber.call(@min_x), FormatNumber.call(@min_y),
-          FormatNumber.call(@max_x), FormatNumber.call(@max_y),
+          FormatNumber.call(@max_x), FormatNumber.call(@max_y)
         ]
       end
     end