ea 0.6.107 → 0.6.108

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

@@ -78,6 +78,7 @@ module Ea
             if tree && zero_offset?(text_box, mult_box)
               text_pos, mult_pos = tree_positions(end_kind, anchor, role,
                                                   text_pos, mult_pos)
+              mult_pos = tree_left_multiplicity(end_kind, heading, anchor, mult_box, mult) || mult_pos
             elsif mult_box && stored_offsets_zero?(mult_box)
               # Start at the legacy default; measured directional seats
               # below replace it for default Cambria labels.
@@ -94,12 +95,14 @@ module Ea
                          source_property_seat(connector, direction, anchor, text_box, role) ||
                          plain_upward_seat(connector, direction, anchor, text_box, role) ||
                          role_seat(direction, anchor, text_box, role) || text_pos
-              mult_pos = directional_multiplicity(connector, direction, anchor, mult_box, mult) ||
+              mult_pos = directional_multiplicity(direction, anchor, mult_box, mult) ||
+                         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) ||
                          target_rightward_role(heading, anchor, text_box, role) || text_pos
-              mult_pos = target_multiplicity_seat(heading, anchor, mult_box) || mult_pos
+              mult_pos = target_multiplicity_seat(heading, anchor, mult_box) ||
+                         target_horizontal_multiplicity(heading, anchor, mult_box, mult) || mult_pos
             end
 
             build_texts(role:, mult:, standalone:,
@@ -306,17 +309,47 @@ module Ea
             %w[1 3].include?(style[:mode]) && style[:lwidth] == "2" && !style[:tree]
           end
 
-          def directional_multiplicity(connector, direction, anchor, box, mult)
+          def directional_multiplicity(direction, anchor, box, mult)
             return nil unless cambria_box?(box)
 
             x, y = seat_corner(anchor, box)
             return [x + 8, y + 15] if direction == :down
-            return nil unless direction == :left && source_property_font?(connector, direction)
+            return nil unless direction == :left
 
             width = Ea::Fonts::Metrics.text_length(mult, font_size, family: font_family)
             [x - width - 3, y + 15] if width
           end
 
+          # On an "H" tree route a property end leaving right seats its
+          # multiplicity one text width further right than the plain
+          # rightward seat.
+          def horizontal_tree_multiplicity(connector, direction, anchor, box, mult)
+            return nil unless direction == :right && property_label?(connector, :source)
+            return nil unless connector.style.to_h[:tree] == "H" && cambria_box?(box) && !mult_empty?(mult)
+
+            width = Ea::Fonts::Metrics.text_length(mult, font_size, family: font_family)
+            x, y = seat_corner(anchor, box)
+            [x + SEAT_X_INSET + width, y + 15] if width
+          end
+
+          # A tree-route source leaving left seats its multiplicity like any
+          # other leftward source rather than at the rightward tree default.
+          def tree_left_multiplicity(end_kind, heading, anchor, box, mult)
+            return nil if end_kind != :source || mult_empty?(mult) || leg_direction(end_kind, heading) != :left
+
+            directional_multiplicity(:left, anchor, box, mult)
+          end
+
+          # A target whose first leg runs sideways seats its multiplicity at
+          # the stored corner like a source leaving the same way.
+          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_multiplicity_seat(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

@@ -84,24 +84,32 @@ module Ea
           stored_src = end_boxes(boxes, :llt, :llb)
           stored_tgt = end_boxes(boxes, :lrt, :lrb)
           stored_labels = !(stored_src.nil? && stored_tgt.nil?)
-          src_tb, src_mb = stored_src || default_label_boxes(points, :source)
-          tgt_tb, tgt_mb = stored_tgt || default_label_boxes(points, :target)
+          src_tb, src_mb = stored_src || unstored_label_boxes(points, :source, stored_labels)
+          tgt_tb, tgt_mb = stored_tgt || unstored_label_boxes(points, :target, stored_labels)
 
           texts = []
           end_renderer.texts(text_box: src_tb, mult_box: src_mb,
                              anchor: source_pt, connector: connector,
                              end_kind: :source, tree: tree && tree[:source],
-                             heading: stored_src && source_heading(connector, points),
+                             heading: (stored_src || stored_labels) && source_heading(connector, points),
                              stored_labels: stored_labels).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],
-                             heading: stored_tgt && target_heading(connector, points),
+                             heading: (stored_tgt || stored_labels) && target_heading(connector, points),
                              stored_labels: stored_labels).each { |t| texts << t }
           texts
         end
 
