ea 0.6.107 → 0.6.108

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

@@ -47,12 +47,14 @@ module Ea
           end
 
           def self.render(lines, bounds:, first_y:, family:,
-                          size:, size_unit: DEFAULT_FONT_UNIT,
+                          size:, size_unit: DEFAULT_FONT_UNIT, logical_height: nil,
                           fill: "#000000",
                           visibility_x_offset: DEFAULT_VISIBILITY_X_OFFSET,
                           content_x_offset: nil)
 
-            line_h = size + ROW_LINE_OFFSET
+            line_h = Ea::Fonts::Metrics.compartment_line_height(
+              size, family: family, unit: size_unit, offset: ROW_LINE_OFFSET, logical_height: logical_height
+            )
             offsets = group_lead_offsets(lines)
             text_blocks = []
             lines.each_with_index do |line, idx|
@@ -60,15 +62,27 @@ module Ea
               visibility, rest = split_visibility(line)
               if visibility
                 unless visibility.strip.empty?
-                  text_blocks << build_text(bounds.x + visibility_x_offset, y, visibility, family, size, size_unit, fill)
+                  text_blocks << build_text(
+                    bounds.x + visibility_x_offset, y, visibility, family, size, size_unit, fill,
+                    logical_height: logical_height
+                  )
                 end
                 offset = (content_x_offset || DEFAULT_CONTENT_X_OFFSET) +
                          2 * (size - 7)
-                text_blocks << build_text(bounds.x + offset, y, rest, family, size, size_unit, fill)
+                offset -= 1 if Ea::Fonts::Metrics.compact_compartment_font?(size, family: family, unit: size_unit)
+                text_blocks << build_text(
+                  bounds.x + offset, y, rest, family, size, size_unit, fill, logical_height: logical_height
+                )
               elsif line.strip.start_with?("«")
-                text_blocks << build_text(bounds.x + STEREOTYPE_HEADER_X_OFFSET, y, line.strip, family, size, size_unit, fill)
+                text_blocks << build_text(
+                  bounds.x + STEREOTYPE_HEADER_X_OFFSET, y, line.strip, family, size, size_unit, fill,
+                  logical_height: logical_height
+                )
               else
-                text_blocks << build_text(bounds.x + visibility_x_offset, y, line.strip, family, size, size_unit, fill)
+                text_blocks << build_text(
+                  bounds.x + visibility_x_offset, y, line.strip, family, size, size_unit, fill,
+                  logical_height: logical_height
+                )
               end
             end
             group_style = "stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel; fill:#{fill};fill-opacity:1.00; stroke:#000000; stroke-opacity:0.00"
@@ -149,9 +163,11 @@ module Ea
           end
           private_class_method :split_visibility
 
-          def self.build_text(x, y, content, family, size, size_unit = DEFAULT_FONT_UNIT, fill = "#000000")
+          def self.build_text(x, y, content, family, size, size_unit = DEFAULT_FONT_UNIT,
+                              fill = "#000000", logical_height: nil)
             TextRenderer.new(content: content, x: x, y: y,
-                              family: family, size: size, size_unit: size_unit, fill: fill).to_svg
+                             family: family, size: size, size_unit: size_unit,
+                             logical_height: logical_height, fill: fill).to_svg
           end
           private_class_method :build_text
 

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

@@ -40,10 +40,14 @@ module Ea
                           attr_line_offset: 6,
                           attr_first_offset: 7,
                           attr_group_lead: 0,
+                         family: nil, size_unit: "pt", logical_height: nil,
                           header_ghost: false,
                           header_ghost_tight: false)
             @bounds = bounds
             @size = size
+            @family = family
+            @size_unit = size_unit
+            @logical_height = logical_height
             @header_lines_count = header_lines_count
             @attr_lines_count = attr_lines_count
             @op_lines_count = op_lines_count
@@ -61,6 +65,13 @@ module Ea
             @header_ghost_tight = header_ghost_tight
           end
 
