ea 0.6.140 → 0.6.142

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

@@ -15,6 +15,11 @@ module Ea
 
           module_function
 
+          # The text group keeps the pen the note outline was drawn with.
+          def pen(context)
+            context.previous_pen || Pen::INITIAL
+          end
+
           def render(context)
             return nil if context.model_element.is_a?(Ea::Model::Note) &&
                           context.model_element.legend
@@ -63,7 +68,7 @@ module Ea
           # [pitch, first-baseline offset] for the note font.
           def vertical_layout(context)
             size = context.size
-            height = context.logical_height
+            height = Ea::Fonts::Metrics.source_logical_height(context.logical_height)
             height ||= Ea::Fonts::Metrics.gdi_logical_height(size) if context.size_unit == "pt"
             ascent, descent = Ea::Fonts::Metrics.gdi_cell_metrics(context.family, height)
             return [size + 7, size + 9] unless ascent
@@ -121,7 +126,7 @@ module Ea
           # (EA never sets a note pen; 7C44AC09 square/miter, 7D960BD8
           # square/bevel), so the next element inherits the right pen.
           def group_style(context)
-            cap, join = context.previous_pen || Element::NoteShapeRenderer::INITIAL_PEN
+            cap, join = pen(context)
             "stroke-width:1;stroke-linecap:#{cap};stroke-linejoin:#{join}; " \
               "fill:#{context.theme.text_color};fill-opacity:1.00; " \
               "stroke:#000000; stroke-opacity:0.00"

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

@@ -10,6 +10,11 @@ module Ea
         # Lines are estimated by character width and split at word
         # boundaries to fit the element bounds.
         module NoteText
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           X_PADDING = 5
           HAND_DRAW_X_PADDING = 10
           Y_FIRST_OFFSET = 15

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

@@ -7,6 +7,11 @@ module Ea
         # Operation compartment: divider line + operation signatures.
         # Skipped when no operations or when geometry cannot fit them.
         module Operations
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           module_function
 
           def render(context)

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

@@ -11,6 +11,11 @@ module Ea
         # text (Enumeration gets a list-style icon; other classifiers
         # get the "folded paper" silhouette).
         module PackageContents
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::SQUARE_BEVEL
+          end
+
           ROW_HEIGHT = 16
           ICON_X_OFFSET = 5
           TEXT_X_OFFSET = 23

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

@@ -13,6 +13,11 @@ module Ea
         # (379 diagrams, 378 exact): classifiers never render the
         # subtitle, and ShowForeign=0 diagrams render none.
         module PackageFromParent
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           module_function
 
           def render(context)
@@ -49,6 +54,10 @@ module Ea
           ASCENT_FAMILIES = %w[cambria carlito].freeze
           GAP_BELOW_BODY = 5
           LEGACY_Y_OFFSET_FROM_BOTTOM = 15
+          # Heights above this (a 100pt caption is H143) are corrupt
+          # input; they keep the legacy offset instead of pushing the
+          # caption far off the element.
+          MAX_CAPTION_HEIGHT = 60
 
           LINE_PITCH = 13
           WRAP_PADDING = 15
@@ -82,10 +91,12 @@ module Ea
           module_function :subtitle
 
           def offset_from_bottom(context)
-            height = context.logical_height
+            height = Ea::Fonts::Metrics.source_logical_height(context.logical_height)
             height ||= Ea::Fonts::Metrics.gdi_logical_height(context.size) if context.size_unit == "pt"
             return LEGACY_Y_OFFSET_FROM_BOTTOM unless ASCENT_FAMILIES.include?(context.family.to_s.downcase)
 
+            return LEGACY_Y_OFFSET_FROM_BOTTOM unless height.nil? || height <= MAX_CAPTION_HEIGHT
+
             ascent, = Ea::Fonts::Metrics.gdi_cell_metrics(context.family, height)
             ascent ? GAP_BELOW_BODY + ascent : LEGACY_Y_OFFSET_FROM_BOTTOM
           end

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

@@ -9,6 +9,19 @@ module Ea
         module Shape
           module_function
 
