ea 0.6.46 → 0.6.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c75b8ba9d59e1d04e015a9daacbc50ee2494e41f6a92d3338e204842df32198
-  data.tar.gz: 30d44ea4fbac3e6f7566dd9e1a4b353f306faca1190690a8756da6f828f5bb6b
+  metadata.gz: 883c961d3fd0e63b7d48117b76db47d79e90a62ed1027ad2cf4aa55082ee5132
+  data.tar.gz: d499d2e8b9376a7b79004f7da6c82ed8558cbebaca22fe7b9b83f4e3f534df87
 SHA512:
-  metadata.gz: 86964ae657e21e80eede2a3579ebd0c07070bb4f4d16a7d388e267a4ab883c81969ef08c936c373606b3cc76ee3bce2dcb15b9678306936eefbcd9e822f94330
-  data.tar.gz: 0aac4dde65b4fe80813fb8ef1d813b5487159bf0a77160e9ff00e49a70f2490bee5f1c224dae9ccf7ba99337288ecbec3fd7c13bd70d283d6b5f2b78119e5bb5
+  metadata.gz: f056a65fa2b30039c1602d38e90b775f0fd712be85f36774ddbb068c74649bd47f756eb7aa67c45124fbe698c64119849d468d3b29f527ceb113ce4707ea1b96
+  data.tar.gz: 8dc93dcf117c9ba1cfaff73a4f521f6c1e9ca8189173f992dbd3e7b15cd43712c843f3b9a80b8d668b3d9ca79043a462cffd2404936d441e09202d1c6f9a5c04

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

@@ -26,27 +26,35 @@ module Ea
           # cumulative integer textLength fits bounds.width - 15.
           # Verified against EA-published reference SVGs.
           def wrapped_lines(context, body)
-            usable = context.bounds.width - 15
+            # EA's note wrap padding is 4: lines fit bounds.width - 4
+            # (9BA1CE54: width 214, longest line tl 210). Pitch and
+            # first-line offset scale with the note font (9pt: pitch
+            # 16 = size+7, first line at bounds.y + 18 = size+9), and
+            # each paragraph break adds one blank pitch row
+            # (paragraph 2 starts 32 after the last line of
+            # paragraph 1).
+            usable = context.bounds.width - 4
             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, context.family)
-            end.each_with_index.map do |line, idx|
-              y = context.bounds.y + first_offset + (idx * pitch)
-              TextRenderer.new(
-                content: line,
-                x: context.bounds.x + context.theme.note.text_x_offset,
-                y: y,
-                family: context.family, size: context.size, size_unit: context.size_unit,
-                fill: context.theme.text_color,
-                stroke_in_text: context.theme.stroke_in_text_color,
-                width_factor: context.theme.text_width_factor
-              ).to_svg
+            pitch = size + 7
+            first_offset = size + 9
+            y_index = 0
+            paragraphs = body.to_s.split(/\n/).reject { |p| p.strip.empty? }
+            paragraphs.flat_map do |para|
+              lines = wrap_paragraph(para, usable, size, context.family)
+              lines.each_with_index.map do |line, i|
+                y = context.bounds.y + first_offset + ((y_index + i) * pitch)
+                TextRenderer.new(
+                  content: line,
+                  x: context.bounds.x + context.theme.note.text_x_offset,
+                  y: y,
+                  family: context.family, size: context.size,
+                  size_unit: context.size_unit,
+                  fill: context.theme.text_color,
+                  stroke_in_text: context.theme.stroke_in_text_color,
+                  width_factor: context.theme.text_width_factor
+                ).to_svg
+              end.tap { y_index += lines.size + 1 }
             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.46"
+  VERSION = "0.6.47"
 end

metadata

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