@onjmin/dtm 0.1.86 → 0.1.87

package/dist/index.js

@@ -124,6 +124,7 @@ __export(index_exports, {
   stripCustomVocals: () => stripCustomVocals,
   stripLyrics: () => stripLyrics,
   stripMmlMeta: () => stripMmlMeta,
+  transposeNotes: () => transposeNotes,
   vocalVolumeToGain: () => vocalVolumeToGain
 });
 module.exports = __toCommonJS(index_exports);
@@ -2319,8 +2320,9 @@ var parseLyrics = (mml) => {
     let delay = 0;
     let gender = 50;
     let breathiness = 50;
+    let octaveDouble = false;
     const modelMatch = rest.match(
-      /^([a-z_][a-z0-9_]*?)(?=(?:[vqpobrghe]-?\d)|[^a-z0-9_]|$)(?::(\d+))?/i
+      /^([a-z_][a-z0-9_]*?)(?=(?:[vqpobrghew]-?\d)|[^a-z0-9_]|$)(?::(\d+))?/i
     );
     let model = "";
     const metaTokens = [];
@@ -2396,6 +2398,13 @@ var parseLyrics = (mml) => {
         rest = rest.substring(eMatch[0].length).trim();
         continue;
       }
+      const wMatch = rest.match(/^w([01])/i);
+      if (wMatch) {
+        octaveDouble = wMatch[1] === "1";
+        metaTokens.push(wMatch[0]);
+        rest = rest.substring(wMatch[0].length).trim();
+        continue;
+      }
       break;
     }
     const lyricLines = [rest];
