ea 0.6.45 → 0.6.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70775a4db6ad6a0d240e3eb3de0e60aa31db24561ad167898a9613df3f431810
-  data.tar.gz: b15a7d2bcce540619ed08e2fb32d6fe427850a6381e6db15dd72a25b6bc6739f
+  metadata.gz: 5c75b8ba9d59e1d04e015a9daacbc50ee2494e41f6a92d3338e204842df32198
+  data.tar.gz: 30d44ea4fbac3e6f7566dd9e1a4b353f306faca1190690a8756da6f828f5bb6b
 SHA512:
-  metadata.gz: 1d3e2a0d75fc280ab1eea83db6376dd9d6e045569ca99ef5ba5fa7bbc7a39d8c3b5eff7af59fa12bd7ad5b63f2518b16dbc20694b605c80574c5415617635036
-  data.tar.gz: 49baf9df9e8d0327b9d81bc5549edbf3a8d71e4401adbbe5cf895a17bcae8e283daf178e4e87ef5a509b9d7e0a94a2630899e22adebddebcdd9a40f5c1e2042a
+  metadata.gz: 86964ae657e21e80eede2a3579ebd0c07070bb4f4d16a7d388e267a4ab883c81969ef08c936c373606b3cc76ee3bce2dcb15b9678306936eefbcd9e822f94330
+  data.tar.gz: 0aac4dde65b4fe80813fb8ef1d813b5487159bf0a77160e9ff00e49a70f2490bee5f1c224dae9ccf7ba99337288ecbec3fd7c13bd70d283d6b5f2b78119e5bb5

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

@@ -85,6 +85,7 @@ module Ea
         end
 
         def build_element(obj_row, diagram_row)
+          @current_obj_row = obj_row
           style_hash = DiagramStyleParser.parse(obj_row.objectstyle)
           Ea::Model::DiagramElement.new(
             id: IdNormalizer.synthetic("de", diagram_row.diagram_id,
@@ -123,9 +124,25 @@ module Ea
           raw = style_hash[:fontsz]
           return nil if raw.nil? || raw.to_s.empty?
 
+          return nil if raw.to_i.zero?
+
+          stored = (raw.to_f / 10).round
+          return stored - 1 if note_element? && stored > 1
+
           return nil if USE_DEFAULT_FONTSZ.include?(raw.to_i)
 
-          (raw.to_f / 10).round
+          stored
+        end
+
+        # Text/Note elements carry their real font size in fontsz
+        # shifted by one point (stored 100 renders 9pt, 80 renders
+        # 7pt - corpus-verified on EA-published note SVGs);
+        # classifiers keep the use-default convention.
+        def note_element?
+          return false unless database && @current_obj_row
+
+          obj = database.find_object(@current_obj_row.ea_object_id.to_i)
+          obj&.object_type.to_s == "Text"
         end
 
         def build_connectors(diagram_row)

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

@@ -29,11 +29,15 @@ module Ea
             usable = context.bounds.width - 15
             size = context.size
             family = context.family
+            # EA's note body pitch and first-line offset scale with
+            # the note font (9pt notes: pitch 16 = size+7, first line
+            # at bounds.y + 18 = size+9 - 9BA1CE54).
+            pitch = context.size + 7
+            first_offset = context.size + 9
             body.to_s.split(/\n/).flat_map do |para|
-              wrap_paragraph(para, usable, size, family)
+              wrap_paragraph(para, usable, size, context.family)
             end.each_with_index.map do |line, idx|
-              y = context.bounds.y + context.theme.note.text_y_offset +
-                  (idx * context.theme.note.line_height)
+              y = context.bounds.y + first_offset + (idx * pitch)
               TextRenderer.new(
                 content: line,
                 x: context.bounds.x + context.theme.note.text_x_offset,

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

@@ -19,8 +19,10 @@ module Ea
               )
             elsif context.model_element.is_a?(Ea::Model::Package) ||
                   context.model_element.is_a?(Ea::Model::Note)
-              label = package_label(context.model_element)
-              stereotype = package_stereotype(context.model_element)
+              # Notes keep the folder silhouette but never render a
+              # label (EA publishes note bodies only).
+              label = package_label(context.model_element) if context.model_element.is_a?(Ea::Model::Package)
+              stereotype = package_stereotype(context.model_element) if context.model_element.is_a?(Ea::Model::Package)
               Element::PackageShapeRenderer.render(
                 context.bounds,
                 fill: context.fill, stroke: context.stroke,

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.45"
+  VERSION = "0.6.46"
 end

metadata

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