+          def line_height(offset)
+            Ea::Fonts::Metrics.compartment_line_height(
+              size, family: @family, unit: @size_unit, offset: offset, logical_height: @logical_height
+            )
+          end
+          private :line_height
+
           def header_first_y
             bounds.y + size + (header_top_padding || 12)
           end
@@ -81,9 +92,9 @@ module Ea
             ghost_shift = header_ghost ? (header_ghost_tight ? 3 : 6) : 0
 
             header_first_y +
-              ([header_lines_count, 1].max - 1) * (size + (header_line_offset || 6)) +
+              ([header_lines_count, 1].max - 1) * line_height(header_line_offset || 6) +
               ghost_shift +
-              (marker_count.to_i * (size + 6)) +
+              (marker_count.to_i * line_height(6)) +
               (divider_offset || 8)
           end
 
@@ -104,13 +115,13 @@ module Ea
           def raw_attr_first_y
             return bounds.y + size + (header_top_padding || 12) + 12 unless divider_y
 
-            divider_y + size + (attr_first_offset || 7)
+            divider_y + line_height((attr_first_offset || 7) - 1) + 1
           end
 
           def attr_bottom_y
             return attr_first_y unless attr_lines_count&.positive?
 
-            attr_first_y + (attr_lines_count - 1) * (size + (attr_line_offset || 6)) +
+            attr_first_y + (attr_lines_count - 1) * line_height(attr_line_offset || 6) +
               @attr_group_lead.to_i
           end
 
@@ -137,7 +148,7 @@ module Ea
           def op_bottom_y
             return op_divider_y unless op_lines_count&.positive?
 
-            op_first_y + (op_lines_count - 1) * (size + 6)
+            op_first_y + (op_lines_count - 1) * line_height(6)
           end
 
           # EA draws a single divider under the header and seats
@@ -147,7 +158,7 @@ module Ea
           def enum_literal_first_y
             return nil unless divider_y
 
-            divider_y + size + (attr_first_offset || 7)
+            divider_y + line_height((attr_first_offset || 7) - 1) + 1
           end
 
           # OCL constraints follow the regular content with a divider and caption.
@@ -199,7 +210,7 @@ module Ea
           def enum_literals_bottom_y
             return nil unless enum_literal_first_y
 
-            enum_literal_first_y + ([enum_literals_count, 1].max - 1) * (size + 6)
+            enum_literal_first_y + ([enum_literals_count, 1].max - 1) * line_height(6)
           end
         end
       end

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

@@ -39,27 +39,31 @@ module Ea
           def self.compartment_row(constraint, context, index)
             build_text(context.bounds.x + 5,
                        context.geometry.constraints_first_y + (index + 1) * (context.size + 5),
-                       "{#{constraint.name}}", context.family, context.size, context.text_fill)
+                       "{#{constraint.name}}", context.family, context.size, context.text_fill,
+                       size_unit: context.size_unit, logical_height: context.logical_height)
           end
           private_class_method :compartment_row
 
           def self.compartment_caption(context)
             TextRenderer.new(content: "constraints", x: caption_x(context),
                              y: context.geometry.constraints_first_y, family: context.family,
-                             size: context.size, fill: context.text_fill, style: "italic").to_svg
+                             size: context.size, size_unit: context.size_unit, logical_height: context.logical_height,
+                             fill: context.text_fill, style: "italic").to_svg
           end
           private_class_method :compartment_caption
 
           def self.caption_x(context)
             width = TextRenderer.estimate_width("constraints", context.size, nil,
-                                                family: context.family, style: "italic").round
+                                                family: context.family, style: "italic",
+                                                logical_height: context.logical_height).round
             context.bounds.x + ((context.bounds.width - width) / 2).floor
           end
           private_class_method :caption_x
 
-          def self.build_text(x, y, content, family, size, fill)
+          def self.build_text(x, y, content, family, size, fill, size_unit: "px", logical_height: nil)
             TextRenderer.new(content: content, x: x, y: y,
-                              family: family, size: size, fill: fill).to_svg
+                             family: family, size: size, size_unit: size_unit,
+                             logical_height: logical_height, fill: fill).to_svg
           end
           private_class_method :build_text
         end

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

