ea 0.6.131 → 0.6.132

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

@@ -54,12 +54,14 @@ module Ea
           #   end_kind   - :source or :target
           #   heading    - [dx, dy] of the first leg leaving the anchor
           #   source_bounds - effective drawn source outline, in anchor coordinates
+          #   target_face - exact drawn target dock face when it leads the emitted leg
           #   bend       - first bend of a saved descending vertical stair
           #   stored_labels - the connector has stored label boxes at
           #                   either end; false keeps the opposite-end
           #                   fallback
           def texts(text_box:, mult_box:, anchor:, connector:, end_kind:,
-                    tree: false, heading: nil, stored_labels: false, bend: nil, source_bounds: nil)
+                    tree: false, heading: nil, stored_labels: false, bend: nil, source_bounds: nil,
+                    target_face: nil)
             from_property, role, mult = role_and_multiplicity(connector, end_kind)
             if role_empty?(role) && mult_empty?(mult)
               other_from_prop, other_role, other_mult = role_and_multiplicity(connector,
@@ -114,13 +116,23 @@ module Ea
                          target_diagonal_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
+              if horizontal_aligned_target_baseline?(connector, heading, text_box, role)
+                text_pos = [text_pos[0], seat_corner(anchor, text_box)[1] - 7]
+              end
+              face_multiplicity = if target_left_face_multiplicity?(connector, heading, mult_box, mult,
+                                                                    target_face)
+                                    directional_multiplicity(:left, anchor, mult_box, mult)
+                                  end
               mult_pos = target_multiplicity_seat(connector, heading, anchor, mult_box) ||
-                         target_horizontal_multiplicity(heading, anchor, mult_box, mult) || mult_pos
+                         face_multiplicity || target_horizontal_multiplicity(heading, anchor, mult_box, mult) ||
+                         mult_pos
             end
 
             if end_kind == :source
               text_pos = source_top_property_role(connector, heading, anchor, text_box, role) ||
                          source_bottom_property_role(connector, heading, anchor, text_box, role) || text_pos
+              mult_pos = source_top_property_multiplicity(connector, heading, anchor,
+                                                          [text_box, mult_box], mult) || mult_pos
               if external_upward_property_source?(connector, heading, anchor, text_box, source_bounds)
                 text_pos = external_upward_property_role(anchor, role) || text_pos
               end
@@ -143,6 +155,23 @@ module Ea
 
           private
 
+          # ALN2 single-line target roles retain their horizontal placement
+          # and use the saved corner's baseline on a straight stored ray.
+          def horizontal_aligned_target_baseline?(connector, heading, box, role)
+            return false unless heading && heading[1].zero? && !heading[0].zero?
+            return false unless saved_target_ray?(connector) && !role_empty?(role)
+            return false unless connector_source_dest_stereotype(connector, :target).to_s.empty?
+
+            aligned_target_baseline_box?(box)
+          end
+
+          def aligned_target_baseline_box?(box)
+            return false unless seat_font? && font_weight == 400 && font_style == "normal"
+            return false unless box && box["alignment"] == 2 && [13, 14].include?(box["cy"])
+
+            cambria_box?(box.merge("alignment" => 0))
+          end
+
           def plain_leftward_target_role(connector, heading, anchor, box, role)
             return nil unless heading && heading[0].negative? && heading[1].zero?
             return nil unless plain_target_role?(connector, box, role)
@@ -339,14 +368,27 @@ module Ea
           # EDGE=1 certifies the top dock independently of the clipped ray's
           # heading. An absent source box uses the upward Property seat.
           def source_top_property_role(connector, heading, anchor, box, role)
-            return nil unless source_seat?(:source, heading) && heading[0].negative? && heading[1].positive?
-            return nil unless zero_source_property_box?(box)
-
-            return nil unless source_top_property_route?(connector.style.to_h)
+            return nil unless source_top_property_box?(connector, heading, box)
 
             source_property_seat(connector, :up, anchor, box, role)
           end
 
+          def source_top_property_multiplicity(connector, heading, anchor, boxes, mult)
+            return nil if mult_empty?(mult)
+
+            role_box, mult_box = boxes
+            return nil unless source_top_property_box?(connector, heading, role_box)
+            return nil unless source_top_property_box?(connector, heading, mult_box)
+
+            mult_seat(:up, anchor, mult_box)
+          end
+
+          def source_top_property_box?(connector, heading, box)
+            source_seat?(:source, heading) && heading[0].negative? && heading[1].positive? &&
+              zero_source_property_box?(box) && source_top_property_route?(connector.style.to_h) &&
+              source_property_seat?(connector, :up, box)
+          end
+
           # A persisted origin above the drawn source outline keeps the
           # upward seat's inset and the shared upper baseline, including
           # steep diagonals. Origins clipped onto the face retain -6.
@@ -697,11 +739,21 @@ module Ea
           def target_horizontal_multiplicity(heading, anchor, box, mult)
             return nil unless seat_font? && heading && heading[1].zero? && !heading[0].zero?
             return nil if mult_empty?(mult)
+
             return directional_multiplicity(:left, anchor, box, mult) if heading[0].negative?
 
             mult_seat(:right, anchor, box)
           end
 
+          def target_left_face_multiplicity?(connector, heading, box, mult, target_face)
+            seat_font? && !mult_empty?(mult) && property_label?(connector, :target) && cambria_box?(box) &&
+              stored_offsets_zero?(box) && target_left_face_heading?(heading, target_face)
+          end
+
+          def target_left_face_heading?(heading, target_face)
+            heading && !heading[1].zero? && heading[0].negative? && target_face == [-1, 0]
+          end
+
           def target_multiplicity_seat(connector, heading, anchor, box)
             return nil unless seat_font?
             return nil unless heading && heading[0].zero? && heading[1].negative?

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

@@ -100,6 +100,7 @@ module Ea
                              end_kind: :target, tree: tree && tree[:target],
                              bend: Label::TargetBendSeat.reference(points),
                              heading: (stored_tgt || stored_labels) && target_heading(connector, points),
+                             target_face: target_dock_heading(connector, target_pt, target_heading(connector, points)),
                              stored_labels: stored_labels).each { |t| texts << t }
           texts
         end
