Repository navigation
Commit 178039a
committed
fix(lang): a bar a chord is pushed into has its own text; a pushed chord reads at its written place
As it reads a chord pushed onto the next bar's downbeat ('6m), the parser
opens that bar and takes it back, so the tokens read meanwhile were
marked as starting in a bar they ended before: the bar after a push
shared its line's text with the next, and 49 bars (all of Know Me's
4 '6m // 5 // runs) were read-only. A token is now the bar it ended in.
A bar's chord line reads each pushed chord where it is written (its
sounding start plus its push), so one pushed onto the downbeat is the
bar's first chord rather than out of order at its end; this replaces
the slot shifting #117 did after the fact.
Dev vault: read-only 94 -> 41 bars (pushed over a barline 49 -> 0);
notes written back 2,182 -> 2,442, chords 2,281 -> 2,314; note refusals
316 -> 105. Know Me: 154 of 154 bars take a note (was 22).1 parent cdb4181 commit 178039a
4 files changed
Lines changed: 69 additions & 49 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
38 | 51 | | |
39 | 52 | | |
40 | 53 | | |
| |||
87 | 100 | | |
88 | 101 | | |
89 | 102 | | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
90 | 107 | | |
91 | 108 | | |
92 | 109 | | |
93 | | - | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
94 | 114 | | |
95 | 115 | | |
96 | 116 | | |
| |||
124 | 144 | | |
125 | 145 | | |
126 | 146 | | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | 147 | | |
150 | 148 | | |
151 | 149 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1122 | 1122 | | |
1123 | 1123 | | |
1124 | 1124 | | |
1125 | | - | |
1126 | | - | |
1127 | | - | |
1128 | | - | |
1129 | | - | |
1130 | | - | |
| 1125 | + | |
| 1126 | + | |
| 1127 | + | |
| 1128 | + | |
| 1129 | + | |
1131 | 1130 | | |
1132 | 1131 | | |
1133 | 1132 | | |
1134 | | - | |
1135 | | - | |
1136 | | - | |
1137 | | - | |
1138 | | - | |
1139 | | - | |
1140 | | - | |
1141 | | - | |
1142 | | - | |
1143 | | - | |
1144 | | - | |
1145 | | - | |
1146 | | - | |
1147 | | - | |
1148 | | - | |
1149 | 1133 | | |
1150 | | - | |
1151 | | - | |
| 1134 | + | |
| 1135 | + | |
| 1136 | + | |
1152 | 1137 | | |
| 1138 | + | |
| 1139 | + | |
| 1140 | + | |
| 1141 | + | |
| 1142 | + | |
| 1143 | + | |
| 1144 | + | |
| 1145 | + | |
| 1146 | + | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
| 1151 | + | |
| 1152 | + | |
| 1153 | + | |
| 1154 | + | |
| 1155 | + | |
| 1156 | + | |
| 1157 | + | |
| 1158 | + | |
| 1159 | + | |
| 1160 | + | |
| 1161 | + | |
| 1162 | + | |
1153 | 1163 | | |
1154 | 1164 | | |
1155 | 1165 | | |
| |||
1346 | 1356 | | |
1347 | 1357 | | |
1348 | 1358 | | |
1349 | | - | |
| 1359 | + | |
1350 | 1360 | | |
1351 | 1361 | | |
1352 | 1362 | | |
| |||
1506 | 1516 | | |
1507 | 1517 | | |
1508 | 1518 | | |
1509 | | - | |
| 1519 | + | |
1510 | 1520 | | |
1511 | 1521 | | |
1512 | 1522 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1260 | 1260 | | |
1261 | 1261 | | |
1262 | 1262 | | |
1263 | | - | |
| 1263 | + | |
1264 | 1264 | | |
1265 | 1265 | | |
1266 | 1266 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
986 | 986 | | |
987 | 987 | | |
988 | 988 | | |
| 989 | + | |
| 990 | + | |
| 991 | + | |
| 992 | + | |
| 993 | + | |
| 994 | + | |
| 995 | + | |
| 996 | + | |
| 997 | + | |
| 998 | + | |
| 999 | + | |
| 1000 | + | |
989 | 1001 | | |
990 | 1002 | | |
991 | 1003 | | |
| |||
0 commit comments