+          # Notes and legends take the pen the previous drawing left; every
+          # other shape draws its own round/bevel pen.
+          def pen(context)
+            return Pen::ROUND_BEVEL unless pen_inheriting?(context)
+
+            context.previous_pen || Pen::INITIAL
+          end
+
+          def pen_inheriting?(context)
+            legend?(context) || context.model_element.is_a?(Ea::Model::Note)
+          end
+          private_class_method :pen_inheriting?
+
           def render(context)
             if legend?(context)
               Element::LegendRenderer.render(
@@ -17,7 +30,7 @@ module Ea
                 family: context.family,
                 item_font: { size: legend_item_size(context), unit: context.size_unit,
                              logical_height: context.logical_height },
-                first_painted: context.first_painted
+                pen: context.previous_pen
               )
             elsif context.model_element.is_a?(Ea::Model::Note)
               Element::NoteShapeRenderer.render(

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

@@ -13,6 +13,12 @@ module Ea
         # Rendered after the header so the icon sits inside the
         # element body below the stereotype label.
         module StereotypeIcon
+          # ShapeScript output sets no stroke pen, so the icon leaves the
+          # previous pen in force.
+          def self.pen(_context)
+            nil
+          end
+
           module_function
 
           def render(context)

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

@@ -7,6 +7,11 @@ module Ea
         # Tagged value compartment. Skipped when no tagged values
         # or when geometry cannot fit them.
         module TaggedValues
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           DEFAULT_TEXT_COLOR = "#000000"
 
           module_function

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

@@ -49,6 +49,10 @@ module Ea
           InstanceUnderline
         ].freeze
 
+        # One rendered compartment and the pen its first group leaves behind
+        # (nil when it sets none, leaving the previous pen in force).
+        Painted = Struct.new(:svg, :pen)
+
         module_function
 
         # Renders every applicable compartment for the context.
@@ -57,6 +61,15 @@ module Ea
         def render_all(context)
           ALL.map { |compartment| compartment.render(context) }
         end
+
+        # Like render_all, but each applicable compartment comes with the
+        # pen it leaves behind; compartments that do not apply are dropped.
+        def paint_all(context)
+          ALL.filter_map do |compartment|
+            svg = compartment.render(context)
+            Painted.new(svg, compartment.pen(context)) if svg
+          end
+        end
       end
     end
   end

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

@@ -21,10 +21,9 @@ module Ea
         def path_for(connector, points)
           priority = priority_for(connector)
           return centerline(connector, points) unless priority
+          return direct_path(connector, priority, points) if points.size == 2 && direct?(connector)
 
-          segments = points.each_cons(2).map do |first, last|
-            crossings_for(connector, priority, first, last)
-          end
+          segments = bridge_segments(connector, priority, points)
           return centerline(connector, points) if segments.all?(&:empty?)
 
           serialize(points, segments)
@@ -32,6 +31,21 @@ module Ea
 
         private
 
+        # Direct lines are written target-first like their centerline, so the
+        # bridges are walked in that travel direction (arc sweeps are relative
+        # to it) and the target repeat closes the path.
+        def direct_path(connector, priority, points)
+          travel = points.reverse
+          segments = bridge_segments(connector, priority, travel)
+          return centerline(connector, points) if segments.all?(&:empty?)
+
+          "#{serialize(travel, segments)} M #{coordinates(travel.first)}"
+        end
+
+        def bridge_segments(connector, priority, points)
+          points.each_cons(2).map { |first, last| crossings_for(connector, priority, first, last) }
+        end
+
         def centerline(connector, points)
           seats = points.map { |point| coordinates(point) }
           # Direct lines retain EA's target-first repeat and source-first model.
@@ -94,7 +108,7 @@ module Ea
 
           @routes.select do |partner, _points, order|
             !partner.equal?(connector) && order.is_a?(Array) && order.size == priority.size &&
-              !same_source?(connector, partner) && (order <=> priority).negative?
+              !same_source?(connector, partner) && (order <=> priority)&.negative?
           end
         end
 

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

@@ -632,12 +632,19 @@ module Ea
         # Dependency client→supplier (client_id/supplier_id),
         # Association source_id/target_id.
         def end_refs(rel)
