ea 0.6.116 → 0.6.117

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ccebe3cc90560d4079f23a067cb41d94cbdeb87bc07873406edc97dd414c71
-  data.tar.gz: f9c39d517836ec0c8a6f737761e9f7fbc47ca49f4cfe2256aeccccfa38df4659
+  metadata.gz: 473bc36a9b9e843f0eb497f2437f56932823a674d8823c44c40063f93ab2da54
+  data.tar.gz: 41b7858cf138ecc8e5a16b05762451ac98e738b9c4b13b3bfd781fb9821ab002
 SHA512:
-  metadata.gz: 60a5c35a8607a8169f6e7be4866c07972b37e75f790851e36191ea4ec93a9ac8c793589fedccdbcacef456d44d96dd791687a6deb54ac7943d7d547060685072
-  data.tar.gz: b6cef3d3516f3c290ec2c1a05f138213bd3a7f2b18f0f063113f22865c89835804977c733b22f60819d7004c998dd9b98b7b244da8c70505bfb0873d1f184c7b
+  metadata.gz: c319d8f6b1c3454cd5c04495822223b4ec22e58bb1a357774b9ec3f5bbccde4eb1fa10bd94ff64a1a61cac24a70462d63915757fa6df98846d0c3fa7c5174b35
+  data.tar.gz: d9dc77d29d955d62ec4e27d102a35b41cd4e7a561f08ec91077a8cb8838f0de2438c935d3cb1176a03687eb7efab9c23654fdfbb299c7fab84dc8a92ddc7d3a1

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

@@ -73,7 +73,7 @@ module Ea
               x: bounds.x + (context.theme.attribute_spec.content_x_offset || 26),
               y: y_pos,
               family: context.family, size: context.size,
-              size_unit: context.size_unit, fill: fill
+              size_unit: context.size_unit, logical_height: context.logical_height, fill: fill
             ).to_svg
           end
           module_function :line_text
@@ -86,7 +86,7 @@ module Ea
               x: x_pos,
               y: y_pos,
               family: context.family, size: context.size,
-              size_unit: context.size_unit, fill: fill,
+              size_unit: context.size_unit, logical_height: context.logical_height, fill: fill,
               style: "italic"
             ).to_svg
           end

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

@@ -14,7 +14,9 @@ module Ea
               Element::LegendRenderer.render(
                 context.bounds,
                 legend: context.model_element.legend,
-                family: context.family
+                family: context.family,
+                item_font: { size: context.element&.font_size&.nonzero?, unit: context.size_unit,
+                             logical_height: context.logical_height }
               )
             elsif context.model_element.is_a?(Ea::Model::Note)
               Element::NoteShapeRenderer.render(

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

@@ -20,6 +20,7 @@ module Ea
               bounds: context.bounds,
               first_y: context.geometry.tagged_value_first_y,
               family: context.family, size: context.size,
+              size_unit: context.size_unit, logical_height: context.logical_height,
               fill: DEFAULT_TEXT_COLOR
             )
           end

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

@@ -12,10 +12,10 @@ module Ea
 
         attr_reader :diagram, :model_index, :frame, :document
 
-        def initialize(diagram, model_index:, frame: true, document: nil, **_options)
+        def initialize(diagram, model_index:, frame: nil, document: nil, **_options)
           @diagram = diagram
           @model_index = model_index
-          @frame = frame
+          @frame = frame.nil? ? !empty_diagram?(diagram) : frame
           @document = document
         end
 