@@ -16,19 +16,22 @@ module Ea
           # EA lists literals alphabetically (case-insensitive) and
           # spaces rows at the same 13px pitch as attributes at 7pt
           # (size + 6) — corpus-verified against EA-published SVGs.
-          def self.render(literals, bounds:, first_y:, family:, size:)
-            line_h = size + 6
+          def self.render(literals, bounds:, first_y:, family:, size:, size_unit: "px", logical_height: nil)
+            line_h = Ea::Fonts::Metrics.compartment_line_height(
+              size, family: family, unit: size_unit, logical_height: logical_height
+            )
             sorted = literals.sort_by { |l| [l.name.to_s.downcase, l.name.to_s] }
             text_blocks = sorted.each_with_index.map do |literal, idx|
               y = first_y + (idx * line_h)
-              build_text(bounds.x + 5, y, literal.name.to_s, family, size)
+              build_text(bounds.x + 5, y, literal.name.to_s, family, size, 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)
+          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).to_svg
+                             family: family, size: size, size_unit: size_unit,
+                             logical_height: logical_height).to_svg
           end
           private_class_method :build_text
         end

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

@@ -19,7 +19,7 @@ module Ea
         module HeaderLinePipeline
           Context = Struct.new(:classifier, :diagram_package_id,
                                :visually_nested, :umldi_keyword,
-                               :bounds_width, :font_size, :family,
+                               :bounds_width, :font_size, :family, :logical_height,
                                :off_canvas_parent_name,
                                :foreign_package_name,
                                :suppress_stereotypes,
@@ -57,7 +57,8 @@ module Ea
             width = lambda do |s|
               TextRenderer.estimate_width(
                 s, context.font_size || 9, nil,
-                family: context.family, weight: "700", style: font_style
+                family: context.family, weight: "700", style: font_style,
+                logical_height: context.logical_height
               ).round
             end
             return [text] if context.bounds_width.nil?

data/lib/ea/svg/ea_emitter/element/header_line_provider/instance_spec.rb

@@ -20,15 +20,20 @@ module Ea
               return [] unless inst.is_a?(Ea::Model::InstanceSpecification)
 
               lines = stereotype_lines(inst, context)
-              label = inst.name.to_s
-              if inst.classifier_name && !inst.classifier_name.empty?
-                label = "#{label}: #{inst.classifier_name}"
-              end
-              lines + HeaderLinePipeline.wrap_words(label, context, :bold).map do |line|
+              lines + HeaderLinePipeline.wrap_words(label_for(inst), context, :bold).map do |line|
                 [line, :bold]
               end
             end
 
+            # "Name / alias: Classifier"; t_object.Alias is the instance role.
+            def self.label_for(inst)
+              label = inst.name.to_s
+              label = "#{label} / #{inst.role_name}" unless inst.role_name.to_s.empty?
+              return label if inst.classifier_name.to_s.empty?
+
+              "#{label}: #{inst.classifier_name}"
+            end
+
             def self.stereotype_lines(inst, context)
               return [] if context.suppress_stereotypes
 

data/lib/ea/svg/ea_emitter/element/header_line_provider/name.rb

@@ -56,7 +56,8 @@ module Ea
               font_style = weight == :bold_italic ? "italic" : "normal"
               len = TextRenderer.estimate_width(
                 name, context.font_size || 9, nil,
-                family: context.family, weight: "700", style: font_style
+                family: context.family, weight: "700", style: font_style,
+                logical_height: context.logical_height
               ).round
               # Same usable width as wrap_words: box width - 6.
               # EA wraps "Content information::MD_FeatureCatalogue-

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

@@ -12,17 +12,20 @@ module Ea
         # x= is the start position, not the center).
         class HeaderRenderer
           def self.render(lines, bounds:, first_y:, family:,
-                          size:, size_unit: "pt",
+                          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)
-            line_h = size + line_offset
+            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
+            )
             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 = (style == :italic || style == :bold_italic) ? "italic" : "normal"
