ea 0.6.109 → 0.6.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db09c594a106072a0600df4d18a9db32ac9823fe348d903440639946d4bbbc25
-  data.tar.gz: e39606ab7c251e044d5f1918e624a088d4c812503a5899d5c2ce1bd2bf04b6f6
+  metadata.gz: 612161a78bd06432a03732a325ff6de795f200d37ee87c4dfe41a0e1b44bb39e
+  data.tar.gz: ec6d0535486058e4eaa38ef5fbbd2de7d88a601517f95b31e76142f4f0aa7f8a
 SHA512:
-  metadata.gz: 8631b532ab58510c40589b8918fab7c03ec36f9c838a8497e985f38588b039c8ee1b77fba537506285d1b3771af156f44a7daf2824a335a4ae6514be6793b156
-  data.tar.gz: 7f5e2eea1b46aa5ac9dc60e0d9a74e693bc7e47d965a46948c2621fcc9c4a9775732ffb2aab5c1b3c6a0a59806aab713eb64ae1cacd08d8e063bfe7f19b4ef2f
+  metadata.gz: 2374fbd101b31c488752c90eced651591271fa54ef2c5ae104641c8ae02c6183f5d62b17cb8b46e2b8a790728f04df6cea7e17d66c80feb699ab4fdcad55e686
+  data.tar.gz: 52d024c1f2cf5e2c1e2d69b4b1c9d1313aa27ab2548c36ca3232f9122de71e7dc21d0b8824a7f4a4803722afd57942660642bde9997240529b4b62945f25321a

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

@@ -72,6 +72,10 @@ module Ea
             # 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 + offset,

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

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/package_shape_renderer.rb

@@ -29,7 +29,7 @@ module Ea
           TAB_LABEL_PADDING = 10
           TAB_LABEL_X_OFFSET = 5
           TAB_LABEL_Y_OFFSET = 13
-          TAB_LINE_OFFSET = 13
+          TAB_TEXT_PADDING = 6
           DEFAULT_TAB_WIDTH = 105
           # EA autosizes the TAB: max(text width + 15, 105). The BODY
           # width = max(stored rect, tab + 15): user-widened packages
@@ -116,21 +116,30 @@ module Ea
             bounds.x + TAB_LABEL_X_OFFSET
           end
 
-          # Stereotype line baseline: 13px below the tab top.
           def stereotype_y
-            tab_top_y + TAB_LABEL_Y_OFFSET
+            tab_top_y + first_baseline_offset
           end
 
-          # Name baseline when stereotype is also rendered: 26px below
-          # the tab top (one line below the stereotype).
           def name_y
-            tab_top_y + TAB_LABEL_Y_OFFSET + TAB_LINE_OFFSET
+            stereotype_y + tab_line_height
           end
 
-          # Name baseline when only the name renders (no stereotype):
-          # 13px below the tab top.
           def name_y_single
-            tab_top_y + TAB_LABEL_Y_OFFSET
+            stereotype_y
+          end
+
+          # Package tabs use the same font-size-plus-padding anchor as
+          # classifier headers, with a smaller top inset.
+          def first_baseline_offset
+            size_unit == "pt" ? size + TAB_TEXT_PADDING : TAB_LABEL_Y_OFFSET
+          end
+
+          def tab_line_height
+            return TAB_LABEL_Y_OFFSET unless size_unit == "pt"
+
+            Ea::Fonts::Metrics.compartment_line_height(
+              size, family: family, unit: size_unit, offset: TAB_TEXT_PADDING
+            )
           end
 
           # Tab occupies the top of the stored rect.

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.109"
+  VERSION = "0.6.111"
 end

metadata

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