ea 0.6.113 → 0.6.115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 673f03cddf9ae4a7cb297beaa9b9fab0b3e272e26771d976c90c521726465af5
-  data.tar.gz: 1147cce73671336e59d68dc04caeee0cb66276ce946e5af3a8b07d378f21ac7b
+  metadata.gz: c4e23583eed4c1a582614c26b2c77ada31ab41af83b00b474fcdc199d807b599
+  data.tar.gz: 7c02275d511da08c73e261f53815f8d55092420a7bff501151c5b713162068d6
 SHA512:
-  metadata.gz: 44fcd7c27d72d01fef2fdf70498bee178904e54af09484506ff61ff2372281cbc03b5c7d23d4750f4ad7f1c2a474ad3fb3c79cfbbcc61e520f151d11a670a2be
-  data.tar.gz: 5a5ba8607a019d59be72fa1416cfbd66056e751420318bc02042a0ba02bd82dcc66452a97d25c26b2a0f408f132a2891a37db3e19f14f1c4ad98dfe1f4319c19
+  metadata.gz: 378bb61902c1103887fcc9807e675fd2ebfc2dfe50c7b5266c20f2570b02a42ed0c8b120fc81ca626a6b4d9a421f45d2fd151c21b189714282a50f668ce07b79
+  data.tar.gz: 3e4edfe09c4c9235c39e47b6cd202f64bed7904d2b99567cabbff418ecbb7298a1e38b7a0c805fe2e12d760b7e2c11274cf67ee36811925dad804c9c24e61670

data/config/themes/119.yml

@@ -34,7 +34,7 @@ colors:
 
 # Stroke widths.
 strokes:
-  element_border: 2
+  element_border: 1
   connector_line: 2
   divider: 2
   marker: 2

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

@@ -126,6 +126,8 @@ module Ea
           @current_obj_row = obj_row
           style_hash = DiagramStyleParser.parse(obj_row.objectstyle)
           style_hash[:stored_attribute_order] = true