@@ -2415,6 +2424,7 @@ var parseLyrics = (mml) => {
       delay,
       gender,
       breathiness,
+      octaveDouble,
       syllables,
       metaText: metaTokens.join(" "),
       ...lineBreaks.length > 0 ? { lineBreaks } : {}
@@ -3011,6 +3021,8 @@ 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 FALLBACK_MODEL = "klatt";
 var createSingingVoices = (ctx, destination, options = {}) => {
   const catalog = {};
@@ -3097,7 +3109,24 @@ var createSingingVoices = (ctx, destination, options = {}) => {
       forEachSungNote(track, (note, prevVowel) => {
         if (n >= count && note.startSec >= STREAM_LOOKAHEAD_SEC) return;
         n++;
-        tasks.push({ model: m, note, prevVowel, vibrato: track.vibrato, expr });
+        tasks.push({
+          model: m,
+          note,
+          prevVowel,
+          pitch: note.pitch,
+          vibrato: track.vibrato,
+          expr
+        });
+        if (track.octaveDouble) {
+          tasks.push({
+            model: m,
+            note,
+            prevVowel,
+            pitch: note.pitch + OCTAVE_DOUBLE_SEMITONES,
+            vibrato: track.vibrato,
+            expr
+          });
+        }
       });
     }
     const total = tasks.length;
@@ -3111,7 +3140,7 @@ var createSingingVoices = (ctx, destination, options = {}) => {
       await (task.model.renderToCache?.(
         task.note.syllable,
         task.prevVowel,
-        task.note.pitch,
+        task.pitch,
         task.note.durationSec * 1e3,
         task.vibrato,
         task.expr
@@ -3151,59 +3180,70 @@ var createSingingVoices = (ctx, destination, options = {}) => {
           }
           if (opts?.isAudible && !opts.isAudible(track)) continue;
           const t0 = anchorTime + startSec;
-          if (model.renderToCache && model.scheduleCached) {
-            const renderToCache = model.renderToCache;
-            const scheduleCached = model.scheduleCached;
-            void (async () => {
-              const key = await renderToCache(
-                note.syllable,
-                prevVowel,
-                note.pitch,
-                note.durationSec * 1e3,
-                track.vibrato,
-                { gender: track.gender, breathiness: track.breathiness }
-              );
-              if (session !== streamSession) return;
-              if (key) {
-                const delay = ctx.currentTime - t0;
-                if (delay < 0.05) {
-                  const dest = options.getTrackDestination?.(track.id ?? "");
-                  const effPeak = dest ? peak * masterVolumeScalar : peak;
-                  scheduleCached(
-                    key,
-                    t0,
-                    effPeak,
-                    track.pan,
-                    track.reverbSend,
-                    track.delaySend,
-                    dest
-                  );
-                  opts?.onScheduled?.(track, note, t0);
-                } else {
-                  console.warn(
-                    `[dtm] Synthesizer late skip: ${note.syllable.kana} at ${startSec}s (delayed by ${delay.toFixed(3)}s)`
-                  );
-                  opts?.onLateSkip?.(note, delay);
+          const dispatchNote = (pitch, peakScale) => {
+            if (model.renderToCache && model.scheduleCached) {
+              const renderToCache = model.renderToCache;
+              const scheduleCached = model.scheduleCached;
+              void (async () => {
+                const key = await renderToCache(
+                  note.syllable,
+                  prevVowel,
+                  pitch,
+                  note.durationSec * 1e3,
+                  track.vibrato,
+                  { gender: track.gender, breathiness: track.breathiness }
+                );
+                if (session !== streamSession) return;
+                if (key) {
+                  const delay = ctx.currentTime - t0;
+                  if (delay < 0.05) {
+                    const dest = options.getTrackDestination?.(track.id ?? "");
+                    const effPeak = (dest ? peak * masterVolumeScalar : peak) * peakScale;
+                    scheduleCached(
+                      key,
+                      t0,
+                      effPeak,
+                      track.pan,
+                      track.reverbSend,
+                      track.delaySend,
+                      dest
+                    );
+                    opts?.onScheduled?.(track, note, t0);
+                  } else {
+                    console.warn(
+                      `[dtm] Synthesizer late skip: ${note.syllable.kana} at ${startSec}s (delayed by ${delay.toFixed(3)}s)`
+                    );
+                    opts?.onLateSkip?.(note, delay);
+                  }
                 }
-              }
-            })();
-          } else {
-            const when = t0 - ctx.currentTime;
-            const dest = options.getTrackDestination?.(track.id ?? "");
-            const effPeak = dest ? peak * masterVolumeScalar : peak;
-            model(note.syllable, {
-              trackId: track.id ?? "",
-              pitch: note.pitch,
-              velocity: 100,
-              volume: effPeak,
-              when,
-              duration: note.durationSec,
-              pan: track.pan,
-              reverbSend: track.reverbSend,
-              delaySend: track.delaySend,
-              destination: dest
-            });
-            opts?.onScheduled?.(track, note, t0);
+              })();
+            } else {
+              const when = t0 - ctx.currentTime;
+              const dest = options.getTrackDestination?.(track.id ?? "");
+              const effPeak = (dest ? peak * masterVolumeScalar : peak) * peakScale;
+              model(note.syllable, {
+                trackId: track.id ?? "",
+                pitch,
+                velocity: 100,
+                volume: effPeak,
+                when,
+                duration: note.durationSec,
+                pan: track.pan,
+                reverbSend: track.reverbSend,
+                delaySend: track.delaySend,
+                destination: dest
+              });
+              opts?.onScheduled?.(track, note, t0);
+            }
+          };
+          dispatchNote(note.pitch, 1);
+          if (track.octaveDouble) {
+            dispatchNote(
+              note.pitch + OCTAVE_DOUBLE_SEMITONES,
+              OCTAVE_DOUBLE_PEAK_SCALE
+            );
+          }
+          if (!(model.renderToCache && model.scheduleCached)) {
             await new Promise((resolve) => setTimeout(resolve, 0));
           }
         }
@@ -3262,7 +3302,7 @@ var PITCH_MAP = {
   b: 11
 };
 var clamp2 = (value, lo, hi) => Math.min(hi, Math.max(lo, value));
-var META_DIRECTIVE = /#(inst|drum|drumfont|volume|drumvolume|reverb|reverbdecay|reverbpredelay|delay|delaydiv|mode)=([\w-]+)/gi;
+var META_DIRECTIVE = /#(inst|drum|drumfont|volume|drumvolume|reverb|reverbdecay|reverbpredelay|delay|delaydiv|fadein|fadeout|mode)=([\w-]+)/gi;
 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;
@@ -3296,6 +3336,12 @@ var parseMmlMeta = (mml) => {
       if (!Number.isNaN(dv)) meta.delay = clamp2(dv, 0, 100);
     } else if (key === "delaydiv") {
       if (["4", "8", "8d", "16"].includes(m[2])) meta.delayDivision = m[2];
+    } else if (key === "fadein") {
+      const fi = Number.parseInt(m[2], 10);
+      if (!Number.isNaN(fi)) meta.fadeIn = clamp2(fi, 0, 100);
+    } else if (key === "fadeout") {
+      const fo = Number.parseInt(m[2], 10);
+      if (!Number.isNaN(fo)) meta.fadeOut = clamp2(fo, 0, 100);
     } else if (key === "mode") {
       if (m[2] === "simple" || m[2] === "advanced") {
         meta.mode = m[2];
@@ -3371,6 +3417,10 @@ var formatMmlMeta = (meta, space = "") => {
     parts.push(`#delay=${meta.delay}`);
   if (meta.delayDivision && meta.delayDivision !== "8")
     parts.push(`#delaydiv=${meta.delayDivision}`);
+  if (meta.fadeIn !== void 0 && meta.fadeIn !== 0)
+    parts.push(`#fadein=${meta.fadeIn}`);
+  if (meta.fadeOut !== void 0 && meta.fadeOut !== 0)
+    parts.push(`#fadeout=${meta.fadeOut}`);
   if (meta.mode) parts.push(`#mode=${meta.mode}`);
   if (meta.trackInstruments) {
     for (const [idx, name] of Object.entries(meta.trackInstruments)) {
@@ -9240,6 +9290,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
       delaySend: (lt.delay ?? 0) / 100,
       gender: (lt.gender ?? 50) / 100,
       breathiness: (lt.breathiness ?? 50) / 100,
+      octaveDouble: lt.octaveDouble,
       notes
     };
   });
@@ -11117,6 +11168,17 @@ var buildUI = (target, options) => {
         </select>
         <button class="dtm-infobtn" data-dtm="delay-amount-info" title="\u30DE\u30B9\u30BF\u30C7\u30A3\u30EC\u30A4\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
       </div>
+      <div class="dtm-row">
+        <span class="dtm-label">\u30D5\u30A7\u30FC\u30C9\u30A4\u30F3</span>
+        <input type="range" class="dtm-range dtm-grow" data-dtm="fade-in" value="0" min="0" max="10" step="0.5" aria-label="\u66F2\u982D\u306E\u30D5\u30A7\u30FC\u30C9\u30A4\u30F3\u9577\uFF08\u79D2\uFF09">
+        <span class="dtm-label" data-dtm="fade-in-label">0.0s</span>
+        <button class="dtm-infobtn" data-dtm="fade-info" title="\u30D5\u30A7\u30FC\u30C9\u30A4\u30F3/\u30A2\u30A6\u30C8\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
+      </div>
+      <div class="dtm-row">
+        <span class="dtm-label">\u30D5\u30A7\u30FC\u30C9\u30A2\u30A6\u30C8</span>
+        <input type="range" class="dtm-range dtm-grow" data-dtm="fade-out" value="0" min="0" max="10" step="0.5" aria-label="\u66F2\u5C3E\u306E\u30D5\u30A7\u30FC\u30C9\u30A2\u30A6\u30C8\u9577\uFF08\u79D2\uFF09">
+        <span class="dtm-label" data-dtm="fade-out-label">0.0s</span>
+      </div>
     </div>
   </details>
 
@@ -11201,6 +11263,25 @@ var buildUI = (target, options) => {
         </select>
         <button class="dtm-btn dtm-btn--primary" data-dtm="shift-apply">\u9069\u7528</button>
       </div>
+      <div class="dtm-row">
+        <span class="dtm-label">\u79FB\u8ABF</span>
+        <select class="dtm-select" data-dtm="transpose-select" aria-label="\u79FB\u8ABF\u3059\u308B\u534A\u97F3\u6570">
+          <option value="-12">-1oct</option>
+          <option value="-7">-5th</option>
+          <option value="-5">-4th</option>
+          <option value="-3">-3\u534A\u97F3</option>
+          <option value="-2">-2\u534A\u97F3</option>
+          <option value="-1">-1\u534A\u97F3</option>
+          <option value="1">+1\u534A\u97F3</option>
+          <option value="2">+2\u534A\u97F3</option>
+          <option value="3">+3\u534A\u97F3</option>
+          <option value="5">+4th</option>
+          <option value="7">+5th</option>
+          <option value="12">+1oct</option>
+        </select>
+        <button class="dtm-btn dtm-btn--primary" data-dtm="transpose-apply">\u9069\u7528</button>
+        <button class="dtm-infobtn" data-dtm="transpose-info" title="\u79FB\u8ABF\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
+      </div>
       <div class="dtm-row">
         <button class="dtm-btn dtm-btn--danger" data-dtm="macro-clear">\u5168\u6D88\u53BB</button>
         <button class="dtm-btn dtm-btn--accent" data-dtm="macro-random">\u30E9\u30F3\u30C0\u30E0\u914D\u7F6E</button>
@@ -11323,6 +11404,11 @@ var buildUI = (target, options) => {
     delayAmountLabel: sel("delay-amount-label"),
     delayAmountInfoBtn: sel("delay-amount-info"),
     delayDivision: sel("delay-division"),
+    fadeIn: sel("fade-in"),
+    fadeInLabel: sel("fade-in-label"),
+    fadeOut: sel("fade-out"),
+    fadeOutLabel: sel("fade-out-label"),
+    fadeInfoBtn: sel("fade-info"),
     autoMasterBtn: sel("auto-master"),
     autoMasterInfoBtn: sel("auto-master-info"),
     trackTabs: sel("track-tabs"),
@@ -11343,6 +11429,9 @@ var buildUI = (target, options) => {
     applyActiveOnly: sel("apply-active-only"),
     shiftSelect: sel("shift-select"),
     shiftApplyBtn: sel("shift-apply"),
+    transposeSelect: sel("transpose-select"),
+    transposeApplyBtn: sel("transpose-apply"),
+    transposeInfoBtn: sel("transpose-info"),
     macroClear: sel("macro-clear"),
     macroRandom: sel("macro-random"),
     macroHarmonic: sel("macro-harmonic"),
@@ -11597,6 +11686,18 @@ var shiftNotes = (cores, shiftSteps) => {
     }
   }
 };
+var transposeNotes = (cores, semitones) => {
+  if (semitones === 0) return;
+  for (const core of cores) {
+    const notes = [...core.getNotes()];
+    for (const note of notes) {
+      const newPitch = Math.max(0, Math.min(127, note.pitch + semitones));
+      if (newPitch !== note.pitch) {
+        core.moveNote(note.id, note.startStep, newPitch);
+      }
+    }
+  }
+};
 
 // src/midi-io.ts
 var STEPS_PER_BEAT3 = 48;
@@ -13029,6 +13130,16 @@ 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 = `
+<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>
+  <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>
+</div>
+`;
 var GENDER_INFO_HTML = `
 <div class="dtm-modal-body-content">
   <h4>\u4F55\u3092\u3059\u308B\u8A2D\u5B9A\u304B</h4>
@@ -13091,6 +13202,26 @@ var MASTER_DELAY_INFO_HTML = `
   <p>\u30EA\u30D0\u30FC\u30D6\u3068\u540C\u3058\u4E8C\u6BB5\u69CB\u3048\u3067\u3059\u3002\u6B4C\u8A5E\u30C8\u30E9\u30C3\u30AF\u500B\u5225\u306E\u300C\u30C7\u30A3\u30EC\u30A4\u9001\u308A\u300D\u304C0%\u306A\u3089\u3053\u306E\u30DE\u30B9\u30BF\u306E\u5024\u3092\u4E0A\u3052\u3066\u3082\u7121\u97F3\u3001\u9006\u306B\u3053\u306E\u30DE\u30B9\u30BF\u304C0%\u306A\u3089\u3069\u306E\u30C8\u30E9\u30C3\u30AF\u306E\u9001\u308A\u91CF\u3092\u4E0A\u3052\u3066\u3082\u52B9\u679C\u304C\u51FA\u307E\u305B\u3093\u3002</p>
 </div>
 `;
+var FADE_INFO_HTML = `
+<div class="dtm-modal-body-content">
+  <h4>\u4F55\u3092\u3059\u308B\u8A2D\u5B9A\u304B</h4>
+  <p>\u66F2\u306E\u982D\u3067\u97F3\u91CF0%\u304B\u3089\u5F90\u3005\u306B\u4E0A\u3052\u308B\u300C\u30D5\u30A7\u30FC\u30C9\u30A4\u30F3\u300D\u3001\u66F2\u306E\u7D42\u308F\u308A\u3067\u97F3\u91CF\u30920%\u307E\u3067\u5F90\u3005\u306B\u4E0B\u3052\u308B\u300C\u30D5\u30A7\u30FC\u30C9\u30A2\u30A6\u30C8\u300D\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u30020\u79D2\u3067\u30D5\u30A7\u30FC\u30C9\u306A\u3057\u3067\u3059\u3002</p>
+  <h4>\u3044\u3064\u52B9\u304F\u304B</h4>
+  <p>\u30D5\u30A7\u30FC\u30C9\u30A4\u30F3\u306F\u66F2\u306E\u5148\u982D\uFF080\u5C0F\u7BC0\u76EE\uFF09\u304B\u3089\u518D\u751F\u3057\u305F\u3068\u304D\u3060\u3051\u639B\u304B\u308A\u307E\u3059\u3002\u9014\u4E2D\u306E\u5C0F\u7BC0\u304B\u3089\u518D\u751F\u30FB\u30B7\u30FC\u30AF\u3057\u305F\u5834\u5408\u306F\u639B\u304B\u308A\u307E\u305B\u3093\u3002\u30D5\u30A7\u30FC\u30C9\u30A2\u30A6\u30C8\u306F\u3001\u4ECA\u30CE\u30FC\u30C8\u304C\u7F6E\u304B\u308C\u3066\u3044\u308B\u7BC4\u56F2\u306E\u7D42\u7AEF\u306B\u5411\u3051\u3066\u81EA\u52D5\u7684\u306B\u639B\u304B\u308A\u307E\u3059\uFF08\u30CE\u30FC\u30C8\u3092\u8DB3\u305B\u3070\u7D42\u7AEF\u3082\u4F38\u3073\u307E\u3059\uFF09\u3002</p>
+  <h4>\u4F7F\u3044\u3069\u3053\u308D</h4>
+  <p>\u7DE8\u96C6\u4E2D\u306F\u307B\u3068\u3093\u3069\u610F\u8B58\u3057\u307E\u305B\u3093\u304C\u3001\u66F8\u304D\u51FA\u3057\u3066\u4EBA\u306B\u8074\u304B\u305B\u308B\u30FB\u914D\u4FE1\u3059\u308B\u6BB5\u306B\u306A\u308B\u3068\u3001\u66F2\u306E\u51FA\u5165\u308A\u304C\u5510\u7A81\u3060\u3068\u7D20\u4EBA\u3063\u307D\u304F\u805E\u3053\u3048\u304C\u3061\u3067\u3059\u3002\u6570\u79D2\u306E\u30D5\u30A7\u30FC\u30C9\u3092\u5165\u308C\u308B\u3060\u3051\u3067\u4ED5\u4E0A\u304C\u308A\u306E\u5370\u8C61\u304C\u5909\u308F\u308A\u307E\u3059\u3002</p>
+</div>
+`;
+var TRANSPOSE_INFO_HTML = `
+<div class="dtm-modal-body-content">
+  <h4>\u4F55\u3092\u3059\u308B\u8A2D\u5B9A\u304B</h4>
+  <p>\u5168\u30C8\u30E9\u30C3\u30AF\u306E\u30CE\u30FC\u30C8\u3092\u9078\u3093\u3060\u534A\u97F3\u6570\u3060\u3051\u4E00\u62EC\u3067\u79FB\u8ABF\u3057\u307E\u3059\u3002\u6B4C\u8A5E\u30C8\u30E9\u30C3\u30AF\u306E\u6B4C\u58F0\u3082\u30CE\u30FC\u30C8\u306E\u30D4\u30C3\u30C1\u306B\u8FFD\u5F93\u3059\u308B\u305F\u3081\u3001\u30DC\u30FC\u30AB\u30EB\u3082\u4E00\u7DD2\u306B\u79FB\u8ABF\u3055\u308C\u307E\u3059\u3002</p>
+  <h4>\u4F7F\u3044\u3069\u3053\u308D</h4>
+  <p>\u300C\u6B4C\u3063\u3066\u307F\u305F\u3089\u97F3\u57DF\u304C\u9AD8\u3059\u304E\u305F/\u4F4E\u3059\u304E\u305F\u300D\u3068\u3044\u3046\u3068\u304D\u306E\u8ABF\u6574\u5B9A\u756A\u3067\u3059\u3002\u30DC\u30FC\u30AB\u30EB\u306E\u58F0\u57DF\u306B\u5408\u308F\u305B\u3066\u66F2\u5168\u4F53\u306E\u30AD\u30FC\u3092\u4E0A\u3052\u4E0B\u3052\u3067\u304D\u307E\u3059\u3002</p>
+  <h4>\u6CE8\u610F</h4>
+  <p>\u30CE\u30FC\u30C8\u30C7\u30FC\u30BF\u3092\u76F4\u63A5\u66F8\u304D\u63DB\u3048\u308B\u64CD\u4F5C\u3067\u3059\uFF08\u5143\u306B\u623B\u3059\u306B\u306F\u300C\u5143\u306B\u623B\u3059\u300D\u30DC\u30BF\u30F3\u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044\uFF09\u3002MIDI\u30CE\u30FC\u30C8\u7BC4\u56F2\uFF080-127\uFF09\u3092\u8D85\u3048\u308B\u97F3\u306F\u7BC4\u56F2\u5185\u306B\u30AF\u30E9\u30F3\u30D7\u3055\u308C\u307E\u3059\u3002</p>
+</div>
+`;
 var TRACK_EQ_INFO_HTML = `
 <div class="dtm-modal-body-content">
   <h4>\u4F55\u3092\u3059\u308B\u8A2D\u5B9A\u304B</h4>
@@ -13426,6 +13557,10 @@ var mountDAW = (target, options = {}) => {
   refs.delayAmount.value = String(options.delayAmount ?? 0);
   refs.delayAmountLabel.textContent = `${options.delayAmount ?? 0}%`;
   refs.delayDivision.value = options.delayDivision ?? "8";
+  refs.fadeIn.value = String(options.fadeInSec ?? 0);
+  refs.fadeInLabel.textContent = `${(options.fadeInSec ?? 0).toFixed(1)}s`;
+  refs.fadeOut.value = String(options.fadeOutSec ?? 0);
+  refs.fadeOutLabel.textContent = `${(options.fadeOutSec ?? 0).toFixed(1)}s`;
   refs.drumVolume.value = String(options.drumVolume ?? 80);
   refs.drumVolumeLabel.textContent = `${options.drumVolume ?? 80}%`;
   const renderConfig = {
@@ -13446,6 +13581,8 @@ var mountDAW = (target, options = {}) => {
   let reverbPreDelay = options.reverbPreDelay ?? DEFAULT_REVERB_PREDELAY_MS;
   let delayAmount = options.delayAmount ?? 0;
   let delayDivision = options.delayDivision ?? "8";
+  let fadeInSec = options.fadeInSec ?? 0;
+  let fadeOutSec = options.fadeOutSec ?? 0;
   let unsubscribeClip;
   options.onReverbChange?.(reverbAmount);
   options.onReverbDecayChange?.(reverbDecay);
@@ -13534,7 +13671,8 @@ var mountDAW = (target, options = {}) => {
       vocalReverb: t.vocalReverb,
       vocalDelay: t.vocalDelay,
       vocalGender: t.vocalGender,
-      vocalBreathiness: t.vocalBreathiness
+      vocalBreathiness: t.vocalBreathiness,
+      vocalOctaveDouble: t.vocalOctaveDouble
     };
     if (lyricsDebounceTimer) clearTimeout(lyricsDebounceTimer);
     lyricsDebounceTimer = setTimeout(() => {
@@ -13599,6 +13737,7 @@ var mountDAW = (target, options = {}) => {
         vocalDelay: 0,
         vocalGender: 50,
         vocalBreathiness: 50,
+        vocalOctaveDouble: false,
         trackInstrument: "",
         trackCompression: 0,
         trackWidth: 100,
@@ -13628,6 +13767,7 @@ var mountDAW = (target, options = {}) => {
         delay: t.vocalDelay,
         gender: t.vocalGender,
         breathiness: t.vocalBreathiness,
+        octaveDouble: t.vocalOctaveDouble,
         syllables
       });
     });
@@ -13635,16 +13775,18 @@ var mountDAW = (target, options = {}) => {
   };
   const getActive = () => trackStates.find((t) => t.config.id === activeTrackId) ?? trackStates[0];
   let showModal;
-  const getMaxNoteStep = () => {
+  const getSongEndStepExact = () => {
     let maxEndStep = 0;
     for (const t of trackStates) {
       for (const n of t.core.getNotes()) {
         const end = n.startStep + n.durationSteps;
-        if (end > maxEndStep) {
-          maxEndStep = end;
-        }
+        if (end > maxEndStep) maxEndStep = end;
       }
     }
+    return maxEndStep;
+  };
+  const getMaxNoteStep = () => {
+    const maxEndStep = getSongEndStepExact();
     if (maxEndStep === 0) {
       return renderConfig.stepsPerBar * 4;
     }
@@ -14435,6 +14577,7 @@ var mountDAW = (target, options = {}) => {
         delaySend: (lt.delay ?? 0) / 100,
         gender: (lt.gender ?? 50) / 100,
         breathiness: (lt.breathiness ?? 50) / 100,
+        octaveDouble: lt.octaveDouble,
         notes
       };
     }) : [];
@@ -14471,6 +14614,29 @@ var mountDAW = (target, options = {}) => {
     }
     playbackState = "playing";
     sequencer.start(fromStep);
+    {
+      const anchor = sequencer.getStartTime();
+      const secondsPerStepFade = 60 / bpm / 48;
+      const params = {};
+      if (fadeInSec > 0 && fromStep === 0) {
+        params.fadeInStartAt = anchor;
+        params.fadeInEndAt = anchor + fadeInSec;
+      }
+      if (fadeOutSec > 0) {
+        const endStep = getSongEndStepExact();
+        const totalDurationSec = (endStep - fromStep) * secondsPerStepFade;
+        if (totalDurationSec > 0) {
+          const fadeOutEndAt = anchor + totalDurationSec;
+          const earliestStart = params.fadeInEndAt ?? anchor;
+          params.fadeOutEndAt = fadeOutEndAt;
+          params.fadeOutStartAt = Math.max(
+            fadeOutEndAt - fadeOutSec,
+            earliestStart
+          );
+        }
+      }
+      options.onScheduleFade?.(params);
+    }
     if (streaming && voices) {
       voices.startStream(streamTracks, sequencer.getStartTime(), {
         isAudible: (t) => !isSolo || t.id === activeTrackId,
@@ -14488,6 +14654,7 @@ var mountDAW = (target, options = {}) => {
     sequencer.stop();
     options.singingVoices?.stopStream();
     clearSoundTimers();
+    options.onScheduleFade?.(null);
     playbackState = "paused";
     updateTransport();
   };
@@ -14501,6 +14668,7 @@ var mountDAW = (target, options = {}) => {
     sequencer.stop();
     options.singingVoices?.stopStream();
     clearSoundTimers();
+    options.onScheduleFade?.(null);
     playbackState = "stopped";
     currentPlayStep = 0;
     updateTransport();
@@ -14810,6 +14978,12 @@ var mountDAW = (target, options = {}) => {
             </span>
             <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>
+          </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>
       </div>`;
@@ -14901,6 +15075,15 @@ 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 lyricOctaveDoubleInfo = lyricDiv.querySelector(
+        '[data-dtm="lyric-octave-double-info"]'
+      );
+      lyricOctaveDoubleInfo.addEventListener("click", () => {
+        showModal("\u30AA\u30AF\u30BF\u30FC\u30D6\u30C0\u30D6\u30EB\u89E3\u8AAC", OCTAVE_DOUBLE_INFO_HTML);
+      });
       const lyricTerms = lyricDiv.querySelector(
         '[data-dtm="lyric-terms"]'
       );
@@ -14971,6 +15154,7 @@ var mountDAW = (target, options = {}) => {
       lyricBreathiness.value = String(active.vocalBreathiness);
       lyricBreathinessLabel.textContent = `${active.vocalBreathiness}`;
       lyricVibrato.checked = active.vocalVibrato;
+      lyricOctaveDouble.checked = active.vocalOctaveDouble;
       const updateLyricCount = () => {
         const n = normalizeLyrics(lyricInput.value).length;
         lyricCount.textContent = active.lyricModel && n > 0 ? `${n}\u97F3\u7BC0` : "";
@@ -15092,6 +15276,10 @@ var mountDAW = (target, options = {}) => {
         active.vocalVibrato = lyricVibrato.checked;
         fireLyricsChange(active);
       });
+      lyricOctaveDouble.addEventListener("change", () => {
+        active.vocalOctaveDouble = lyricOctaveDouble.checked;
+        fireLyricsChange(active);
+      });
       lyricInput.addEventListener("input", () => {
         active.lyrics = lyricInput.value;
         updateLyricCount();
@@ -15249,6 +15437,8 @@ var mountDAW = (target, options = {}) => {
         reverbPreDelay,
         delay: delayAmount,
         delayDivision,
+        fadeIn: Math.round(fadeInSec * 10),
+        fadeOut: Math.round(fadeOutSec * 10),
         mode,
         trackInstruments: trackInstMeta,
         trackCompression: trackCompMeta,
@@ -15270,6 +15460,8 @@ var mountDAW = (target, options = {}) => {
         reverbPreDelay,
         delay: delayAmount,
         delayDivision,
+        fadeIn: Math.round(fadeInSec * 10),
+        fadeOut: Math.round(fadeOutSec * 10),
         mode,
         trackInstruments: trackInstMeta,
         trackCompression: trackCompMeta,
@@ -15328,7 +15520,8 @@ var mountDAW = (target, options = {}) => {
       rev: t.vocalReverb,
       del: t.vocalDelay,
       gen: t.vocalGender,
-      bre: t.vocalBreathiness
+      bre: t.vocalBreathiness,
+      dbl: t.vocalOctaveDouble
     })).filter(
       (x2) => x2.model.length > 0 && x2.text.length > 0 && x2.notes.length > 0
     ).map((x2) => {
@@ -15341,7 +15534,8 @@ var mountDAW = (target, options = {}) => {
         x2.rev === 0 ? "" : `r${x2.rev}`,
         x2.del === 0 ? "" : `e${x2.del}`,
         x2.gen === 50 ? "" : `g${x2.gen}`,
-        x2.bre === 50 ? "" : `h${x2.bre}`
+        x2.bre === 50 ? "" : `h${x2.bre}`,
+        x2.dbl ? "w1" : ""
       ].filter((s) => s.length > 0).join(" ");
       const head = params ? `${x2.model} ${params}` : x2.model;
       return `@@${x2.i} ${head} ${x2.text}`;
@@ -15510,6 +15704,16 @@ var mountDAW = (target, options = {}) => {
         refs.delayDivision.value = delayDivision;
         options.onDelayDivisionChange?.(delayDivision);
       }
+      if (meta.fadeIn !== void 0) {
+        fadeInSec = meta.fadeIn / 10;
+        refs.fadeIn.value = String(fadeInSec);
+        refs.fadeInLabel.textContent = `${fadeInSec.toFixed(1)}s`;
+      }
+      if (meta.fadeOut !== void 0) {
+        fadeOutSec = meta.fadeOut / 10;
+        refs.fadeOut.value = String(fadeOutSec);
+        refs.fadeOutLabel.textContent = `${fadeOutSec.toFixed(1)}s`;
+      }
     }
     trackStates.forEach((t, i2) => {
       if (applyActiveOnly && i2 !== activeTrackIndex) return;
@@ -15568,6 +15772,7 @@ var mountDAW = (target, options = {}) => {
       active.vocalDelay = 0;
       active.vocalGender = 50;
       active.vocalBreathiness = 50;
+      active.vocalOctaveDouble = false;
     } else {
       for (const t of trackStates) {
         t.lyrics = "";
@@ -15581,6 +15786,7 @@ var mountDAW = (target, options = {}) => {
         t.vocalDelay = 0;
         t.vocalGender = 50;
         t.vocalBreathiness = 50;
+        t.vocalOctaveDouble = false;
       }
     }
     lyrics?.forEach((lt) => {
@@ -15598,6 +15804,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;
     });
     for (const p of placements) {
       if (applyActiveOnly && p.trackIndex !== activeTrackIndex) continue;
@@ -15681,6 +15888,7 @@ var mountDAW = (target, options = {}) => {
       active.vocalDelay = 0;
       active.vocalGender = 50;
       active.vocalBreathiness = 50;
+      active.vocalOctaveDouble = false;
     } else {
       clearAll();
       for (const t of trackStates) t.core.setLoadMode(true);
@@ -15696,6 +15904,7 @@ var mountDAW = (target, options = {}) => {
         t.vocalDelay = 0;
         t.vocalGender = 50;
         t.vocalBreathiness = 50;
+        t.vocalOctaveDouble = false;
       }
     }
     const { placements, bpm: parsedBpm } = isAdvanced ? extractMidiPlacementsByTrack(
@@ -15946,6 +16155,17 @@ var mountDAW = (target, options = {}) => {
     refs.delayAmountInfoBtn.addEventListener("click", () => {
       showModal("\u30DE\u30B9\u30BF\u30C7\u30A3\u30EC\u30A4\u306E\u89E3\u8AAC", MASTER_DELAY_INFO_HTML);
     });
+    refs.fadeIn.addEventListener("input", () => {
+      fadeInSec = Number.parseFloat(refs.fadeIn.value) || 0;
+      refs.fadeInLabel.textContent = `${fadeInSec.toFixed(1)}s`;
+    });
+    refs.fadeOut.addEventListener("input", () => {
+      fadeOutSec = Number.parseFloat(refs.fadeOut.value) || 0;
+      refs.fadeOutLabel.textContent = `${fadeOutSec.toFixed(1)}s`;
+    });
+    refs.fadeInfoBtn.addEventListener("click", () => {
+      showModal("\u30D5\u30A7\u30FC\u30C9\u30A4\u30F3/\u30A2\u30A6\u30C8\u306E\u89E3\u8AAC", FADE_INFO_HTML);
+    });
     refs.autoMasterInfoBtn.addEventListener("click", () => {
       showModal("\u304A\u307E\u304B\u305B\u30DE\u30B9\u30BF\u30EA\u30F3\u30B0\u89E3\u8AAC", AUTO_MASTER_INFO_HTML);
     });
@@ -16223,6 +16443,20 @@ var mountDAW = (target, options = {}) => {
         redrawAll();
       })
     );
+    refs.transposeApplyBtn.addEventListener(
+      "click",
+      () => overlayDuring(() => {
+        transposeNotes(
+          trackStates.map((t) => t.core),
+          Number.parseInt(refs.transposeSelect.value, 10) || 0
+        );
+        redrawAll();
+        updateUndoRedo();
+      })
+    );
+    refs.transposeInfoBtn.addEventListener("click", () => {
+      showModal("\u79FB\u8ABF\u306E\u89E3\u8AAC", TRANSPOSE_INFO_HTML);
+    });
     if (showMidi) wireMidi();
     if (showMidiSearch) wireMidiSearch();
     document.addEventListener("keydown", onKeyDown);
@@ -17030,6 +17264,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;
     },
     applyTrackInstrument: (trackIndex, instrumentName) => {
       const t = trackStates[trackIndex];
@@ -17151,6 +17386,7 @@ var playSingingMML = async (mml, options = {}) => {
       delaySend: (lt.delay ?? 0) / 100,
       gender: (lt.gender ?? 50) / 100,
       breathiness: (lt.breathiness ?? 50) / 100,
+      octaveDouble: lt.octaveDouble,
       notes
     };
   });
@@ -18146,7 +18382,28 @@ var createDtmStudio = async (options = {}) => {
   safetyLimiter.attack.value = 1e-3;
   safetyLimiter.release.value = 0.1;
   finalMix.connect(safetyLimiter);
-  safetyLimiter.connect(options.destination ?? audioCtx.destination);
+  const fadeGain = audioCtx.createGain();
+  fadeGain.gain.value = 1;
+  safetyLimiter.connect(fadeGain);
+  fadeGain.connect(options.destination ?? audioCtx.destination);
+  const scheduleFade = (params) => {
+    fadeGain.gain.cancelScheduledValues(audioCtx.currentTime);
+    if (!params) {
+      fadeGain.gain.setValueAtTime(1, audioCtx.currentTime);
+      return;
+    }
+    const { fadeInStartAt, fadeInEndAt, fadeOutStartAt, fadeOutEndAt } = params;
+    if (fadeInStartAt !== void 0 && fadeInEndAt !== void 0) {
+      fadeGain.gain.setValueAtTime(0, fadeInStartAt);
+      fadeGain.gain.linearRampToValueAtTime(1, fadeInEndAt);
+    } else {
+      fadeGain.gain.setValueAtTime(1, audioCtx.currentTime);
+    }
+    if (fadeOutStartAt !== void 0 && fadeOutEndAt !== void 0) {
+      fadeGain.gain.setValueAtTime(1, fadeOutStartAt);
+      fadeGain.gain.linearRampToValueAtTime(0, fadeOutEndAt);
+    }
+  };
   const clipMeter = createClipMeter(audioCtx, finalMix);
   const channelStrips = /* @__PURE__ */ new Map();
   const getChannelStrip = (trackId) => {
@@ -18482,6 +18739,9 @@ var createDtmStudio = async (options = {}) => {
       delayDivision: options.delayDivision,
       onDelayDivisionChange: (division) => delayBus.setDivision(division),
       onBpmChange: (bpm) => delayBus.setBpm(bpm),
+      fadeInSec: options.fadeInSec,
+      fadeOutSec: options.fadeOutSec,
+      onScheduleFade: scheduleFade,
       onTrackCompressionChange: (trackId, amount) => getChannelStrip(trackId).setCompression(amount),
       onTrackWidthChange: (trackId, width) => getChannelStrip(trackId).setWidth(width),
       onTrackEqLowChange: (trackId, db) => getChannelStrip(trackId).setEqLow(db),
@@ -19177,5 +19437,6 @@ var createDtmStudio = async (options = {}) => {
   stripCustomVocals,
   stripLyrics,
   stripMmlMeta,
+  transposeNotes,
   vocalVolumeToGain
 });