ea 0.6.108 → 0.6.110

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5457390e5e190fab6345e9bb50a0bb773b1223e7e0617de9b8121efb6eb0cf7
-  data.tar.gz: b56bf3ce3bb1b5b8f1339f509b1ba99080f72eb480c0d85db5826c7251f91caa
+  metadata.gz: 55380e3923a2afe6babb0b3163079cc273e7f054cc8d1549db7985ace1f45757
+  data.tar.gz: dd92a38559eb5c1688771391995247055d633530fdcb4712a62aa087a31bfbf4
 SHA512:
-  metadata.gz: 769abf22c7038cab232e7ca4965dd44d6e11c1940d1de7cbc9f5821478109d5113d430805af6278caa34fa827167f92834400631992305f402ea38483d2e98d9
-  data.tar.gz: 19a7d924227c5783ac2e348ab6b682943746112bc3809fd32d2c1edef3c92fabdf2e74ac1de1f910c996b355825ab083cb25d20d7910ac68851801d4d5c5b401
+  metadata.gz: 9c98de5218163ad487eb0453bcf8fca9ea844a8cecbe3d36856ce2a44ab5728a691792d9a112c9efdf4f1e4084360a655052494af40764e339f0086692c8f6d8
+  data.tar.gz: 83fe0979cd7213d32a2615efd5d8e4f54f22c4c94761f5ec8bc15da01adf5070878fe937475a7424a8e8afc144cff1b0bc3620137bd491584d59cbb4733a75cf

data/lib/ea/diagram/display_config.rb

@@ -101,6 +101,11 @@ module Ea
         style_flags["OpParams"] != "0"
       end
 
+      # Type-only parameter detail is stored as OpParams=1.
+      def operation_parameter_detail
+        :type_only if style_flags["OpParams"] == "1"
+      end
+
       # Element Alias instead of Name in the header. Defaults to false
       # — most diagrams show the Name.
       def use_alias?

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

@@ -6,13 +6,11 @@ module Ea
       module Compartment
         # Enumeration literal compartment: divider line + "literals"
         # italic header + each literal name. Skipped when the
-        # classifier has no literals or the geometry cannot fit them.
+        # classifier has no literals or no content geometry.
         module EnumLiterals
           module_function
 
-          # EA: literal rows sit directly under the header divider,
-          # 13px apart at 7pt (attr rows use 14), first row at
-          # divider + 14. No compartment divider, no header label.
+          # Caption and literal rows share the same baseline spacing.
           LITERAL_LINE_OFFSET = 6
 
           def render(context)
@@ -29,16 +27,8 @@ module Ea
             )
             text_blocks = []
             row_y = context.geometry.enum_literal_first_y
-            # EA renders a centered italic "literals" caption above
-            # the rows when the literals carry stored code values
-            # (t_attribute.Default); bare literal lists render the
-            # rows directly. Corpus-verified (PT_TypeOfSA:
-            # "literals" caption + "ServingParcel = SP" rows;
-            # CV_SequenceType: bare rows, no caption).
-            if caption?(context)
-              text_blocks << caption_text(context, row_y)
-              row_y += line_h
-            end
+            text_blocks << caption_text(context, row_y)
+            row_y += line_h
             context.enum_literals.each_with_index do |literal, idx|
               y = row_y + (idx * line_h)
               text_blocks << visibility_placeholder(context, y)
@@ -47,28 +37,6 @@ module Ea
             wrap_group(text_blocks, context.theme.text_color)
           end
 