+          fqname = stereotype_fqname_for(obj_row)
+          style_hash[:stereotype_fqname] = fqname if fqname
           font_style = effective_font_style(obj_row, style_hash)
           Ea::Model::DiagramElement.new(
             id: IdNormalizer.synthetic("de", diagram_row.diagram_id,
@@ -142,14 +144,40 @@ module Ea
             font_italic: truthy?(style_hash[:italic]),
             font_underline: truthy?(style_hash[:ul]),
             show_tagged_values: truthy?(style_hash[:tag]),
+            line_width: effective_line_width(obj_row, style_hash),
             background_color: style_hash[:bcol]&.to_i
           )
         end
 
+        # Negative widths inherit the saved object border, then the diagram theme.
+        def effective_line_width(obj_row, style)
+          object = database.find_object(obj_row.ea_object_id)
+          [style[:lwth], object&.borderwidth].each do |raw|
+            next if raw.nil? || raw.to_s.empty?
+
+            width = raw.to_i
+            return width if width >= 0
+          end
+          nil
+        end
+
         def truthy?(raw)
           raw == "1" || raw == "-1"
         end
 
+        def stereotype_fqname_for(placement)
+          object = database.find_object(placement.ea_object_id)
+          return nil unless object
+
+          database.xrefs_for_client(object.ea_guid).each do |xref|
+            application = Xref::Parser.parse(xref.description).stereotype
+            next unless application && application.name == object.stereotype
+
+            return application.fqname
+          end
+          nil
+        end
+
         def build_connectors(diagram_row)
           links = database.diagram_links_for(diagram_row.diagram_id) || []
           context = ContextDiagramSupport.context?(diagram_row)

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

@@ -215,7 +215,7 @@ module Ea
         private_class_method :overlap_ray?
 
         # The QEA builder flags a model relationship drawn without any
-        # diagram link row; EA strokes it at the 2px box outline.
+        # diagram link row; its docks follow the resolved element borders.
         def default_model_connector?(connector)
           connector.style.to_h[:phantom_outline] == true && !connector.has_geometry_offsets &&
             %w[Aggregation Association].include?(connector.connector_type)
@@ -243,16 +243,32 @@ module Ea
         end
         private_class_method :border_width?
 
-        # Explicit zero-width borders keep that end on the geometric edge;
-        # absent or inherited widths retain the default outer-stroke docking.
+        # EA seats docks on whole pixels; a 1px border keeps the geometric edge.
         def outline_bounds(box, diagram, ref, duid)
-          return box if border_width?(diagram, ref, duid, 0)
-
-          Ea::Model::Bounds.new(x: box.x - 1, y: box.y - 1,
-                                width: box.width + 2, height: box.height + 2)
+          inset = (outline_width(diagram, ref, duid) / 2.0).floor
+          Ea::Model::Bounds.new(x: box.x - inset, y: box.y - inset,
+                                width: box.width + 2 * inset, height: box.height + 2 * inset)
         end
         private_class_method :outline_bounds
 
+        def outline_width(diagram, ref, duid)
+          widths = end_placements(diagram, ref, duid).map do |element|
+            effective_border_width(element, diagram)
+          end.uniq
+          widths.size == 1 ? widths.first : diagram.theme.stroke_width
+        end
+        private_class_method :outline_width
+
+        def effective_border_width(element, diagram)
+          return element.line_width if element.line_width && element.line_width >= 0
+
+          raw = element.style.to_h[:lwth]
+          return raw.to_i if raw && raw.to_i >= 0
+
+          diagram.theme.stroke_width
+        end
+        private_class_method :effective_border_width
+
         def end_placements(diagram, ref, duid)
           placed = Array(diagram&.elements).select { |el| el.model_element_ref == ref }
           named = placed.select { |el| duid && el.duid.to_s.casecmp?(duid.to_s) }
@@ -389,6 +405,7 @@ module Ea
           dividers = [divider_y_by_ref[source_ref],
                       divider_y_by_ref[target_ref]]
           return nil unless bounds.all? && dividers.all?
+          return nil if flush_lateral_line?(connector, pairs, *bounds)
 
           preserve_source = explicit_horizontal_source_dock?(pairs, connector)
           adjusted = row_slot_pairs(pairs, bounds, dividers, preserve_source: preserve_source)

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

@@ -23,6 +23,7 @@ module Ea
                                :off_canvas_parent_name,
                                :foreign_package_name,
                                :suppress_stereotypes,
+                               :stereotype_fqname,
                                keyword_init: true)
 
           PROVIDERS = [

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

@@ -22,7 +22,7 @@ module Ea
               # render zero «...» lines, classes included).
               return [] if context.suppress_stereotypes
 
-              labels = label_for(classifier, context.umldi_keyword)
+              labels = label_for(classifier, context.umldi_keyword, context.stereotype_fqname)
               return [] if labels.empty?
 
               labels.map { |l| [l, :normal] }
@@ -30,10 +30,10 @@ module Ea
 
             # @return [Array<String>] «name» labels (EA renders one
             # line per applied stereotype)
-            def self.label_for(classifier, umldi_keyword)
+            def self.label_for(classifier, umldi_keyword, stereotype_fqname = nil)
               return ["«#{umldi_keyword}»"] if umldi_keyword && !umldi_keyword.empty?
 
-              explicit = explicit_stereotype(classifier)
+              explicit = explicit_stereotype(classifier, stereotype_fqname)
               return explicit if explicit
 
               case classifier
@@ -45,21 +45,21 @@ module Ea
               end
             end
 
-            def self.explicit_stereotype(classifier)
+            def self.explicit_stereotype(classifier, stereotype_fqname = nil)
               return nil unless classifier.is_a?(Ea::Model::Classifier) ||
                                  classifier.is_a?(Ea::Model::Package)
 
               refs = classifier.stereotype_refs
               return nil unless refs&.any?
 
-              refs.map { |ref| "«#{canonical(ref)}»" }
+              refs.map { |ref| "«#{canonical(ref, stereotype_fqname)}»" }
             end
 
-            # EA renders the stereotype string exactly as stored in
-            # t_object.Stereotype — corpus-verified: 3,284 placements
-            # render verbatim ('CodeList', 'codeList', 'codelist',
-            # 'featureType' …), zero case-canonicalized.
-            def self.canonical(ref)
+            # EA's standard Class stereotype displays as «type» while
+            # its semantic name remains Type. Custom profiles retain case.
+            def self.canonical(ref, stereotype_fqname = nil)
+              return "type" if ref == "Type" && stereotype_fqname == "StandardProfileL2::Type"
+
               ref
             end
 

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

@@ -169,7 +169,11 @@ module Ea
           end
 
           def title_font_size
-            legend.heading_size || Ea::Model::Legend::DEFAULT_HEADING_SIZE
+            return Ea::Model::Legend::DEFAULT_HEADING_SIZE unless legend.heading_size
+
+            # HEADINGSIZE is stored in pixels; SVG legend text uses points.
+            points = legend.heading_size * 72.0 / 96
+            points == points.to_i ? points.to_i : points
           end
 
           def item_font_size

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

@@ -166,10 +166,12 @@ module Ea
               )
             end
           end