-          case rel
-          when Ea::Model::Generalization then [rel.specific_id, rel.general_id]
-          when Ea::Model::Realization then [rel.realizing_id, rel.contract_id]
-          when Ea::Model::Dependency then [rel.client_id, rel.supplier_id]
-          else [rel.source_id, rel.target_id]
-          end
+          refs = case rel
+                 when Ea::Model::Generalization then [rel.specific_id, rel.general_id]
+                 when Ea::Model::Realization then [rel.realizing_id, rel.contract_id]
+                 when Ea::Model::Dependency then [rel.client_id, rel.supplier_id]
+                 else [rel.source_id, rel.target_id]
+                 end
+          refs.map { |ref| diagram_ref(ref) }
+        end
+
+        # A package is `EAPK_<guid>` in the XMI model but is placed on a
+        # diagram as `EAID_<guid>`; key its ends by the diagram spelling.
+        def diagram_ref(ref)
+          ref.is_a?(String) && ref.start_with?("EAPK_") ? "EAID_#{ref[5..]}" : ref
         end
 
         # Center-to-center ray clipped at both box outlines.

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

@@ -60,13 +60,22 @@ module Ea
           path_data.scan(PATH_COMMAND).flat_map do |command, body|
             numbers = body.scan(NUMBER).map(&:to_f)
             case command
-            when "M", "L", "C" then numbers.each_slice(2).select { |pair| pair.size == 2 }
-            when "A" then numbers.each_slice(7).map { |a| a.last(2) }
+            when "M", "L" then numbers.each_slice(2).select { |pair| pair.size == 2 }
+            when "C" then end_points(numbers, 6)
+            when "A" then end_points(numbers, 7)
             else []
             end
           end
         end
 
+        # The segment end point only: a Bezier's control points lie
+        # outside the drawn curve and EA does not count them (basic
+        # E325B9D8, hand-drawn style: 504 x 274 natively, 508 x 278
+        # with the control points).
+        def self.end_points(numbers, stride)
+          numbers.each_slice(stride).select { |a| a.size == stride }.map { |a| a.last(2) }
+        end
+
         def self.text_box(attrs)
           style = attrs["style"].to_s
           size = style[/font-size:([\d.]+)/, 1].to_f

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

@@ -48,6 +48,13 @@ module Ea
           ].compact
         end
 
+        # Narrowest canvas that holds the name tab inside the border
+        # (the border inset on both sides of the tab).
+        def min_width(diagram)
+          2 * theme.frame.inset + tab_label_width(diagram) +
+            theme.frame.tab_slant
+        end
+
         private
 
         def border_layer(canvas)

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

@@ -17,7 +17,7 @@ module Ea
         # origins the canvas on the drawn content like EA's native
         # unframed export; off, it keeps the framed 35/40 content origin.
         def initialize(diagram, model_index:, frame: false, document: nil,
-                       content_anchor: true, **_options)
+                       content_anchor: true)
           @diagram = diagram
           @model_index = model_index
           @frame = frame
@@ -44,10 +44,25 @@ module Ea
                              content_anchor: content_anchor)
           seq = sequence(canvas)
           canvas, seq = redo_on_drawn(canvas, seq)
-          content_anchor ? anchor_on_content(canvas, seq) : [canvas, seq]
+          return anchor_on_content(canvas, seq) if content_anchor
+
+          frame ? grow_to_drawn_shapes(canvas, seq) : [canvas, seq]
         end
         private :lay_out
 
+        # A framed canvas is sized from element rects, so a stored
+        # connector bend beyond them is drawn outside the viewBox. Grows
+        # the canvas to hold every drawn shape; a diagram whose shapes
+        # already fit keeps its canvas untouched.
+        def grow_to_drawn_shapes(canvas, seq)
+          shapes = ContentExtent.measure(seq.layers.drop(1)).shapes
+          return [canvas, seq] unless shapes
+
+          grown = canvas.holding(shapes)
+          grown.equal?(canvas) ? [canvas, seq] : [grown, sequence(grown)]
+        end
+        private :grow_to_drawn_shapes
+
         def redo_on_drawn(canvas, seq)
           grown = seq.drawn_bounds
           return [canvas, seq] unless grown&.values&.any? &&
