wani 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ff93e8caf99520439378ec599dea98fe0cb16c6704fbd7180fdedbd62b3ec2f
-  data.tar.gz: 0e10b33b011d5a227236da73dcb0ba8d576abb0f421010f832d0ba2e8372b582
+  metadata.gz: f85a23004f1df4d2bbbbc63f5f0b1390fc23476719bdf53af05d493a2c2cbc2d
+  data.tar.gz: dc2c7fbeed8adceb6c10ce6efb0f8c3bc418625e82878845426c203a20a8bfd6
 SHA512:
-  metadata.gz: 9fd07de540a9a83d403e4dd5b38bd71306e19287605a0c56819e43b1addfb683c1528f95732dc4273a33c20d7dee57b95b41b55562b2712b4d67591a662faee0
-  data.tar.gz: b01f44dc7f6250766599fccbe388e816efd06b83d1ea098df3713049ba9db3cc6d55c8864150fe10ad4417778e5e029f341cf66d2bd7dab00989ada94bbdff73
+  metadata.gz: b75c77c939e09c3e195a63b119f4e6e5c8557bcb5f120edf5496a00a2ee20da64b70cae8b18d8a87a98dd0e70299fe1e9881ebbfbdbdf6f94e2995725b531a56
+  data.tar.gz: e207c8c3ae8ceb6906702ce73a2dbca34005b09c7a2a80b178cf1f9c832f4abeb75fcb48844e31e46738cb128bc03eaa5431c3ebc0ac41683bacda36a9075f01

data/README.md

@@ -25,7 +25,7 @@ npm ci
 bundle exec rake build:wasm
 
 gem build wani.gemspec
-gem install ./wani-0.1.9.gem
+gem install ./wani-0.1.10.gem
 
 wani new my-talk
 cd my-talk
@@ -111,6 +111,8 @@ notes:
 
 スライドは1920×1080、16:9、白背景です。タイトル・本文・脚注を分け、画面に合わせて全体を拡大縮小します。
 画像とフォントを読み込み、幅と高さに合わせて文字サイズを自動調整します。
+タイトルは1行に収めます。本文の段落・見出し・箇条書きは、使用フォントの全角20文字（「あ」20個）相当の幅以下なら折り返さず、それを超える場合は自然に折り返します。
+明示的な改行は維持し、改行ごとに幅を判定します。文字サイズは本文全体で共通です。
 画像は比率を維持して縦に配置し、画像だけの場合は本文領域を広く使います。
 収まらない内容は分割・スクロールせず、番号と内容を含む警告を表示します。
 画像の読み込みを最大15秒待ち、失敗やタイムアウトを通知します。

data/assets/build.json

@@ -1,6 +1,6 @@
 {
-  "version": "0.1.9",
-  "source_sha256": "45e449c831f3ae3092ad05f56b8694ae73c2c5ffcc1a5fa1469351eb2e108b52",
+  "version": "0.1.10",
+  "source_sha256": "b66ef1d534e169a73a33bf97aacbb95049b982a006fc6487baf5969a897b6dc9",
   "loader_commit": "dc6b0ffd5800ed9bfc49268ed8021d456f10ddf8",
-  "wasm_sha256": "64559bd712ffbafbea133c20cbd2a44ad2ad87410465c93766817ed858e0caee"
+  "wasm_sha256": "0b632b9dc039dfa2e6a76f5ab54938788a334ffe24aaeb07570f0e23f0ac2215"
 }

data/assets/style.css