+              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).
@@ -33,23 +36,22 @@ module Ea
                             end
               y = first_y + (idx * line_h) +
                   (idx >= 1 && ghost_shift.positive? ? ghost_shift : 0)
-              x = if style == :italic
-                    # EA right-aligns the off-canvas parent ghost at
-                    # the box's right edge by its integer textLength.
-                    bounds.x + bounds.width -
+              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
+                        family: family, weight: weight, style: font_style, logical_height: logical_height
                       ).round
                   else
                     center_x_for(text, bounds, size, width_factor,
                                  family: family, weight: weight,
-                                 style: font_style)
+                                 style: font_style, logical_height: logical_height)
                   end
               TextRenderer.new(
                 content: text,
                 x: x, y: y,
-                family: family, size: size, size_unit: size_unit,
+                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
@@ -60,9 +62,9 @@ module Ea
           # 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)
+                                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
+              text, size, width_factor, family: family, weight: weight, style: style, logical_height: logical_height
             ).round
             (bounds.x + (bounds.width - len) / 2.0).floor
           end

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

@@ -16,10 +16,12 @@ module Ea
           VISIBILITY_X_OFFSET = 5
           CONTENT_X_OFFSET = 22
 
-          def self.render(operations, bounds:, first_y:, family:, size:)
+          def self.render(operations, bounds:, first_y:, family:, size:, size_unit: "px", logical_height: nil)
             # EA's op rows pitch 13 (size + 6), same as attribute
             # rows (6D4C665D: ops 541..658 step 13).
-            line_h = size + 6
+            line_h = Ea::Fonts::Metrics.compartment_line_height(
+              size, family: family, unit: size_unit, logical_height: logical_height
+            )
             text_blocks = []
             has_receptions = operations.any?(&:is_reception)
             if has_receptions
@@ -27,7 +29,7 @@ module Ea
                 content: "receptions",
                 x: bounds.x + (bounds.width / 2.0) - (8 * size * 0.65) / 2,
                 y: first_y,
-                family: family, size: size,
+                family: family, size: size, size_unit: size_unit, logical_height: logical_height,
                 style: "italic", fill: "#000000"
               ).to_svg
             end
@@ -36,9 +38,9 @@ module Ea
             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)
+                                        visibility_prefix(op), family, size, size_unit, logical_height: logical_height)
               text_blocks << build_text(bounds.x + AttributeRenderer.content_x_offset(size), y,
-                                         operation_text(op), family, size)
+                                        operation_text(op), family, size, size_unit, logical_height: logical_height)
             end
             %(<g style="#{Style::TEXT_GROUP}">\n#{text_blocks.join("\n")}\n</g>)
           end
@@ -90,9 +92,10 @@ module Ea
           end
           private_class_method :reception_params
 
-          def self.build_text(x, y, content, family, size)
+          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).to_svg
+                             family: family, size: size, size_unit: size_unit,
+                             logical_height: logical_height).to_svg
           end
           private_class_method :build_text
         end

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

@@ -116,6 +116,7 @@ module Ea
           size = font_resolver.size_for(element)
           family = font_resolver.family_for(element)
           size_unit = font_resolver.size_unit_for(element)
+          logical_height = font_resolver.logical_height_for(element)
           parent_name = off_canvas_parent_name_for(classifier)
 
 
@@ -152,8 +153,8 @@ module Ea
           # 22 + 3 (CharacterString 197+27=224, Integer 92+25=117).
           # Titles never drive growth - they wrap instead.
           if attr_lines.any? || op_lines.any?
-            row_w = [row_content_width(attr_lines, 5, size, family),
-                     row_content_width(op_lines, 3, size, family)].compact.max
+            row_w = [row_content_width(attr_lines, 5, size, family, logical_height),
+                     row_content_width(op_lines, 3, size, family, logical_height)].compact.max
             if row_w && row_w > bounds.width
               bounds = Ea::Model::Bounds.new(
                 x: bounds.x, y: bounds.y,
@@ -167,18 +168,19 @@ module Ea
                                                                 visually_nested: visually_nested?(element),
                                                                 umldi_keyword: element.umldi_keyword,
                                                                 bounds_width: bounds.width,
-                                                                font_size: size,
+                                                                font_size: size, logical_height: logical_height,
                                                                 family: family,
                                                                 off_canvas_parent_name: parent_name,
                                                                 foreign_package_name: foreign_package_name_for(classifier),
                                                                 suppress_stereotypes: suppress_stereotypes?) : []
           geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
