ea 0.6.127 → 0.6.129

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Ea
+  module Svg
+    module EaEmitter
+      module Label
+        # Moved plain target pairs on saved vertical stairs use the first
+        # bend, opposing 8px gutters and a baseline 3px above the saved OY.
+        module TargetBendSeat
+          def self.reference(points)
+            return nil unless points.size == 4
+
+            first, bend, corner, last = points
+            bend if descending_leg?(first, bend) && descending_leg?(corner, last) &&
+                    bend[1] == corner[1] && bend[0] != corner[0]
+          end
+
+          def self.descending_leg?(first, last)
+            first[0] == last[0] && first[1] < last[1]
+          end
+          private_class_method :descending_leg?
+
+          def self.positions(connector:, bend:, text_box:, mult_box:, width:)
+            return nil unless bend && width && connector.connector_type == "Association"
+            return nil unless connector.style.to_h.values_at(:mode, :lwidth, :tree) == %w[3 0 V]
+            return nil unless moved_box?(text_box, 31) && moved_box?(mult_box, 16)
+
+            [position(bend, text_box, -width - 8), position(bend, mult_box, 8)]
+          end
+
+          def self.position(bend, box, inset)
+            [bend[0] + box["ox"].to_i + inset, bend[1] + box["oy"].to_i - 3]
+          end
+          private_class_method :position
+
+          def self.moved_box?(box, height)
+            box["alignment"] == 1 && box["cy"] == height &&
+              [box["ox"].to_i, box["oy"].to_i] != [0, 0]
+          end
+          private_class_method :moved_box?
+        end
+      end
+    end
+  end
+end

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

@@ -15,6 +15,10 @@ module Ea
       # register rather than editing the orchestrator (OCP).
       module Label
         autoload :EndLabel, "ea/svg/ea_emitter/label/end_label"
+        autoload :TargetBendSeat, "ea/svg/ea_emitter/label/target_bend_seat"
+        autoload :SourceStairSeat, "ea/svg/ea_emitter/label/source_stair_seat"
+        autoload :PlainSourceSeat, "ea/svg/ea_emitter/label/plain_source_seat"
+        autoload :PlainTargetSeat, "ea/svg/ea_emitter/label/plain_target_seat"
         autoload :MidpointLabel, "ea/svg/ea_emitter/label/midpoint_label"
         autoload :Registry, "ea/svg/ea_emitter/label/registry"
       end

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

@@ -92,11 +92,13 @@ module Ea
                              anchor: source_pt, connector: connector,
                              end_kind: :source, tree: tree && tree[:source],
                              heading: (stored_src || stored_labels) && source_heading(connector, points),
-                             stored_labels: stored_labels).each { |t| texts << t }
+                             stored_labels: stored_labels,
+                             source_bounds: source_dock_bounds(connector)).each { |t| texts << t }
           end_renderer.texts(text_box: tgt_tb,
                              mult_box: tgt_mb,
                              anchor: target_pt, connector: connector,
                              end_kind: :target, tree: tree && tree[:target],
+                             bend: Label::TargetBendSeat.reference(points),
                              heading: (stored_tgt || stored_labels) && target_heading(connector, points),
                              stored_labels: stored_labels).each { |t| texts << t }
           texts
@@ -290,7 +292,9 @@ module Ea
             theme: theme,
             font_family: label_font_family,
             font_size: label_font_size,
-            font_unit: theme.label_font_size_unit
+            font_unit: theme.label_font_size_unit,
+            font_weight: label_font_weight,
+            font_style: label_font_style
           )
         end
 
@@ -300,7 +304,9 @@ module Ea
             model_index: model_index,
             font_family: label_font_family,
             font_size: label_font_size,
-            font_unit: theme.label_font_size_unit
+            font_unit: theme.label_font_size_unit,
+            font_weight: label_font_weight,
+            font_style: label_font_style
           )
         end
 
@@ -326,9 +332,19 @@ module Ea
         end
 
         def label_font_family
+          return FontResolver::HAND_DRAW_FAMILY if diagram.hand_draw
+
           theme.label_font_family || DEFAULT_FAMILY
         end
 
+        def label_font_weight
+          diagram.hand_draw ? FontResolver::HAND_DRAW_LABEL_WEIGHT : 400
+        end
+
+        def label_font_style
+          diagram.hand_draw ? "italic" : "normal"
+        end
+
         def label_font_size
           theme.label_font_size || DEFAULT_SIZE
         end

data/lib/ea/svg/ea_emitter/marker/diamond.rb

@@ -17,10 +17,11 @@ module Ea
             whole_anchor = whole_at_target ? target : source
             whole_base = whole_at_target ? before_target : after_source
             specs = [Registry::Spec.new(shape: diamond_shape(connector, relationship, whole_at_target),
-                                        anchor: whole_anchor,
-                                        base: whole_base)]
+                                        anchor: whole_anchor, base: whole_base)]
             return specs unless whole_at_target
-            return specs if arrow_on_target_diamond?(connector, relationship)
+
+            target, before_target = target_arrow_points(connector, relationship, target, before_target)
+            return specs unless target
 
             specs.concat(direction_specs(connector, source, target,
                                          before_target, after_source))
