ea 0.6.35 → 0.6.37

data/lib/ea/fonts/metrics.rb

@@ -91,7 +91,7 @@ module Ea
       end
 
       # EA's scale factor varies by point size (GDI quantization):
-      # Carlito regular fits 1.390 at 7pt but 1.432 at 9pt. Sizes
+      # Carlito regular fits 1.390 at 7pt but 1.440 at 9pt. Sizes
       # without a fitted entry use the style's default (7pt, the
       # corpus's dominant size).
       def factor_for(family, size_pt, weight, style)

data/lib/ea/sources/qea/diagram_builder.rb

@@ -396,12 +396,9 @@ module Ea
                            drawn_bounds_for(target))
         end
 
-        # The outline EA clips connector rays against: the DRAWN
-        # autosized box, not the stored logical rect. Packages draw
-        # narrower than their stored rect (body = autosized tab +
-        # 15), so their docks land on the drawn edges (E58034A3:
-        # supplier right-edge dock 155 drawn vs 121 stored). All
-        # other element kinds draw at the stored rect.
+        # The outline EA clips connector rays against: the drawn box.
+        # Package bodies = max(stored width, autosized tab + 15);
+        # every other kind draws at the stored rect.
         PACKAGE_BODY_EXTRA = 15
 
         def drawn_bounds_for(placement)
@@ -416,7 +413,7 @@ module Ea
           Ea::Model::Bounds.new(
             x: logical.x,
             y: logical.y,
-            width: tab + PACKAGE_BODY_EXTRA,
+            width: [logical.width, tab + PACKAGE_BODY_EXTRA].max,
             height: logical.height
           )
         end

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

@@ -41,31 +41,63 @@ module Ea
           # the box) — verified against EA-published package SVGs.
           Y_OFFSET_FROM_BOTTOM = 15
 
+          LINE_PITCH = 13
+          WRAP_PADDING = 15
+
           def subtitle(text, context)
             bounds = context.bounds
             fill = context.theme.attribute_text_color
             y = bounds.y + bounds.height + Y_OFFSET_FROM_BOTTOM
-            # EA centers the subtitle by its integer textLength inside
-            # the package BODY and floors x.
-            body_width = Element::PackageShapeRenderer.body_width_for(
-              label: context.model_element.name.to_s,
-              stereotype: nil, size: context.size
-            )
-            len = TextRenderer.estimate_width(
-              text, context.size, nil,
-              family: context.family, style: "italic"
-            ).round
-            x = (bounds.x + (body_width - len) / 2.0).floor
-            body = TextRenderer.new(
-              content: text, x: x, y: y,
-              family: context.family, size: context.size,
-              size_unit: context.size_unit, fill: fill,
-              style: "italic"
-            ).to_svg
-            wrap(body, fill)
+            # EA word-wraps the subtitle to the package BODY width
+            # (minus padding), centers each line by its integer
+            # textLength inside the body, and floors x; successive
+            # lines pitch +13 (05DF5000: "(from ISO 19115-1:2014
+            # Metadata" / "Fundamentals)" at y 123/136).
+            body_width = bounds.width
+            lines = wrap_lines(text, context, body_width - WRAP_PADDING)
+            bodies = lines.each_with_index.map do |line, i|
+              len = TextRenderer.estimate_width(
+                line, context.size, nil,
+                family: context.family, style: "italic"
+              ).round
+              x = (bounds.x + (body_width - len) / 2.0).floor
+              TextRenderer.new(
+                content: line, x: x, y: y + i * LINE_PITCH,
+                family: context.family, size: context.size,
+                size_unit: context.size_unit, fill: fill,
+                style: "italic"
+              ).to_svg
+            end
+            wrap(bodies.join("\n"), fill)
           end
           module_function :subtitle
 