@@ -52,6 +52,7 @@ button:focus-visible, a:focus-visible { outline: 2px solid #557e64; outline-offs
 .bridge-wani { display: block; width: 100%; height: 44px; object-fit: contain; }
 .rabbit-position { position: absolute; bottom: 30px; width: 84px; height: 40px; left: calc((100% - 84px) * var(--rabbit-progress)); }
 .rabbit-image { display: block; width: 84px; height: 40px; }
+.decorations[data-direction="left"] .rabbit-image { scale: -1 1; }
 .slide.active .bridge-segment[data-appearing="true"] { animation: wani-arrive .35s ease-out; }
 .slide.active .decorations[data-moving="true"] .rabbit-position { animation: rabbit-advance .45s ease-in-out; }
 .slide.active .decorations[data-moving="true"] .rabbit-image { animation: rabbit-hop .45s ease-in-out; }

data/assets/wani.wasm

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: data/assets/wani.wasm
-size: 35166009 bytes
-sha256: 64559bd712ffbafbea133c20cbd2a44ad2ad87410465c93766817ed858e0caee
+size: 35167886 bytes
+sha256: 0b632b9dc039dfa2e6a76f5ab54938788a334ffe24aaeb07570f0e23f0ac2215

data/lib/wani/browser/layout.rb

@@ -7,6 +7,7 @@ module Wani
       BODY_MAX = 160
       TITLE_MIN = 24
       TITLE_MAX = 220
+      NO_WRAP_EMS = 20
 
       def initialize(document, &warn)
         @document, @warn = document, warn
@@ -55,6 +56,7 @@ module Wani
           @warn.call("スライド #{number}: タイトルが収まりません: #{title[:textContent]}") unless fits?(title)
         end
         body = section.querySelector(".body")
+        prepare_wrapping(body)
         fit_images(body)
         fit_font(body, BODY_MIN, BODY_MAX)
         @warn.call("スライド #{number}: 本文が収まりません: #{body[:textContent].to_s[0, 120]}") unless fits?(body)
@@ -72,6 +74,41 @@ module Wani
 
       private
 
+      def prepare_wrapping(body)
+        # Rebuild the wrappers when a slide is fitted again (for example after
+        # editing). Ranges preserve links, emphasis and explicit line breaks.
+        body.querySelectorAll("[data-wani-line]").to_a.each do |line|
+          line.replaceWith(*line[:childNodes].to_a)
+        end
+        body[:style][:fontSize] = "#{BODY_MIN}px"
+        body.querySelectorAll("p, h1, h2, h3, h4, h5, h6, li").to_a.each do |block|
+          next unless block.querySelector("p, ul, ol") == JS::Null
+          breaks = block.querySelectorAll("br").to_a
+          # Work backwards so extracting a range does not invalidate the next.
+          (0..breaks.length).to_a.reverse_each do |index|
+            range = @document.createRange
+            range.selectNodeContents(block)
+            range.setStartAfter(breaks[index - 1]) if index.positive?
+            range.setEndBefore(breaks[index]) if index < breaks.length
+            line = @document.createElement("span")
+            line.setAttribute("data-wani-line", "")
+            line[:style][:whiteSpace] = "nowrap"
+            line.appendChild(range.extractContents)
+            range.insertNode(line)
+
+            reference = @document.createElement("span")
+            reference[:textContent] = "あ" * NO_WRAP_EMS
+            reference[:style][:position] = "absolute"
+            reference[:style][:whiteSpace] = "nowrap"
+            block.appendChild(reference)
+            if line.getBoundingClientRect[:width].to_f > reference.getBoundingClientRect[:width].to_f + 0.01
+              line[:style][:whiteSpace] = "normal"
+            end
+            reference.remove
+          end
+        end
+      end
+
       def fits?(node)
         node[:scrollWidth].to_i <= node[:clientWidth].to_i + 1 && node[:scrollHeight].to_i <= node[:clientHeight].to_i + 1
       end

data/lib/wani/browser/renderer.rb

@@ -53,6 +53,7 @@ module Wani
         current = BridgeProgress.new(scene.getAttribute("data-slide").to_s.to_i, @presentation.slides.length)
         scene[:style].setProperty("--rabbit-from", previous.rabbit_fraction.to_s)
         scene.setAttribute("data-moving", (previous.rabbit_fraction != current.rabbit_fraction).to_s)
+        scene.setAttribute("data-direction", current.rabbit_fraction < previous.rabbit_fraction ? "left" : "right")
         scene.querySelectorAll(".bridge-segment").to_a.each_with_index do |segment, index|
           appearing = index >= BridgeProgress::SEGMENTS - current.sharks && index < BridgeProgress::SEGMENTS - previous.sharks
           segment.setAttribute("data-appearing", appearing.to_s)

data/lib/wani/version.rb

@@ -1,3 +1,3 @@
 module Wani
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wani
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - ledsun