ea 0.6.114 → 0.6.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 251161fffac3b07a12851b0abd26a046998a61b19a9418da8c6d6ceea1cbb09f
-  data.tar.gz: 549486eec86fb19c6275db6ab7dafdcb7987c1a22b12df2740140e60c7bb2690
+  metadata.gz: 21ccebe3cc90560d4079f23a067cb41d94cbdeb87bc07873406edc97dd414c71
+  data.tar.gz: f9c39d517836ec0c8a6f737761e9f7fbc47ca49f4cfe2256aeccccfa38df4659
 SHA512:
-  metadata.gz: c5cccbc615740b54619be7e36e4c6edb6382768d97b8a120841aca69018b73e693d9dadb8480e78c9e1e0a18ccfc09122668caf9680571496d99b44372c593cd
-  data.tar.gz: 87a9b79c59a7102d10aaf4968c052f5a63c1e707ef4daf2376d1278ca79b1317e2fc7d47988d57cb09c5abe88d57aeb12b611ba7066e421a1820ce07ac7ff581
+  metadata.gz: 60a5c35a8607a8169f6e7be4866c07972b37e75f790851e36191ea4ec93a9ac8c793589fedccdbcacef456d44d96dd791687a6deb54ac7943d7d547060685072
+  data.tar.gz: b6cef3d3516f3c290ec2c1a05f138213bd3a7f2b18f0f063113f22865c89835804977c733b22f60819d7004c998dd9b98b7b244da8c70505bfb0873d1f184c7b

data/config/themes/119.yml

@@ -34,7 +34,7 @@ colors:
 
 # Stroke widths.
 strokes:
-  element_border: 2
+  element_border: 1
   connector_line: 2
   divider: 2
   marker: 2

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

@@ -144,10 +144,23 @@ module Ea
             font_italic: truthy?(style_hash[:italic]),
             font_underline: truthy?(style_hash[:ul]),
             show_tagged_values: truthy?(style_hash[:tag]),
+            line_width: effective_line_width(obj_row, style_hash),
             background_color: style_hash[:bcol]&.to_i
           )
         end
 
+        # Negative widths inherit the saved object border, then the diagram theme.
+        def effective_line_width(obj_row, style)
+          object = database.find_object(obj_row.ea_object_id)
+          [style[:lwth], object&.borderwidth].each do |raw|
+            next if raw.nil? || raw.to_s.empty?
+
+            width = raw.to_i
+            return width if width >= 0
+          end
+          nil
+        end
+
         def truthy?(raw)
           raw == "1" || raw == "-1"
         end

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

@@ -16,12 +16,17 @@ module Ea
                 legend: context.model_element.legend,
                 family: context.family
               )