@@ -103,13 +118,14 @@ module Ea
           %(<g id="images">\n#{fragments.join("\n")}\n</g>)
         end
 
-        # True when any drawn bound falls outside the stored-rect
-        # canvas content area.
+        # True when any drawn bound falls outside the canvas content
+        # area; the far edges are measured from the canvas' model-space
+        # origin (its insets included).
         def exceeds?(canvas, bounds)
           bounds.any? do |b|
             b.x < canvas.min_x || b.y < canvas.min_y ||
-              b.x + b.width > canvas.min_x + canvas.width ||
-              b.y + b.height > canvas.min_y + canvas.height
+              b.x + b.width > canvas.origin_x + canvas.width ||
+              b.y + b.height > canvas.origin_y + canvas.height
           end
         end
 

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

@@ -116,7 +116,12 @@ module Ea
                                          lookup: lookup).to_s
               end
             else
-              ordered_properties(props, stored_order).flat_map do |prop|
+              # EMPIRICAL FIT (test B58D1A53, the only corpus class mixing
+              # stereotyped and plain attributes): EA draws the plain rows
+              # first, then the stereotyped ones in stored order.
+              plain, stereotyped = ordered_properties(props, stored_order)
+                                   .partition { |prop| property_stereotype(prop).nil? }
+              (plain + stereotyped).flat_map do |prop|
                 lines = []
                 stereotype = property_stereotype(prop)
                 lines << "«#{stereotype}»" if stereotype

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

@@ -206,6 +206,15 @@ module Ea
             content_bottom_y ? content_bottom_y + size + 5 : raw_attr_first_y
           end
 
+          # Bottom edge of the tags compartment: the last tag row plus one
+          # row of trailing space (204F4ACC: last baseline 83, EA bottom 95).
+          def tagged_values_bottom_y
+            return nil unless tagged_value_first_y
+
+            tagged_value_first_y +
+              (tagged_values_count.to_i + 1) * line_height(@size_unit == "pt" ? 6 : 4)
+          end
+
           # The lowest content edge among attributes, enum literals,
           # operations, and constraints — the anchor for trailing
           # compartments and the autosize height.

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

@@ -11,6 +11,7 @@ module Ea
         # the left edge from text-width approximation since SVG text
         # x= is the start position, not the center).
         class HeaderRenderer
+          OVERFLOW_INSET = 2
           HeaderLine = Struct.new(:text, :style, :x, :y, :text_length,
                                   :weight, :font_style, keyword_init: true)
 
@@ -83,7 +84,13 @@ module Ea
 
           # EA centers text by its INTEGER textLength and floors the
           # resulting x (verified exact against EA-published SVGs).
+          #
+          # EMPIRICAL FIT: a name wider than its box starts 2px inside the
+          # left edge instead of centring past it (simple 204F4ACC
+          # AcmeUmlEnumeration, 106 in a 90 box: x = box x + 2).
           def self.center_x_for(text_length, bounds)
+            return bounds.x + OVERFLOW_INSET if text_length > bounds.width
+
             (bounds.x + (bounds.width - text_length) / 2.0).floor
           end
           private_class_method :center_x_for

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

@@ -32,23 +32,24 @@ module Ea
           LABEL_BASELINE_FROM_ICON_TOP = 12
           DEFAULT_ITEM_FONT_SIZE = 9
           # The legend pen is not set explicitly: the panel inherits the pen
-          # left by the previous drawing (round/bevel), or EA's initial pen
-          # (square/miter) when the legend is the first thing painted. Held
-          # across the corpus: 11 of 11 legends painted first are square, 105
-          # of 105 painted later are round.
-          INHERITED_STROKE = "stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;"
-          INITIAL_STROKE = "stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;"
+          # left by the previous drawing, or EA's initial pen (square/miter)
+          # when nothing was drawn before it - the same rule notes follow.
+          # Held across the corpus: 11 of 11 legends painted first are
+          # square/miter, 105 of 105 painted later follow a class-like
+          # drawing that leaves round/bevel.
+          INITIAL_PEN = Element::NoteShapeRenderer::INITIAL_PEN
 