+          # EA carries the break space onto the broken line: line 1
+          # is "(from ... Metadata - " with the trailing space, and
+          # its textLength includes it (05DF5000: tl 146).
+          def wrap_lines(text, context, max_width)
+            words = text.split(" ")
+            return [text] if words.size <= 1
+
+            lines = []
+            current = +""
+            words.each do |word|
+              candidate = current.empty? ? word : "#{current} #{word}"
+              if !current.empty? && TextRenderer.estimate_width(
+                candidate, context.size, nil,
+                family: context.family, style: "italic"
+              ) > max_width
+                lines << "#{current} "
+                current = word
+              else
+                current = candidate
+              end
+            end
+            lines << current unless current.empty?
+            lines
+          end
+          module_function :wrap_lines
+
           def wrap(body, fill)
             group_style = "stroke-width:1;stroke-linecap:round;" \
                           "stroke-linejoin:bevel; fill:#{fill};" \

data/lib/ea/svg/ea_emitter/element/package_shape_renderer.rb

@@ -31,9 +31,11 @@ module Ea
           TAB_LABEL_Y_OFFSET = 13
           TAB_LINE_OFFSET = 13
           DEFAULT_TAB_WIDTH = 105
-          # EA autosizes: tab = max(text width + 15, 105) and the body
-          # is always 15px wider than the tab. Corpus-verified against
-          # EA-published package element polygons.
+          # EA autosizes the TAB: max(text width + 15, 105). The BODY
+          # width = max(stored rect, tab + 15): user-widened packages
+          # keep their stored width (05DF5000: bodies 248/194 with
+          # tabs 141/105), while EA-autosized packages grow to
+          # tab + 15 (E58034A3: stored 86 -> body 120 with tab 105).
           TAB_NAME_EXTRA = 15
           TAB_BODY_EXTRA = 15
 
@@ -143,7 +145,7 @@ module Ea
           def body_points
             x = bounds.x
             y = tab_top_y + tab_height
-            w = self.class.body_width_for(label: label, stereotype: stereotype, size: size)
+            w = body_width
             h = body_height(y)
             [
               [x, y],
@@ -173,8 +175,13 @@ module Ea
             ]
           end
 
+          def body_width
+            [bounds.width, self.class.autosized_tab_width(label: label, stereotype: stereotype, size: size) + TAB_BODY_EXTRA].max
+          end
+
           def tab_width
-            self.class.autosized_tab_width(label: label, stereotype: stereotype, size: size)
+            [body_width,
+             self.class.autosized_tab_width(label: label, stereotype: stereotype, size: size)].min
           end
 
           # Tab width fits the widest text line (stereotype or name)
@@ -189,6 +196,7 @@ module Ea
           def self.body_width_for(label:, stereotype:, size:)
             autosized_tab_width(label: label, stereotype: stereotype, size: size) + TAB_BODY_EXTRA
           end
+
         end
       end
     end

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

@@ -63,6 +63,14 @@ module Ea
         # packages). Heights/widths are translation-invariant, so the
         # connector emitters can redock in logical space and run the
         # normal canvas translation afterwards.
+        def classifier_package?(classifier)
+          classifier.is_a?(Ea::Model::Package)
+        end
+
+        def package_stereotype(context)
+          context.classifier.stereotype_refs.first.to_s
+        end
+
         def record_drawn_bounds(element, context)
           return unless element.model_element_ref
 
@@ -76,7 +84,7 @@ module Ea
               stereotype: package_stereotype(context),
               size: context.size
             )
-            width = tab + Element::PackageShapeRenderer::TAB_BODY_EXTRA
+            width = [raw.width, tab + Element::PackageShapeRenderer::TAB_BODY_EXTRA].max
           end
           @drawn_bounds[element.model_element_ref] = Ea::Model::Bounds.new(
             x: raw.x, y: raw.y,
@@ -85,13 +93,7 @@ module Ea
           )
         end
 
-        def classifier_package?(classifier)
-          classifier.class == Ea::Model::Package
-        end
 
-        def package_stereotype(context)
-          context.classifier.stereotype_refs.first.to_s
-        end
 
         # Build the RenderContext for one element. Returns nil when
         # the element has no usable bounds (skip rendering).

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.35"
+  VERSION = "0.6.37"
 end

metadata

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