abc2svg
Diff
Not logged in

Differences From Artifact [af8341dc8f]:

To Artifact [196bec81ee]:


774
775
776
777
778
779
780
781

782
783
784

785
786
787
788
789
790
791
774
775
776
777
778
779
780

781
782
783

784
785
786
787
788
789
790
791







-
+


-
+







			ak = sk.k_map[(note.pit + 19) % 7]
			if (ak == an)
				an = 0		// accidental in the key
		}
		if (!an)
			an = 3
	} else if (sk.k_none) {			// if no key
		if (acc_same_pitch(s, note.pit)) // and accidental from previous notes
		if (acc_same_pitch(s, note.midi)) // and accidental from previous notes
			return			// no change
	} else if (sk.k_a_acc) {		// if accidental list
		if (acc_same_pitch(s, note.pit)) // and accidental from previous notes
		if (acc_same_pitch(s, note.midi)) // and accidental from previous notes
			return			// no change
		ak = sk.k_map[(note.pit + 19) % 7]
		if (ak)
			an = 3		// natural
	} else {
		return			// same accidental (in the key)
	}
1467
1468
1469
1470
1471
1472
1473
1474

1475
1476

1477
1478
1479
1480
1481
1482
1483
1484

1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498

1499
1500
1501

1502
1503
1504
1505
1506
1507

1508
1509

1510
1511
1512
1513
1514
1515
1516
1517
1467
1468
1469
1470
1471
1472
1473

1474
1475

1476
1477
1478
1479
1480
1481
1482
1483

1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497

1498



1499

1500
1501
1502
1503

1504


1505

1506
1507
1508
1509
1510
1511
1512







-
+

-
+







-
+













-
+
-
-
-
+
-




-
+
-
-
+
-







   var sf = abc2svg.b40sf[n_b40]
	sk.k_sf = sf
	sk.k_map = abc2svg.keys[sf + 7]	// map of the notes with accidentals
}

/*
 * for transpose purpose, check if a pitch is already in the measure or
 * if it is tied from a previous note, and return the associated accidental
 * if it is tied from a previous note
 */
function acc_same_pitch(s, pit) {
function acc_same_pitch(s, midi) {
    var	i, a,
	time = s.time

	for (s = s.prev; s; s = s.prev) {
		switch (s.type) {
		case C.BAR:
			if (s.time < time)
				return //undefined // no same pitch
				return //undefined // not the same pitch
			while (1) {
				s = s.prev
				if (!s)
					return //undefined
				if (s.type == C.NOTE) {
					if (s.time + s.dur == time)
						break
					return //undefined
				}
				if (s.time < time)
					return //undefined
			}
			for (i = 0; i <= s.nhd; i++) {
				if (s.notes[i].pit == pit
				if (s.notes[i].midi == midi)
				 && s.notes[i].tie_ty) {
					a = s.notes[i].acc
					return a == undefined || a == 3
					return 1 //true
				}
			}
			return //undefined
		case C.NOTE:
			for (i = 0; i <= s.nhd; i++) {
				if (s.notes[i].pit == pit) {
				if (s.notes[i].midi == midi)
					a = s.notes[i].acc
					return a == undefined || a == 3
					return 1 //true
				}
			}
			break
		}
	}
	return //undefined
}