-          def self.render(bounds, legend:, family:, canvas: nil, item_font: {}, first_painted: false)
-            new(bounds, legend, family, canvas, item_font, first_painted: first_painted).to_svg
+          def self.render(bounds, legend:, family:, canvas: nil, item_font: {}, pen: nil)
+            new(bounds, legend, family, canvas, item_font, pen: pen).to_svg
           end
 
-          def initialize(bounds, legend, family, canvas, item_font = {}, first_painted: false)
+          def initialize(bounds, legend, family, canvas, item_font = {}, pen: nil)
             @bounds = bounds
             @legend = legend
             @family = family
             @canvas = canvas
-            @pen = first_painted ? INITIAL_STROKE : INHERITED_STROKE
+            cap, join = pen || INITIAL_PEN
+            @pen = "stroke-width:1;stroke-linecap:#{cap};stroke-linejoin:#{join};"
             @item_font = item_font[:size]&.nonzero? ? item_font : {}
           end
 
@@ -162,10 +163,11 @@ module Ea
             (block_left + (block_right - block_left - title_text_width.round) / 2.0).floor
           end
 
-          def estimated_width(text, size, weight: nil, logical_height: nil, text_family: family)
+          def estimated_width(text, size, weight: nil, logical_height: nil, text_family: family,
+                              legend_title: false)
             TextRenderer.estimate_width(
               text, size, family: text_family, weight: weight,
-                          logical_height: logical_height
+                          logical_height: logical_height, legend_title: legend_title
             ).round
           end
 
@@ -193,7 +195,8 @@ module Ea
           end
 
           def title_text_width
-            estimated_width(legend.title, title_font_size, weight: 700, text_family: heading_family)
+            estimated_width(legend.title, title_font_size, weight: 700, text_family: heading_family,
+                                       legend_title: true)
           end
 
           def heading_family
@@ -206,7 +209,8 @@ module Ea
             TextRenderer.new(
               content: content.to_s, x: tx, y: ty,
               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
+              weight: weight, fill: label_fill, logical_height: weight.zero? ? item_font[:logical_height] : nil,
+              legend_title: !weight.zero?
             ).to_svg
           end
 

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

@@ -32,14 +32,7 @@ module Ea
           # native notes: 7C44AC09 first (square/miter), 7D960BD8 after
           # square/bevel icons (square/bevel), 676B9C9A, 926AFE38, 9DA6C553
           # and C028B286 after round/bevel shapes (round/bevel).
-          INITIAL_PEN = %w[square miter].freeze
-          PEN_PATTERN = /stroke-linecap:(\w+);stroke-linejoin:(\w+)/
-
-          # The [cap, join] a rendered group leaves behind, or nil.
-          def self.pen_of(group)
-            match = PEN_PATTERN.match(group.to_s)
-            match&.captures
-          end
+          INITIAL_PEN = Pen::INITIAL
 
           def self.render(bounds, body:, fill:, stroke:, stroke_width:, family:, size:, text_fill:, pen: nil)
             new(bounds, body, fill, stroke, stroke_width, family, size, text_fill, pen || INITIAL_PEN).to_svg

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

@@ -33,13 +33,11 @@ module Ea
         def groups
           @drawn_bounds = {}
           @divider_y = {}
-          @painted_any = false
           @previous_pen = nil
           ordered_elements.flat_map do |e|
-            groups = groups_for(e)
-            @painted_any ||= groups.any?
-            @previous_pen = Element::NoteShapeRenderer.pen_of(groups.last) || @previous_pen
-            groups
+            painted = groups_for(e)
+            @previous_pen = painted.last&.pen || @previous_pen
+            painted.map(&:svg)
           end
         end
 
@@ -58,9 +56,14 @@ module Ea
         private
 
         # EA paints placements by descending Sequence (the lowest
-        # Sequence is on top); equal keys keep their stored order.
+        # Sequence is on top); equal keys keep their stored order. A
+        # placement with no Sequence (no such row in the corpus, so EA's
+        # treatment is unmeasured) is painted first, as before the
+        # descending order, rather than ahead of the numbered ones.
         def ordered_elements
