ea 0.6.122 → 0.6.124

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 134a5c15aeb52f545cffe73a1541d36c404bc73daef03794c3cc0289744c0364
-  data.tar.gz: 231fad8c18f4f7ab8b72bc7e3f4b23652f2b44dfd5b9e6b54d8377cc3e4625d9
+  metadata.gz: dd02b1a50cdc130c8d08643767666068e9272158df4592e4bea690c1b1e7e778
+  data.tar.gz: dc499639ec487f46cc5ee952b1fa16ce58a7eb5fc57747ca4b9ff7584488fed4
 SHA512:
-  metadata.gz: 210b2520ec8a7d00782cc06b65a27ff3b391c611a4994b97aabc3281528db9e1356a96cd1b07a8734533f50c8c1b9a9e82e74576cf2a25f533c442e163ea09e4
-  data.tar.gz: d46dd157918d5fa7a1d9884d6cdba517a4d3fc911894c6f800d2cece0fdb62e2b5a09dfa030bd80cc604fe5ab2a91a310d86b5c9893c54b81cad2536200563ac
+  metadata.gz: 537cd073276c4eb487d6848c28e5522df1c87cdf55170d2e94e4142f4ed3e6b2dd2544fc8220cbc75373fd33ac47349e25f0f979b126791d567946be3a3a2007
+  data.tar.gz: e07055d655ee0667d604a9089bf243ea3dc7d4e602035ec1a2a58e2db27f744e410dc4b095b3d85f0fdffd02a8068675c24c172bd44062a82d1259191242359d

data/lib/ea/model/legend.rb

@@ -21,6 +21,7 @@ module Ea
 
       attribute :title, :string, default: -> { DEFAULT_TITLE }
       attribute :heading_size, :integer
+      attribute :heading_family, :string
       attribute :font_color, :integer, default: -> { DEFAULT_FONT_COLOR }
       attribute :background_color, :integer, default: -> { DEFAULT_BACKGROUND_COLOR }
       attribute :border_color, :integer, default: -> { DEFAULT_BORDER_COLOR }
@@ -32,6 +33,7 @@ module Ea
         map "name", to: :name
         map "title", to: :title
         map "headingSize", to: :heading_size
+        map "headingFamily", to: :heading_family
         map "fontColor", to: :font_color
         map "backgroundColor", to: :background_color
         map "borderColor", to: :border_color

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

@@ -12,6 +12,7 @@ module Ea
       # Returns nil when no matching xref exists (the Text element
       # is not a legend — caller should render it as a plain note).
       class LegendBuilder
+        DEFAULT_HEADING_FAMILY = "Cambria"
         LEGEND_XREF_NAME = "CustomProperties"
         LEGEND_TYPE_OBJECT_STYLE = "LEGEND_OBJECTSTYLE"
         LEGEND_TYPE_STYLE_SETTINGS = "LEGEND_STYLE_SETTINGS"