-          def caption?(context)
-            values_caption?(context) || grown?(context)
-          end
-
-          # EA draws the 'literals' caption on every enum box it
-          # re-lays (grown height) - corpus 8/8 grown=caption. Boxes
-          # keeping stored size keep their stored caption state,
-          # captured by the stored literal values.
-          def grown?(context)
-            stored = context.element&.bounds
-            return false unless stored
-
-            context.bounds.height > stored.height + 4
-          end
-
-          def values_caption?(context)
-            context.enum_literals.any? do |l|
-              value = l.value.to_s
-              !value.empty? && value != l.name.to_s
-            end
-          end
-
           def caption_text(context, y)
             content = "literals"
             len = TextRenderer.estimate_width(content, context.size, nil,
@@ -101,9 +69,16 @@ module Ea
 
           def literal_name_text(context, literal, y)
             content = literal_display(literal)
+            # EA uses the attribute row point-size increment for literal names.
+            offset = context.theme.attribute_spec.content_x_offset || 26
+            offset += 2 * (context.size - 7) if context.size_unit == "pt"
+            if Ea::Fonts::Metrics.compact_compartment_font?(context.size,
+                                                            family: context.family, unit: context.size_unit)
+              offset -= 1
+            end
             TextRenderer.new(
               content: content,
-              x: context.bounds.x + (context.theme.attribute_spec.content_x_offset || 26),
+              x: context.bounds.x + offset,
               y: y,
               family: context.family, size: context.size,
               size_unit: context.size_unit, logical_height: context.logical_height,

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

@@ -28,7 +28,8 @@ module Ea
               bounds: context.bounds,
               first_y: context.geometry.op_first_y,
               family: context.family, size: context.size,
-              size_unit: context.size_unit, logical_height: context.logical_height
+              size_unit: context.size_unit, logical_height: context.logical_height,
+              parameter_detail: context.diagram&.display_config&.operation_parameter_detail
             )
             parts.join("\n")
           end

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

@@ -14,8 +14,7 @@ module Ea
               Element::LegendRenderer.render(
                 context.bounds,
                 legend: context.model_element.legend,
-                family: context.family,
-                canvas: context.canvas
+                family: context.family
               )
             elsif context.model_element.is_a?(Ea::Model::Package) ||
                   context.model_element.is_a?(Ea::Model::Note)

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

@@ -72,8 +72,19 @@ module Ea
           end
           private :line_height
 
+          # A source font can export at the same point size with a smaller
+          # logical cell. Seat its first baseline using the same height delta
+          # as its row pitch, without changing compact-font spacing.
+          def source_baseline_adjustment
+            nominal_height = Ea::Fonts::Metrics.compartment_line_height(
+              size, family: @family, unit: @size_unit, offset: 0
+            )
+            line_height(0) - nominal_height
+          end
+          private :source_baseline_adjustment
+
           def header_first_y
-            bounds.y + size + (header_top_padding || 12)
+            bounds.y + size + (header_top_padding || 12) + source_baseline_adjustment
           end
 
           # Y of the divider line between header and the rest.
@@ -113,7 +124,7 @@ module Ea
           end
 
           def raw_attr_first_y
-            return bounds.y + size + (header_top_padding || 12) + 12 unless divider_y
+            return header_first_y + 12 unless divider_y
 
             divider_y + line_height((attr_first_offset || 7) - 1) + 1
           end
@@ -152,9 +163,8 @@ module Ea
           end
 
           # EA draws a single divider under the header and seats
-          # enumeration literals directly after it (+14 at 7pt),
-          # exactly like attribute rows - no second divider and no
-          # "literals" header. Verified against EA-published SVGs.
+          # the enumeration caption directly after it (+14 at 7pt),
+          # followed by the literal rows without a second divider.
           def enum_literal_first_y
             return nil unless divider_y
 

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

@@ -11,12 +11,9 @@ module Ea
           # - Foreign elements (owning package ≠ the diagram's package,
           #   gated on t_diagram.ShowForeign) render the qualified
           #   name "OwningPackage::Name".
-          # - Qualified-name wrap: when the combined integer
-          #   textLength exceeds the element bounds width, EA splits
-          #   "pkg::Class" across two lines ("pkg::" then "Class"),
-          #   each centered independently. Corpus-verified: every
-          #   wrapped header overflows its box and every single-line
-          #   header fits (tightest observed slack 6px).
+          # - Qualified names wrap after their colon separator when
+          #   the measured name reaches the box width minus 6px.
+          #   Each resulting line retains its separator and is centered.
           #
           # InstanceSpecification returns [] (InstanceSpec provider
           # already emitted the full label).
@@ -42,9 +39,8 @@ module Ea
                 return [[name, weight]]
               end
 
-              if name.include?("::")
-                qualifier, base = name.split("::", 2)
-                [["#{qualifier}::", weight], [base, weight]]
+              if (qualified = name.match(/\A(.+?:{1,2})([^:\s].*)\z/))
+                [[qualified[1], weight], [qualified[2], weight]]
               else
                 HeaderLinePipeline.wrap_words(name, context, weight).map do |line|
                   [line, weight]
@@ -59,11 +55,10 @@ module Ea
                 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-
-              # Description" (parts 86 + 137 + space 4 = 227) inside
-              # a 230px box (F851A657).
-              len > context.bounds_width.to_i - 6
+              # Qualified classifier names also wrap at the exact boundary;
+              # ordinary word wrapping keeps the shared pipeline threshold.
+              usable = context.bounds_width.to_i - 6
+              name.match?(/:{1,2}[^:\s]/) ? len >= usable : len > usable
             end
 
             # EA renders the plain classifier name in element headers;

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

@@ -9,7 +9,7 @@ module Ea
         # (verified against plateau reference SVGs):
         #
         #   ┌──────────────────────────────┐
-        #   │            凡例              │  ← title baseline 19px below top
+        #   │            凡例              │  ← title baseline 20px below top
         #   │  ┌──┐                        │
         #   │  └──┘  GMLに定義されたクラス  │  ← item 0 (icon top + 30px)
         #   │  ┌──┐                        │
@@ -24,8 +24,8 @@ module Ea
         class LegendRenderer
           CONTAINER_RX = 3
           ICON_SIZE = 17
-          TITLE_Y_OFFSET = 22
-          FIRST_ITEM_Y_OFFSET = 33
+          TITLE_Y_OFFSET = 20
+          FIRST_ITEM_Y_OFFSET = 30
           ITEM_SPACING = 19
           ICON_X_OFFSET = 10
           ICON_LABEL_GAP = 22

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

@@ -16,7 +16,8 @@ module Ea
           VISIBILITY_X_OFFSET = 5
           CONTENT_X_OFFSET = 22
 
-          def self.render(operations, bounds:, first_y:, family:, size:, size_unit: "px", logical_height: nil)
+          def self.render(operations, bounds:, first_y:, family:, size:, size_unit: "px",
+                          logical_height: nil, parameter_detail: nil)
             # EA's op rows pitch 13 (size + 6), same as attribute
             # rows (6D4C665D: ops 541..658 step 13).
             line_h = Ea::Fonts::Metrics.compartment_line_height(
@@ -39,14 +40,15 @@ module Ea
               y = first_y + ((idx + offset) * line_h)
               text_blocks << build_text(bounds.x + VISIBILITY_X_OFFSET, y,
                                         visibility_prefix(op), family, size, size_unit, logical_height: logical_height)
+              text = operation_text(op, parameter_detail: parameter_detail)
               text_blocks << build_text(bounds.x + AttributeRenderer.content_x_offset(size), y,
-                                        operation_text(op), family, size, size_unit, logical_height: logical_height)
+                                        text, family, size, size_unit, logical_height: logical_height)
             end
             %(<g style="#{Style::TEXT_GROUP}">\n#{text_blocks.join("\n")}\n</g>)
           end
 
           # Builds display lines for a classifier's operations.
-          def self.lines_for(classifier)
+          def self.lines_for(classifier, parameter_detail: nil)
             ops = classifier.operations
             return [] unless ops&.any?
 
@@ -54,7 +56,7 @@ module Ea
               visibility = visibility_prefix(op).strip
               params = (op.parameters || []).map do |p|
                 type = namespace_double_colon(p.type_name)
-                p.direction == "inout" ? "#{type}*" : "#{p.name}: #{type}"
+                parameter_text(p, type, parameter_detail)
               end.join(", ")
               return_type = namespace_double_colon(op.return_type_name)
               "#{visibility} #{op.name}(#{params}): #{return_type}".strip
@@ -66,9 +68,9 @@ module Ea
           end
           private_class_method :visibility_prefix
 
-          def self.operation_text(operation)
+          def self.operation_text(operation, parameter_detail: nil)
             prefix = operation.is_reception ? "«signal» " : ""
-            text = "#{prefix}#{operation.name}(#{reception_params(operation)})"
+            text = "#{prefix}#{operation.name}(#{reception_params(operation, parameter_detail)})"
             return text unless operation.return_type_name && !operation.is_reception
 
             "#{text}: #{operation.return_type_name}"
@@ -82,11 +84,19 @@ module Ea
           end
           private_class_method :namespace_double_colon
 
-          def self.reception_params(operation)
+          def self.parameter_text(param, type, parameter_detail)
+            return "#{type}*" if param.direction == "inout"
+            return type if parameter_detail == :type_only
+
+            "#{param.name}: #{type}"
+          end
+          private_class_method :parameter_text
+
+          def self.reception_params(operation, parameter_detail)
             params = (operation.parameters || []).filter_map { |p|
               next nil if p.type_name.to_s.empty?
 
-              p.direction == "inout" ? "#{p.type_name}*" : "#{p.name}: #{p.type_name}"
+              parameter_text(p, p.type_name, parameter_detail)
             }.join(", ")
             params
           end

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

@@ -144,7 +144,10 @@ module Ea
                        end
           op_lines = if is_classifier && show_operations? &&
                         (operations_visible?(element) || regenerated_context?)
-                        Element::OperationRenderer.lines_for(classifier)
+                        Element::OperationRenderer.lines_for(
+                          classifier,
+                          parameter_detail: display_config.operation_parameter_detail
+                        )
                       else
                         []
                       end
@@ -440,12 +443,10 @@ module Ea
           classifier.literals || []
         end
 
-        # The "literals" caption occupies a row slot when any
-        # literal carries a stored code value.
+        # A populated literal compartment includes its caption row.
         def enum_row_count_for(classifier)
           literals = enum_literals_for(classifier)
-          caption = literals.any? { |l| !l.value.to_s.empty? && l.value.to_s != l.name.to_s }
-          literals.size + (caption ? 1 : 0)
+          literals.empty? ? 0 : literals.size + 1
         end
 
         def tagged_values_for(classifier)

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

@@ -99,9 +99,10 @@ module Ea
                          horizontal_tree_multiplicity(connector, direction, anchor, mult_box, mult) ||
                          mult_seat(direction, anchor, mult_box) || mult_pos
             elsif end_kind == :target && !(tree && zero_offset?(text_box, mult_box))
-              text_pos = target_vertical_role(connector, heading, anchor, text_box, role) ||
+              text_pos = target_property_role(connector, heading, anchor, text_box, role) ||
+                         target_vertical_role(connector, heading, anchor, text_box, role) ||
                          target_rightward_role(heading, anchor, text_box, role) || text_pos
-              mult_pos = target_multiplicity_seat(heading, anchor, mult_box) ||
+              mult_pos = target_multiplicity_seat(connector, heading, anchor, mult_box) ||
                          target_horizontal_multiplicity(heading, anchor, mult_box, mult) || mult_pos
             end
 
@@ -213,6 +214,25 @@ module Ea
             [x - SEAT_X_INSET - width, y - 6]
           end
 
+          # An upward target uses the downward property's right edge and
+          # the upward target baseline, both relative to its stored corner.
+          def target_property_role(connector, heading, anchor, box, role)
+            return nil unless upward_target_property?(connector, heading)
+            return nil unless plain_vertical_box?(box) && box["alignment"] == 1
+
+            width = Ea::Fonts::Metrics.text_length(role, font_size, family: font_family)
+            return nil unless width
+
+            x, y = seat_corner(anchor, box)
+            inset, = property_role_offsets(:down)
+            [x - inset - width, y - 7]
+          end
+
+          def upward_target_property?(connector, heading)
+            heading && heading[0].zero? && heading[1].negative? &&
+              property_label?(connector, :target) && downward_property_route?(connector.style.to_h)
+          end
+
           def target_vertical_role(connector, heading, anchor, box, role)
             return nil unless heading && heading[0].zero? && !heading[1].zero?
 
@@ -350,12 +370,19 @@ module Ea
             mult_seat(:right, anchor, box)
           end
 
-          def target_multiplicity_seat(heading, anchor, box)
+          def target_multiplicity_seat(connector, heading, anchor, box)
             return nil unless seat_font?
             return nil unless heading && heading[0].zero? && heading[1].negative?
-            return nil unless cambria_box?(box) && stored_offsets_zero?(box)
+            return nil unless target_multiplicity_box?(connector, box)
+
+            x, y = seat_corner(anchor, box)
+            [x + 8, y - 7]
+          end
 
-            [anchor[0] + 8, anchor[1] - 7]
+          def target_multiplicity_box?(connector, box)
+            # Property targets seat at the stored corner; plain moved labels
+            # retain their explicit offsets.
+            cambria_box?(box) && (stored_offsets_zero?(box) || property_label?(connector, :target))
           end
 
           def cambria_box?(box)

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.108"
+  VERSION = "0.6.110"
 end

metadata

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