@onjmin/dtm 0.1.87 → 0.1.88

package/dist/index.mjs

@@ -2189,7 +2189,7 @@ var parseLyrics = (mml) => {
     let delay = 0;
     let gender = 50;
     let breathiness = 50;
-    let octaveDouble = false;
+    let octaveUnison = "none";
     const modelMatch = rest.match(
       /^([a-z_][a-z0-9_]*?)(?=(?:[vqpobrghew]-?\d)|[^a-z0-9_]|$)(?::(\d+))?/i
     );
@@ -2267,9 +2267,9 @@ var parseLyrics = (mml) => {
         rest = rest.substring(eMatch[0].length).trim();
         continue;
       }
-      const wMatch = rest.match(/^w([01])/i);
+      const wMatch = rest.match(/^w([0-3])/i);
       if (wMatch) {
-        octaveDouble = wMatch[1] === "1";
+        octaveUnison = ["none", "down", "up", "both"][Number.parseInt(wMatch[1], 10)];
         metaTokens.push(wMatch[0]);
         rest = rest.substring(wMatch[0].length).trim();
         continue;
@@ -2293,7 +2293,7 @@ var parseLyrics = (mml) => {
       delay,
       gender,
       breathiness,
-      octaveDouble,
+      octaveUnison,
       syllables,
       metaText: metaTokens.join(" "),
       ...lineBreaks.length > 0 ? { lineBreaks } : {}
@@ -2890,8 +2890,19 @@ var createKoeVoice = async (ctx, destination, options) => {
 var PREWARM_NOTES = 3;
 var STREAM_LOOKAHEAD_SEC = 1.5;
 var STREAM_POLL_MS = 100;
-var OCTAVE_DOUBLE_SEMITONES = -12;
-var OCTAVE_DOUBLE_PEAK_SCALE = 0.6;
+var OCTAVE_UNISON_PEAK_SCALE = 0.6;
+var octaveUnisonOffsets = (mode) => {
+  switch (mode) {
+    case "down":
+      return [-12];
+    case "up":
+      return [12];
+    case "both":
+      return [-12, 12];
+    default:
+      return [];
+  }
+};
 var FALLBACK_MODEL = "klatt";
 var createSingingVoices = (ctx, destination, options = {}) => {
   const catalog = {};
@@ -2986,12 +2997,12 @@ var createSingingVoices = (ctx, destination, options = {}) => {
           vibrato: track.vibrato,
           expr
         });
-        if (track.octaveDouble) {
+        for (const offset of octaveUnisonOffsets(track.octaveUnison)) {
           tasks.push({
             model: m,
             note,
             prevVowel,
-            pitch: note.pitch + OCTAVE_DOUBLE_SEMITONES,
+            pitch: note.pitch + offset,
             vibrato: track.vibrato,
             expr
           });
@@ -3106,11 +3117,8 @@ var createSingingVoices = (ctx, destination, options = {}) => {
             }
           };
           dispatchNote(note.pitch, 1);
-          if (track.octaveDouble) {
-            dispatchNote(
-              note.pitch + OCTAVE_DOUBLE_SEMITONES,
-              OCTAVE_DOUBLE_PEAK_SCALE
-            );
+          for (const offset of octaveUnisonOffsets(track.octaveUnison)) {
+            dispatchNote(note.pitch + offset, OCTAVE_UNISON_PEAK_SCALE);
           }
           if (!(model.renderToCache && model.scheduleCached)) {
             await new Promise((resolve) => setTimeout(resolve, 0));
@@ -3175,6 +3183,7 @@ var META_DIRECTIVE = /#(inst|drum|drumfont|volume|drumvolume|reverb|reverbdecay|
 var TRACK_INST_DIRECTIVE = /#t(\d+)inst=([^#;\r\n]+)/gi;
 var TRACK_COMP_DIRECTIVE = /#t(\d+)comp=(\d+)/gi;
 var TRACK_WIDTH_DIRECTIVE = /#t(\d+)width=(\d+)/gi;
+var TRACK_REVERBSEND_DIRECTIVE = /#t(\d+)rev=(\d+)/gi;
 var TRACK_EQLOW_DIRECTIVE = /#t(\d+)eqlo=(-?\d+)/gi;
 var TRACK_EQMID_DIRECTIVE = /#t(\d+)eqmid=(-?\d+)/gi;
 var TRACK_EQHIGH_DIRECTIVE = /#t(\d+)eqhi=(-?\d+)/gi;
@@ -3241,6 +3250,14 @@ var parseMmlMeta = (mml) => {
       meta.trackWidth[idx] = val;
     }
   }
+  for (const m of mml.matchAll(TRACK_REVERBSEND_DIRECTIVE)) {
+    const idx = Number.parseInt(m[1], 10);
+    const val = clamp2(Number.parseInt(m[2], 10), 0, 100);
+    if (!Number.isNaN(idx) && !Number.isNaN(val)) {
+      meta.trackReverbSend ??= {};
+      meta.trackReverbSend[idx] = val;
+    }
+  }
   for (const m of mml.matchAll(TRACK_EQLOW_DIRECTIVE)) {
     const idx = Number.parseInt(m[1], 10);
     const val = clamp2(Number.parseInt(m[2], 10), -12, 12);
@@ -3267,7 +3284,7 @@ var parseMmlMeta = (mml) => {
   }
   return meta;
 };
-var stripMmlMeta = (mml) => mml.replace(META_DIRECTIVE, "").replace(TRACK_INST_DIRECTIVE, "").replace(TRACK_COMP_DIRECTIVE, "").replace(TRACK_WIDTH_DIRECTIVE, "").replace(TRACK_EQLOW_DIRECTIVE, "").replace(TRACK_EQMID_DIRECTIVE, "").replace(TRACK_EQHIGH_DIRECTIVE, "");
+var stripMmlMeta = (mml) => mml.replace(META_DIRECTIVE, "").replace(TRACK_INST_DIRECTIVE, "").replace(TRACK_COMP_DIRECTIVE, "").replace(TRACK_WIDTH_DIRECTIVE, "").replace(TRACK_REVERBSEND_DIRECTIVE, "").replace(TRACK_EQLOW_DIRECTIVE, "").replace(TRACK_EQMID_DIRECTIVE, "").replace(TRACK_EQHIGH_DIRECTIVE, "");
 var formatMmlMeta = (meta, space = "") => {
   const parts = [];
   if (meta.instrument) parts.push(`#inst=${meta.instrument}`);
@@ -3306,6 +3323,11 @@ var formatMmlMeta = (meta, space = "") => {
       if (val !== 100) parts.push(`#t${idx}width=${val}`);
     }
   }
+  if (meta.trackReverbSend) {
+    for (const [idx, val] of Object.entries(meta.trackReverbSend)) {
+      if (val !== 0) parts.push(`#t${idx}rev=${val}`);
+    }
+  }
   if (meta.trackEqLow) {
     for (const [idx, val] of Object.entries(meta.trackEqLow)) {
       if (val !== 0) parts.push(`#t${idx}eqlo=${val}`);
@@ -7621,11 +7643,14 @@ var DAW_CSS = `
   user-select: none;
 }
 .dtm-player-balloon {
-  position: absolute;
-  bottom: calc(100% + 6px);
-  left: 50%;
-  transform: translateX(-50%);
-  z-index: 100;
+  /* body \u76F4\u4E0B\u306B\u751F\u6210\u3055\u308C\u3001JS(positionBalloon)\u304C\u6BCE\u56DE left/top \u3092\u30A2\u30F3\u30AB\u30FC\u306E\u753B\u9762\u5EA7\u6A19\u3067
+     \u8A2D\u5B9A\u3059\u308B\u3002overflow:hidden \u306A\u7956\u5148\uFF08\u6295\u7A3F\u30AB\u30FC\u30C9\u7B49\uFF09\u306B\u30AF\u30EA\u30C3\u30D7\u3055\u308C\u306A\u3044\u3088\u3046 fixed \u3067\u6D6E\u304B\u305B\u308B\u3002
+     top \u306F\u30A2\u30F3\u30AB\u30FC\u4E0A\u7AEF-6px\u3001transform \u3067\u81EA\u8EAB\u306E\u5DE6\u4E0B\u89D2\u3092\u305D\u306E\u70B9\u306B\u5408\u308F\u305B\u308B\u3002 */
+  position: fixed;
+  left: 0;
+  top: 0;
+  transform: translate(-50%, -100%);
+  z-index: 1000;
   display: none;
   pointer-events: none;
   font-family: var(--dtm-font);
@@ -7654,8 +7679,8 @@ var DAW_CSS = `
   animation: dtm-balloon-fade-in 0.1s steps(2);
 }
 @keyframes dtm-balloon-fade-in {
-  from { opacity: 0; transform: translateX(-50%) translateY(4px); }
-  to { opacity: 1; transform: translateX(-50%) translateY(0); }
+  from { opacity: 0; transform: translate(-50%, -100%) translateY(4px); }
+  to { opacity: 1; transform: translate(-50%, -100%) translateY(0); }
 }
 @keyframes dtm-emoji-jump {
   0%   { transform: translateY(0); }
@@ -8078,6 +8103,27 @@ var LYRIC_MODEL_LABELS = {
 };
 var activeBalloonEl = null;
 var activeBalloonTimer = null;
+var balloonAnchors = /* @__PURE__ */ new WeakMap();
+var positionBalloon = (balloonEl) => {
+  const anchor = balloonAnchors.get(balloonEl);
+  if (!anchor) return;
+  const rect = anchor.getBoundingClientRect();
+  balloonEl.style.left = `${rect.left + rect.width / 2}px`;
+  balloonEl.style.top = `${rect.top - 6}px`;
+};
+var balloonListenersBound = false;
+var ensureBalloonListeners = () => {
+  if (balloonListenersBound || typeof window === "undefined") return;
+  balloonListenersBound = true;
+  const reposition = () => {
+    if (activeBalloonEl) positionBalloon(activeBalloonEl);
+  };
+  window.addEventListener("scroll", reposition, {
+    capture: true,
+    passive: true
+  });
+  window.addEventListener("resize", reposition, { passive: true });
+};
 var hideActiveBalloon = () => {
   if (activeBalloonEl) {
     activeBalloonEl.classList.remove("dtm-player-balloon--visible");
@@ -8089,6 +8135,7 @@ var hideActiveBalloon = () => {
   }
 };
 var showBalloon = (balloonEl) => {
+  positionBalloon(balloonEl);
   if (activeBalloonEl === balloonEl) {
     if (activeBalloonTimer) {
       clearTimeout(activeBalloonTimer);
@@ -8353,6 +8400,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   const doc = target.ownerDocument ?? document;
   const root = doc.createElement("div");
   root.className = "dtm-daw dtm-player";
+  const playerBalloons = [];
   const head = doc.createElement("div");
   head.className = "dtm-player-head";
   const playBtn = doc.createElement("button");
@@ -8698,7 +8746,10 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     balloon.className = "dtm-player-balloon";
     const modelKey = lt.model.toLowerCase();
     balloon.textContent = LYRIC_MODEL_LABELS[modelKey] ?? lt.model;
-    em.appendChild(balloon);
+    balloonAnchors.set(balloon, em);
+    doc.body.appendChild(balloon);
+    playerBalloons.push(balloon);
+    ensureBalloonListeners();
     em.addEventListener("mouseenter", () => {
       showBalloon(balloon);
     });
@@ -9159,7 +9210,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
       delaySend: (lt.delay ?? 0) / 100,
       gender: (lt.gender ?? 50) / 100,
       breathiness: (lt.breathiness ?? 50) / 100,
-      octaveDouble: lt.octaveDouble,
+      octaveUnison: lt.octaveUnison,
       notes
     };
   });
@@ -9295,9 +9346,10 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     }
     for (const t of blinkTimers) clearTimeout(t);
     clearJumpTimers();
-    if (activeBalloonEl && root.contains(activeBalloonEl)) {
+    if (activeBalloonEl && playerBalloons.includes(activeBalloonEl)) {
       hideActiveBalloon();
     }
+    for (const balloon of playerBalloons) balloon.remove();
     root.remove();
     consentOverlayEl?.remove();
     closeInfoModal();
@@ -12999,14 +13051,22 @@ var VIBRATO_INFO_HTML = `
   <p>\u30D4\u30C3\u30C1\u3092\u63FA\u3089\u3059\u52B9\u679C\u306A\u306E\u3067\u3001\u58F0\u8CEA\u305D\u306E\u3082\u306E\u3092\u5909\u3048\u308B\u30B8\u30A7\u30F3\u30C0\u30FC/\u30D6\u30EC\u30B7\u30CD\u30B9\u3068\u306F\u72EC\u7ACB\u3057\u3066\u7D44\u307F\u5408\u308F\u305B\u3089\u308C\u307E\u3059\u3002\u901F\u3055\u30FB\u6DF1\u3055\u306F\u8ABF\u6574\u3067\u304D\u307E\u305B\u3093\uFF08\u6B4C\u3068\u3057\u3066\u7834\u7DBB\u3057\u306B\u304F\u3044\u63A7\u3048\u3081\u306A\u91CF\u306B\u56FA\u5B9A\uFF09\u3002\u66F2\u3084\u7B87\u6240\u3054\u3068\u306B\u639B\u3051\u305F\u3044/\u639B\u3051\u305F\u304F\u306A\u3044\u304C\u3042\u308B\u5834\u5408\u306F\u3001\u30C8\u30E9\u30C3\u30AF\u3092\u5206\u3051\u3066\u6B4C\u8A5E\u3092\u66F8\u3044\u3066\u304F\u3060\u3055\u3044\u3002</p>
 </div>
 `;
-var OCTAVE_DOUBLE_INFO_HTML = `
+var OCTAVE_UNISON_TOKEN = {
+  none: "",
+  down: "w1",
+  up: "w2",
+  both: "w3"
+};
+var OCTAVE_UNISON_INFO_HTML = `
 <div class="dtm-modal-body-content">
   <h4>\u4F55\u3092\u3059\u308B\u8A2D\u5B9A\u304B</h4>
-  <p>ON\u306B\u3059\u308B\u3068\u3001\u3053\u306E\u30C8\u30E9\u30C3\u30AF\u306E\u5404\u97F3\u7BC0\u30921\u30AA\u30AF\u30BF\u30FC\u30D6\u4E0B\uFF08\u63A7\u3048\u3081\u306A\u97F3\u91CF\uFF09\u3067\u540C\u6642\u306B\u91CD\u306D\u3066\u767A\u97F3\u3057\u307E\u3059\u3002\u58F0\u306B\u539A\u307F\u30FB\u30D1\u30EF\u30FC\u3092\u8DB3\u3059\u300C\u30AA\u30AF\u30BF\u30FC\u30D6\u30C0\u30D6\u30EA\u30F3\u30B0\u300D\u3068\u3044\u3046\u5B9A\u756A\u306E\u30DC\u30FC\u30AB\u30EB\u52A0\u5DE5\u3067\u3059\u3002</p>
+  <p>\u3053\u306E\u30C8\u30E9\u30C3\u30AF\u306E\u5404\u97F3\u7BC0\u306B\u3001\u3082\u30461\u58F0\u30921\u30AA\u30AF\u30BF\u30FC\u30D6\u4E0A/\u4E0B/\u4E21\u65B9\uFF08\u63A7\u3048\u3081\u306A\u97F3\u91CF\uFF09\u3067\u540C\u6642\u306B\u91CD\u306D\u3066\u767A\u97F3\u3057\u307E\u3059\u3002\u58F0\u306B\u539A\u307F\u30FB\u30D1\u30EF\u30FC\u3092\u8DB3\u3059\u300C\u30AA\u30AF\u30BF\u30FC\u30D6\u30E6\u30CB\u30BE\u30F3\uFF08\u30C0\u30D6\u30EA\u30F3\u30B0\uFF09\u300D\u3068\u3044\u3046\u5B9A\u756A\u306E\u30DC\u30FC\u30AB\u30EB\u52A0\u5DE5\u3067\u3059\u3002</p>
+  <h4>\u4E0B\u30FB\u4E0A\u30FB\u4E21\u65B9\u306E\u9055\u3044</h4>
+  <p>\u300C\u4E0B\u300D\u306F\u58F0\u306B\u91CD\u307F\u30FB\u30D1\u30EF\u30FC\u3092\u8DB3\u3059\u5B9A\u756A\u306E\u4F7F\u3044\u65B9\uFF08\u30ED\u30C3\u30AF/EDM\u306E\u30D0\u30C3\u30AD\u30F3\u30B0\u7B49\uFF09\u3002\u300C\u4E0A\u300D\u306F\u592A\u3055\u3067\u306F\u306A\u304F\u714C\u3073\u3084\u304B\u3055\u30FB\u53EF\u6190\u3055\u3092\u8DB3\u3059\u4F7F\u3044\u65B9\uFF08\u30A2\u30CB\u30BD\u30F3/\u30CF\u30E2\u30EA\u7B49\uFF09\u3002\u300C\u4E21\u65B9\u300D\u306F\u4E0A\u4E0B\u540C\u6642\u306B\u91CD\u306D\u308B\u7279\u6B8A\u306A\u52B9\u679C\u3067\u3001\u30AD\u30E3\u30E9\u30AF\u30BF\u30FC\u6027\u3092\u5F37\u304F\u51FA\u3057\u305F\u3044\u3068\u304D\u306B\u3002</p>
   <h4>\u4F7F\u3044\u3069\u3053\u308D</h4>
   <p>\u30B5\u30D3\u306E\u6C7A\u3081\u306E\u30D5\u30EC\u30FC\u30BA\u3001\u30ED\u30DC\u30C3\u30C8\u7684/\u30C0\u30FC\u30AF\u306A\u8CEA\u611F\u306E\u6F14\u51FA\u3001\u30E6\u30CB\u30BE\u30F3\u30CF\u30FC\u30E2\u30CB\u30FC\u306A\u3069\u3067\u3088\u304F\u4F7F\u308F\u308C\u307E\u3059\u3002\u66F2\u5168\u4F53\u306B\u639B\u3051\u3063\u3071\u306A\u3057\u306B\u3059\u308B\u3068\u5E38\u306B\u304F\u3069\u3044\u5370\u8C61\u306B\u306A\u308A\u3084\u3059\u3044\u306E\u3067\u3001\u30C8\u30E9\u30C3\u30AF\u3092\u5206\u3051\u3066\u4F7F\u3044\u305F\u3044\u7B87\u6240\u3060\u3051\u306B\u7D5E\u308B\u306E\u304C\u304A\u3059\u3059\u3081\u3067\u3059\u3002</p>
   <h4>\u4ED6\u306E\u8A2D\u5B9A\u3068\u306E\u517C\u306D\u5408\u3044</h4>
-  <p>\u91CD\u306D\u308B\u58F0\u306B\u3082\u540C\u3058\u30D3\u30D6\u30E9\u30FC\u30C8/\u30B8\u30A7\u30F3\u30C0\u30FC/\u30D6\u30EC\u30B7\u30CD\u30B9/\u30EA\u30D0\u30FC\u30D6\u9001\u308A/\u30C7\u30A3\u30EC\u30A4\u9001\u308A\u306E\u8A2D\u5B9A\u304C\u305D\u306E\u307E\u307E\u9069\u7528\u3055\u308C\u307E\u3059\u3002\u97F3\u91CF\u6BD4\u30FB\u97F3\u7A0B\u5DEE\uFF081\u30AA\u30AF\u30BF\u30FC\u30D6\u56FA\u5B9A\uFF09\u306F\u8ABF\u6574\u3067\u304D\u307E\u305B\u3093\u3002\u5408\u6210\u304C\u5358\u7D14\u306B2\u500D\u8D70\u308B\u305F\u3081\u3001\u97F3\u6570\u306E\u591A\u3044\u30C8\u30E9\u30C3\u30AF\u3067\u306F\u3084\u3084\u91CD\u304F\u306A\u308A\u307E\u3059\u3002</p>
+  <p>\u91CD\u306D\u308B\u58F0\u306B\u3082\u540C\u3058\u30D3\u30D6\u30E9\u30FC\u30C8/\u30B8\u30A7\u30F3\u30C0\u30FC/\u30D6\u30EC\u30B7\u30CD\u30B9/\u30EA\u30D0\u30FC\u30D6\u9001\u308A/\u30C7\u30A3\u30EC\u30A4\u9001\u308A\u306E\u8A2D\u5B9A\u304C\u305D\u306E\u307E\u307E\u9069\u7528\u3055\u308C\u307E\u3059\u3002\u97F3\u91CF\u6BD4\u30FB\u97F3\u7A0B\u5DEE\uFF081\u30AA\u30AF\u30BF\u30FC\u30D6\u56FA\u5B9A\uFF09\u306F\u8ABF\u6574\u3067\u304D\u307E\u305B\u3093\u3002\u300C\u4E21\u65B9\u300D\u306F\u5408\u6210\u304C3\u500D\u8D70\u308B\u305F\u3081\u3001\u97F3\u6570\u306E\u591A\u3044\u30C8\u30E9\u30C3\u30AF\u3067\u306F\u3084\u3084\u91CD\u304F\u306A\u308A\u307E\u3059\u3002</p>
 </div>
 `;
 var GENDER_INFO_HTML = `
@@ -13121,6 +13181,16 @@ var TRACK_WIDTH_INFO_HTML = `
   <p>\u30B9\u30DE\u30DB\u306E\u30B9\u30D4\u30FC\u30AB\u30FC1\u500B\u306A\u3069\u3001\u30E2\u30CE\u30E9\u30EB\u306B\u8FD1\u3044\u74B0\u5883\u3067\u518D\u751F\u3059\u308B\u3068\u97F3\u304C\u8584\u304F/\u4F4D\u76F8\u304C\u4E71\u308C\u3066\u805E\u3053\u3048\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\uFF08\u5DE6\u53F3\u306E\u5DEE\u5206\u3092\u8A87\u5F35\u3057\u3066\u3044\u308B\u305F\u3081\u3001\u8DB3\u3057\u5408\u308F\u305B\u308B\u3068\u6253\u3061\u6D88\u3057\u5408\u3046\u6210\u5206\u304C\u5897\u3048\u308B\uFF09\u3002\u4E3B\u65CB\u5F8B\u3084\u30DC\u30FC\u30AB\u30EB\u306F\u4E2D\u592E\u4ED8\u8FD1\u3067\u72ED\u3081\u3001\u30D1\u30C3\u30C9\u3084\u30B7\u30F3\u30BB\u306E\u88C5\u98FE\u30D1\u30FC\u30C8\u306F\u5E83\u3052\u308B\u3001\u3068\u3044\u3046\u306E\u304C\u30DF\u30C3\u30AF\u30B9\u306E\u5B9A\u77F3\u3067\u3059\u3002</p>
 </div>
 `;
+var TRACK_REVERBSEND_INFO_HTML = `
+<div class="dtm-modal-body-content">
+  <h4>\u4F55\u3092\u3059\u308B\u8A2D\u5B9A\u304B</h4>
+  <p>\u3053\u306E\u30C8\u30E9\u30C3\u30AF\u306E\u97F3\u3092\u3001\u30DE\u30B9\u30BF\u30EA\u30D0\u30FC\u30D6\uFF08[reverb]\u30D1\u30CD\u30EB\u306EDecay/Pre Delay/Mix\uFF09\u3078\u3069\u308C\u3060\u3051\u9001\u308B\u304B\u3092 0-100% \u3067\u6C7A\u3081\u307E\u3059\u30020\u306A\u3089\u9001\u3089\u306A\u3044\uFF1D\u3053\u306E\u30C8\u30E9\u30C3\u30AF\u306B\u306F\u30EA\u30D0\u30FC\u30D6\u304C\u639B\u304B\u308A\u307E\u305B\u3093\u3002</p>
+  <h4>\u300C\u58F0\u3060\u3051\u30EA\u30D0\u30FC\u30D6\u300D\u3092\u4F5C\u308B\u306B\u306F</h4>
+  <p>\u30EA\u30D0\u30FC\u30D6\u306F\u5168\u30C8\u30E9\u30C3\u30AF\u3078\u4E00\u5F8B\u3067\u639B\u304B\u308B\u308F\u3051\u3067\u306F\u306A\u304F\u3001\u3053\u306E\u9001\u308A\u91CF\u3067\u500B\u5225\u306B\u6C7A\u307E\u308A\u307E\u3059\u3002\u30DC\u30FC\u30AB\u30EB\u306E\u30C8\u30E9\u30C3\u30AF\u3060\u3051\u9001\u308A\u91CF\u3092\u4E0A\u3052\u3001\u4ED6\u306E\u697D\u5668\u30C8\u30E9\u30C3\u30AF\u306F0\u306E\u307E\u307E\u306B\u3059\u308C\u3070\u3001\u58F0\u3060\u3051\u306B\u30EA\u30D0\u30FC\u30D6\u3092\u639B\u3051\u3089\u308C\u307E\u3059\u3002\u4F4E\u57DF\u306E\u697D\u5668\uFF08\u30D9\u30FC\u30B9\u30FB\u30AD\u30C3\u30AF\u7B49\uFF09\u306F\u9001\u3089\u306A\u3044\u3001\u30DC\u30FC\u30AB\u30EB\u3084\u30D1\u30C3\u30C9\u306F\u591A\u3081\u306B\u9001\u308B\u3001\u3068\u3044\u3046\u306E\u304C\u30DF\u30C3\u30AF\u30B9\u306E\u5B9A\u77F3\u3067\u3059\u3002</p>
+  <h4>[reverb]\u30D1\u30CD\u30EB\u306EMix\u3068\u306E\u95A2\u4FC2</h4>
+  <p>Mix\u306F\u300C\u9001\u3089\u308C\u3066\u304D\u305F\u97F3\u3092\u3069\u308C\u3060\u3051\u8FD4\u3059\u304B\u300D\u3068\u3044\u3046\u5168\u4F53\u306E\u8FD4\u308A\u91CF\u3067\u3059\u3002\u5404\u30C8\u30E9\u30C3\u30AF\u306E\u9001\u308A\u91CF\u304C0\u306A\u3089\u3001Mix\u3092\u4E0A\u3052\u3066\u3082\u4F55\u3082\u8FD4\u3063\u3066\u304D\u307E\u305B\u3093\u3002\u307E\u305A\u3053\u306E\u30C8\u30E9\u30C3\u30AF\u306E\u9001\u308A\u91CF\u3092\u6C7A\u3081\u3066\u304B\u3089\u3001Mix\u3067\u5168\u4F53\u306E\u639B\u304B\u308A\u5177\u5408\u3092\u5FAE\u8ABF\u6574\u3057\u3066\u304F\u3060\u3055\u3044\u3002</p>
+</div>
+`;
 var AUTO_MASTER_INFO_HTML = `
 <div class="dtm-modal-body-content">
   <h4>\u304A\u307E\u304B\u305B\u30DE\u30B9\u30BF\u30EA\u30F3\u30B0\u3068\u306F</h4>
@@ -13541,7 +13611,7 @@ var mountDAW = (target, options = {}) => {
       vocalDelay: t.vocalDelay,
       vocalGender: t.vocalGender,
       vocalBreathiness: t.vocalBreathiness,
-      vocalOctaveDouble: t.vocalOctaveDouble
+      vocalOctaveUnison: t.vocalOctaveUnison
     };
     if (lyricsDebounceTimer) clearTimeout(lyricsDebounceTimer);
     lyricsDebounceTimer = setTimeout(() => {
@@ -13606,10 +13676,11 @@ var mountDAW = (target, options = {}) => {
         vocalDelay: 0,
         vocalGender: 50,
         vocalBreathiness: 50,
-        vocalOctaveDouble: false,
+        vocalOctaveUnison: "none",
         trackInstrument: "",
         trackCompression: 0,
         trackWidth: 100,
+        trackReverbSend: 0,
         trackEqLow: 0,
         trackEqMid: 0,
         trackEqHigh: 0
@@ -13636,7 +13707,7 @@ var mountDAW = (target, options = {}) => {
         delay: t.vocalDelay,
         gender: t.vocalGender,
         breathiness: t.vocalBreathiness,
-        octaveDouble: t.vocalOctaveDouble,
+        octaveUnison: t.vocalOctaveUnison,
         syllables
       });
     });
@@ -14446,7 +14517,7 @@ var mountDAW = (target, options = {}) => {
         delaySend: (lt.delay ?? 0) / 100,
         gender: (lt.gender ?? 50) / 100,
         breathiness: (lt.breathiness ?? 50) / 100,
-        octaveDouble: lt.octaveDouble,
+        octaveUnison: lt.octaveUnison,
         notes
       };
     }) : [];
@@ -14608,6 +14679,12 @@ var mountDAW = (target, options = {}) => {
           <span class="dtm-label" data-dtm="track-width-label"></span>
           <button class="dtm-infobtn" data-dtm="track-width-info" title="\u30B9\u30C6\u30EC\u30AA\u5E45\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
         </div>
+        <div class="dtm-row">
+          <span class="dtm-label">\u30EA\u30D0\u30FC\u30D6\u9001\u308A</span>
+          <input type="range" class="dtm-range dtm-grow" data-dtm="track-reverb-send" min="0" max="100" aria-label="\u3053\u306E\u30C8\u30E9\u30C3\u30AF\u306E\u30DE\u30B9\u30BF\u30EA\u30D0\u30FC\u30D6\u3078\u306E\u9001\u308A\u91CF\uFF080=\u639B\u304B\u3089\u306A\u3044\uFF09">
+          <span class="dtm-label" data-dtm="track-reverb-send-label"></span>
+          <button class="dtm-infobtn" data-dtm="track-reverb-send-info" title="\u30EA\u30D0\u30FC\u30D6\u9001\u308A\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
+        </div>
       </details>`;
     const volInput = refs.trackBody.querySelector(
       '[data-dtm="track-vol"]'
@@ -14712,6 +14789,28 @@ var mountDAW = (target, options = {}) => {
     trackWidthInfo.addEventListener("click", () => {
       showModal("\u30B9\u30C6\u30EC\u30AA\u5E45\u306E\u89E3\u8AAC", TRACK_WIDTH_INFO_HTML);
     });
+    const trackReverbSendInput = refs.trackBody.querySelector(
+      '[data-dtm="track-reverb-send"]'
+    );
+    const trackReverbSendLabel = refs.trackBody.querySelector(
+      '[data-dtm="track-reverb-send-label"]'
+    );
+    const trackReverbSendInfo = refs.trackBody.querySelector(
+      '[data-dtm="track-reverb-send-info"]'
+    );
+    trackReverbSendInput.value = String(active.trackReverbSend);
+    trackReverbSendLabel.textContent = `${active.trackReverbSend}%`;
+    trackReverbSendInput.addEventListener("input", () => {
+      active.trackReverbSend = Number.parseInt(trackReverbSendInput.value, 10);
+      trackReverbSendLabel.textContent = `${active.trackReverbSend}%`;
+      options.onTrackReverbSendChange?.(
+        active.config.id,
+        active.trackReverbSend
+      );
+    });
+    trackReverbSendInfo.addEventListener("click", () => {
+      showModal("\u30EA\u30D0\u30FC\u30D6\u9001\u308A\u306E\u89E3\u8AAC", TRACK_REVERBSEND_INFO_HTML);
+    });
     const instRow = document.createElement("div");
     instRow.className = "dtm-row";
     instRow.innerHTML = `<span class="dtm-label">\u697D\u5668</span>`;
@@ -14848,10 +14947,14 @@ var mountDAW = (target, options = {}) => {
             <button class="dtm-infobtn" data-dtm="lyric-vibrato-info" title="\u81EA\u52D5\u30D3\u30D6\u30E9\u30FC\u30C8\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
           </div>
           <div class="dtm-row">
-            <span class="dtm-label" style="display:inline-flex;align-items:center;gap:2px">
-              <input type="checkbox" data-dtm="lyric-octave-double" aria-label="\u30AA\u30AF\u30BF\u30FC\u30D6\u30C0\u30D6\u30EB">\u30AA\u30AF\u30BF\u30FC\u30D6\u30C0\u30D6\u30EB
-            </span>
-            <button class="dtm-infobtn" data-dtm="lyric-octave-double-info" title="\u30AA\u30AF\u30BF\u30FC\u30D6\u30C0\u30D6\u30EB\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
+            <span class="dtm-label">\u30AA\u30AF\u30BF\u30FC\u30D6\u30E6\u30CB\u30BE\u30F3</span>
+            <select class="dtm-select dtm-grow" data-dtm="lyric-octave-unison" aria-label="\u30AA\u30AF\u30BF\u30FC\u30D6\u30E6\u30CB\u30BE\u30F3\uFF08\u3082\u30461\u58F0\u3092\u4E0A/\u4E0B\u306B\u91CD\u306D\u308B\uFF09">
+              <option value="none">\u306A\u3057</option>
+              <option value="down">\u4E0B (-1oct)</option>
+              <option value="up">\u4E0A (+1oct)</option>
+              <option value="both">\u4E0A\u4E0B\u4E21\u65B9</option>
+            </select>
+            <button class="dtm-infobtn" data-dtm="lyric-octave-unison-info" title="\u30AA\u30AF\u30BF\u30FC\u30D6\u30E6\u30CB\u30BE\u30F3\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
           </div>
         </details>
         <textarea class="dtm-textarea" data-dtm="lyric-input" rows="2" placeholder="\u3072\u3089\u304C\u306A\u30FB\u30AB\u30BF\u30AB\u30CA\u3067\u6B4C\u8A5E\uFF08\u4F8B: \u3069\u308C\u307F\u3075\u3041\u305D\u3089\u3057\u3069\uFF09"></textarea>
@@ -14944,14 +15047,14 @@ var mountDAW = (target, options = {}) => {
       lyricVibratoInfo.addEventListener("click", () => {
         showModal("\u81EA\u52D5\u30D3\u30D6\u30E9\u30FC\u30C8\u89E3\u8AAC", VIBRATO_INFO_HTML);
       });
-      const lyricOctaveDouble = lyricDiv.querySelector(
-        '[data-dtm="lyric-octave-double"]'
+      const lyricOctaveUnison = lyricDiv.querySelector(
+        '[data-dtm="lyric-octave-unison"]'
       );
-      const lyricOctaveDoubleInfo = lyricDiv.querySelector(
-        '[data-dtm="lyric-octave-double-info"]'
+      const lyricOctaveUnisonInfo = lyricDiv.querySelector(
+        '[data-dtm="lyric-octave-unison-info"]'
       );
-      lyricOctaveDoubleInfo.addEventListener("click", () => {
-        showModal("\u30AA\u30AF\u30BF\u30FC\u30D6\u30C0\u30D6\u30EB\u89E3\u8AAC", OCTAVE_DOUBLE_INFO_HTML);
+      lyricOctaveUnisonInfo.addEventListener("click", () => {
+        showModal("\u30AA\u30AF\u30BF\u30FC\u30D6\u30E6\u30CB\u30BE\u30F3\u89E3\u8AAC", OCTAVE_UNISON_INFO_HTML);
       });
       const lyricTerms = lyricDiv.querySelector(
         '[data-dtm="lyric-terms"]'
@@ -15023,7 +15126,7 @@ var mountDAW = (target, options = {}) => {
       lyricBreathiness.value = String(active.vocalBreathiness);
       lyricBreathinessLabel.textContent = `${active.vocalBreathiness}`;
       lyricVibrato.checked = active.vocalVibrato;
-      lyricOctaveDouble.checked = active.vocalOctaveDouble;
+      lyricOctaveUnison.value = active.vocalOctaveUnison;
       const updateLyricCount = () => {
         const n = normalizeLyrics(lyricInput.value).length;
         lyricCount.textContent = active.lyricModel && n > 0 ? `${n}\u97F3\u7BC0` : "";
@@ -15145,8 +15248,8 @@ var mountDAW = (target, options = {}) => {
         active.vocalVibrato = lyricVibrato.checked;
         fireLyricsChange(active);
       });
-      lyricOctaveDouble.addEventListener("change", () => {
-        active.vocalOctaveDouble = lyricOctaveDouble.checked;
+      lyricOctaveUnison.addEventListener("change", () => {
+        active.vocalOctaveUnison = lyricOctaveUnison.value;
         fireLyricsChange(active);
       });
       lyricInput.addEventListener("input", () => {
@@ -15277,6 +15380,7 @@ var mountDAW = (target, options = {}) => {
     const trackInstrumentsForMeta = {};
     const trackCompressionForMeta = {};
     const trackWidthForMeta = {};
+    const trackReverbSendForMeta = {};
     const trackEqLowForMeta = {};
     const trackEqMidForMeta = {};
     const trackEqHighForMeta = {};
@@ -15285,6 +15389,8 @@ var mountDAW = (target, options = {}) => {
       if (t.trackCompression !== 0)
         trackCompressionForMeta[i2] = t.trackCompression;
       if (t.trackWidth !== 100) trackWidthForMeta[i2] = t.trackWidth;
+      if (t.trackReverbSend !== 0)
+        trackReverbSendForMeta[i2] = t.trackReverbSend;
       if (t.trackEqLow !== 0) trackEqLowForMeta[i2] = t.trackEqLow;
       if (t.trackEqMid !== 0) trackEqMidForMeta[i2] = t.trackEqMid;
       if (t.trackEqHigh !== 0) trackEqHighForMeta[i2] = t.trackEqHigh;
@@ -15292,6 +15398,7 @@ var mountDAW = (target, options = {}) => {
     const trackInstMeta = Object.keys(trackInstrumentsForMeta).length > 0 ? trackInstrumentsForMeta : void 0;
     const trackCompMeta = Object.keys(trackCompressionForMeta).length > 0 ? trackCompressionForMeta : void 0;
     const trackWidthMeta = Object.keys(trackWidthForMeta).length > 0 ? trackWidthForMeta : void 0;
+    const trackReverbSendMeta = Object.keys(trackReverbSendForMeta).length > 0 ? trackReverbSendForMeta : void 0;
     const trackEqLowMeta = Object.keys(trackEqLowForMeta).length > 0 ? trackEqLowForMeta : void 0;
     const trackEqMidMeta = Object.keys(trackEqMidForMeta).length > 0 ? trackEqMidForMeta : void 0;
     const trackEqHighMeta = Object.keys(trackEqHighForMeta).length > 0 ? trackEqHighForMeta : void 0;
@@ -15312,6 +15419,7 @@ var mountDAW = (target, options = {}) => {
         trackInstruments: trackInstMeta,
         trackCompression: trackCompMeta,
         trackWidth: trackWidthMeta,
+        trackReverbSend: trackReverbSendMeta,
         trackEqLow: trackEqLowMeta,
         trackEqMid: trackEqMidMeta,
         trackEqHigh: trackEqHighMeta
@@ -15335,6 +15443,7 @@ var mountDAW = (target, options = {}) => {
         trackInstruments: trackInstMeta,
         trackCompression: trackCompMeta,
         trackWidth: trackWidthMeta,
+        trackReverbSend: trackReverbSendMeta,
         trackEqLow: trackEqLowMeta,
         trackEqMid: trackEqMidMeta,
         trackEqHigh: trackEqHighMeta
@@ -15390,7 +15499,7 @@ var mountDAW = (target, options = {}) => {
       del: t.vocalDelay,
       gen: t.vocalGender,
       bre: t.vocalBreathiness,
-      dbl: t.vocalOctaveDouble
+      uni: t.vocalOctaveUnison
     })).filter(
       (x2) => x2.model.length > 0 && x2.text.length > 0 && x2.notes.length > 0
     ).map((x2) => {
@@ -15404,7 +15513,7 @@ var mountDAW = (target, options = {}) => {
         x2.del === 0 ? "" : `e${x2.del}`,
         x2.gen === 50 ? "" : `g${x2.gen}`,
         x2.bre === 50 ? "" : `h${x2.bre}`,
-        x2.dbl ? "w1" : ""
+        OCTAVE_UNISON_TOKEN[x2.uni]
       ].filter((s) => s.length > 0).join(" ");
       const head = params ? `${x2.model} ${params}` : x2.model;
       return `@@${x2.i} ${head} ${x2.text}`;
@@ -15604,6 +15713,11 @@ var mountDAW = (target, options = {}) => {
         t.trackWidth = width;
         options.onTrackWidthChange?.(t.config.id, width);
       }
+      const reverbSend = meta.trackReverbSend?.[i2] ?? 0;
+      if (t.trackReverbSend !== reverbSend) {
+        t.trackReverbSend = reverbSend;
+        options.onTrackReverbSendChange?.(t.config.id, reverbSend);
+      }
       const eqLow = meta.trackEqLow?.[i2] ?? 0;
       if (t.trackEqLow !== eqLow) {
         t.trackEqLow = eqLow;
@@ -15641,7 +15755,7 @@ var mountDAW = (target, options = {}) => {
       active.vocalDelay = 0;
       active.vocalGender = 50;
       active.vocalBreathiness = 50;
-      active.vocalOctaveDouble = false;
+      active.vocalOctaveUnison = "none";
     } else {
       for (const t of trackStates) {
         t.lyrics = "";
@@ -15655,7 +15769,7 @@ var mountDAW = (target, options = {}) => {
         t.vocalDelay = 0;
         t.vocalGender = 50;
         t.vocalBreathiness = 50;
-        t.vocalOctaveDouble = false;
+        t.vocalOctaveUnison = "none";
       }
     }
     lyrics?.forEach((lt) => {
@@ -15673,7 +15787,7 @@ var mountDAW = (target, options = {}) => {
       t.vocalDelay = lt.delay ?? 0;
       t.vocalGender = lt.gender ?? 50;
       t.vocalBreathiness = lt.breathiness ?? 50;
-      t.vocalOctaveDouble = lt.octaveDouble ?? false;
+      t.vocalOctaveUnison = lt.octaveUnison ?? "none";
     });
     for (const p of placements) {
       if (applyActiveOnly && p.trackIndex !== activeTrackIndex) continue;
@@ -15757,7 +15871,7 @@ var mountDAW = (target, options = {}) => {
       active.vocalDelay = 0;
       active.vocalGender = 50;
       active.vocalBreathiness = 50;
-      active.vocalOctaveDouble = false;
+      active.vocalOctaveUnison = "none";
     } else {
       clearAll();
       for (const t of trackStates) t.core.setLoadMode(true);
@@ -15773,7 +15887,7 @@ var mountDAW = (target, options = {}) => {
         t.vocalDelay = 0;
         t.vocalGender = 50;
         t.vocalBreathiness = 50;
-        t.vocalOctaveDouble = false;
+        t.vocalOctaveUnison = "none";
       }
     }
     const { placements, bpm: parsedBpm } = isAdvanced ? extractMidiPlacementsByTrack(
@@ -16073,6 +16187,10 @@ var mountDAW = (target, options = {}) => {
         t.trackWidth = 115;
         options.onTrackCompressionChange?.(t.config.id, comp);
         options.onTrackWidthChange?.(t.config.id, 115);
+        if (!t.lyricModel) {
+          t.trackReverbSend = 15;
+          options.onTrackReverbSendChange?.(t.config.id, 15);
+        }
         if (t.lyricModel) {
           t.vocalVibrato = true;
           t.vocalReverb = isMainVocal ? 15 : 30;
@@ -17133,7 +17251,7 @@ var mountDAW = (target, options = {}) => {
       t.vocalDelay = data.vocalDelay ?? 0;
       t.vocalGender = data.vocalGender ?? 50;
       t.vocalBreathiness = data.vocalBreathiness ?? 50;
-      t.vocalOctaveDouble = data.vocalOctaveDouble ?? false;
+      t.vocalOctaveUnison = data.vocalOctaveUnison ?? "none";
     },
     applyTrackInstrument: (trackIndex, instrumentName) => {
       const t = trackStates[trackIndex];
@@ -17255,7 +17373,7 @@ var playSingingMML = async (mml, options = {}) => {
       delaySend: (lt.delay ?? 0) / 100,
       gender: (lt.gender ?? 50) / 100,
       breathiness: (lt.breathiness ?? 50) / 100,
-      octaveDouble: lt.octaveDouble,
+      octaveUnison: lt.octaveUnison,
       notes
     };
   });
@@ -17949,6 +18067,10 @@ var createChannelStrip = (ctx, destination, options = {}) => {
   eqHigh.connect(compressor);
   compressor.connect(splitter);
   merger.connect(destination);
+  const reverbSendGain = ctx.createGain();
+  reverbSendGain.gain.value = clamp5(options.reverbSend ?? 0, 0, 100) / 100;
+  merger.connect(reverbSendGain);
+  if (options.reverbBus) reverbSendGain.connect(options.reverbBus);
   return {
     input,
     setEqLow: (db) => {
@@ -17974,6 +18096,13 @@ var createChannelStrip = (ctx, destination, options = {}) => {
     },
     setCompression: applyCompression,
     setWidth,
+    setReverbSend: (amount) => {
+      reverbSendGain.gain.setTargetAtTime(
+        clamp5(amount, 0, 100) / 100,
+        ctx.currentTime,
+        0.02
+      );
+    },
     dispose: () => {
       input.disconnect();
       eqLow.disconnect();
@@ -17990,6 +18119,7 @@ var createChannelStrip = (ctx, destination, options = {}) => {
       outL.disconnect();
       outR.disconnect();
       merger.disconnect();
+      reverbSendGain.disconnect();
     }
   };
 };
@@ -18211,7 +18341,6 @@ var createDtmStudio = async (options = {}) => {
   reverbConvolver.normalize = true;
   const reverbWetGain = audioCtx.createGain();
   reverbWetGain.gain.value = reverbAmountToGain(options.reverbAmount ?? 0);
-  masterGain.connect(reverbPreDelay);
   reverbPreDelay.connect(reverbConvolver);
   reverbConvolver.connect(reverbWetGain);
   const setReverbAmount = (amount) => {
@@ -18277,7 +18406,9 @@ var createDtmStudio = async (options = {}) => {
   const getChannelStrip = (trackId) => {
     let strip = channelStrips.get(trackId);
     if (!strip) {
-      strip = createChannelStrip(audioCtx, masterGain);
+      strip = createChannelStrip(audioCtx, masterGain, {
+        reverbBus: reverbPreDelay
+      });
       channelStrips.set(trackId, strip);
     }
     return strip;
@@ -18314,7 +18445,8 @@ var createDtmStudio = async (options = {}) => {
     voicebanks,
     worldlineScriptUrl: options.worldlineScriptUrl,
     // ボーカルトラック個別のリバーブセンド（`r`トークン）先。マスタリバーブの
-    // Convolver 入力へ直接センドする（masterGain 経由のドライ段は素通り）。
+    // Convolver 入力へ直接センドする（PreDelayは経由しない。チャンネルストリップの
+    // reverbSend とは別経路の、音節単位でより細かく制御できるセンド）。
     reverbBus: reverbConvolver,
     // ボーカルトラック個別のディレイセンド（`e`トークン）先。
     delayBus: delayBus.input,
@@ -18612,6 +18744,7 @@ var createDtmStudio = async (options = {}) => {
       onScheduleFade: scheduleFade,
       onTrackCompressionChange: (trackId, amount) => getChannelStrip(trackId).setCompression(amount),
       onTrackWidthChange: (trackId, width) => getChannelStrip(trackId).setWidth(width),
+      onTrackReverbSendChange: (trackId, amount) => getChannelStrip(trackId).setReverbSend(amount),
       onTrackEqLowChange: (trackId, db) => getChannelStrip(trackId).setEqLow(db),
       onTrackEqMidChange: (trackId, db) => getChannelStrip(trackId).setEqMid(db),
       onTrackEqHighChange: (trackId, db) => getChannelStrip(trackId).setEqHigh(db),

package/package.json

@@ -2,7 +2,7 @@
   "author": "onjmin",
   "license": "MIT",
   "name": "@onjmin/dtm",
-  "version": "0.1.87",
+  "version": "0.1.88",
   "description": "MMLを中間言語に用いた、モバイルファーストなDAW / ピアノロール打ち込みコンポーネント",
   "homepage": "https://onjmin.github.io/dtm",
   "repository": {