@@ -77,6 +78,7 @@ module Ea
           Ea::Model::Legend.new(
             title: style["TITLE"] || Ea::Model::Legend::DEFAULT_TITLE,
             heading_size: int_or_nil(style["HEADINGSIZE"]),
+            heading_family: DEFAULT_HEADING_FAMILY,
             font_color: int_or(style["FONTCOLOR"],
                                Ea::Model::Legend::DEFAULT_FONT_COLOR),
             background_color: int_or(style["BACKGROUNDCOLOR"],

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

@@ -5,12 +5,10 @@ module Ea
     module EaEmitter
       module Compartment
         # Instance-name underline for object diagrams. EA draws a
-        # short horizontal line just below each instance name to
-        # denote that it is an instance (UML convention). Rendered
-        # only when the diagram's `diagram_type` is "Object".
+        # short horizontal line below each instance name to denote
+        # that it is an instance (UML convention).
         module InstanceUnderline
-          Y_OFFSET = 2
-          WIDTH_FACTOR = 0.65
+          Y_OFFSET = 1
 
           module_function
 
@@ -19,11 +17,22 @@ module Ea
             return nil unless object_diagram?(context)
             return nil if context.header_lines.empty?
 
-            name_line = context.header_lines.last
-            text = name_line.first.to_s
-            return nil if text.empty?
+            header = Element::HeaderRenderer.line_layout(
+              context.header_lines,
+              bounds: context.bounds,
+              first_y: context.geometry.header_first_y,
+              family: context.family,
+              size: context.size,
+              size_unit: context.size_unit,
+              logical_height: context.logical_height,
+              weight_normal: context.theme.text_weight_normal,
+              weight_bold: context.theme.text_weight_bold,
+              width_factor: context.theme.text_width_factor,
+              line_offset: context.theme.compartments.header_line_offset
+            ).last
+            return nil unless header && !header.text.to_s.empty?
 
-            underline_path(context, text)
+            underline_path(header)
           end
 
           def object_diagram?(context)
@@ -31,18 +40,13 @@ module Ea
           end
           module_function :object_diagram?
 
-          def underline_path(context, text)
-            bounds = context.bounds
-            text_width = TextRenderer.estimate_width(text, context.size,
-                                                     WIDTH_FACTOR)
-            x_start = bounds.x + (bounds.width - text_width) / 2.0
-            y_pos = context.geometry.header_first_y + Y_OFFSET
-            build_path_tag(x_start, y_pos, text_width)
+          def underline_path(header)
+            build_path_tag(header.x, header.y + Y_OFFSET, header.text_length)
           end
           module_function :underline_path
 
-          def build_path_tag(x_start, y_pos, text_width)
-            x_end = x_start + text_width
+          def build_path_tag(x_start, y_pos, text_length)
+            x_end = x_start + text_length
             coords = format_coords(x_start, y_pos, x_end)
             d = "M #{coords[:x1]} #{coords[:y1]} L #{coords[:x2]} #{coords[:y1]}"
             style = "stroke-width:1;stroke-linecap:square;" \

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

@@ -14,6 +14,7 @@ module Ea
           ROW_HEIGHT = 16
           ICON_X_OFFSET = 5
           TEXT_X_OFFSET = 23
+          FIRST_BASELINE_OFFSET = 15
 
           module_function
 
@@ -22,7 +23,7 @@ module Ea
             return nil if rows.nil? || rows.empty?
 
             bounds = context.bounds
-            first_y = context.geometry.attr_first_y
+            first_y = first_baseline(context)
             blocks = rows.each_with_index.flat_map do |row, idx|
               y_top = first_y - 11 + (idx * ROW_HEIGHT)
               y_text = first_y + (idx * ROW_HEIGHT)
@@ -34,6 +35,14 @@ module Ea
             wrap_group(blocks.join("\n"))
           end
 
+          def first_baseline(context)
+            context.bounds.y + Element::PackageShapeRenderer.tab_height_for(
+              stereotype: Shape.package_stereotype(context.model_element),
+              family: context.family, size: context.size, size_unit: context.size_unit
+            ) + FIRST_BASELINE_OFFSET
+          end
+          private_class_method :first_baseline
+
           def wrap_group(body)
             %(<g style="#{group_style}">\n#{body}\n</g>)
           end

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

@@ -256,12 +256,14 @@ module Ea
         end
         private_class_method :default_model_connector?
 
-        # A thin straight Generalization/Aggregation/Association between two elements
-        # drawn with a 2px border stops on the outer edge of those borders.
+        # Thin connectors between explicitly bordered elements stop on the outer
+        # edge of their 2px borders, including package imports.
         def bordered_outline?(connector, diagram, refs, bounds)
           style = connector.style.to_h
           return false unless style[:lwidth] == "0" && !style[:tree]
-          return false unless %w[Generalization Aggregation Association Dependency].include?(connector.connector_type)
+          return false unless %w[Generalization Aggregation Association Dependency Package].include?(
+            connector.connector_type
+          )
           return false unless bounds.all? { |box| box.width.positive? && box.height.positive? }
 
           ends = [[refs.first, style[:soid]], [refs.last, style[:eoid]]]

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

@@ -40,6 +40,7 @@ module Ea
                           attr_line_offset: 6,
                           attr_first_offset: 7,
                           attr_group_lead: 0,
+                         compact_standard_operations: false,
                          family: nil, size_unit: "pt", logical_height: nil,
                           header_ghost: false,
                           header_ghost_tight: false)
@@ -61,6 +62,7 @@ module Ea
             @attr_line_offset = attr_line_offset
             @attr_first_offset = attr_first_offset
             @attr_group_lead = attr_group_lead
+            @compact_standard_operations = compact_standard_operations
             @header_ghost = header_ghost
             @header_ghost_tight = header_ghost_tight
           end
@@ -137,24 +139,29 @@ module Ea
           end
 
           def op_divider_y
+            return attr_bottom_y + line_height(attr_line_offset || 6) / 2.0 if compact_operation_spacing?
+
             attr_bottom_y + size + 5
           end
 
-          # EA's op block: first row 21 below the last attribute row
-          # (9pt... 7pt: attr_bottom + 21), uniform 13px pitch across
-          # attrs AND ops (6D4C665D: attrs ..520, ops 541..658 step 13).
-          # Attribute-empty boxes anchor on the divider instead:
-          # first op at divider + 14 (001A64C1: EA ops 104 vs our
-          # 125 when attrs were absent).
+          # Compact standard classes end attributes with a half row cell;
+          # operations then use the same inset as an attribute-empty box.
           def op_first_y
             return nil unless op_lines_count&.positive?
 
-            if attr_lines_count.to_i.positive?
-              attr_bottom_y + size + 14
-            else
-              divider_y + size + 7
-            end
+            anchor = if attr_lines_count.to_i.positive?
+                       compact_operation_spacing? ? op_divider_y : attr_bottom_y + 7
+                     else
+                       divider_y
+                     end
+            anchor + size + 7
+          end
+
+          def compact_operation_spacing?
+            @compact_standard_operations && attr_lines_count.to_i.positive? &&
+              Ea::Fonts::Metrics.compact_compartment_font?(size, family: @family, unit: @size_unit)
           end
+          private :compact_operation_spacing?
 
           def op_bottom_y
             return op_divider_y unless op_lines_count&.positive?

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

@@ -11,55 +11,70 @@ module Ea
         # the left edge from text-width approximation since SVG text
         # x= is the start position, not the center).
         class HeaderRenderer
+          HeaderLine = Struct.new(:text, :style, :x, :y, :text_length,
+                                  :weight, :font_style, keyword_init: true)
+
           def self.render(lines, bounds:, first_y:, family:,
                           size:, size_unit: "pt", logical_height: nil,
                           fill: "#000000", weight_normal: 400, weight_bold: 700,
                           stroke_in_text: "#000000", width_factor: 0.612,
                           line_offset: 6)
             logical_height = nil unless size_unit == "pt"
+            layout = line_layout(
+              lines, bounds: bounds, first_y: first_y, family: family,
+                     size: size, size_unit: size_unit, logical_height: logical_height,
+                     weight_normal: weight_normal, weight_bold: weight_bold,
+                     width_factor: width_factor, line_offset: line_offset
+            )
+            text_blocks = layout.map do |line|
+              TextRenderer.new(
+                content: line.text,
+                x: line.x, y: line.y,
+                family: family, size: size, size_unit: size_unit, logical_height: logical_height,
+                weight: line.weight, style: line.font_style, fill: fill,
+                stroke_in_text: stroke_in_text, width_factor: width_factor,
+                text_length: line.text_length
+              ).to_svg
+            end
+            %(<g style="#{Style::TEXT_GROUP}">\n#{text_blocks.join("\n")}\n</g>)
+          end
+
+          # Returns the exact integer placement and width used for each
+          # emitted header line so dependent compartments can align to it.
+          def self.line_layout(lines, bounds:, first_y:, family:, size:,
+                               size_unit: "pt", logical_height: nil,
+                               weight_normal: 400, weight_bold: 700,
+                               width_factor: 0.612, line_offset: 6)
+            logical_height = nil unless size_unit == "pt"
             line_h = Ea::Fonts::Metrics.compartment_line_height(
-              size, family: family, unit: size_unit, offset: line_offset, logical_height: logical_height
+              size, family: family, unit: size_unit, offset: line_offset,
+                    logical_height: logical_height
             )
             ghost_shift = HeaderLines.parent_ghost_gap(lines)
-            text_blocks = lines.each_with_index.map do |(text, style), idx|
-              weight = case style
-                       when :bold, :bold_italic then weight_bold
-                       else weight_normal
-                       end
+            lines.each_with_index.map do |(text, style), idx|
+              weight = %i[bold bold_italic].include?(style) ? weight_bold : weight_normal
               font_style = %i[italic italic_tight bold_italic].include?(style) ? "italic" : "normal"
+              text_length = TextRenderer.estimate_width(
+                text, size, width_factor, family: family, weight: weight,
+                                          style: font_style, logical_height: logical_height
+              ).round
               y = first_y + (idx * line_h) +
                   (idx >= 1 && ghost_shift.positive? ? ghost_shift : 0)
               x = if %i[italic italic_tight].include?(style)
-                    # Parent ghosts end 3px inside the box's right edge.
-                    bounds.x + bounds.width - 3 -
-                      Ea::Svg::EaEmitter::TextRenderer.estimate_width(
-                        text, size, width_factor,
-                        family: family, weight: weight, style: font_style, logical_height: logical_height
-                      ).round
+                    bounds.x + bounds.width - 3 - text_length
                   else
-                    center_x_for(text, bounds, size, width_factor,
-                                 family: family, weight: weight,
-                                 style: font_style, logical_height: logical_height)
+                    center_x_for(text_length, bounds)
                   end
-              TextRenderer.new(
-                content: text,
-                x: x, y: y,
-                family: family, size: size, size_unit: size_unit, logical_height: logical_height,
-                weight: weight, style: font_style, fill: fill,
-                stroke_in_text: stroke_in_text, width_factor: width_factor
-              ).to_svg
+              HeaderLine.new(text: text, style: style, x: x, y: y,
+                             text_length: text_length, weight: weight,
+                             font_style: font_style)
             end
-            %(<g style="#{Style::TEXT_GROUP}">\n#{text_blocks.join("\n")}\n</g>)
           end
 
           # EA centers text by its INTEGER textLength and floors the
           # resulting x (verified exact against EA-published SVGs).
-          def self.center_x_for(text, bounds, size, width_factor,
-                                family: nil, weight: nil, style: nil, logical_height: nil)
-            len = Ea::Svg::EaEmitter::TextRenderer.estimate_width(
-              text, size, width_factor, family: family, weight: weight, style: style, logical_height: logical_height
-            ).round
-            (bounds.x + (bounds.width - len) / 2.0).floor
+          def self.center_x_for(text_length, bounds)
+            (bounds.x + (bounds.width - text_length) / 2.0).floor
           end
           private_class_method :center_x_for
         end

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

@@ -126,10 +126,16 @@ module Ea
 
           def item_label(item, index)
             x = bounds.x + ICON_X_OFFSET + ICON_LABEL_GAP
-            y = item_top_y(index) + LABEL_BASELINE_FROM_ICON_TOP
+            y = item_top_y(index) + item_label_baseline
             build_text(item.name, x: x, y: y, size: item_font_size, weight: 0)
           end
 
+          def item_label_baseline
+            return LABEL_BASELINE_FROM_ICON_TOP unless (item_font[:unit] || "pt") == "pt"
+
+            item_font[:logical_height] || LABEL_BASELINE_FROM_ICON_TOP
+          end
+
           def title_text
             x = title_x
             y = bounds.y + TITLE_Y_OFFSET
@@ -152,8 +158,8 @@ module Ea
 
           # Real font metrics when available; legacy per-char
           # estimate otherwise (families without metric tables).
-          def estimated_width(text, size, weight: nil, logical_height: nil)
-            measured = Ea::Fonts::Metrics.text_length(text, size, family: family, weight: weight,
+          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
 
@@ -186,7 +192,11 @@ module Ea
           end
 
           def title_text_width
-            estimated_width(legend.title, title_font_size, weight: 700)
+            estimated_width(legend.title, title_font_size, weight: 700, text_family: heading_family)
+          end
+
+          def heading_family
+            legend.heading_family || family
           end
 
           def build_text(content, x:, y:, size:, weight:)
@@ -194,7 +204,7 @@ module Ea
             size_unit = weight.zero? ? (item_font[:unit] || "pt") : "pt"
             TextRenderer.new(
               content: content.to_s, x: tx, y: ty,
-              family: family, size: size, size_unit: size_unit,
+              family: weight.zero? ? family : heading_family, size: size, size_unit: size_unit,
               weight: weight, fill: label_fill, logical_height: weight.zero? ? item_font[:logical_height] : nil
             ).to_svg
           end

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

@@ -26,9 +26,10 @@ module Ea
             text_blocks = []
             has_receptions = operations.any?(&:is_reception)
             if has_receptions
+              heading_width = reception_heading_width(family, size, size_unit, logical_height)
               text_blocks << TextRenderer.new(
                 content: "receptions",
-                x: bounds.x + (bounds.width / 2.0) - (8 * size * 0.65) / 2,
+                x: bounds.x + (bounds.width / 2.0) - heading_width / 2.0,
                 y: first_y,
                 family: family, size: size, size_unit: size_unit, logical_height: logical_height,
                 style: "italic", fill: "#000000"
@@ -36,12 +37,14 @@ module Ea
             end
             ops = has_receptions ? operations : operations
             offset = has_receptions ? 1 : 0
+            content_x_offset = CONTENT_X_OFFSET + 2 * (size - 7)
+            content_x_offset -= 1 if Ea::Fonts::Metrics.compact_compartment_font?(size, family: family, unit: size_unit)
             ops.each_with_index do |op, idx|
               y = first_y + ((idx + offset) * line_h)
               text_blocks << build_text(bounds.x + VISIBILITY_X_OFFSET, y,
                                         visibility_prefix(op), family, size, size_unit, logical_height: logical_height)
               text = operation_text(op, parameter_detail: parameter_detail)
-              text_blocks << build_text(bounds.x + AttributeRenderer.content_x_offset(size), y,
+              text_blocks << build_text(bounds.x + content_x_offset, y,
                                         text, family, size, size_unit, logical_height: logical_height)
             end
             %(<g style="#{Style::TEXT_GROUP}">\n#{text_blocks.join("\n")}\n</g>)
@@ -102,6 +105,15 @@ module Ea
           end
           private_class_method :reception_params
 
+          def self.reception_heading_width(family, size, size_unit, logical_height)
+            TextRenderer.estimate_width(
+              "receptions", size,
+              family: family, weight: 400, style: "italic",
+              logical_height: size_unit == "pt" ? logical_height : nil
+            ).round
+          end
+          private_class_method :reception_heading_width
+
           def self.build_text(x, y, content, family, size, size_unit, logical_height: nil)
             TextRenderer.new(content: content, x: x, y: y,
                              family: family, size: size, size_unit: size_unit,

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

@@ -45,6 +45,21 @@ module Ea
                 family, size, size_unit, text_fill).to_svg
           end
 
+          def self.tab_height_for(stereotype:, family:, size:, size_unit: "pt")
+            rows = stereotype && !stereotype.empty? ? 2 : 1
+            nominal_height = rows == 2 ? TAB_HEIGHT_DOUBLE : TAB_HEIGHT_SINGLE
+            line_height = if size_unit == "pt"
+                            Ea::Fonts::Metrics.compartment_line_height(
+                              size, family: family, unit: size_unit, offset: TAB_TEXT_PADDING
+                            )
+                          else
+                            TAB_LABEL_Y_OFFSET
+                          end
+            # Preserve the nominal padding while each row follows the same
+            # font line height used to place the package header text.
+            nominal_height + rows * (line_height - TAB_LABEL_Y_OFFSET)
+          end
+
           def initialize(bounds, fill, stroke, stroke_width, label,
                          stereotype, family, size, size_unit, text_fill)
             @bounds = bounds
@@ -147,11 +162,8 @@ module Ea
           end
 
           def tab_height
-            nominal_height = has_stereotype? ? TAB_HEIGHT_DOUBLE : TAB_HEIGHT_SINGLE
-            rows = has_stereotype? ? 2 : 1
-            # Preserve the nominal padding while each row follows the same
-            # font line height used to place the package header text.
-            nominal_height + rows * (tab_line_height - TAB_LABEL_Y_OFFSET)
+            self.class.tab_height_for(stereotype: stereotype, family: family,
+                                      size: size, size_unit: size_unit)
           end
 
           def body_points

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

@@ -332,8 +332,22 @@ module Ea
                                  constraints_count: 0, marker_count: 0,
                                  enum_literals_count: 0,
                                  attr_group_lead: 0, family: nil, size_unit: "pt", logical_height: nil)
+          divider_offset = divider_offset_for(header_lines, classifier)
+          attr_first_offset = attr_first_offset_for(attr_lines)
+          compact_standard = compact_header_offsets?(
+            classifier, header_lines, size,
+            family: family, size_unit: size_unit, logical_height: logical_height,
+            marker_count: marker_count, enum_literals_count: enum_literals_count,
+            divider_offset: divider_offset, attr_first_offset: attr_first_offset
+          )
+          if compact_standard
+            divider_offset = 7
+            # Attribute baselines retain their anchor when the divider moves up.
+            attr_first_offset = 8
+          end
           CompartmentGeometry.new(bounds: bounds, size: size, family: family,
                                   size_unit: size_unit, logical_height: logical_height,
+                                   compact_standard_operations: compact_standard,
                                    header_ghost: header_lines.any? &&
                                                   %i[italic italic_tight].include?(header_lines.first.last),
                                    header_ghost_tight: Element::HeaderLines.parent_ghost_gap(header_lines) == 3,
@@ -346,12 +360,21 @@ module Ea
                                    enum_literals_count: enum_literals_count,
                                    header_top_padding: header_padding_for(header_lines, classifier),
                                    header_line_offset: theme.compartments.header_line_offset,
-                                   divider_offset: divider_offset_for(header_lines, classifier),
+                                   divider_offset: divider_offset,
                                    attr_line_offset: theme.compartments.attr_line_offset,
-                                   attr_first_offset: attr_first_offset_for(attr_lines),
+                                   attr_first_offset: attr_first_offset,
                                    attr_group_lead: attr_group_lead)
         end
 
+        def compact_header_offsets?(classifier, header_lines, size, **options)
+          classifier.is_a?(Ea::Model::Klass) &&
+            Ea::Fonts::Metrics.compact_compartment_font?(size, family: options[:family], unit: options[:size_unit]) &&
+            !%i[italic italic_tight].include?(header_lines.dig(0, 1)) &&
+            options.values_at(:logical_height, :marker_count, :enum_literals_count,
+                              :divider_offset, :attr_first_offset) == [nil, 0, 0, 8, 7] &&
+            theme.compartments.header_line_offset == 6 && theme.compartments.attr_line_offset == 6
+        end
+
         # EA seats a stereotype line 3px higher than a bare class name
         # (first baseline +16 vs +19 at 7pt) - and Enumeration /
         # Interface elements seat their stereotype 3px higher still

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.122"
+  VERSION = "0.6.124"
 end

metadata

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