ea 0.6.122 → 0.6.123

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 134a5c15aeb52f545cffe73a1541d36c404bc73daef03794c3cc0289744c0364
-  data.tar.gz: 231fad8c18f4f7ab8b72bc7e3f4b23652f2b44dfd5b9e6b54d8377cc3e4625d9
+  metadata.gz: d897b1e2165c9993420958c081ee3e2eedebbfbb8ac4db1ea8f160fd45913a3d
+  data.tar.gz: 667e5cce39c543c97f96fd7b64c994d72808daf3bf6a875ae112e0efe4b2623b
 SHA512:
-  metadata.gz: 210b2520ec8a7d00782cc06b65a27ff3b391c611a4994b97aabc3281528db9e1356a96cd1b07a8734533f50c8c1b9a9e82e74576cf2a25f533c442e163ea09e4
-  data.tar.gz: d46dd157918d5fa7a1d9884d6cdba517a4d3fc911894c6f800d2cece0fdb62e2b5a09dfa030bd80cc604fe5ab2a91a310d86b5c9893c54b81cad2536200563ac
+  metadata.gz: e8789c4187a4c72534f2e4d17f1caf650e7da1748aa08bed49764fa6fde0dafdfc1bf8c6811ab7a33e31b6da1ffe0a71397b6ca60b1a8c2e7ee0e65a4798368d
+  data.tar.gz: 37bf77d8c14e921888081ee961506f835b5cd0de1bb28de790d5ba848003915922e83c83e2b29d6db0f58141f25dc1d643059f642950ee6cd2028da87d42b42f

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/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/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/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.123"
 end

metadata

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