-          (diagram.elements || []).sort_by.with_index { |e, i| [-(e.z_order || 0), i] }
+          (diagram.elements || []).sort_by.with_index do |e, i|
+            e.z_order ? [1, -e.z_order, i] : [0, 0, i]
+          end
         end
 
         def groups_for(element)
@@ -72,7 +75,7 @@ module Ea
           record_drawn_bounds(element, context)
           return [] if element.style&.fetch("connector_proxy", false)
 
-          Compartment.render_all(context).compact
+          Compartment.paint_all(context)
         end
 
         # Logical-space drawn bounds: stored x/y with the RENDERED
@@ -286,6 +289,7 @@ module Ea
               height: grown_bottom + compartment_bottom_padding(size, family, size_unit) - bounds.y
             )
           end
+          bounds = grow_for_tagged_values(bounds, geometry, element, classifier)
           RenderContext.new(
             element: element,
             bounds: bounds,
@@ -310,7 +314,6 @@ module Ea
             diagram: diagram,
             model_index: model_index,
             off_canvas_parent_name: parent_name,
-            first_painted: !@painted_any,
             previous_pen: @previous_pen
           )
         end
@@ -322,6 +325,21 @@ module Ea
           offset
         end
 
+        # A shown tags compartment that overflows the stored box grows
+        # it to the last tag row plus one row (204F4ACC AcmeUmlClass:
+        # QEA stores h70; EA draws h85, the XMI geometry already says 85).
+        # Fitted on that diagram only; boxes whose stored height already
+        # holds the tags are untouched.
+        def grow_for_tagged_values(bounds, geometry, element, classifier)
+          return bounds unless element.show_tagged_values && tagged_values_for(classifier).any?
+
+          tags_bottom = geometry.tagged_values_bottom_y
+          return bounds unless tags_bottom && tags_bottom > bounds.y + bounds.height
+
+          Ea::Model::Bounds.new(x: bounds.x, y: bounds.y, width: bounds.width,
+                                height: tags_bottom - bounds.y)
+        end
+
         def compartment_bottom_padding(size, family, size_unit)
           Ea::Fonts::Metrics.compact_compartment_font?(size, family: family, unit: size_unit) ? 7 : 8
         end
@@ -397,12 +415,18 @@ module Ea
         # that were +1: 0114FD24 uro::AbstractConstruction etc.; 20 of
         # 21 now exact, no other compared item moved). The tight ghost
         # variant has no corpus case and keeps the default offsets.
+        #
+        # An Enumeration with literals takes it too (EMPIRICAL FIT, test
+        # B58D1A53 Enumeration: divider 346 = name 339 + 7; the only Cambria 7pt
+        # enumeration with literals in the small corpora).
         def compact_header_offsets?(classifier, header_lines, size, **options)
-          classifier.is_a?(Ea::Model::Klass) &&
+          literals = options[:enum_literals_count]
+          kind_fits = (classifier.is_a?(Ea::Model::Klass) && literals.zero?) ||
+                      (classifier.is_a?(Ea::Model::Enumeration) && literals.positive?)
+          kind_fits &&
             Ea::Fonts::Metrics.compact_compartment_font?(size, family: options[:family], unit: options[:size_unit]) &&
             header_lines.dig(0, 1) != :italic_tight &&
-            options.values_at(:logical_height, :marker_count, :enum_literals_count,
-                              :divider_offset, :attr_first_offset) == [nil, 0, 0, 8, 7] &&
+            options.values_at(:logical_height, :marker_count, :divider_offset, :attr_first_offset) == [nil, 0, 8, 7] &&
             theme.compartments.header_line_offset == 6 && theme.compartments.attr_line_offset == 6
         end
 

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

@@ -68,7 +68,9 @@ module Ea
         end
 
         def logical_height_for(element)
-          element&.font_logical_height if size_unit_for(element) == "pt"
+          return nil unless size_unit_for(element) == "pt"
+
+          Ea::Fonts::Metrics.source_logical_height(element&.font_logical_height)
         end
 
         def weight_for(element)