+        # A connector that stores label boxes for only one end seats the
+        # other end's labels at its anchor, like a stored zero offset.
+        def unstored_label_boxes(points, end_kind, stored_labels)
+          return default_label_boxes(points, end_kind) unless stored_labels
+
+          [{ "ox" => 0, "oy" => 0, "alignment" => 0 }, { "ox" => 0, "oy" => 0, "alignment" => 0 }]
+        end
+
         # EA tree routes are a perfect L: source-exit horizontal into
         # the corner, vertical trunk into the target dock. Returns
         # per-end flags when the connector matches, else nil.

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

@@ -14,7 +14,7 @@ module Ea
       class RenderContext < Struct.new(
         :element, :bounds, :model_element, :classifier,
         :fill, :stroke, :stroke_width, :text_fill,
-        :family, :size, :size_unit,
+        :family, :size, :size_unit, :logical_height,
         :header_lines, :attr_lines, :op_lines,
         :enum_literals, :tagged_values, :constraints, :marker_lines,
         :package_content_lines,

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

@@ -24,12 +24,12 @@ module Ea
 
         attr_reader :content, :x, :y, :family, :size, :weight, :style,
                     :fill, :text_length, :rotation, :size_unit,
-                    :stroke_in_text, :width_factor
+                    :stroke_in_text, :width_factor, :logical_height
 
         def initialize(content:, x:, y:, family:, size:, weight: 400,
                        style: "normal", fill: DEFAULT_FILL,
                        text_length: nil, rotation: DEFAULT_ROTATION,
-                       size_unit: "px",
+                       size_unit: "px", logical_height: nil,
                        stroke_in_text: DEFAULT_STROKE_IN_TEXT,
                        width_factor: DEFAULT_WIDTH_FACTOR)
           @content = content.to_s
@@ -43,6 +43,7 @@ module Ea
           @text_length = text_length
           @rotation = rotation
           @size_unit = size_unit
+          @logical_height = logical_height if size_unit == "pt"
           @stroke_in_text = stroke_in_text
           @width_factor = width_factor
         end
@@ -154,10 +155,10 @@ module Ea
         GLYPH_FALLBACK = 0.61
 
         def self.estimate_width(text, size, _width_factor = nil, family: nil,
-                                weight: nil, style: nil)
+                                weight: nil, style: nil, logical_height: nil)
           real = Ea::Fonts::Metrics.text_length(text, size, family: family,
                                                             weight: weight,
-                                                            style: style)
+                                                            style: style, logical_height: logical_height)
           return real if real
 
           text.to_s.each_char.sum do |ch|
@@ -170,7 +171,7 @@ module Ea
 
           width = self.class.estimate_width(content, size, width_factor,
                                             family: family, weight: weight,
-                                            style: style)
+                                            style: style, logical_height: logical_height)
           width.round.to_s
         end
 

data/lib/ea/theme/definition.rb

@@ -29,7 +29,7 @@ module Ea
       attr_reader :id, :name,
                   :font_family, :font_size, :font_size_unit,
                   :text_weight_normal, :text_weight_bold,
-                  :element_font_size, :element_font_unit,
+                  :element_font_family, :element_font_size, :element_font_unit,
                   :text_color, :attribute_text_color, :method_text_color,
                   :border_color, :fill_color, :background_color,
                   :stroke_in_text_color,
@@ -69,7 +69,7 @@ module Ea
                      label_font_size_unit: nil,
                      font_size_unit: "pt", text_weight_normal: 400,
                      text_weight_bold: 700,