+          stereotype_fqname = element.style&.fetch(:stereotype_fqname, nil)
           header_lines = classifier ? Element::HeaderLines.for(classifier,
                                                                 diagram_package_id: diagram.package_id,
                                                                 visually_nested: visually_nested?(element),
                                                                 umldi_keyword: element.umldi_keyword,
+                                                                stereotype_fqname: stereotype_fqname,
                                                                 bounds_width: bounds.width,
                                                                 font_size: size, logical_height: logical_height,
                                                                 family: family,
@@ -271,7 +273,7 @@ module Ea
             classifier: classifier,
             fill: resolve_fill(element, classifier),
             stroke: resolve_stroke,
-            stroke_width: resolve_stroke_width,
+            stroke_width: resolve_stroke_width(element),
             text_fill: theme.text_color,
             family: family, size: size, size_unit: size_unit, logical_height: logical_height,
             header_lines: header_lines,
@@ -452,7 +454,7 @@ module Ea
         def tagged_values_for(classifier)
           return [] unless classifier.is_a?(Ea::Model::Classifier)
 
-          classifier.tagged_values || []
+          (classifier.tagged_values || []).reject { |tag| tag.value.nil? || tag.value.empty? }
         end
 
         # Real OCL constraints render trailing, after the content
@@ -668,7 +670,9 @@ module Ea
           color_resolver.stroke_for(nil)
         end
 
-        def resolve_stroke_width
+        def resolve_stroke_width(element)
+          return element.line_width if element.line_width && element.line_width >= 0
+
           theme.themed? ? theme.stroke_width : DEFAULT_STROKE_WIDTH
         end
 

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

@@ -10,7 +10,7 @@ module Ea
       #   2. theme.font_family / theme.font_size (when theme is themed)
       #   3. diagram-level default (most common non-nil value across
       #      the diagram's elements)
-      #   4. locale fallback (Calibri 10)
+      #   4. unthemed fallback (Cambria)
       #
       # Lives outside the Elements emitter so the resolution rule is
       # defined once (MECE) and reusable by Labels and any future
@@ -83,14 +83,8 @@ module Ea
           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
-        # from the diagram:
-        #
-        # - If ANY element specifies font=, use the most common.
-        # - If NO element specifies font= (all are "use default"),
-        #   assume the EA English-locale default: Calibri 10.
+        # Unthemed diagrams without a saved family use Cambria.
+        # Saved families still supply the diagram default.
         def diagram_default_family
           families = element_families
           return FALLBACK_DEFAULT_FAMILY if families.empty?
@@ -98,7 +92,7 @@ module Ea
           most_common(families)
         end
 
-        FALLBACK_DEFAULT_FAMILY = "Calibri"
+        FALLBACK_DEFAULT_FAMILY = "Cambria"
 
         def most_common(values)
           return nil if values.empty?

data/lib/ea/svg/ea_emitter/label/end_label.rb

@@ -247,12 +247,15 @@ module Ea
           def source_bottom_dock?(connector, heading, box)
             source_seat?(:source, heading) && heading[0].zero? && heading[1].positive? &&
               zero_source_property_box?(box) && default_presentation?(box) &&
-              source_bottom_property_route?(connector.style.to_h) &&
-              source_property_font?(connector, :down)
+              source_bottom_property_route?(connector.style.to_h) && source_property_cambria?(connector)
           end
 
+          # A downward leg on the horizontal lateral tree seats an absent
+          # box like the up leg already does on the same route.
           def source_bottom_property_route?(style)
-            style[:stored_association_ray] == true && style.values_at(:mode, :lwidth, :tree) == ["3", "2", nil]
+            return false unless style.values_at(:mode, :lwidth) == %w[3 2]
+
+            style[:tree] == "LH" || (style[:stored_association_ray] == true && style[:tree].nil?)
           end
 
           def plain_upward_seat(connector, direction, anchor, box, role)
@@ -386,11 +389,14 @@ module Ea
           end
 
           def source_property_font?(connector, direction)
-            font_family.to_s.casecmp("Cambria").zero? &&
-              property_label?(connector, :source) &&
+            source_property_cambria?(connector) &&
               source_property_route?(connector.style.to_h, direction)
           end
 
+          def source_property_cambria?(connector)
+            font_family.to_s.casecmp("Cambria").zero? && property_label?(connector, :source)
+          end
+
           def source_property_route?(style, direction)
             case direction
             when :left then left_property_route?(style)

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.113"
+  VERSION = "0.6.115"
 end

metadata

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