-                                           tagged_values_for(classifier).size,
-                                           header_lines, classifier: classifier,
-                                           constraints_count: constraints_for(classifier).size,
-                                           marker_count: marker_lines_for(classifier, element).size,
-                                           enum_literals_count: enum_row_count_for(classifier),
-                                                 attr_group_lead: Element::AttributeRenderer.group_lead_total(attr_lines))
+                                          tagged_values_for(classifier).size,
+                                          header_lines, classifier: classifier, family: family,
+                                          size_unit: size_unit, logical_height: logical_height,
+                                          constraints_count: constraints_for(classifier).size,
+                                          marker_count: marker_lines_for(classifier, element).size,
+                                          enum_literals_count: enum_row_count_for(classifier),
+                                          attr_group_lead: Element::AttributeRenderer.group_lead_total(attr_lines))
           # EA suppresses the whole attribute compartment when its
           # rows do not fit the stored box height (never truncates
           # rows) - the AOS box on CityFurniture hides its
@@ -196,12 +198,13 @@ module Ea
              geometry.attr_bottom_y.to_i > bounds.y + bounds.height
             attr_lines = []
             geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
-                                             tagged_values_for(classifier).size,
-                                             header_lines, classifier: classifier,
-                                             constraints_count: constraints_for(classifier).size,
-                                           marker_count: marker_lines_for(classifier, element).size,
-                                           enum_literals_count: enum_row_count_for(classifier),
-                                                 attr_group_lead: Element::AttributeRenderer.group_lead_total(attr_lines))
+                                            tagged_values_for(classifier).size,
+                                            header_lines, classifier: classifier, family: family,
+                                            size_unit: size_unit, logical_height: logical_height,
+                                            constraints_count: constraints_for(classifier).size,
+                                            marker_count: marker_lines_for(classifier, element).size,
+                                            enum_literals_count: enum_row_count_for(classifier),
+                                            attr_group_lead: Element::AttributeRenderer.group_lead_total(attr_lines))
           end
           # EA suppresses the operations compartment when its rows
           # overflow the stored box height (same rule as attributes)
@@ -216,22 +219,24 @@ module Ea
               height: geometry.op_bottom_y.to_i + 8 - bounds.y
             )
             geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
-                                             tagged_values_for(classifier).size,
-                                             header_lines, classifier: classifier,
-                                             constraints_count: constraints_for(classifier).size,
-                                           marker_count: marker_lines_for(classifier, element).size,
-                                           enum_literals_count: enum_row_count_for(classifier),
-                                                 attr_group_lead: Element::AttributeRenderer.group_lead_total(attr_lines))
+                                            tagged_values_for(classifier).size,
+                                            header_lines, classifier: classifier, family: family,
+                                            size_unit: size_unit, logical_height: logical_height,
+                                            constraints_count: constraints_for(classifier).size,
+                                            marker_count: marker_lines_for(classifier, element).size,
+                                            enum_literals_count: enum_row_count_for(classifier),
+                                            attr_group_lead: Element::AttributeRenderer.group_lead_total(attr_lines))
           elsif op_lines.any? && geometry.op_first_y &&
              geometry.op_bottom_y.to_i > bounds.y + bounds.height
             op_lines = []
             geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
