@onjmin/dtm 2.1.11 → 2.1.12

package/dist/voice-worker.js

@@ -525,34 +525,36 @@
   };
 
   // src/pitch-curve.ts
-  var STEP_GLIDE_MS = 15;
-  var PORTAMENTO_MS = 70;
+  var STEP_GLIDE_RATIO = 0.35;
+  var PORTAMENTO_RATIO = 0.8;
+  var MAX_STEP_GLIDE_MS = 120;
+  var MAX_PORTAMENTO_MS = 400;
   var MIN_GLIDE_MS = 4;
+  var MAX_GLIDE_SPAN_RATIO = 0.9;
   var unitsToHz = (units) => 440 * 2 ** ((units - 2139) / 372);
   var smoothstep = (u) => u * u * (3 - 2 * u);
-  var toKeyframes = (segments) => {
-    const kf = [];
-    let prevAtMs = 0;
-    for (const seg of segments) {
-      const atMs = seg.atSec * 1e3;
-      const glideMs = Math.max(
-        MIN_GLIDE_MS,
-        Math.min(
-          seg.portamento ? PORTAMENTO_MS : STEP_GLIDE_MS,
-          (atMs - prevAtMs) * 0.5
-        )
-      );
-      kf.push({
-        hz: unitsToHz(seg.pitch),
-        startMs: Math.max(0, atMs - glideMs / 2),
-        glideMs
-      });
-      prevAtMs = atMs;
-    }
-    return kf;
+  var glideMsForSegments = (segments, totalMs) => segments.map((seg, i2) => {
+    const atMs = seg.atSec * 1e3;
+    const prevMs = i2 === 0 ? 0 : segments[i2 - 1].atSec * 1e3;
+    const nextMs = i2 + 1 < segments.length ? segments[i2 + 1].atSec * 1e3 : totalMs ?? atMs + (atMs - prevMs);
+    const span = Math.max(0, Math.min(atMs - prevMs, nextMs - atMs));
+    const ratio = seg.portamento ? PORTAMENTO_RATIO : STEP_GLIDE_RATIO;
+    const cap = seg.portamento ? MAX_PORTAMENTO_MS : MAX_STEP_GLIDE_MS;
+    return Math.min(
+      Math.max(MIN_GLIDE_MS, Math.min(span * ratio, cap)),
+      span * MAX_GLIDE_SPAN_RATIO
+    );
+  });
+  var toKeyframes = (segments, totalMs) => {
+    const glides = glideMsForSegments(segments, totalMs);
+    return segments.map((seg, i2) => ({
+      hz: unitsToHz(seg.pitch),
+      startMs: Math.max(0, seg.atSec * 1e3 - glides[i2] / 2),
+      glideMs: glides[i2]
+    }));
   };
-  var pitchCurveFor = (baseHz, segments, preMs, vibrato) => {
-    const kf = segments?.length ? toKeyframes(segments) : null;
+  var pitchCurveFor = (baseHz, segments, preMs, vibrato, totalMs) => {
+    const kf = segments?.length ? toKeyframes(segments, totalMs) : null;
     if (!kf && !vibrato) return baseHz;
     return (tMs) => {
       const sinceOnset = tMs - preMs;
@@ -627,7 +629,13 @@
     const targetHz = unitsToFreq(pitch);
     const audio = worldline.renderNote({
       pcm: spliced.pcm,
-      pitch: pitchCurveFor(targetHz, pitchSegments, spliced.preMs, !!vibrato),
+      pitch: pitchCurveFor(
+        targetHz,
+        pitchSegments,
+        spliced.preMs,
+        !!vibrato,
+        durationMs
+      ),
       durationMs,
       preMs: spliced.preMs,
       consonantMs: spliced.consonantMs,
@@ -661,7 +669,13 @@
     if (worldline) {
       const audio = worldline.renderNote({
         pcm,
-        pitch: pitchCurveFor(targetHz, pitchSegments, lead.preMs, !!vibrato),
+        pitch: pitchCurveFor(
+          targetHz,
+          pitchSegments,
+          lead.preMs,
+          !!vibrato,
+          durationMs
+        ),
         durationMs,
         ...lead,
         gender,

package/package.json

@@ -2,7 +2,7 @@
   "author": "onjmin",
   "license": "MIT",
   "name": "@onjmin/dtm",
-  "version": "2.1.11",
+  "version": "2.1.12",
   "description": "MMLを中間言語に用いた、モバイルファーストなDAW / ピアノロール打ち込みコンポーネント",
   "homepage": "https://onjmin.github.io/dtm",
   "repository": {
@@ -45,6 +45,7 @@
     "@biomejs/biome": "2.2.3",
     "@hono/node-server": "1.19.5",
     "@types/node": "26.1.1",
+    "@xmldom/xmldom": "0.9.12",
     "esbuild": "0.28.1",
     "hono": "4.10.1",
     "rimraf": "6.0.1",
@@ -62,7 +63,7 @@
     "dev": "rimraf dist && tsup && biome format src --write && tsx demo/server.ts",
     "build": "rimraf dist && tsup && biome format src --write",
     "check": "biome check src --write",
-    "test": "tsx scripts/check-compose.ts && tsx scripts/check-registers.ts && tsx scripts/check-tracks.ts",
+    "test": "tsx scripts/check-version.ts && tsx scripts/check-compose.ts && tsx scripts/check-registers.ts && tsx scripts/check-tracks.ts && tsx scripts/check-lyrics-fade.ts && tsx scripts/check-pitch-glide.ts && tsx scripts/check-ust.ts && tsx scripts/check-musicxml.ts && tsx scripts/check-backing-audio.ts",
     "patch": "pnpm version patch",
     "minor": "pnpm version minor",
     "major": "pnpm version major",