ea 0.6.125 → 0.6.127

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee64290319fb525469230eeb6d6f1fc2b923a8a2d82115c6f297d98d0d90e10b
-  data.tar.gz: 76d8ead072a4ea88a2429cc506ecc410a62cd5755688b53d88cf5df41866fbc7
+  metadata.gz: 78f923bf1924106f7e6853841f3470c198e6ed0c9198e4501acd63aa3e84b3b6
+  data.tar.gz: 46975a9dd5d9f80c027a4b7f906abb2dfaff6d7bfdcc8b0af82f3ce390f6a2c6
 SHA512:
-  metadata.gz: 43f49df97683830c845d3124dbc36de402fa482c3c90362477d594087e5c8267083aae48e81bdfd0c0a341a4a71b729b75d7ba26245dc2e9001895333237dc2b
-  data.tar.gz: fe1b7a4c60545649fbabb1d24312959ba1a74f0c73b9e299d3518c0e7c4b7ae166843481c12a523398b704805c999fbb1d692bfb051faf53b6603e08299069a4
+  metadata.gz: e9b5fcacddafe90bac1b21015a6649227fd9676e01e8f5367e9eec96c0eac8712ff6303e49fadfa1d3db0c19c648eec056030ddcdb0e8d68609191502fd26193
+  data.tar.gz: 3f95877c62d6dc05b74096bba8ecd49961a2c40bd363a98fde2d5e27f53a31e43ecb871a210e010ef5721b7c6e4d58c2cd94c6bf16e3826a712e80c1f0f7055e

data/lib/ea/sources/qea/diagram_builder/routing.rb

@@ -555,7 +555,7 @@ module Ea
           end
 
           # A width-2 Mode 3 route without a tree style keeps authored orthogonal
-          # bends: two corners for Associations, three or more for Aggregations.
+          # bends: two corners for Associations, two or more for Aggregations.
           # Each end docks on
           # the 1px outline its adjacent leg points at, from the corner's own
           # coordinate; any end that cannot do so leaves the route unchanged.
@@ -569,7 +569,13 @@ module Ea
 
             first = outline_dock(corners[0], corners[1], source)
             last = outline_dock(corners[-1], corners[-2], target)
-            [first, *corners, last] if first && last
+            return nil unless distinct_stair_docks?(corners, first, last)
+
+            [first, *corners, last]
+          end
+
+          def distinct_stair_docks?(corners, first, last)
+            first && last && first != corners.first && last != corners.last
           end
 
           def stair_style?(link_row, connector)
@@ -579,7 +585,7 @@ module Ea
           end
 
           def stair_corner_count?(corners, connector_type)
-            connector_type == "Association" ? corners.size == 2 : corners.size >= 3
+            connector_type == "Association" ? corners.size == 2 : corners.size >= 2
           end
 
           # Every leg is non-zero and runs along the opposite axis of the last.

data/lib/ea/svg/ea_emitter/compartment/instance_slots.rb

@@ -70,7 +70,7 @@ module Ea
             content = "#{slot.name} #{slot.op} #{slot.value}"
             TextRenderer.new(
               content: content,
-              x: bounds.x + (context.theme.attribute_spec.content_x_offset || 26),
+              x: bounds.x + content_x_offset(context),
               y: y_pos,
               family: context.family, size: context.size,
               size_unit: context.size_unit, logical_height: context.logical_height, fill: fill
@@ -78,6 +78,16 @@ module Ea
           end
           module_function :line_text
 
+          def content_x_offset(context)
+            offset = context.theme.attribute_spec.content_x_offset || 26
+            if Ea::Fonts::Metrics.compact_compartment_font?(context.size,
+                                                            family: context.family, unit: context.size_unit)
+              offset -= 1
+            end
+            offset
+          end
+          module_function :content_x_offset
+
           def subtitle_text(text, bounds, y_pos, context, fill)
             estimated_width = text.length * context.size * 0.5
             x_pos = bounds.x + (bounds.width - estimated_width) / 2.0

data/lib/ea/svg/ea_emitter/element/legend_renderer.rb

@@ -154,18 +154,11 @@ module Ea
             (block_left + (block_right - block_left - title_text_width.round) / 2.0).floor
           end
 
-          CJK_RANGE = /[\u3000-\u9fff\uff00-\uffef]/
-
-          # Real font metrics when available; legacy per-char
-          # estimate otherwise (families without metric tables).
           def estimated_width(text, size, weight: nil, logical_height: nil, text_family: family)
-            measured = Ea::Fonts::Metrics.text_length(text, size, family: text_family, weight: weight,
-                                                                  logical_height: logical_height)
-            return measured if measured
-
-            text.to_s.each_char.sum do |ch|
-              ch.match?(CJK_RANGE) ? size * 0.70 : size * 0.612
-            end
+            TextRenderer.estimate_width(
+              text, size, family: text_family, weight: weight,
+                          logical_height: logical_height
+            ).round
           end
 
           def widest_item_label_width

data/lib/ea/version.rb

@@ -4,5 +4,5 @@ module Ea
   # Gem release version. Extracted to its own file so the
   # `gem-release` tool's `gem bump` can find and update it via the
   # standard `lib/<gem>/version.rb` convention.
-  VERSION = "0.6.125"
+  VERSION = "0.6.127"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.125
+  version: 0.6.127
 platform: ruby
 authors:
 - Ribose Inc.