ea 0.6.128 → 0.6.129

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

@@ -92,7 +92,8 @@ 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,
@@ -291,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
 
@@ -301,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
 
@@ -327,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/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.128"
+  VERSION = "0.6.129"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.128
+  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