-                                             tagged_values_for(classifier).size,
-                                             header_lines, classifier: classifier,
-                                             constraints_count: constraints_for(classifier).size,
-                                           marker_count: marker_lines_for(classifier, element).size,
-                                           enum_literals_count: enum_row_count_for(classifier),
-                                                 attr_group_lead: Element::AttributeRenderer.group_lead_total(attr_lines))
+                                            tagged_values_for(classifier).size,
+                                            header_lines, classifier: classifier, family: family,
+                                            size_unit: size_unit, logical_height: logical_height,
+                                            constraints_count: constraints_for(classifier).size,
+                                            marker_count: marker_lines_for(classifier, element).size,
+                                            enum_literals_count: enum_row_count_for(classifier),
+                                            attr_group_lead: Element::AttributeRenderer.group_lead_total(attr_lines))
           end
           # Real attributes grow the DRAWN box past the stored
           # height instead of being dropped (0CABA7D7: stored h44
@@ -265,7 +270,7 @@ module Ea
             stroke: resolve_stroke,
             stroke_width: resolve_stroke_width,
             text_fill: theme.text_color,
-            family: family, size: size, size_unit: size_unit,
+            family: family, size: size, size_unit: size_unit, logical_height: logical_height,
             header_lines: header_lines,
             attr_lines: attr_lines,
             op_lines: op_lines,
@@ -283,14 +288,14 @@ module Ea
           )
         end
 
-        def row_content_width(lines, right_pad, size, family)
+        def row_content_width(lines, right_pad, size, family, logical_height)
           return nil if lines.to_a.empty?
 
           tl = lines.filter_map do |line|
             text = line.sub(/\A\S /, "")
             Ea::Fonts::Metrics.text_length(text, size,
                                            family: family,
-                                           weight: "400")&.round
+                                           weight: "400", logical_height: logical_height)&.round
           end.max
           return nil unless tl
 
@@ -301,8 +306,9 @@ module Ea
                                  tagged_count, header_lines, classifier: nil,
                                  constraints_count: 0, marker_count: 0,
                                  enum_literals_count: 0,
-                                 attr_group_lead: 0)
-          CompartmentGeometry.new(bounds: bounds, size: size,
+                                 attr_group_lead: 0, family: nil, size_unit: "pt", logical_height: nil)
+          CompartmentGeometry.new(bounds: bounds, size: size, family: family,
+                                  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? &&
@@ -496,6 +502,7 @@ module Ea
 
         def foreign_package_name_for(classifier)
           return nil unless diagram.show_foreign
+          return nil if diagram.style_ex.to_s.split(";").include?("NoFullScope=1")
           return nil unless classifier.is_a?(Ea::Model::Classifier)
 
           # Nested classifiers (t_object.ParentID -> a Class) qualify

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

@@ -41,9 +41,8 @@ module Ea
                  DEFAULT_MARKER_FAMILIES.include?(explicit)
             return explicit
           end
-          return theme.font_family if theme.themed? && theme.font_family
 
-          diagram_default_family || DEFAULT_FONT_FAMILY
+          theme_family_for(explicit) || diagram_default_family || DEFAULT_FONT_FAMILY
         end
 
         def size_for(element)
@@ -58,8 +57,12 @@ module Ea
           DEFAULT_ELEMENT_FONT_SIZE
         end
 
-        def size_unit_for(_element)
-          theme.font_size_unit || "pt"
+        def size_unit_for(element)
+          element&.font_size_unit || theme.font_size_unit || "pt"
+        end
+
+        def logical_height_for(element)
+          element&.font_logical_height if size_unit_for(element) == "pt"
         end
 
         def weight_for(element)
@@ -73,6 +76,13 @@ module Ea
 
         private
 
+        def theme_family_for(explicit)
+          return unless theme.themed?
+          return theme.font_family if DEFAULT_MARKER_FAMILIES.include?(explicit)
+
+          theme.element_font_family || theme.font_family
+        end
+
         # EA's app-default font depends on the system locale:
         # Japanese Windows → "Yu Gothic UI" 13, English Windows →
         # "Calibri" 10. We can't query EA's runtime, so we infer

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

@@ -42,8 +42,11 @@ module Ea
 
         private
 
+        # EA does not draw a connector whose other end is missing from
+        # the diagram, so it has no waypoints and no ghost label either.
         def visible_connectors
           (diagram.connectors || []).select(&:renderable?)
+                                    .reject { |connector| connector.waypoints.empty? }
         end
 
         def text_for(ghost)