@@ -68,14 +69,27 @@ module Ea
             !whole_end_at_source?(connector)
           end
 
-          # EA draws no arrow where a directed, dest-flagged aggregation
-          # would put it on its own target diamond.
+          # Navigable target-owned aggregations put the arrow at the
+          # diamond's inner vertex; nonnavigable targets omit it.
           def self.arrow_on_target_diamond?(connector, relationship)
             connector.direction == "Source -> Destination" &&
               dest_flagged?(relationship)
           end
           private_class_method :arrow_on_target_diamond?
 
+          def self.inner_vertex(tip, base)
+            tx, ty = tip
+            bx, by = base
+            dx = bx - tx
+            dy = by - ty
+            length = Math.hypot(dx, dy)
+            return tip if length.zero?
+
+            depth = Markers::DIAMOND_HALF_H * 2
+            [(tx + dx / length * depth).round, (ty + dy / length * depth).round]
+          end
+          private_class_method :inner_vertex
+
           def self.dest_flagged?(relationship)
             relationship &&
               %w[shared composite].include?(relationship.target_aggregation.to_s)
@@ -97,6 +111,16 @@ module Ea
                                 base: before_target)]
           end
           private_class_method :direction_specs
+
+          def self.target_arrow_points(connector, relationship, target, before_target)
+            return [target, before_target] unless arrow_on_target_diamond?(connector, relationship)
+            return [] unless relationship.target_navigable
+
+            anchor = inner_vertex(target, before_target)
+            base = anchor.zip(before_target, target).map { |inner, before, tip| inner + before - tip }
+            [anchor, base]
+          end
+          private_class_method :target_arrow_points
         end
       end
     end

data/lib/ea/theme/definition.rb

@@ -108,6 +108,7 @@ module Ea
         @geometry = geometry || DEFAULT_GEOMETRY.dup
         @frame = frame || DEFAULT_FRAME.dup
         @compartments = compartments || DEFAULT_COMPARTMENTS.dup
+        @attribute_spec_override = attribute_spec
         @attribute_spec = attribute_spec || DEFAULT_ATTR.dup
         @markers = markers || DEFAULT_MARKERS.dup
         @package = package || DEFAULT_PACKAGE.dup
@@ -137,6 +138,12 @@ module Ea
         @label_font_size_unit || font_size_unit
       end
 
+      # Attribute cells have a different inherited seat from enum literals,
+      # which continue to consume the legacy attribute_spec default.
+      def attribute_content_x_offset
+        @attribute_spec_override ? attribute_spec.content_x_offset : 22
+      end
+
       def with(**overrides)
         clear_label_override(overrides, :font_family, :label_font_family)
         clear_label_override(overrides, :font_family, :element_font_family)
@@ -193,7 +200,8 @@ module Ea
           marker_stroke_width: marker_stroke_width,
           text_width_factor: text_width_factor,
           geometry: geometry, frame: frame, compartments: compartments,
-          attribute_spec: attribute_spec, markers: markers,
+          # Preserve omission so reconstruction retains the attribute-cell default.
+          attribute_spec: @attribute_spec_override, markers: markers,
           package: package, note: note, fills: fills
         }
       end

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.127"
+  VERSION = "0.6.129"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.127
+  version: 0.6.129
 platform: ruby
 authors:
 - Ribose Inc.
@@ -618,8 +618,11 @@ files:
 - lib/ea/fonts.rb
 - lib/ea/fonts/cambria_7_regular_widths.json
 - lib/ea/fonts/cambria_7_styled_widths.json
+- lib/ea/fonts/carlito_gdi_widths.json
 - lib/ea/fonts/carlito_metrics.json
+- lib/ea/fonts/cjk_fallback_widths.json
 - lib/ea/fonts/metrics.rb
+- lib/ea/fonts/vertical_metrics.json
 - lib/ea/guid_format.rb
 - lib/ea/image.rb
 - lib/ea/image/emf_renderer.rb
@@ -818,6 +821,7 @@ files:
 - lib/ea/sources/qea/connector_relationship_map.rb
 - lib/ea/sources/qea/context_diagram_support.rb
 - lib/ea/sources/qea/diagram_builder.rb
+- lib/ea/sources/qea/diagram_builder/association_class.rb
 - lib/ea/sources/qea/diagram_builder/auto_routing.rb
 - lib/ea/sources/qea/diagram_builder/font_settings.rb
 - lib/ea/sources/qea/diagram_builder/routing.rb
@@ -940,7 +944,11 @@ files:
 - lib/ea/svg/ea_emitter/label.rb
 - lib/ea/svg/ea_emitter/label/end_label.rb
 - lib/ea/svg/ea_emitter/label/midpoint_label.rb
+- lib/ea/svg/ea_emitter/label/plain_source_seat.rb
+- lib/ea/svg/ea_emitter/label/plain_target_seat.rb
 - lib/ea/svg/ea_emitter/label/registry.rb
+- lib/ea/svg/ea_emitter/label/source_stair_seat.rb
+- lib/ea/svg/ea_emitter/label/target_bend_seat.rb
 - lib/ea/svg/ea_emitter/labels.rb
 - lib/ea/svg/ea_emitter/layer.rb
 - lib/ea/svg/ea_emitter/layer_sequencer.rb