-                     element_font_size: 9, element_font_unit: "pt",
+                     element_font_family: nil, element_font_size: 9, element_font_unit: "pt",
                      text_color: "#000000", attribute_text_color: nil,
                      method_text_color: nil, border_color: "#000000",
                      fill_color: "#FFFFFF", background_color: "#FFFFFF",
@@ -90,6 +90,7 @@ module Ea
         @font_size_unit = font_size_unit
         @text_weight_normal = text_weight_normal
         @text_weight_bold = text_weight_bold
+        @element_font_family = element_font_family
         @element_font_size = element_font_size
         @element_font_unit = element_font_unit
         @text_color = text_color
@@ -138,6 +139,7 @@ module Ea
 
       def with(**overrides)
         clear_label_override(overrides, :font_family, :label_font_family)
+        clear_label_override(overrides, :font_family, :element_font_family)
         clear_label_override(overrides, :font_size, :label_font_size)
         clear_label_override(overrides, :font_size_unit, :label_font_size_unit)
         Definition.new(**to_h.merge(overrides))
@@ -176,6 +178,7 @@ module Ea
           label_font_size_unit: @label_font_size_unit,
           text_weight_normal: text_weight_normal,
           text_weight_bold: text_weight_bold,
+          element_font_family: element_font_family,
           element_font_size: element_font_size,
           element_font_unit: element_font_unit,
           text_color: text_color,

data/lib/ea/theme/loader.rb

@@ -11,7 +11,7 @@ module Ea
     #   font: { family: Carlito, size: 7, unit: pt, weight_normal: 400, ... }
     #   element_font: { size: 9, unit: pt }
     #   label_font: { family: Cambria, size: 7, unit: pt }
-    #   colors: { text: "#000000", attribute_text: "#66413F", ... }
+    #   colors: { text: "#000000", attribute_text: "#336699", ... }
     #   strokes: { element_border: 2, connector_line: 2, ... }
     #   text_metrics: { width_factor: 0.65 }
     #   canvas: { inset_left: 35, inset_right: 50, ... }
@@ -62,10 +62,11 @@ module Ea
             font_size_unit: font["unit"] || "pt",
             text_weight_normal: font["weight_normal"] || 400,
             text_weight_bold: font["weight_bold"] || 700,
+            element_font_family: elem_font["family"],
             element_font_size: elem_font["size"] || 9,
             element_font_unit: elem_font["unit"] || "pt",
             text_color: colors["text"] || "#000000",
-            attribute_text_color: colors["attribute_text"],
+            attribute_text_color: colors["attribute_text"] || colors["text"] || "#000000",
             method_text_color: colors["method_text"],
             border_color: colors["border"] || "#000000",
             fill_color: colors["fill"] || "#FFFFFF",

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.107"
+  VERSION = "0.6.108"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.107
+  version: 0.6.108
 platform: ruby
 authors:
 - Ribose Inc.
@@ -617,6 +617,7 @@ files:
 - lib/ea/export/xsd/namespace_registry.rb
 - lib/ea/fonts.rb
 - lib/ea/fonts/cambria_7_regular_widths.json
+- lib/ea/fonts/cambria_7_styled_widths.json
 - lib/ea/fonts/carlito_metrics.json
 - lib/ea/fonts/metrics.rb
 - lib/ea/guid_format.rb
@@ -818,6 +819,7 @@ files:
 - lib/ea/sources/qea/context_diagram_support.rb
 - lib/ea/sources/qea/diagram_builder.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
 - lib/ea/sources/qea/diagram_builder/stored_square_ports.rb
 - lib/ea/sources/qea/diagram_style_parser.rb
@@ -892,6 +894,7 @@ files:
 - lib/ea/svg/ea_emitter/compartment/instance_underline.rb
 - lib/ea/svg/ea_emitter/compartment/marker.rb
 - lib/ea/svg/ea_emitter/compartment/note_body.rb
+- lib/ea/svg/ea_emitter/compartment/note_html.rb
 - lib/ea/svg/ea_emitter/compartment/note_text.rb
 - lib/ea/svg/ea_emitter/compartment/operations.rb
 - lib/ea/svg/ea_emitter/compartment/package_contents.rb