@onjmin/dtm 0.1.90 → 0.1.92

package/dist/index.mjs

@@ -2154,6 +2154,15 @@ var vibratoPitchCurve = (baseHz, preMs) => (tMs) => {
   return baseHz * 2 ** (cents / 1200);
 };
 
+// src/voice-worker-types.ts
+var COMPOSITE_ALIAS_SEP = "\0";
+var packCompositeAlias = (consonantAlias, vowelAlias) => `${COMPOSITE_ALIAS_SEP}${consonantAlias}${COMPOSITE_ALIAS_SEP}${vowelAlias}`;
+var unpackCompositeAlias = (alias) => {
+  if (!alias.startsWith(COMPOSITE_ALIAS_SEP)) return null;
+  const parts = alias.slice(COMPOSITE_ALIAS_SEP.length).split(COMPOSITE_ALIAS_SEP);
+  return parts.length === 2 ? [parts[0], parts[1]] : null;
+};
+
 // src/lyrics.ts
 var kanaTable = {
   \u3042: ["", "a"],
@@ -2332,9 +2341,10 @@ var parseLyrics = (mml) => {
     let delay = 0;
     let gender = 50;
     let breathiness = 50;
+    let tension = 50;
     let octaveUnison = "none";
     const modelMatch = rest.match(
-      /^([a-z_][a-z0-9_]*?)(?=(?:[vqpobrghew]-?\d)|[^a-z0-9_]|$)(?::(\d+))?/i
+      /^([a-z_][a-z0-9_]*?)(?=(?:[vqpobrghewt]-?\d)|[^a-z0-9_]|$)(?::(\d+))?/i
     );
     let model = "";
     const metaTokens = [];
@@ -2403,6 +2413,13 @@ var parseLyrics = (mml) => {
         rest = rest.substring(hMatch[0].length).trim();
         continue;
       }
+      const tMatch = rest.match(/^t(\d+)/i);
+      if (tMatch) {
+        tension = clamp2(Number.parseInt(tMatch[1], 10), 0, 100);
+        metaTokens.push(tMatch[0]);
+        rest = rest.substring(tMatch[0].length).trim();
+        continue;
+      }
       const eMatch = rest.match(/^e(\d+)/i);
       if (eMatch) {
         delay = clamp2(Number.parseInt(eMatch[1], 10), 0, 100);
@@ -2436,6 +2453,7 @@ var parseLyrics = (mml) => {
       delay,
       gender,
       breathiness,
+      tension,
       octaveUnison,
       syllables,
       metaText: metaTokens.join(" "),
@@ -2757,8 +2775,33 @@ var resolveKoeAlias = (hasAlias, pitchTokens, syl, prevVowel, noteNum) => {
     const hit = tryAlias(base);
     if (hit) return hit;
   }
+  if (cons && vow) {
+    const vowelAlias = tryAlias(vow) ?? tryAlias(`${pv} ${vow}`);
+    const consAlias = vowelAlias ? tryAlias(cons) : null;
+    if (vowelAlias && consAlias)
+      return packCompositeAlias(consAlias, vowelAlias);
+  }
   return null;
 };
+var COMPOSITE_SPLICE_XFADE_SEC = 5e-3;
+var spliceCompositePcm = (consonantPcm, vowelPcm, sampleRate) => {
+  if (consonantPcm.length === 0 || vowelPcm.length === 0) return null;
+  const xfade = Math.min(
+    Math.floor(sampleRate * COMPOSITE_SPLICE_XFADE_SEC),
+    consonantPcm.length,
+    vowelPcm.length
+  );
+  const pcm = new Float64Array(consonantPcm.length + vowelPcm.length - xfade);
+  pcm.set(consonantPcm, 0);
+  for (let i2 = 0; i2 < xfade; i2++) {
+    const t = (i2 + 1) / (xfade + 1);
+    const idx = consonantPcm.length - xfade + i2;
+    pcm[idx] = consonantPcm[idx] * (1 - t) + vowelPcm[i2] * t;
+  }
+  pcm.set(vowelPcm.subarray(xfade), consonantPcm.length);
+  const consonantMs = (consonantPcm.length - xfade / 2) / sampleRate * 1e3;
+  return { pcm, preMs: consonantMs, consonantMs };
+};
 var createLocalBackend = async (options) => {
   const bank = await VoiceBank.load(options.koe);
   const worldline = options.lightweight ? null : await Worldline.load({
@@ -2773,7 +2816,40 @@ var createLocalBackend = async (options) => {
     }
     return p;
   };
+  const renderComposite = async (consonantAlias, vowelAlias, pitch, durationMs, vibrato, expr) => {
+    if (!worldline) return null;
+    const [consonantPcm, vowelPcm] = await Promise.all([
+      getPcm(consonantAlias),
+      getPcm(vowelAlias)
+    ]);
+    if (!consonantPcm || !vowelPcm) return null;
+    const spliced = spliceCompositePcm(consonantPcm, vowelPcm, KOE_SAMPLE_RATE);
+    if (!spliced) return null;
+    const targetHz = midiToFreq(pitch);
+    const audio = worldline.renderNote({
+      pcm: spliced.pcm,
+      pitch: vibrato ? vibratoPitchCurve(targetHz, spliced.preMs) : targetHz,
+      durationMs,
+      preMs: spliced.preMs,
+      consonantMs: spliced.consonantMs,
+      gender: expr?.gender,
+      breathiness: expr?.breathiness,
+      tension: expr?.tension
+    });
+    return audio ? { pcm: audio, preSec: spliced.preMs / 1e3, rate: 1 } : null;
+  };
   const renderAlias = async (alias, pitch, durationMs, vibrato, expr) => {
+    const composite = unpackCompositeAlias(alias);
+    if (composite) {
+      return renderComposite(
+        composite[0],
+        composite[1],
+        pitch,
+        durationMs,
+        vibrato,
+        expr
+      );
+    }
     const pcm = await getPcm(alias);
     if (!pcm || pcm.length === 0) return null;
     const entry = bank.manifest.phonemes[alias];
@@ -2786,7 +2862,8 @@ var createLocalBackend = async (options) => {
         durationMs,
         ...lead,
         gender: expr?.gender,
-        breathiness: expr?.breathiness
+        breathiness: expr?.breathiness,
+        tension: expr?.tension
       });
       if (audio) return { pcm: audio, preSec: lead.preMs / 1e3, rate: 1 };
     }
@@ -2867,7 +2944,8 @@ var createWorkerBackend = async (workerUrl, options) => {
       durationMs,
       vibrato,
       gender: expr?.gender,
-      breathiness: expr?.breathiness
+      breathiness: expr?.breathiness,
+      tension: expr?.tension
     });
   });
   return {
@@ -2896,7 +2974,7 @@ var createKoeVoice = async (ctx, destination, options) => {
   const inflight = /* @__PURE__ */ new Map();
   const active = /* @__PURE__ */ new Set();
   let prevVowel = "";
-  const keyOf = (alias, pitch, durationMs, vibrato, expr) => `${alias}|${pitch}|${Math.round(durationMs / 10) * 10}${vibrato ? "|vib" : ""}${expr?.gender !== void 0 ? `|g${Math.round(expr.gender * 100)}` : ""}${expr?.breathiness !== void 0 ? `|h${Math.round(expr.breathiness * 100)}` : ""}`;
+  const keyOf = (alias, pitch, durationMs, vibrato, expr) => `${alias}|${pitch}|${Math.round(durationMs / 10) * 10}${vibrato ? "|vib" : ""}${expr?.gender !== void 0 ? `|g${Math.round(expr.gender * 100)}` : ""}${expr?.breathiness !== void 0 ? `|h${Math.round(expr.breathiness * 100)}` : ""}${expr?.tension !== void 0 ? `|t${Math.round(expr.tension * 100)}` : ""}`;
   const renderInto = (alias, pitch, durationMs, vibrato, expr) => {
     const key = keyOf(alias, pitch, durationMs, vibrato, expr);
     const existing = renderCache.get(key);
@@ -3127,7 +3205,8 @@ var createSingingVoices = (ctx, destination, options = {}) => {
       let n = 0;
       const expr = {
         gender: track.gender,
-        breathiness: track.breathiness
+        breathiness: track.breathiness,
+        tension: track.tension
       };
       forEachSungNote(track, (note, prevVowel) => {
         if (n >= count && note.startSec >= STREAM_LOOKAHEAD_SEC) return;
@@ -3214,7 +3293,11 @@ var createSingingVoices = (ctx, destination, options = {}) => {
                   pitch,
                   note.durationSec * 1e3,
                   track.vibrato,
-                  { gender: track.gender, breathiness: track.breathiness }
+                  {
+                    gender: track.gender,
+                    breathiness: track.breathiness,
+                    tension: track.tension
+                  }
                 );
                 if (session !== streamSession) return;
                 if (key) {
@@ -7905,14 +7988,33 @@ var DAW_CSS = `
   border-right: 2px solid var(--c-black);
   border-bottom: 2px solid var(--c-black);
 }
+/* \u30A2\u30A4\u30B3\u30F3\u304C\u753B\u9762\u4E0A\u7AEF\u306B\u8FD1\u304F\u4E0A\u306B\u51FA\u3059\u4F59\u767D\u304C\u7121\u3044\u5834\u5408\u306F\u4E0B\u306B\u53CD\u8EE2\u8868\u793A\u3059\u308B\uFF08positionBalloon \u304C\u4ED8\u4E0E\uFF09 */
+.dtm-player-balloon--below {
+  transform: translate(-50%, 0);
+}
+.dtm-player-balloon--below::after {
+  bottom: auto;
+  top: -6px;
+  border-right: none;
+  border-bottom: none;
+  border-left: 2px solid var(--c-black);
+  border-top: 2px solid var(--c-black);
+}
 .dtm-player-balloon--visible {
   display: block;
   animation: dtm-balloon-fade-in 0.1s steps(2);
 }
+.dtm-player-balloon--below.dtm-player-balloon--visible {
+  animation-name: dtm-balloon-fade-in-below;
+}
 @keyframes dtm-balloon-fade-in {
   from { opacity: 0; transform: translate(-50%, -100%) translateY(4px); }
   to { opacity: 1; transform: translate(-50%, -100%) translateY(0); }
 }
+@keyframes dtm-balloon-fade-in-below {
+  from { opacity: 0; transform: translate(-50%, 0) translateY(-4px); }
+  to { opacity: 1; transform: translate(-50%, 0) translateY(0); }
+}
 @keyframes dtm-emoji-jump {
   0%   { transform: translateY(0); }
   35%  { transform: translateY(-5px); }
@@ -8338,9 +8440,17 @@ var balloonAnchors = /* @__PURE__ */ new WeakMap();
 var positionBalloon = (balloonEl) => {
   const anchor = balloonAnchors.get(balloonEl);
   if (!anchor) return;
+  const win = balloonEl.ownerDocument?.defaultView ?? window;
   const rect = anchor.getBoundingClientRect();
-  balloonEl.style.left = `${rect.left + rect.width / 2}px`;
-  balloonEl.style.top = `${rect.top - 6}px`;
+  const centerX = rect.left + rect.width / 2;
+  const balloonRect = balloonEl.getBoundingClientRect();
+  const showBelow = rect.top - balloonRect.height - 6 < 0;
+  balloonEl.classList.toggle("dtm-player-balloon--below", showBelow);
+  balloonEl.style.top = showBelow ? `${rect.bottom + 6}px` : `${rect.top - 6}px`;
+  const halfWidth = balloonRect.width / 2 || 40;
+  const minX = halfWidth + 4;
+  const maxX = win.innerWidth - halfWidth - 4;
+  balloonEl.style.left = `${Math.min(Math.max(centerX, minX), maxX)}px`;
 };
 var balloonListenersBound = false;
 var ensureBalloonListeners = () => {
@@ -8366,6 +8476,7 @@ var hideActiveBalloon = () => {
   }
 };
 var showBalloon = (balloonEl) => {
+  balloonEl.classList.add("dtm-player-balloon--visible");
   positionBalloon(balloonEl);
   if (activeBalloonEl === balloonEl) {
     if (activeBalloonTimer) {
@@ -8374,7 +8485,6 @@ var showBalloon = (balloonEl) => {
   } else {
     hideActiveBalloon();
     activeBalloonEl = balloonEl;
-    balloonEl.classList.add("dtm-player-balloon--visible");
   }
   activeBalloonTimer = setTimeout(() => {
     hideActiveBalloon();
@@ -8676,10 +8786,6 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     const textSpan = doc.createElement("span");
     textSpan.textContent = "\u{1F97A}";
     em.appendChild(textSpan);
-    em.addEventListener("click", (e) => {
-      e.stopPropagation();
-      toggleMute(index);
-    });
     mmlHeader.appendChild(em);
     emojiEls.push(em);
     emojiByTrack.set(index, em);
@@ -9441,6 +9547,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
       delaySend: (lt.delay ?? 0) / 100,
       gender: (lt.gender ?? 50) / 100,
       breathiness: (lt.breathiness ?? 50) / 100,
+      tension: (lt.tension ?? 50) / 100,
       octaveUnison: lt.octaveUnison,
       notes
     };
@@ -13291,6 +13398,16 @@ var BREATHINESS_INFO_HTML = `
   <p>\u81EA\u52D5\u30D3\u30D6\u30E9\u30FC\u30C8\u3068\u7D44\u307F\u5408\u308F\u305B\u308B\u3068\u3001\u63FA\u308C\u306A\u304C\u3089\u606F\u3063\u307D\u3044\u3001\u3088\u308A\u30A8\u30E2\u30FC\u30B7\u30E7\u30CA\u30EB\u306A\u8868\u73FE\u306B\u306A\u308A\u3084\u3059\u3044\u3067\u3059\u3002koe\u97F3\u6E90\uFF08UTAU\u7531\u6765\u306E.koe\u97F3\u6E90\uFF09\u9650\u5B9A\u306E\u52B9\u679C\u3067\u3001klatt\uFF08\u5185\u8535\u306E\u7C21\u6613\u5408\u6210\uFF09\u3067\u306F\u5909\u5316\u3057\u307E\u305B\u3093\u3002</p>
 </div>
 `;
+var TENSION_INFO_HTML = `
+<div class="dtm-modal-body-content">
+  <h4>\u4F55\u3092\u3059\u308B\u8A2D\u5B9A\u304B</h4>
+  <p>\u58F0\u306E\u5F35\u308A\uFF0F\u62BC\u3057\u51FA\u3057\u306E\u5F37\u3055\u3067\u3059\u300250\u304C\u7121\u5909\u5316\u3001\u5927\u304D\u3044\u307B\u3069\u5F35\u3063\u305F\u30FB\u62BC\u3057\u305F\u58F0\uFF08\u300C\u3053\u3076\u3057\u300D\u5BC4\u308A\u3001\u529B\u5F37\u304F\u6B4C\u308F\u305B\u308B\uFF09\u306B\u306A\u308A\u3001\u5C0F\u3055\u3044\u307B\u3069\u8131\u529B\u3057\u305F\u30EA\u30E9\u30C3\u30AF\u30B9\u3057\u305F\u58F0\u306B\u306A\u308A\u307E\u3059\u3002</p>
+  <h4>\u30D6\u30EC\u30B7\u30CD\u30B9\u3068\u306E\u9055\u3044</h4>
+  <p>\u30D6\u30EC\u30B7\u30CD\u30B9\u306F\u606F\u6210\u5206\u306E\u91CF\uFF08\u82AF\u306E\u3042\u308B\u58F0\u21D4\u606F\u3063\u307D\u3044\u58F0\uFF09\u3092\u52D5\u304B\u3057\u307E\u3059\u304C\u3001\u30C6\u30F3\u30B7\u30E7\u30F3\u306F\u58F0\u5E2F\u306E\u7DE0\u307E\u308A\u30FB\u62BC\u3057\u306E\u5F37\u3055\uFF08\u8131\u529B\u21D4\u5F35\u3063\u305F\u58F0\uFF09\u3092\u52D5\u304B\u3057\u307E\u3059\u3002\u30C6\u30F3\u30B7\u30E7\u30F3\u3092\u4E0A\u3052\u308B\u3068\u30B5\u30D3\u306E\u529B\u5F37\u3055\u3001\u4E0B\u3052\u308B\u3068\u7A4F\u3084\u304B\u306A\u56C1\u304D\u306B\u5BC4\u305B\u305F\u6B4C\u308F\u305B\u65B9\u306B\u306A\u308A\u307E\u3059\u3002</p>
+  <h4>\u4ED6\u306E\u8A2D\u5B9A\u3068\u306E\u517C\u306D\u5408\u3044</h4>
+  <p>\u30D6\u30EC\u30B7\u30CD\u30B9\u3092\u4E0B\u3052\u3064\u3064\u30C6\u30F3\u30B7\u30E7\u30F3\u3092\u4E0A\u3052\u308B\u3068\u3001\u3088\u308A\u82AF\u304C\u3042\u308A\u529B\u5F37\u3044\u6B4C\u58F0\u306B\u306A\u308A\u307E\u3059\u3002\u9006\u306B\u30D6\u30EC\u30B7\u30CD\u30B9\u3092\u4E0A\u3052\u3064\u3064\u30C6\u30F3\u30B7\u30E7\u30F3\u3092\u4E0B\u3052\u308B\u3068\u3001\u3088\u308A\u8131\u529B\u3057\u305F\u606F\u3063\u307D\u3044\u6B4C\u58F0\u306B\u306A\u308A\u307E\u3059\u3002koe\u97F3\u6E90\uFF08UTAU\u7531\u6765\u306E.koe\u97F3\u6E90\uFF09\u9650\u5B9A\u306E\u52B9\u679C\u3067\u3001klatt\uFF08\u5185\u8535\u306E\u7C21\u6613\u5408\u6210\uFF09\u3067\u306F\u5909\u5316\u3057\u307E\u305B\u3093\u3002</p>
+</div>
+`;
 var LYRIC_REVERB_INFO_HTML = `
 <div class="dtm-modal-body-content">
   <h4>\u4F55\u3092\u3059\u308B\u8A2D\u5B9A\u304B</h4>
@@ -13815,6 +13932,7 @@ var mountDAW = (target, options = {}) => {
       vocalDelay: t.vocalDelay,
       vocalGender: t.vocalGender,
       vocalBreathiness: t.vocalBreathiness,
+      vocalTension: t.vocalTension,
       vocalOctaveUnison: t.vocalOctaveUnison
     };
     if (lyricsDebounceTimer) clearTimeout(lyricsDebounceTimer);
@@ -13880,6 +13998,7 @@ var mountDAW = (target, options = {}) => {
         vocalDelay: 0,
         vocalGender: 50,
         vocalBreathiness: 50,
+        vocalTension: 50,
         vocalOctaveUnison: "none",
         trackInstrument: "",
         trackCompression: 0,
@@ -13911,6 +14030,7 @@ var mountDAW = (target, options = {}) => {
         delay: t.vocalDelay,
         gender: t.vocalGender,
         breathiness: t.vocalBreathiness,
+        tension: t.vocalTension,
         octaveUnison: t.vocalOctaveUnison,
         syllables
       });
@@ -14721,6 +14841,7 @@ var mountDAW = (target, options = {}) => {
         delaySend: (lt.delay ?? 0) / 100,
         gender: (lt.gender ?? 50) / 100,
         breathiness: (lt.breathiness ?? 50) / 100,
+        tension: (lt.tension ?? 50) / 100,
         octaveUnison: lt.octaveUnison,
         notes
       };
@@ -15149,6 +15270,12 @@ var mountDAW = (target, options = {}) => {
             <span class="dtm-label" data-dtm="lyric-breathiness-label"></span>
             <button class="dtm-infobtn" data-dtm="lyric-breathiness-info" title="\u30D6\u30EC\u30B7\u30CD\u30B9\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
           </div>
+          <div class="dtm-row">
+            <span class="dtm-label">\u30C6\u30F3\u30B7\u30E7\u30F3</span>
+            <input type="range" class="dtm-range dtm-grow" data-dtm="lyric-tension" min="0" max="100" aria-label="\u30C6\u30F3\u30B7\u30E7\u30F3\uFF08\u5F35\u308A/\u529B\u5F37\u3055\u3001koe\u97F3\u6E90\u9650\u5B9A\uFF09">
+            <span class="dtm-label" data-dtm="lyric-tension-label"></span>
+            <button class="dtm-infobtn" data-dtm="lyric-tension-info" title="\u30C6\u30F3\u30B7\u30E7\u30F3\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-vibrato" aria-label="\u81EA\u52D5\u30D3\u30D6\u30E9\u30FC\u30C8">\u30D3\u30D6\u30E9\u30FC\u30C8
@@ -15252,6 +15379,18 @@ var mountDAW = (target, options = {}) => {
       lyricBreathinessInfo.addEventListener("click", () => {
         showModal("\u30D6\u30EC\u30B7\u30CD\u30B9\u306E\u89E3\u8AAC", BREATHINESS_INFO_HTML);
       });
+      const lyricTension = lyricDiv.querySelector(
+        '[data-dtm="lyric-tension"]'
+      );
+      const lyricTensionLabel = lyricDiv.querySelector(
+        '[data-dtm="lyric-tension-label"]'
+      );
+      const lyricTensionInfo = lyricDiv.querySelector(
+        '[data-dtm="lyric-tension-info"]'
+      );
+      lyricTensionInfo.addEventListener("click", () => {
+        showModal("\u30C6\u30F3\u30B7\u30E7\u30F3\u306E\u89E3\u8AAC", TENSION_INFO_HTML);
+      });
       const lyricVibrato = lyricDiv.querySelector(
         '[data-dtm="lyric-vibrato"]'
       );
@@ -15339,6 +15478,8 @@ var mountDAW = (target, options = {}) => {
       lyricGenderLabel.textContent = `${active.vocalGender}`;
       lyricBreathiness.value = String(active.vocalBreathiness);
       lyricBreathinessLabel.textContent = `${active.vocalBreathiness}`;
+      lyricTension.value = String(active.vocalTension);
+      lyricTensionLabel.textContent = `${active.vocalTension}`;
       lyricVibrato.checked = active.vocalVibrato;
       lyricOctaveUnison.value = active.vocalOctaveUnison;
       const updateLyricCount = () => {
@@ -15509,6 +15650,11 @@ var mountDAW = (target, options = {}) => {
         lyricBreathinessLabel.textContent = `${active.vocalBreathiness}`;
         fireLyricsChange(active);
       });
+      lyricTension.addEventListener("input", () => {
+        active.vocalTension = Number.parseInt(lyricTension.value, 10);
+        lyricTensionLabel.textContent = `${active.vocalTension}`;
+        fireLyricsChange(active);
+      });
     }
     if (active.config.id === "chord" && showChord) {
       const div = document.createElement("div");
@@ -15713,6 +15859,7 @@ var mountDAW = (target, options = {}) => {
       del: t.vocalDelay,
       gen: t.vocalGender,
       bre: t.vocalBreathiness,
+      ten: t.vocalTension,
       uni: t.vocalOctaveUnison
     })).filter(
       (x2) => x2.model.length > 0 && x2.text.length > 0 && x2.notes.length > 0
@@ -15727,6 +15874,7 @@ var mountDAW = (target, options = {}) => {
         x2.del === 0 ? "" : `e${x2.del}`,
         x2.gen === 50 ? "" : `g${x2.gen}`,
         x2.bre === 50 ? "" : `h${x2.bre}`,
+        x2.ten === 50 ? "" : `t${x2.ten}`,
         OCTAVE_UNISON_TOKEN[x2.uni]
       ].filter((s) => s.length > 0).join(" ");
       const head = params ? `${x2.model} ${params}` : x2.model;
@@ -15969,6 +16117,7 @@ var mountDAW = (target, options = {}) => {
       active.vocalDelay = 0;
       active.vocalGender = 50;
       active.vocalBreathiness = 50;
+      active.vocalTension = 50;
       active.vocalOctaveUnison = "none";
     } else {
       for (const t of trackStates) {
@@ -15983,6 +16132,7 @@ var mountDAW = (target, options = {}) => {
         t.vocalDelay = 0;
         t.vocalGender = 50;
         t.vocalBreathiness = 50;
+        t.vocalTension = 50;
         t.vocalOctaveUnison = "none";
       }
     }
@@ -16001,6 +16151,8 @@ var mountDAW = (target, options = {}) => {
       t.vocalDelay = lt.delay ?? 0;
       t.vocalGender = lt.gender ?? 50;
       t.vocalBreathiness = lt.breathiness ?? 50;
+      t.vocalTension = lt.tension ?? 50;
+      t.vocalTension = lt.tension ?? 50;
       t.vocalOctaveUnison = lt.octaveUnison ?? "none";
     });
     for (const p of placements) {
@@ -16085,6 +16237,7 @@ var mountDAW = (target, options = {}) => {
       active.vocalDelay = 0;
       active.vocalGender = 50;
       active.vocalBreathiness = 50;
+      active.vocalTension = 50;
       active.vocalOctaveUnison = "none";
     } else {
       clearAll();
@@ -16101,6 +16254,7 @@ var mountDAW = (target, options = {}) => {
         t.vocalDelay = 0;
         t.vocalGender = 50;
         t.vocalBreathiness = 50;
+        t.vocalTension = 50;
         t.vocalOctaveUnison = "none";
       }
     }
@@ -17465,6 +17619,7 @@ var mountDAW = (target, options = {}) => {
       t.vocalDelay = data.vocalDelay ?? 0;
       t.vocalGender = data.vocalGender ?? 50;
       t.vocalBreathiness = data.vocalBreathiness ?? 50;
+      t.vocalTension = data.vocalTension ?? 50;
       t.vocalOctaveUnison = data.vocalOctaveUnison ?? "none";
     },
     applyTrackInstrument: (trackIndex, instrumentName) => {
@@ -17587,6 +17742,7 @@ var playSingingMML = async (mml, options = {}) => {
       delaySend: (lt.delay ?? 0) / 100,
       gender: (lt.gender ?? 50) / 100,
       breathiness: (lt.breathiness ?? 50) / 100,
+      tension: (lt.tension ?? 50) / 100,
       octaveUnison: lt.octaveUnison,
       notes
     };

package/dist/voice-worker.js

@@ -525,6 +525,14 @@
     return baseHz * 2 ** (cents / 1200);
   };
 
+  // src/voice-worker-types.ts
+  var COMPOSITE_ALIAS_SEP = "\0";
+  var unpackCompositeAlias = (alias) => {
+    if (!alias.startsWith(COMPOSITE_ALIAS_SEP)) return null;
+    const parts = alias.slice(COMPOSITE_ALIAS_SEP.length).split(COMPOSITE_ALIAS_SEP);
+    return parts.length === 2 ? [parts[0], parts[1]] : null;
+  };
+
   // src/voice-worker.ts
   var KOE_SAMPLE_RATE = 48e3;
   var midiToFreq = (m) => 440 * 2 ** ((m - 69) / 12);
@@ -540,8 +548,62 @@
     }
     return p;
   };
-  var renderAlias = async (alias, pitch, durationMs, vibrato, gender, breathiness) => {
+  var COMPOSITE_SPLICE_XFADE_SEC = 5e-3;
+  var spliceCompositePcm = (consonantPcm, vowelPcm, sampleRate) => {
+    if (consonantPcm.length === 0 || vowelPcm.length === 0) return null;
+    const xfade = Math.min(
+      Math.floor(sampleRate * COMPOSITE_SPLICE_XFADE_SEC),
+      consonantPcm.length,
+      vowelPcm.length
+    );
+    const pcm = new Float64Array(consonantPcm.length + vowelPcm.length - xfade);
+    pcm.set(consonantPcm, 0);
+    for (let i2 = 0; i2 < xfade; i2++) {
+      const t = (i2 + 1) / (xfade + 1);
+      const idx = consonantPcm.length - xfade + i2;
+      pcm[idx] = consonantPcm[idx] * (1 - t) + vowelPcm[i2] * t;
+    }
+    pcm.set(vowelPcm.subarray(xfade), consonantPcm.length);
+    const consonantMs = (consonantPcm.length - xfade / 2) / sampleRate * 1e3;
+    return { pcm, preMs: consonantMs, consonantMs };
+  };
+  var renderComposite = async (consonantAlias, vowelAlias, pitch, durationMs, vibrato, gender, breathiness, tension) => {
+    if (!worldline) return null;
+    const [consonantPcm, vowelPcm] = await Promise.all([
+      getPcm(consonantAlias),
+      getPcm(vowelAlias)
+    ]);
+    if (!consonantPcm || !vowelPcm) return null;
+    const spliced = spliceCompositePcm(consonantPcm, vowelPcm, KOE_SAMPLE_RATE);
+    if (!spliced) return null;
+    const targetHz = midiToFreq(pitch);
+    const audio = worldline.renderNote({
+      pcm: spliced.pcm,
+      pitch: vibrato ? vibratoPitchCurve(targetHz, spliced.preMs) : targetHz,
+      durationMs,
+      preMs: spliced.preMs,
+      consonantMs: spliced.consonantMs,
+      gender,
+      breathiness,
+      tension
+    });
+    return audio ? { pcm: audio, preSec: spliced.preMs / 1e3, rate: 1 } : null;
+  };
+  var renderAlias = async (alias, pitch, durationMs, vibrato, gender, breathiness, tension) => {
     if (!bank) return null;
+    const composite = unpackCompositeAlias(alias);
+    if (composite) {
+      return renderComposite(
+        composite[0],
+        composite[1],
+        pitch,
+        durationMs,
+        vibrato,
+        gender,
+        breathiness,
+        tension
+      );
+    }
     const pcm = await getPcm(alias);
     if (!pcm || pcm.length === 0) return null;
     const entry = bank.manifest.phonemes[alias];
@@ -554,7 +616,8 @@
         durationMs,
         ...lead,
         gender,
-        breathiness
+        breathiness,
+        tension
       });
       if (audio) return { pcm: audio, preSec: lead.preMs / 1e3, rate: 1 };
     }
@@ -586,7 +649,16 @@
       return;
     }
     if (msg.type === "render") {
-      const { id, alias, pitch, durationMs, vibrato, gender, breathiness } = msg;
+      const {
+        id,
+        alias,
+        pitch,
+        durationMs,
+        vibrato,
+        gender,
+        breathiness,
+        tension
+      } = msg;
       try {
         const out = await renderAlias(
           alias,
@@ -594,7 +666,8 @@
           durationMs,
           vibrato,
           gender,
-          breathiness
+          breathiness,
+          tension
         );
         if (out) {
           wself.postMessage(

package/package.json

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