@@ -202,6 +203,29 @@ module Ea
           drawn_bounds[source]
         end
 
+        def target_dock_bounds(connector)
+          return nil unless model_index && drawn_bounds
+
+          relationship = model_index[connector.relationship_ref]
+          return nil unless relationship
+
+          source, target = ConnectorRedock.end_refs(relationship)
+          return nil if source == target
+          return nil unless drawn_bounds[source]
+
+          drawn_bounds[target]
+        end
+
+        def target_dock_heading(connector, point, heading)
+          return nil unless heading
+
+          box = target_dock_bounds(connector)
+          face = box && dock_face_heading(point, box)
+          return nil unless face&.zip(heading)&.any? { |axis, delta| (axis * delta).positive? }
+
+          face
+        end
+
         # Saved rays can start outside the box. Project onto its boundary;
         # corners stay ambiguous and the face must still lead the emitted leg.
         def source_dock_heading(connector, point, box)

data/lib/ea/svg/ea_emitter.rb

@@ -31,6 +31,8 @@ module Ea
       autoload :Style, "ea/svg/ea_emitter/style"
       autoload :Elements, "ea/svg/ea_emitter/elements"
       autoload :Connectors, "ea/svg/ea_emitter/connectors"
+      autoload :ConnectorBridges, "ea/svg/ea_emitter/connector_bridges"
+      private_constant :ConnectorBridges
       autoload :Markers, "ea/svg/ea_emitter/markers"
       autoload :Labels, "ea/svg/ea_emitter/labels"
       autoload :GhostLabels, "ea/svg/ea_emitter/ghost_labels"

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.131"
+  VERSION = "0.6.132"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.131
+  version: 0.6.132
 platform: ruby
 authors:
 - Ribose Inc.
@@ -622,6 +622,7 @@ files:
 - lib/ea/fonts/carlito_metrics.json
 - lib/ea/fonts/cjk_fallback_widths.json
 - lib/ea/fonts/metrics.rb
+- lib/ea/fonts/source_sans_pro_advances.json
 - lib/ea/fonts/vertical_metrics.json
 - lib/ea/guid_format.rb
 - lib/ea/image.rb
@@ -850,6 +851,7 @@ files:
 - lib/ea/sources/xmi/annotation_builder.rb
 - lib/ea/sources/xmi/classifier_builder.rb
 - lib/ea/sources/xmi/diagram_builder.rb
+- lib/ea/sources/xmi/diagram_builder/umldi_edges.rb
 - lib/ea/sources/xmi/extension_elements.rb
 - lib/ea/sources/xmi/extension_geometry_parser.rb
 - lib/ea/sources/xmi/extension_style_parser.rb
@@ -865,6 +867,7 @@ files:
 - lib/ea/sources/xmi/relationship_builder.rb
 - lib/ea/sources/xmi/relationship_type_map.rb
 - lib/ea/sources/xmi/stereotype_builder.rb
+- lib/ea/sources/xmi/stored_route.rb
 - lib/ea/sources/xmi/tag_builder.rb
 - lib/ea/sources/xmi/type_classifier_map.rb
 - lib/ea/sources/xmi/umldi_keyword_extractor.rb
@@ -909,6 +912,7 @@ files:
 - lib/ea/svg/ea_emitter/compartment/shape.rb
 - lib/ea/svg/ea_emitter/compartment/stereotype_icon.rb
 - lib/ea/svg/ea_emitter/compartment/tagged_values.rb
+- lib/ea/svg/ea_emitter/connector_bridges.rb
 - lib/ea/svg/ea_emitter/connector_redock.rb
 - lib/ea/svg/ea_emitter/connectors.rb
 - lib/ea/svg/ea_emitter/diagram_frame.rb