-            elsif context.model_element.is_a?(Ea::Model::Package) ||
-                  context.model_element.is_a?(Ea::Model::Note)
-              # Notes keep the folder silhouette but never render a
-              # label (EA publishes note bodies only).
-              label = package_label(context.model_element) if context.model_element.is_a?(Ea::Model::Package)
-              stereotype = package_stereotype(context.model_element) if context.model_element.is_a?(Ea::Model::Package)
+            elsif context.model_element.is_a?(Ea::Model::Note)
+              Element::NoteShapeRenderer.render(
+                context.bounds,
+                body: "", fill: context.fill, stroke: context.stroke,
+                stroke_width: context.stroke_width,
+                family: context.family, size: context.size,
+                text_fill: context.text_fill
+              )
+            elsif context.model_element.is_a?(Ea::Model::Package)
+              label = package_label(context.model_element)
+              stereotype = package_stereotype(context.model_element)
               Element::PackageShapeRenderer.render(
                 context.bounds,
                 fill: context.fill, stroke: context.stroke,

data/lib/ea/svg/ea_emitter/connector_redock.rb

@@ -215,7 +215,7 @@ module Ea
         private_class_method :overlap_ray?
 
         # The QEA builder flags a model relationship drawn without any
-        # diagram link row; EA strokes it at the 2px box outline.
+        # diagram link row; its docks follow the resolved element borders.
         def default_model_connector?(connector)
           connector.style.to_h[:phantom_outline] == true && !connector.has_geometry_offsets &&
             %w[Aggregation Association].include?(connector.connector_type)
@@ -243,16 +243,32 @@ module Ea
         end
         private_class_method :border_width?
 
-        # Explicit zero-width borders keep that end on the geometric edge;
-        # absent or inherited widths retain the default outer-stroke docking.
+        # EA seats docks on whole pixels; a 1px border keeps the geometric edge.
         def outline_bounds(box, diagram, ref, duid)
-          return box if border_width?(diagram, ref, duid, 0)
-
-          Ea::Model::Bounds.new(x: box.x - 1, y: box.y - 1,
-                                width: box.width + 2, height: box.height + 2)
+          inset = (outline_width(diagram, ref, duid) / 2.0).floor
+          Ea::Model::Bounds.new(x: box.x - inset, y: box.y - inset,
+                                width: box.width + 2 * inset, height: box.height + 2 * inset)
         end
         private_class_method :outline_bounds
 
+        def outline_width(diagram, ref, duid)
+          widths = end_placements(diagram, ref, duid).map do |element|
+            effective_border_width(element, diagram)
+          end.uniq
+          widths.size == 1 ? widths.first : diagram.theme.stroke_width
+        end
+        private_class_method :outline_width
+
+        def effective_border_width(element, diagram)
+          return element.line_width if element.line_width && element.line_width >= 0
+
+          raw = element.style.to_h[:lwth]
+          return raw.to_i if raw && raw.to_i >= 0
+
+          diagram.theme.stroke_width
+        end
+        private_class_method :effective_border_width
+
         def end_placements(diagram, ref, duid)
           placed = Array(diagram&.elements).select { |el| el.model_element_ref == ref }
           named = placed.select { |el| duid && el.duid.to_s.casecmp?(duid.to_s) }

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

@@ -151,8 +151,8 @@ module Ea
 
           # Real font metrics when available; legacy per-char
           # estimate otherwise (families without metric tables).
-          def estimated_width(text, size)
-            measured = Ea::Fonts::Metrics.text_length(text, size, family: family)
+          def estimated_width(text, size, weight: nil)
+            measured = Ea::Fonts::Metrics.text_length(text, size, family: family, weight: weight)
             return measured if measured
 
             text.to_s.each_char.sum do |ch|
@@ -169,7 +169,11 @@ module Ea
           end
 
           def title_font_size
-            legend.heading_size || Ea::Model::Legend::DEFAULT_HEADING_SIZE
+            return Ea::Model::Legend::DEFAULT_HEADING_SIZE unless legend.heading_size
+
+            # HEADINGSIZE is stored in pixels; SVG legend text uses points.
+            points = legend.heading_size * 72.0 / 96
+            points == points.to_i ? points.to_i : points
           end
 
           def item_font_size
@@ -177,7 +181,7 @@ module Ea
           end
 
           def title_text_width
-            estimated_width(legend.title, title_font_size)
+            estimated_width(legend.title, title_font_size, weight: 700)
           end
 
           def build_text(content, x:, y:, size:, weight:)

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

@@ -70,13 +70,16 @@ module Ea
             %(<path d="#{d}" shape-rendering="auto"/>)
           end
 
-          # Diagonal line marking the fold.
+          # Inner edges of the folded corner; the outer path supplies the diagonal.
           def fold_line
             x = bounds.x
             y = bounds.y
             w = bounds.width
             fold = [FOLD_SIZE, w / 3, bounds.height / 3].min
-            %(<path d="M #{Canvas.coord(x + w - fold)} #{Canvas.coord(y)} L #{Canvas.coord(x + w)} #{Canvas.coord(y + fold)}" shape-rendering="auto"/>)
+            d = "M #{Canvas.coord(x + w - fold)} #{Canvas.coord(y)} " \
+                "L #{Canvas.coord(x + w - fold)} #{Canvas.coord(y + fold)} " \
+                "L #{Canvas.coord(x + w)} #{Canvas.coord(y + fold)}"
+            %(<path d="#{d}" shape-rendering="auto"/>)
           end
 
           def text_block

data/lib/ea/svg/ea_emitter/elements.rb

@@ -273,7 +273,7 @@ module Ea
             classifier: classifier,
             fill: resolve_fill(element, classifier),
             stroke: resolve_stroke,
-            stroke_width: resolve_stroke_width,
+            stroke_width: resolve_stroke_width(element),
             text_fill: theme.text_color,
             family: family, size: size, size_unit: size_unit, logical_height: logical_height,
             header_lines: header_lines,
@@ -670,7 +670,9 @@ module Ea
           color_resolver.stroke_for(nil)
         end
 
-        def resolve_stroke_width
+        def resolve_stroke_width(element)
+          return element.line_width if element.line_width && element.line_width >= 0
+
           theme.themed? ? theme.stroke_width : DEFAULT_STROKE_WIDTH
         end
 

data/lib/ea/svg/ea_emitter/font_resolver.rb

@@ -102,7 +102,9 @@ module Ea
         end
 
         def element_families
-          (diagram.elements || []).map(&:font_family).compact
+          (diagram.elements || []).map(&:font_family).compact.reject do |family|
+            family.empty? || DEFAULT_MARKER_FAMILIES.include?(family)
+          end
         end
 
         def tally_values(values)

data/lib/ea/svg/ea_emitter/label/end_label.rb

@@ -112,6 +112,8 @@ module Ea
                          source_bottom_property_role(connector, heading, anchor, text_box, role) || text_pos
             end
 
+            text_box = text_box.merge("alignment" => 1) if phantom_property_box?(connector, direction, text_box)
+
             build_texts(role:, mult:, standalone:,
                         text_pos:, mult_pos:, stereo:, text_box:)
           end
@@ -194,8 +196,7 @@ module Ea
           # Property-role clusters use a direction-specific horizontal seat;
           # alignment controls the stereotype line within that cluster.
           def source_property_seat(connector, direction, anchor, box, role)
-            return nil unless %i[up left right down].include?(direction) && property_role_box?(box, direction)
-            return nil unless source_property_font?(connector, direction)
+            return nil unless source_property_seat?(connector, direction, box)
 
             width = Ea::Fonts::Metrics.text_length(role, font_size, family: font_family)
             return nil unless width
@@ -207,6 +208,22 @@ module Ea
             [left, y + baseline]
           end
 
+          def source_property_seat?(connector, direction, box)
+            phantom_property_box?(connector, direction, box) ||
+              (%i[up left right down].include?(direction) && property_role_box?(box, direction) &&
+                source_property_font?(connector, direction))
+          end
+
+          # Phantom outlines carry synthesized zero boxes without alignment.
+          # Their default Property cluster uses the directional seat with a
+          # centered stereotype; persisted or moved boxes keep their own seat.
+          def phantom_property_box?(connector, direction, box)
+            %i[up left].include?(direction) && seat_font? && cambria_box?(box) &&
+              box["alignment"].nil? && stored_offsets_zero?(box) &&
+              connector.style.to_h[:phantom_outline] == true &&
+              property_label?(connector, :source)
+          end
+
           def property_role_x(direction, origin, offset)
             direction == :right ? origin + offset : origin - offset
           end

data/lib/ea/svg/ea_emitter/labels.rb

@@ -128,7 +128,7 @@ module Ea
           return heading unless points.size == 2 && heading.none?(&:zero?)
 
           box = source_dock_bounds(connector)
-          face = box && dock_face_heading(points.first, box)
+          face = box && source_dock_heading(connector, points.first, box)
           return face if face && face_leads_leg?(connector, face, heading, box)
 
           stored_upward_heading(connector, heading)
@@ -182,6 +182,19 @@ module Ea
           drawn_bounds[source]
         end
 
+        # Saved rays can start outside the box. Project onto its boundary;
+        # corners stay ambiguous and the face must still lead the emitted leg.
+        def source_dock_heading(connector, point, box)
+          return dock_face_heading(point, box) unless connector.style.to_h[:association_ray_outline] == true
+          return nil unless box.width.positive? && box.height.positive?
+
+          dock_face_heading(projected_dock_point(point, box), box)
+        end
+
+        def projected_dock_point(point, box)
+          [point[0].clamp(box.x, box.x + box.width), point[1].clamp(box.y, box.y + box.height)]
+        end
+
         def dock_face_heading(point, box)
           return nil unless box.width.positive? && box.height.positive?
 

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.114"
+  VERSION = "0.6.116"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.114
+  version: 0.6.116
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-16 00:00:00.000000000 Z
+date: 2026-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model