@@ -86,6 +86,11 @@ module Ea
           %(<g>#{svg}</g>)
         end
         private :render_image
+
+        def empty_diagram?(source_diagram)
+          source_diagram.elements.empty? && source_diagram.connectors.empty?
+        end
+        private :empty_diagram?
       end
     end
   end

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

@@ -196,7 +196,7 @@ module Ea
           def tagged_value_first_y
             return nil unless tagged_values_count.to_i.positive?
 
-            (content_bottom_y || raw_attr_first_y) + size + 5
+            content_bottom_y ? content_bottom_y + size + 5 : raw_attr_first_y
           end
 
           # The lowest content edge among attributes, enum literals,

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

@@ -15,6 +15,15 @@ module Ea
             HeaderLinePipeline.for(classifier, **opts)
           end
 
+          # A parent followed directly by the name has a 3px gap beyond
+          # the row pitch. A class stereotype needs 6px; interfaces use 3px.
+          def parent_ghost_gap(lines)
+            style = lines.dig(0, 1)
+            return 0 unless %i[italic italic_tight].include?(style)
+
+            style == :italic_tight || %i[bold bold_italic].include?(lines.dig(1, 1)) ? 3 : 6
+          end
+
           # Delegate to the Name provider so historical callers and
           # specs that test display_name keep working.
           def display_name(classifier, *_)

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

@@ -20,20 +20,13 @@ module Ea
             line_h = Ea::Fonts::Metrics.compartment_line_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
               font_style = %i[italic italic_tight bold_italic].include?(style) ? "italic" : "normal"
-              # EA spaces the line AFTER a right-aligned ghost 3px
-              # wider than the pitch. Interfaces use a tighter +3
-              # (936AA434/Surface: ghost 100, «interface» 116).
-              ghost_shift = case lines.first.last
-                            when :italic then 6
-                            when :italic_tight then 3
-                            else 0
-                            end
               y = first_y + (idx * line_h) +
                   (idx >= 1 && ghost_shift.positive? ? ghost_shift : 0)
               x = if %i[italic italic_tight].include?(style)

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

@@ -32,15 +32,16 @@ module Ea
           LABEL_BASELINE_FROM_ICON_TOP = 12
           DEFAULT_ITEM_FONT_SIZE = 9
 
-          def self.render(bounds, legend:, family:, canvas: nil)
-            new(bounds, legend, family, canvas).to_svg
+          def self.render(bounds, legend:, family:, canvas: nil, item_font: {})
+            new(bounds, legend, family, canvas, item_font).to_svg
           end
 
-          def initialize(bounds, legend, family, canvas)
+          def initialize(bounds, legend, family, canvas, item_font = {})
             @bounds = bounds
             @legend = legend
             @family = family
             @canvas = canvas
+            @item_font = item_font[:size]&.nonzero? ? item_font : {}
           end
 
           def to_svg
@@ -49,7 +50,7 @@ module Ea
 
           private
 
-          attr_reader :bounds, :legend, :family, :canvas
+          attr_reader :bounds, :legend, :family, :canvas, :item_font
 
           def container_layer
             body = format(
@@ -151,8 +152,9 @@ module Ea
 
           # Real font metrics when available; legacy per-char
           # estimate otherwise (families without metric tables).
-          def estimated_width(text, size, weight: nil)
-            measured = Ea::Fonts::Metrics.text_length(text, size, family: family, weight: weight)
+          def estimated_width(text, size, weight: nil, logical_height: nil)
+            measured = Ea::Fonts::Metrics.text_length(text, size, family: family, weight: weight,
+                                                                  logical_height: logical_height)
             return measured if measured
 
             text.to_s.each_char.sum do |ch|
@@ -161,7 +163,10 @@ module Ea
           end
 
           def widest_item_label_width
-            legend.items.map { |i| estimated_width(i.name, item_font_size) }.max || 0.0
+            logical_height = item_font[:logical_height] if (item_font[:unit] || "pt") == "pt"
+            legend.items.map do |item|
+              estimated_width(item.name, item_font_size, logical_height: logical_height)
+            end.max || 0.0
           end
 
           def item_top_y(index)
@@ -177,7 +182,7 @@ module Ea
           end
 
           def item_font_size
-            DEFAULT_ITEM_FONT_SIZE
+            item_font[:size] || DEFAULT_ITEM_FONT_SIZE
           end
 
           def title_text_width
@@ -186,10 +191,11 @@ module Ea
 
           def build_text(content, x:, y:, size:, weight:)
             tx, ty = translate(x, y)
+            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: "pt",
-              weight: weight, fill: label_fill
+              family: 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/package_shape_renderer.rb

@@ -185,25 +185,33 @@ module Ea
           end
 
           def body_width
-            [bounds.width, self.class.autosized_tab_width(label: label, stereotype: stereotype, size: size) + TAB_BODY_EXTRA].max
+            [bounds.width, autosized_tab_width + TAB_BODY_EXTRA].max
           end
 
           def tab_width
-            [body_width,
-             self.class.autosized_tab_width(label: label, stereotype: stereotype, size: size)].min
+            [body_width, autosized_tab_width].min
+          end
+
+          def autosized_tab_width
+            self.class.autosized_tab_width(
+              label: label, stereotype: stereotype, size: size, family: family
+            )
           end
 
           # Tab width fits the widest text line (stereotype or name)
           # plus padding, floored at EA's minimum tab width. The body
           # extends 15px past the tab on the right.
-          def self.autosized_tab_width(label:, stereotype:, size:)
-            lines = [label, stereotype && !stereotype.empty? ? "«#{stereotype}»" : nil].compact
-            widest = lines.map { |l| TextRenderer.estimate_width(l, size) }.max || 0
+          def self.autosized_tab_width(label:, stereotype:, size:, family: nil)
+            lines = [[label, 700]]
+            lines << ["«#{stereotype}»", 0] if stereotype && !stereotype.empty?
+            widest = lines.map do |text, weight|
+              TextRenderer.estimate_width(text, size, family: family, weight: weight)
+            end.max || 0
             [widest + TAB_NAME_EXTRA, DEFAULT_TAB_WIDTH].max.round
           end
 
-          def self.body_width_for(label:, stereotype:, size:)
-            autosized_tab_width(label: label, stereotype: stereotype, size: size) + TAB_BODY_EXTRA
+          def self.body_width_for(label:, stereotype:, size:, family: nil)
+            autosized_tab_width(label: label, stereotype: stereotype, size: size, family: family) + TAB_BODY_EXTRA
           end
 
         end

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

@@ -16,26 +16,37 @@ module Ea
           HEADER_X_OFFSET = 5
           LINE_X_OFFSET = 5
 
-          def self.render(tagged_values, bounds:, first_y:, family:, size:, fill: "#000000")
-            line_h = size + 4
-            text_blocks = []
-            text_blocks << build_text(bounds.x + centered_x_offset(bounds, size), first_y,
-                                       HEADER_TEXT, family, size, fill, style: "italic")
+          def self.render(tagged_values, bounds:, first_y:, family:, size:, fill: "#000000",
+                          size_unit: "px", logical_height: nil)
+            line_h = line_height(size, family, size_unit, logical_height)
+            text_blocks = [build_text(bounds.x + centered_x_offset(bounds, size), first_y,
+                                      HEADER_TEXT, family, size, fill,
+                                      style: "italic", size_unit: size_unit, logical_height: logical_height)]
             tagged_values.each_with_index do |tv, idx|
-              y = first_y + ((idx + 1) * line_h)
-              text_blocks << build_text(bounds.x + LINE_X_OFFSET, y,
-                                          "#{tv.key} = #{tv.value}", family, size, fill)
+              text_blocks << build_text(bounds.x + LINE_X_OFFSET, first_y + ((idx + 1) * line_h),
+                                        "#{tv.key} = #{tv.value}", family, size, fill,
+                                        size_unit: size_unit, logical_height: logical_height)
             end
             %(<g style="#{Style::TEXT_GROUP}">\n#{text_blocks.join("\n")}\n</g>)
           end
 
-          def self.build_text(x, y, content, family, size, fill, style: "normal")
+          def self.build_text(x, y, content, family, size, fill, style: "normal",
+                              size_unit: "px", logical_height: nil)
             TextRenderer.new(content: content, x: x, y: y,
-                              family: family, size: size, fill: fill,
-                              style: style).to_svg
+                             family: family, size: size, fill: fill,
+                             size_unit: size_unit, logical_height: logical_height,
+                             style: style).to_svg
           end
           private_class_method :build_text
 
+          def self.line_height(size, family, size_unit, logical_height)
+            Ea::Fonts::Metrics.compartment_line_height(
+              size, family: family, unit: size_unit, logical_height: logical_height,
+                    offset: size_unit == "pt" ? 6 : 4
+            )
+          end
+          private_class_method :line_height
+
           # Center the "tags" header text within the bounds width.
           def self.centered_x_offset(bounds, size)
             text_width = HEADER_TEXT.length * (size / 2)

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

@@ -74,7 +74,7 @@ module Ea
         end
 
         def package_stereotype(context)
-          context.classifier.stereotype_refs.first.to_s
+          context.model_element.stereotype_refs.first.to_s
         end
 
         def record_drawn_bounds(element, context)
@@ -84,11 +84,11 @@ module Ea
           return unless raw
 
           width = context.bounds.width
-          if classifier_package?(context.classifier)
+          if classifier_package?(context.model_element)
             tab = Element::PackageShapeRenderer.autosized_tab_width(
-              label: context.classifier.name.to_s,
+              label: context.model_element.name.to_s,
               stereotype: package_stereotype(context),
-              size: context.size
+              size: context.size, family: context.family
             )
             width = [raw.width, tab + Element::PackageShapeRenderer::TAB_BODY_EXTRA].max
           end
@@ -316,8 +316,7 @@ module Ea
                                   size_unit: size_unit, logical_height: logical_height,
                                    header_ghost: header_lines.any? &&
                                                   %i[italic italic_tight].include?(header_lines.first.last),
-                                   header_ghost_tight: header_lines.any? &&
-                                                       header_lines.first.last == :italic_tight,
+                                   header_ghost_tight: Element::HeaderLines.parent_ghost_gap(header_lines) == 3,
                                    header_lines_count: header_lines.size,
                                    attr_lines_count: attr_lines.size,
                                    op_lines_count: op_lines.size,
@@ -705,7 +704,7 @@ module Ea
         end
 
         def font_resolver
-          @font_resolver ||= FontResolver.new(diagram, theme: theme)
+          @font_resolver ||= FontResolver.new(diagram, theme: theme, model_index: model_index)
         end
 
         def element_filter

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

@@ -23,10 +23,11 @@ module Ea
         # a use-default marker (see QEA DiagramBuilder.font_size_from).
         DEFAULT_ELEMENT_FONT_SIZE = 7
 
-        attr_reader :diagram, :theme
+        attr_reader :diagram, :theme, :model_index
 
-        def initialize(diagram, theme: nil)
+        def initialize(diagram, theme: nil, model_index: {})
           @diagram = diagram
+          @model_index = model_index
           @theme = theme || Ea::Theme::Registry.default
         end
 
@@ -84,7 +85,8 @@ module Ea
         end
 
         # Unthemed diagrams without a saved family use Cambria.
-        # Saved families still supply the diagram default.
+        # Saved classifier families still supply the diagram default.
+        # A note's explicit font belongs to its body, not sibling classifiers.
         def diagram_default_family
           families = element_families
           return FALLBACK_DEFAULT_FAMILY if families.empty?
@@ -102,7 +104,10 @@ module Ea
         end
 
         def element_families
-          (diagram.elements || []).map(&:font_family).compact.reject do |family|
+          placements = (diagram.elements || []).reject do |element|
+            model_index[element.model_element_ref].is_a?(Ea::Model::Note)
+          end
+          placements.map(&:font_family).compact.reject do |family|
             family.empty? || DEFAULT_MARKER_FAMILIES.include?(family)
           end
         end

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.116"
+  VERSION = "0.6.117"
 end

metadata

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