Browse Source

Merge branch 'feature-tianyong' into gym-online

TIANYONG 2 months ago
parent
commit
d2960226c1
3 changed files with 3 additions and 2 deletions
  1. 1 1
      osmd-extended
  2. 1 0
      src/helpers/calcSpeed.ts
  3. 1 1
      src/helpers/formateMusic.ts

+ 1 - 1
osmd-extended

@@ -1 +1 @@
-Subproject commit 8646ea65db6520df8fe8d5d180d5c9dcf634e2b2
+Subproject commit 43dc4f3b6489924056a28b1c1c5a40771d150378

+ 1 - 0
src/helpers/calcSpeed.ts

@@ -42,6 +42,7 @@ export const speedInfo: { [key in string]: number } = {
 	slowly: 1.333333333,
 	faster: 1.333333333,
 	"molto allargando": 1.333333333,
+	stringendo: 0.8,
 };
 
 /**

+ 1 - 1
src/helpers/formateMusic.ts

@@ -860,7 +860,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 
 	let preNoteEndTime = 0; // 上一个音符的结束时间
 
-	let preNoteMeasureNumber = 0; // 上一个小节的number值
+	let preNoteMeasureNumber: any = null; // 上一个小节的number值
 
 	let currentRealTempo: any = {}; // 当前小节的速度与拍号信息