Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Difference From 7190e10838e534a3 To 433944c7887548a5
|
2019-02-06
| ||
| 14:25 | batch: add 'abctopdf' ... (check-in: 2c9cf4bafe user: jef tags: trunk) | |
|
2019-02-01
| ||
| 15:55 | New release v1.19.1 ... (check-in: 433944c788 user: jef tags: trunk, v1.19.1) | |
| 14:01 | copyright update to 2019 ... (check-in: 83a7d2efe0 user: jef tags: trunk) | |
|
2018-06-21
| ||
| 08:33 | back to trunk ... (check-in: 68ef6ecf8e user: jef tags: trunk) | |
|
2018-05-28
| ||
| 07:26 | core: fix: accept 'exp' with bagpipe keys ... (check-in: 1909caa58f user: moinejf@free.fr tags: master) | |
|
2018-05-27
| ||
| 13:12 | New release v1.17.4 ... (check-in: 7190e10838 user: moinejf@free.fr tags: trunk, v1.17.4) | |
| 13:10 | core: remove useless double quotes ... (check-in: d41e047436 user: moinejf@free.fr tags: trunk) | |
Deleted .gitignore.
| - - - - - - - - - - |
|
Changes to README.md.
| ︙ | |||
16 17 18 19 20 21 22 | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | - + - + - + + + + + + + + + + + + + - + - + - + - + - + + + - + - - + - - - - - - + + + - - - + - - + - - + - - + | **abc2svg** may be used in any web browser. The needed files are available in my site [http://moinejf.free.fr/js/](http://moinejf.free.fr/js). They are updated on release change. These files are: |
| ︙ | |||
125 126 127 128 129 130 131 | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | - - - + + + + + + - + - - |
```
abc2odt my_file.abc -o my_file.odt
```
### Build
If you want to build the **abc2svg** scripts in your machine,
|
| ︙ | |||
161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 | + + + + - - + + - - - + - - + - - - + - - + - - - + - |
file `font/abc2svg.sfd`. In this case, you will need both `base64` and `fontforge`,
and run
```
samu -v font.js
```
If you cannot or don't want to install `ninja` or `samurai`, you may build
the abc2svg files by `./build` which is a shell script.
### Batch
After building the **abc2svg** scripts, you will be able to generate music
sheets from the command line as you did with `abcm2ps`, thanks to the
following shell scripts (the result goes to stdout):
- `abcjs24` with `js24` (Mozilla JavaScript shell - Spidermonkey)
- `abcjs52` with `js52` (Mozilla JavaScript shell - Spidermonkey)
- `abcjsc` with `jsc-1` (webkitgtk2)
- `abcnode` with `node` (nodeJS)
- `abcv8` with `d8` (Google libv8)
#### backend scripts
By default, the batch scripts generate (XHTML+SVG) files.
This output may be modified by backend scripts. These ones must appear
just after the command.
There are:
- `toabc.js`
This script outputs back the (selected) ABC tunes of the ABC source file.
Transposition is applied.
|
Added abc2svg.ttf.
cannot compute difference between binary files
Added abcjs52.
|
Changes to abcjsc.
1 | 1 2 3 4 5 6 7 8 9 10 11 12 | - + - + | #!/bin/sh |
| ︙ | |||
49 50 51 52 53 54 55 | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | - - - - + + + + + + |
load(progdir + 'cmdline.js')
function main(args) {
if (/\.js$/.test(args[0])) {
load(args[0])
args.shift()
}
|
Changes to abcnode.
1 2 3 4 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | - + - + | #!/bin/sh # abc2svg with raw nodeJS progdir=`dirname $0` |
| ︙ | |||
45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | + + + + |
abc2svg.printErr('Cannot read file ' + fn)
}
}
// (this file is wrapped)
global.Abc = Abc
global.abc2svg = abc2svg
EOF
cat ${progdir}/cmdline.js >> /tmp/toto.js
cat <<EOF >> /tmp/toto.js
// main
var args = process.argv
if (!args[2]) {
abc2svg.print('ABC translator with nodeJS\
and abc2svg-' + abc2svg.version + ' ' + abc2svg.vdate + '\n\
Usage:\n\
abcnode [script.js] [g_options] ABC_file [f_options] [ABC_file [f_options]]*\n\
|
| ︙ |
Added build.
|
Changes to build.ninja.
1 2 3 4 5 6 7 8 9 10 11 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | + + + - + - + + + - - - - - - + + + + + + + + + - - - + - + - + + - - - - - - - - - + - - + - + - + - + - - - + + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + + + + - + - - - - + + + - - + + - - - + + + - + - - - - - + + + + | # rules for ninja (ninja-build) # 'uglifyjs' may be disabled running # NOMIN=1 ninja -v MAJOR=1 # ninja tool tool=samu rule cp command = cp $in $out rule cpm |
Changes to cmdline.js.
| ︙ | |||
69 70 71 72 73 74 75 76 77 78 79 80 81 82 | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | + + + + - - |
abc2svg.abort(e)
}
} // do_file()
function abc_cmd(cmd, args) {
var arg, parm, fn;
// initialize the backend
abc2svg.abc_init(args)
// load 'default.abc'
try {
arg = user.read_file('default.abc');
abc2svg.modules.load(arg)
abc.tosvg(cmd, arg)
} catch (e) {
}
|
| ︙ |
Changes to core/abc2svg.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + | // abc2svg - abc2svg.js // |
| ︙ |
Changes to core/deco.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | - + - + - | // abc2svg - deco.js - decorations // |
| ︙ | |||
51 52 53 54 55 56 57 | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | - - + + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + | "1": "3 fng 8 3 3 1", "2": "3 fng 8 3 3 2", "3": "3 fng 8 3 3 3", "4": "3 fng 8 3 3 4", "5": "3 fng 8 3 3 5", plus: "3 dplus 7 3 3", "+": "3 dplus 7 3 3", |
| ︙ | |||
194 195 196 197 198 199 200 | 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 | - + - + - + - + - + - - + + - + |
}
}
}
/* -- get the staff position of the dynamic and volume marks -- */
function up_p(s, pos) {
switch (pos) {
|
| ︙ | |||
348 349 350 351 352 353 354 | 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 | - + - + + + + + + + + + | } if (up) s.ymx = y + dd.h else s.ymn = y; de.y = y // de.x = s.x + s.notes[s.stem >= 0 ? 0 : s.nhd].shhd |
| ︙ | |||
408 409 410 411 412 413 414 | 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 | - + - - + + - + - + + - - + + - + |
for (m = 0; m <= s.nhd; m++) {
if (s.notes[m].acc) {
dx = 4 + s.notes[m].shac
} else {
dx = 5 - s.notes[m].shhd
switch (s.head) {
|
| ︙ | |||
519 520 521 522 523 524 525 | 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 | - + - + - + - + - + - + - + - + |
if (s.nhd)
x += s.notes[s.stem >= 0 ? 0 : s.nhd].shhd;
up = -1
if (dd.func == 4) { // below
up = 0
} else if (s.pos) {
switch (s.pos.orn) {
|
| ︙ | |||
646 647 648 649 650 651 652 653 654 655 656 657 658 659 | 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 | + + + + + |
return //undefined
}
if ((c_func < 0 || c_func > 10)
&& (c_func < 32 || c_func > 41)) {
error(1, null, "%%deco: bad C function index '$1'", c_func)
return //undefined
}
if (c_func == 5) // old !trill(!
c_func = 3
if (c_func == 7) // old !cresc(!
c_func = 6
if (h < 0 || wl < 0 || wr < 0) {
error(1, null, "%%deco: cannot have a negative value '$1'", text)
return //undefined
}
if (h > 50 || wl > 80 || wr > 80) {
error(1, null, "%%deco: abnormal h/wl/wr value '$1'", text)
return //undefined
|
| ︙ | |||
685 686 687 688 689 690 691 692 693 694 695 696 697 698 | 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 | + |
if (dd.func == 6 && dd.str == undefined)
dd.str = dd.name
// link the start and end of long decorations
c = dd.name.slice(-1)
if (c == '(' ||
(c == ')' && dd.name.indexOf('(') < 0)) {
dd.str = null; // (no string)
name2 = dd.name.slice(0, -1) + (c == '(' ? ')' : '(');
dd2 = dd_tb[name2]
if (dd2) {
if (c == '(') {
dd.dd_en = dd2;
dd2.dd_st = dd
} else {
|
| ︙ | |||
721 722 723 724 725 726 727 | 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 | - + - + - + |
if (!dd)
continue
}
/* special decorations */
switch (dd.func) {
case 0: // near
|
| ︙ | |||
775 776 777 778 779 780 781 | 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 | - + - + - - + + - - - - - - - - - - - - - - + - - + - + - - - - - + | s.color = dd.name } continue case 32: /* invisible */ s.invis = true continue case 33: /* beamon */ |
| ︙ | |||
901 902 903 904 905 906 907 | 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 | + + + + + + + + + - - - + + + + + |
if (wl < 7)
wl = 7
break
case 2: /* arpeggio */
if (wl < 14)
wl = 14
break
case 3:
switch (dd.glyph) {
case "brth":
case "lphr":
case "mphr":
case "sphr":
if (s.wr < 20)
s.wr = 20
break
|
| ︙ | |||
1009 1010 1011 1012 1013 1014 1015 | 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 | - + |
uf = user[f]
if (uf && typeof(uf) == "function") {
uf(x, y, de)
continue
}
// check if user PS definition
|
| ︙ | |||
1060 1061 1062 1063 1064 1065 1066 | 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 | - - | a_de = new_de } /* -- create the decorations and define the ones near the notes -- */ /* (the staves are not yet defined) */ /* (delayed output) */ /* this function must be called first as it builds the deco element table */ |
| ︙ | |||
1096 1097 1098 1099 1100 1101 1102 | 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 | - - - - - - - - - - - - - - - - - - - + |
/* check if hidden */
switch (dd.func) {
default:
pos = 0
break
case 3: /* d_upstaff */
case 4:
|
| ︙ | |||
1313 1314 1315 1316 1317 1318 1319 | 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 | - - - + + + - - - - - + + + + + - + |
de2.start = de
}
} // ll_deco
// update the long decorations started in the previous line
for (s = tsfirst ; s; s = s.ts_next) {
switch (s.type) {
|
| ︙ | |||
1378 1379 1380 1381 1382 1383 1384 | 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 | - + |
/* draw the repeat brackets */
function draw_repbra(p_voice) {
var s, s1, y, y2, i, p, w, wh, first_repeat;
/* search the max y offset */
y = staff_tb[p_voice.st].topbar + 25 // 20 (vert bar) + 5 (room)
for (s = p_voice.sym; s; s = s.next) {
|
| ︙ | |||
1435 1436 1437 1438 1439 1440 1441 | 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 | - + | break } if (s1 == s) break x = s1.x // if (s1.bar_type[0] == ":") // x -= 4; |
| ︙ | |||
1462 1463 1464 1465 1466 1467 1468 | 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 | - - + + - + |
}
w = (s.x - x - w) // / staff_tb[p_voice.st].staffscale;
if (!s.next // 2nd ending at end of line
&& !s.rbstop
&& !p_voice.bar_start) { // continue on next line
p_voice.bar_start = clone(s);
|
| ︙ | |||
1580 1581 1582 1583 1584 1585 1586 | 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 | - + - + - + + - - - - + - + - - - - - - - - + + + - + - + - - + + - - - + - + - + - + + - + - - - - - + + + - + - - - + + + | bot = staff_tb[i].botbar; if (minmax[i].ymin > bot - 4) minmax[i].ymin = bot - 4 top = staff_tb[i].topbar; if (minmax[i].ymax < top + 4) minmax[i].ymax = top + 4 } |
| ︙ | |||
1753 1754 1755 1756 1757 1758 1759 | 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 | - + - + - + - + - - + + - + - + - - + - - + - - - + + - - - + + - + + + + + - - + + - - - - + - - - + - - - - - + + - - - - + - - - - + + + + + + + + + + + + + + + + - + - + + + - + - + - + - + - + + + - + - - - - + |
// // protection against end of container
// if (stv_g.started) {
// output += "</g>\n";
// stv_g.started = false
// }
out_XYAB('<g transform="translate(X,Y) scale(F)">\n',
|
Changes to core/draw.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | // abc2svg - draw.js - draw functions // |
| ︙ | |||
89 90 91 92 93 94 95 96 | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | + - + |
var min_tb = [
[STEM_MIN, STEM_MIN,
STEM_MIN2, STEM_MIN3, STEM_MIN4, STEM_MIN4],
[STEM_CH_MIN, STEM_CH_MIN,
STEM_CH_MIN2, STEM_CH_MIN3, STEM_CH_MIN4, STEM_CH_MIN4]
]
// (possible hook)
function calculate_beam(bm, s1) {
|
| ︙ | |||
118 119 120 121 122 123 124 | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | - + - + |
/* search last note in beam */
notes = nflags = 0; /* set x positions, count notes and flags */
two_staves = two_dir = false;
st = s1.st;
v = s1.v;
stem_xoff = s1.grace ? GSTEM_XOFF : 3.5
for (s2 = s1; ;s2 = s2.next) {
|
| ︙ | |||
175 176 177 178 179 180 181 | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 | - + - + |
if (staff_tb[st].y == 0) { /* staves not defined */
if (two_staves)
return false
} else { /* staves defined */
// if (!two_staves && !s1.grace) {
if (!two_staves) {
bm.s1 = s1; /* beam already calculated */
|
| ︙ | |||
229 230 231 232 233 234 235 | 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 | + - + - + - - + - + - + |
if (a != 0) {
if (a > 0)
a = BEAM_SLOPE * a / (BEAM_SLOPE + a) // max steepness for beam
else
a = BEAM_SLOPE * a / (BEAM_SLOPE - a);
}
// pivot around the middle of the beam
|
| ︙ | |||
336 337 338 339 340 341 342 | 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 | - - + - + - + - + - + |
if (max_stem_err > 0) /* shift beam if stems too short */
b += s1.stem * max_stem_err
/* have room for the gracenotes, bars and clefs */
/*fixme: test*/
if (!two_staves && !two_dir)
for (s = s1.next; ; s = s.next) {
|
| ︙ | |||
395 396 397 398 399 400 401 | 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 | - + - + - + - + |
if (a == 0) /* shift flat beams onto staff lines */
b += b_pos(s1.grace, s1.stem, nflags, b - staff_tb[st].y)
/* adjust final stems and rests under beam */
for (s = s1; ; s = s.next) {
switch (s.type) {
|
| ︙ | |||
467 468 469 470 471 472 473 | 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 | - + - + - - - + + + |
var y1, dy2,
s = bm.s1,
nflags = s.nflags
if (s.ntrem)
nflags -= s.ntrem
if (s.trem2 && n > nflags) {
|
| ︙ | |||
515 516 517 518 519 520 521 | 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 | - + |
if (beam_dir < 0)
bh = -bh;
/* make first beam over whole word and adjust the stem lengths */
draw_beam(s1.xs - shift, s2.xs + shift, 0, bh, bm, 1);
da = 0
for (s = s1; ; s = s.next) {
|
| ︙ | |||
543 544 545 546 547 548 549 | 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 | - + - + - + - + - + - + |
/* other beams with two or more flags */
shift = 0
for (i = 2; i <= bm.nflags; i++) {
shift += bshift
if (da != 0)
bm.a += da
for (s = s1; ; s = s.next) {
|
| ︙ | |||
678 679 680 681 682 683 684 | 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 | - + - + - - + - - + - - - - - + - + - - - - - - - - - - - - - - - - - + - + - - + - - - | break } if (i == j && l == 0) return yb = staff_tb[j].y + staff_tb[j].botbar * staff_tb[j].staffscale; h = staff_tb[i].y + staff_tb[i].topbar * staff_tb[i].staffscale - yb; xypath(x, yb); |
| ︙ | |||
810 811 812 813 814 815 816 | 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 | - + - + | var sharp_cl = new Int8Array([24, 9, 15, 21, 6, 12, 18]), flat_cl = new Int8Array([12, 18, 24, 9, 15, 21, 6]), sharp1 = new Int8Array([-9, 12, -9, -9, 12, -9]), sharp2 = new Int8Array([12, -9, 12, -9, 12, -9]), flat1 = new Int8Array([9, -12, 9, -12, 9, -12]), flat2 = new Int8Array([-12, 9, -12, 9, -12, 9]) |
| ︙ | |||
938 939 940 941 942 943 944 | 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - | return "[" + bar_type /* |::: -> [|::: */ case ":|": case "::|": case ":::|": return bar_type + "]" /* :..| -> :..|] */ case "::": return cfmt.dblrepbar /* :: -> double repeat bar */ |
| ︙ | |||
1052 1053 1054 1055 1056 1057 1058 | 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 | - + + - + + + - + - + + + + + - + + + - + - + - + + - - - - - + + + + + + - + | x = s.x if (s.notes[0].shhd) x += s.notes[0].shhd * stv_g.scale } if (s.invis) return |
| ︙ | |||
1175 1176 1177 1178 1179 1180 1181 | 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 | - + | /* slur */ //fixme: have a full key symbol in voice if (s.p_v.key.k_bagpipe /* no slur when bagpipe */ || !cfmt.graceslurs || s.slur_start /* explicit slur */ || !s.next |
| ︙ | |||
1263 1264 1265 1266 1267 1268 1269 | 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 | - - - + + + | x1 = bet1 * x3 + (1 - bet1) * x0 - x0; y1 = bet1 * y3 + (1 - bet1) * y0 - dy1 - y0; x2 = bet2 * x3 + (1 - bet2) * x0 - x0; y2 = bet2 * y3 + (1 - bet2) * y0 - dy2 - y0; anno_start(s, 'slur'); xypath(x0, y0 + staff_tb[s.st].y); |
| ︙ | |||
1307 1308 1309 1310 1311 1312 1313 | 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 | - + - + |
}
}
}
// get the x and y position of a note head
// (when the staves are defined)
function x_head(s, note) {
|
| ︙ | |||
1372 1373 1374 1375 1376 1377 1378 | 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 | - + - + - - + + - - + + + + + + + - + - + - + + + + + - + + + |
i = p.indexOf('/')
if (i >= 0) { // stem dependant
if (s.stem >= 0)
p = p.slice(0, i)
else
p = p.slice(i + 1)
}
|
| ︙ | |||
1447 1448 1449 1450 1451 1452 1453 | 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 | - + - + - - - - - - + + + + + - - + + + - + |
}
/* -- draw a note or a chord -- */
/* (the staves are defined) */
function draw_note(s,
fl) { // draw flags
var s2, i, m, y, staffb, slen, c, hltype, nflags,
|
| ︙ | |||
1510 1511 1512 1513 1514 1515 1516 | 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 | - + |
}
/* draw the tremolo bars */
if (fl && s.trem1) {
var ntrem = s.ntrem || 0,
x1 = x;
slen = 3 * (s.notes[s.stem > 0 ? s.nhd : 0].pit - 18)
|
| ︙ | |||
1554 1555 1556 1557 1558 1559 1560 | 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 | - + - + - + - + | s = s.prev if (s.rbstart) return s } /* return a symbol of any voice starting before the start of the voice */ s = s.p_v.sym |
| ︙ | |||
1646 1647 1648 1649 1650 1651 1652 | 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 | - - - - - - + + + + + + - - - - - - - + + + + + + + | var scale_y = stv_g.v ? stv_g.scale : 1 if (!dotted) output += '<path class="fill" d="M' else output += '<path class="stroke" stroke-dasharray="5,5" d="M'; out_sxsy(x1, ' ', y1); output += 'c' + |
| ︙ | |||
1691 1692 1693 1694 1695 1696 1697 | 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 | - - + + + - + |
k, g, x1, y1, x2, y2, height, addy,
a, y, z, h, dx, dy, dir
while (k1.v != k2.v)
k1 = k1.ts_next
/*fixme: if two staves, may have upper or lower slur*/
switch (slur_type & 0x07) { /* (ignore dotted flag) */
|
| ︙ | |||
1734 1735 1736 1737 1738 1739 1740 | 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 | - + - + |
if (k1_o != k2) {
x2 = k2.x
if (k2.notes)
x2 += k2.notes[0].shhd
} else { /* (the slur starts on last note of the line) */
for (k = k2.ts_next; k; k = k.ts_next)
//fixme: must check if the staff continues
|
| ︙ | |||
1793 1794 1795 1796 1797 1798 1799 | 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 | - + |
}
}
}
if (m2 >= 0) {
y2 = 3 * (k2.notes[m2].pit - 18) + 5 * dir
} else {
y2 = dir > 0 ? k2.ymx + 2 : k2.ymn - 2
|
| ︙ | |||
1824 1825 1826 1827 1828 1829 1830 | 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 | - + - - + + - + - + |
// } else {
// y2 = k2.y - 8
}
}
}
}
|
| ︙ | |||
1911 1912 1913 1914 1915 1916 1917 | 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 | - - + + - + |
if (k1 != k2
&& k1.v == k2.v) {
addy = y1 - a * x1
for (k = k1.next; k != k2 ; k = k.next) {
if (k.st != upstaff)
continue
switch (k.type) {
|
| ︙ | |||
1984 1985 1986 1987 1988 1989 1990 | 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 | - + |
} else {
if (height > -.8 * y)
height = -.8 * y
}
height *= cfmt.slurheight;
// anno_start(k1_o, 'slur');
|
| ︙ | |||
2013 2014 2015 2016 2017 2018 2019 | 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 | - + - + - - + + - + - + - - + + - + | dx = k.next.x } if (k != k1) x1 = k.x; dx -= x1; y_set(upstaff, dir > 0, x1, dx, y) } |
| ︙ | |||
2115 2116 2117 2118 2119 2120 2121 | 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 | - + - + - + - + |
/* if slur in grace note sequence, change the linkages */
if (gr1) {
for (s1 = s; s1.next; s1 = s1.next)
;
s1.next = gr1.next
if (gr1.next)
gr1.next.prev = s1;
|
| ︙ | |||
2195 2196 2197 2198 2199 2200 2201 2202 | 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 | + - - + + |
lvl) { // nesting level
var s2, s3, g, upstaff, nb_only, some_slur,
x1, x2, y1, y2, xm, ym, a, s0, yy, yx, dy, a, b, dir,
p, q, r
// check if some slurs and treat the nested tuplets
upstaff = s1.st
set_dscale(s1.st)
for (s2 = s1; s2; s2 = s2.next) {
|
| ︙ | |||
2258 2259 2260 2261 2262 2263 2264 | 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 | - + - + - + - - - - + + + + - - + + - - + + | s1.tp1 = 0 q = s1.tq1 } if (s1.tf[0] == 1) /* if 'when' == never */ return |
| ︙ | |||
2330 2331 2332 2333 2334 2335 2336 | 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 | - + | xm = (s2.x + s1.x) / 2 if (s1 == s2) /* tuplet with 1 note */ a = 0 else a = (s2.ys - s1.ys) / (s2.x - s1.x); b = s1.ys - a * s1.x; yy = a * xm + b |
| ︙ | |||
2356 2357 2358 2359 2360 2361 2362 | 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 | - + - - + + | xm -= 1.5 } ym = a * xm + b if (s1.tf[2] == 0) /* if 'which' == number */ out_bnum(xm, ym, p) else out_bnum(xm, ym, p + ':' + q) |
| ︙ | |||
2567 2568 2569 2570 2571 2572 2573 | 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 | - + - + - + - + |
}
if (s3 == s2)
break
}
} /* lower voice */
if (s1.tf[2] == 1) { /* if 'which' == none */
|
| ︙ | |||
2639 2640 2641 2642 2643 2644 2645 | 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 | - + |
p = p2;
st = k2.st
break
/* case 2: * no ending note */
default:
if (k1 != k2) {
x2 -= k2.wl
|
| ︙ | |||
2662 2663 2664 2665 2666 2667 2668 | 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 | - - - - - - - - - - + - + |
x2 -= 3.5
} else {
x1 += 1.5;
x2 -= 1.5
}
y = 3 * (p - 18)
|
| ︙ | |||
2709 2710 2711 2712 2713 2714 2715 | 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 | - + - + + |
}
/* set up list of ties to draw */
for (i = 0; i <= nh1; i++) {
if (!k1.notes[i].ti1)
continue
tie2 = -1;
|
| ︙ | |||
2743 2744 2745 2746 2747 2748 2749 | 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 | - + - + + - + |
if (!mhead3.length)
return /* no bad tie */
k3 = k1.ts_next
while (k3 && k3.time < time)
k3 = k3.ts_next
while (k3 && k3.time == time) {
|
| ︙ | |||
2786 2787 2788 2789 2790 2791 2792 | 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 | - + - + - - - + + + - + - + |
time = s.time + s.dur;
st = s.st
for (s1 = s.ts_next; s1; s1 = s1.ts_next) {
if (s1.st != st)
continue
if (s1.time == time) {
|
| ︙ | |||
2855 2856 2857 2858 2859 2860 2861 | 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 | - + - + |
// clef_chg = false
while (1) {
for (s1 = s2; s1; s1 = s1.next) {
if (s1.ti1)
break
if (!s_rtie)
continue
|
| ︙ | |||
2887 2888 2889 2890 2891 2892 2893 | 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 | - + |
/* search the end of the tie
* and notice the clef changes (may occur in an other voice) */
time = s1.time + s1.dur
for (s2 = s1.next; s2; s2 = s2.next) {
if (s2.dur)
break
|
| ︙ | |||
2912 2913 2914 2915 2916 2917 2918 | 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 | - - + + - + |
}
if (!s2) {
draw_ties_g(s1, null, 2);
p_voice.s_tie = s1
break
}
} else {
|
| ︙ | |||
2955 2956 2957 2958 2959 2960 2961 | 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 | - + | s1.x += dx if (s1.x < s2.x - 24.) s1.x = s2.x - 24.; draw_ties(s1, s2, 3); s1.x = x continue } |
| ︙ | |||
3000 3001 3002 3003 3004 3005 3006 | 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 | - + - + | break s.notes[m2].sl2--; s.sl2-- } slur_type = slur_st & 0x0f; k = prev_scut(s); draw_slur(k, s, -1, m2, slur_type) |
| ︙ | |||
3038 3039 3040 3041 3042 3043 3044 | 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 | - + - + - + - + - + | * - beams * - decorations near the notes * - measure bar numbers * - n-plets * - decorations tied to the notes * - slurs * - not scaled |
| ︙ | |||
3098 3099 3100 3101 3102 3103 3104 | 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 | - + - + - + + + + - + + + + - + |
draw_deco_near()
/* set the min/max vertical offsets */
for (s = tsfirst; s; s = s.ts_next) {
if (s.invis)
continue
switch (s.type) {
|
| ︙ | |||
3170 3171 3172 3173 3174 3175 3176 | 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 | - |
continue
set_color(s.color);
st = p_voice.st;
// if (st == undefined) {
//error(1, s, "BUG: no staff for voice " + p_voice.id)
// continue
// }
|
| ︙ | |||
3200 3201 3202 3203 3204 3205 3206 | 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 | - + + + - - - | if (top > p_st.top[i]) p_st.top[i] = top if (bot < p_st.bot[i]) p_st.bot[i] = bot } } |
| ︙ | |||
3410 3411 3412 3413 3414 3415 3416 | 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 | - + |
/* output the staff offsets */
for (st = 0; st <= nstaff; st++) {
p_staff = staff_tb[st];
dy = p_staff.y
if (p_staff.staffscale != 1) {
p_staff.scale_str =
'transform="translate(0,' +
|
| ︙ | |||
3437 3438 3439 3440 3441 3442 3443 | 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 | - + - + + + + + + |
// return the height of the whole staff system
return y + dy
}
/* -- draw the staff systems and the measure bars -- */
function draw_systems(indent) {
|
| ︙ | |||
3470 3471 3472 3473 3474 3475 3476 | 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 | - + |
} // bar_set()
/* -- draw a staff -- */
function draw_staff(st, x1, x2) {
var w, ws, i, dy, ty,
y = 0,
ln = "",
|
| ︙ | |||
3494 3495 3496 3497 3498 3499 3500 | 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 | - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - - - - + + + + + - + - - - + + + - + + + + + + - + - - + - - - - - - - - - - - - - + - - - - + - + - + - + |
dy = 0
for (; i < l; i++, y -= 6, dy -= 6) {
switch (stafflines[i]) {
case '.':
case '-':
continue
case ty:
|
| ︙ | |||
3656 3657 3658 3659 3660 3661 3662 | 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 | + + + - + + - + - + + - + - + - + + + + - + - + - - + - - + + - - + - + - + - + + - - - + - + + - + - + - + - + - + - - + + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + | if (bar_force && !cur_sy.st_print[st]) continue x = xstaff[st] if (x < 0 || x >= realwidth) continue draw_staff(st, x, realwidth) } // and the bars out_bars() |
| ︙ | |||
3945 3946 3947 3948 3949 3950 3951 | 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 | - + - + - + |
if (!s)
continue
set_tie_dir(s)
for ( ; s; s = s.next) {
if (!s.ti1)
continue
if (s.notes[0].pit < 20
|
| ︙ |
Changes to core/format.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 | - + - - + - - - - - + + + + - + + + + + - + + + + + + - + + + + + + + + + + - + - + + - - - - - - + + + + + + + + - - + + + - - - - - - + + + + + + + + + + - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + - - - - + + + - - - - + + + + + + - - - - - + + - - - - - - - - - - - - - - - - - - | // abc2svg - format.js - formatting functions // |
| ︙ | |||
262 263 264 265 266 267 268 | 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 | - - - - - - - - + + + + + + + + - + |
}
function get_textopt(param) {
return textopt[param]
}
/* -- position of a voice element -- */
var posval = {
|
| ︙ | |||
301 302 303 304 305 306 307 308 309 | 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 | + - + |
if (cfmt.writefields.indexOf(c) >= 0)
cfmt.writefields = cfmt.writefields.replace(c, '')
}
}
}
// set a voice specific parameter
// (possible hook)
function set_v_param(k, v) {
if (curvoice) {
|
| ︙ | |||
337 338 339 340 341 342 343 344 | 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 | + - + - - - - - - - - - - - - - - - - - - |
error(0, undefined, "Bad staff width");
img.width = img.lm + img.rm + 150
}
set_posx()
} // set_page()
// set a format parameter
// (possible hook)
function set_format(cmd, param, lock) {
|
| ︙ | |||
391 392 393 394 395 396 397 | 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 | - + |
break
case "microscale":
f = parseInt(param)
if (isNaN(f) || f < 4 || f > 256 || f % 1) {
syntax(1, errs.bad_val, "%%" + cmd)
break
}
|
| ︙ | |||
422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 | 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 | + + + + + + + - - - + |
case "pagescale":
cmd = "scale";
img.chg = true
break
}
cfmt[cmd] = f
break
case "annotationbox":
case "gchordbox":
case "measurebox":
case "partsbox":
cfmt[cmd.replace("box", "font")] // font
.box = get_bool(param)
break
case "bstemdown":
case "breakoneoln":
case "cancelkey":
case "contbarnb":
case "custos":
case "decoerr":
case "dynalign":
case "flatbeams":
|
| ︙ | |||
495 496 497 498 499 500 501 | 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 | + - + | syntax(1, errs.bad_val, '%%' + cmd) break } cfmt[cmd] = f; img.chg = true break case "concert-score": if (cfmt.sound != "play") |
| ︙ | |||
521 522 523 524 525 526 527 | 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 | - + + + + + + + + | syntax(1, "Cannot have %%fullsvg inside a tune") break } //fixme: should check only alpha, num and '_' characters cfmt[cmd] = param break case "gracespace": |
| ︙ | |||
560 561 562 563 564 565 566 | 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 | + - + | cfmt.sound = "play" // without clef break case "pos": cmd = param.split(/\s+/); set_pos(cmd[0], cmd[1]) break case "sounding-score": if (cfmt.sound != "play") |
| ︙ | |||
594 595 596 597 598 599 600 | 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 | - + - + - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - + + - - - - + + - - - + + - - - - - + + + + + - - - + + - - - + + + - - + - + - - - - - - - - - + + + + + + + + + + - - - + + - - - - + - - | else cfmt[cmd] = v break case "combinevoices": syntax(1, "%%combinevoices is deprecated - use %%voicecombine instead") break case "voicemap": |
Changes to core/front.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | // abc2svg - front.js - ABC parsing front-end // |
| ︙ | |||
175 176 177 178 179 180 181 | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 | + - + + + + + + + + + + + + | continue } break } dst += '\\' + c; j = i + 1 } // cleanup for XML treatment |
| ︙ | |||
209 210 211 212 213 214 215 | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 | - + |
}
// parse ABC code
function tosvg(in_fname, // file name
file, // file content
bol, eof) { // beginning/end of file
var i, c, bol, eol, end,
|
| ︙ | |||
241 242 243 244 245 246 247 248 | 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 | + + + - + |
else
eol = eof
return false
} // tune_selected()
// remove the comment at end of text
function uncomment(src, do_escape) {
var i
if (!src)
return src
if (src.indexOf('%') >= 0)
|
| ︙ | |||
358 359 360 361 362 363 364 | 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 | - - - + - - - + - + - + - + | } break } text = file.slice(bol, eol) if (!text || text[0] == '%') continue a = text.split(/\s+/, 2) |
| ︙ | |||
473 474 475 476 477 478 479 | 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 | - + - + | break } break } parse.eol = bol - 1 continue } |
| ︙ | |||
610 611 612 613 614 615 616 | 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 | - + | case '|': // "|:" starts a music line if (parse.state < 2) continue parse.line.buffer = uncomment(file.slice(bol, eol), true); parse_music_line() continue default: |
| ︙ |
Changes to core/gchord.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | // abc2svg - gchord.js - chord symbols // |
| ︙ | |||
57 58 59 60 61 62 63 | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | - + + + | c = line.next_char() } text += c } iend = parse.bol + line.index + 1 } |
| ︙ | |||
138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 | 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 | + - - + - - - - - + + - - + - - - - - + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - + + - - - - + - + - - - + + + - + - - + + - - - + - - - - - - - - + + - + - |
case undefined:
case '\\':
break
}
break
}
if (c == ';') {
i++;
gch.text += c
continue
}
break
case ';':
break
}
i++
break
}
if (!a_gch)
a_gch = []
a_gch.push(gch)
}
}
// transpose a chord symbol
var note_names = "CDEFGAB",
|
| ︙ | |||
331 332 333 334 335 336 337 338 339 340 | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 | + + + + - + + + - + - + + + |
case '##': return "𝄪"
case '#': return "\u266f"
case '=': return "\u266e"
case 'b': return "\u266d"
}
return "𝄫"
});
if (gch.font.box)
gch.box = true
} else {
gch.text = cnv_escape(gch.text);
if (gch.font.box)
gch.box = true
if (gch.type == '@'
|
| ︙ | |||
372 373 374 375 376 377 378 | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 | - - - - - - - - - | break case '>': /* right */ gch.x = 6; y_right -= wh[1]; gch.y = y_right + wh[1] / 2 break default: // chord symbol |
| ︙ | |||
422 423 424 425 426 427 428 429 | 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 | + - + - - - + + - - + + - - - - + - + - - - - + + + + - - - + + - - + - + - + - - + + + - - + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + |
}
}
}
// -- draw the chord symbols and annotations
// (the staves are not yet defined)
// (unscaled delayed output)
// (possible hook)
function draw_gchord(s, gchy_min, gchy_max) {
|
Changes to core/license.
1 | 1 2 3 | - - + + | // abc2svg - ABC to SVG translator |
Changes to core/lyrics.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | // abc2svg - lyrics.js - lyrics // |
| ︙ | |||
52 53 54 55 56 57 58 | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | - + |
while (p[i] == ' ' || p[i] == '\t')
i++;
c = p[i]
if (!c)
break
switch (c) {
case '|':
|
| ︙ | |||
91 92 93 94 95 96 97 | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | - + - + - + | } } syntax(1, errs.bad_char, c) break } /* store the element in the next note */ |
| ︙ | |||
162 163 164 165 166 167 168 | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 | - + |
while (p[i] == ' ' || p[i] == '\t')
i++
if (!p[i])
break
j = parse.istart + i + 2 // start index
switch (p[i]) {
case '|':
|
| ︙ | |||
199 200 201 202 203 204 205 | 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 | - + - + - + - + | case '*': case '|': i-- case ' ': case '\t': break case '~': |
| ︙ | |||
267 268 269 270 271 272 273 | 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 | - + - + - + - + |
if (!ly)
continue
p = ly.t;
if (p == "-\n" || p == "_\n") {
ly.shift = 0
continue
}
|
| ︙ | |||
307 308 309 310 311 312 313 | 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 | - - - + + + - - - - + + + |
wlw = shift;
// if (p[p.length - 1] == "\n") // if "xx-"
// xx -= cwid(' ') * swfac
xx -= shift;
shift = 2 * cwid(' ') * swfac
for (k = s.next; k; k = k.next) {
switch (k.type) {
|
| ︙ | |||
356 357 358 359 360 361 362 | 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 | - - + + - - + + - + |
hyflag, lflag, x0, font, shift
if (p_voice.hy_st & (1 << j)) {
hyflag = true;
p_voice.hy_st &= ~(1 << j)
}
for (s = p_voice.sym; /*s*/; s = s.next)
|
| ︙ | |||
428 429 430 431 432 433 434 | 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 | - + - + | ymn: y, ymx: y + gene.curfont.size, wl: 0, wr: w } anno_start(s2, 'lyrics') } |
| ︙ | |||
530 531 532 533 534 535 536 | 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 | - + - + |
if (!a_ly)
continue
/*fixme:should get the real width*/
x = s.x;
w = 10
for (i = 0; i < a_ly.length; i++) {
ly = a_ly[i]
|
| ︙ | |||
569 570 571 572 573 574 575 | 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 | - + |
lyst_tb[st] = {}
lyst_tb[st].top = top;
lyst_tb[st].bot = bot;
nly_tb[v] = nly
if (nly == 0)
continue
if (p_voice.pos.voc)
|
| ︙ |
Changes to core/modules.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | // abc2svg - modules.js - module handling // |
| ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | + + + + - + - |
ambitus: { fn: 'ambitus-1.js' },
beginps: { fn: 'psvg-1.js' },
break: { fn: 'break-1.js' },
capo: { fn: 'capo-1.js' },
clip: { fn: 'clip-1.js' },
voicecombine: { fn: 'combine-1.js' },
diagram: { fn: 'diag-1.js' },
equalbars: { fn: 'equalbars-1.js' },
grid: { fn: 'grid-1.js' },
grid2: { fn: 'grid2-1.js' },
MIDI: { fn: 'MIDI-1.js' },
pageheight: { fn: 'page-1.js' },
percmap: { fn: 'perc-1.js' },
soloffs: { fn: 'soloffs-1.js' },
sth: { fn: 'sth-1.js' },
temperament: { fn: 'temper-1.js' },
|
| ︙ | |||
58 59 60 61 62 63 64 | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | - - + + + - - + + - - - - + + + - - - - - |
return function(m) { alert(m) }
if (typeof console == 'object')
return console.log
return function(){}
}
// test if some keyword in the file
|
| ︙ |
Changes to core/music.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | // abc2svg - music.js - music generation // |
| ︙ | |||
19 20 21 22 23 24 25 | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | - + | var gene, staff_tb, nstaff, // current number of staves tsnext, // next line when cut realwidth, // real staff width while generating insert_meter, // insert time signature (1) and indent 1st line (2) |
| ︙ | |||
114 115 116 117 118 119 120 | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | - + | if (dx_max < -dx) dx_max = -dx continue } } if (d < 0) d = -d |
| ︙ | |||
195 196 197 198 199 200 201 | 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 | - + - + - - + + |
/* this routine is called only once per tune */
function set_acc_shft() {
var s, s2, st, i, acc, st, t, dx_head;
// search the notes with accidentals at the same time
s = tsfirst
while (s) {
|
| ︙ | |||
269 270 271 272 273 274 275 | 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 | - + + + + + + - + + - + - + |
if (s.next)
s.next.prev = s.prev
if (s.prev)
s.prev.next = s.next
else
s.p_v.sym = s.next
if (s.ts_next) {
|
| ︙ | |||
361 362 363 364 365 366 367 | 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 | - + - + |
continue
}
up = 127
for (s1 = s.ts_prev; s1; s1 = s1.ts_prev) {
if (s1.st != st
|| s1.v == s.v)
break
|
| ︙ | |||
412 413 414 415 416 417 418 | 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 | - - - - + + + + - + + + + - - + + - + - + - - + + - - + - + - - + + + - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + - - + + - - - - + + + + - + - - - - + + + + + + - + - + - - + + - + - + - + - - + + - + - + - + - - + - - - - - - + - - - - - - + - + - + - - - + - + + - + - + - - |
s.st++
}
}
}
/* -- set the x offset of the grace notes -- */
function set_graceoffs(s) {
|
| ︙ | |||
788 789 790 791 792 793 794 | 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 | - + - + - - + + + + + + - + + + + + |
if (n1 < 0)
n1 = -n1;
esp += 3 /* see extra space in draw_keysig() */
}
} else {
n1 = n2 = s.k_a_acc.length
if (n2)
|
| ︙ | |||
837 838 839 840 841 842 843 | 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 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 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 | - + - + - + - + - + + + + + + + + + + + + + + + + - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + + - + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - + - - + - + - - - - - + + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + + + + - - - - - + + + + + + + + - + - - + + - - + + + + + + + - + - + - - - + + + - - + - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + - - + + + + + + + + - + | s.x_meter[i] = wlw + w / 2 wlw += w } } s.wl = 0; s.wr = wlw + 6 return |
| ︙ | |||
1096 1097 1098 1099 1100 1101 1102 | 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 | - + - + - + |
/* treat the sequence repeat */
if (n < 0) { /* number of notes / measures */
n = -n;
i = n /* number of notes to repeat */
for (s3 = s.prev; s3; s3 = s3.prev) {
if (!s3.dur) {
|
| ︙ | |||
1152 1153 1154 1155 1156 1157 1158 | 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 | - + - + - + - + | } s2 = s2.ts_next } to_rest(s); s.dur = s.notes[0].dur = dur; s.rep_nb = -1; // single repeat s.beam_st = true; |
| ︙ | |||
1218 1219 1220 1221 1222 1223 1224 | 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 | - + - + - + - + |
dur /= n
if (n == 2) { /* repeat 2 measures (once) */
s3 = s
for (s2 = s.ts_next; ; s2 = s2.ts_next) {
if (s2.st != st)
continue
if (s2.v == v
|
| ︙ | |||
1283 1284 1285 1286 1287 1288 1289 | 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 | - + - + - + - - + + - + - + |
/* add a custos before the symbol of the next line */
function custos_add(s) {
var p_voice, new_s, i,
s2 = s
while (1) {
|
| ︙ | |||
1352 1353 1354 1355 1356 1357 1358 1359 1360 | 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 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - + - + - - - - - - - - + - - + + - + - + - + - + - - - - - + - - - - - + - - - + + + |
if (s.seqst) {
set_eol(s)
break
}
}
return s
} // set_eol_next()
// go to the end of the time sequence
// for adding keywarn or timewarn
while (s) {
if (!s.ts_next)
return // null
if (s.ts_next.seqst)
break
s = s.ts_next
}
// if keywarn or timewarn, move K: and M: to the end of the previous line
if (cfmt.keywarn || cfmt.timewarn) {
for (s2 = s.ts_next; s2; s2 = s2.ts_next) {
switch (s2.type) {
case C.BAR:
case C.CLEF:
continue
case C.KEY:
if (!cfmt.keywarn)
continue
case C.METER:
if (s2.type == C.METER && !cfmt.timewarn)
continue
s3 = s2.ts_prev;
if (s3 == s) { // if next symbol
s = s2 // advance the eol
continue
}
unlksym(s2); // remove
lktsym(s2, s.ts_next); // link in time at eol
s = s2
while (1) { // link in voice
s2 = s2.ts_prev
if (s2.v == s.v) {
s.next = s2.next;
s.prev = s2;
s.next.prev = s;
s2.next = s
break
}
}
// care with spacing
if (s.type != s.ts_prev.type) {
if (!s.seqst) {
s.seqst = true;
s.shrink = s.wl + s.prev.wr;
s.space = s.ts_next.space;
s.ts_next.space = 0
}
} else {
delete s.seqst
}
s2 = s3 // restart
continue
}
if (w_tb[s2.type])
break // symbol with a width
}
}
/* if explicit EOLN, cut on the next symbol */
|
| ︙ | |||
1520 1521 1522 1523 1524 1525 1526 | 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 | - + - + - - - - + - - - + + - - - + - - + |
xmin = s.x - s.shrink - indent;
xmax = xmin + lwidth;
xmid = xmin + wwidth / nlines;
xmin += wwidth / nlines * cfmt.breaklimit;
for (s = s.ts_next; s != last ; s = s.ts_next) {
if (!s.x)
continue
|
| ︙ | |||
1588 1589 1590 1591 1592 1593 1594 | 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 | - + | if (!x) continue if (x + s.wr >= xmax) break if (beam || s.in_tuplet) continue //fixme: this depends on the meter |
| ︙ | |||
1653 1654 1655 1656 1657 1658 1659 | 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 | - + |
indent = 0
}
return s
}
/* -- cut the tune into music lines -- */
function cut_tune(lwidth, indent) {
|
| ︙ | |||
1684 1685 1686 1687 1688 1689 1690 | 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 | - + + - + - + - + - + |
if (cfmt.custos && voice_tb.length == 1)
lwidth -= 12
/* if asked, count the measures and set the EOLNs */
if (cfmt.barsperstaff) {
i = cfmt.barsperstaff;
for (s2 = s; s2; s2 = s2.ts_next) {
|
| ︙ | |||
1765 1766 1767 1768 1769 1770 1771 | 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 | - + |
/* -- set the y values of some symbols -- */
function set_yval(s) {
//fixme: staff_tb is not yet defined
// var top = staff_tb[s.st].topbar
// var bot = staff_tb[s.st].botbar
switch (s.type) {
|
| ︙ | |||
1807 1808 1809 1810 1811 1812 1813 | 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 | - + - - - + + + - + - - + + |
if (s.clef_octave) {
if (s.clef_octave > 0)
s.ymx += 12
else
s.ymn -= 12
}
break
|
| ︙ | |||
1869 1870 1871 1872 1873 1874 1875 | 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 | - + - + - + - + - + - + - + - + - + |
else
clef_type_start = 'b'
}
var clef_type = clef_type_start,
s_last = s,
s_last_chg = null
for (s = s_start; s != s_last; s = s.ts_next) {
|
| ︙ | |||
1997 1998 1999 2000 2001 2002 2003 | 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 | - - |
// set the starting clefs of the staves
for (v = 0; v < voice_tb.length; v++) {
p_voice = voice_tb[v]
if (sy.voices[v].range < 0)
continue
st = sy.voices[v].st
if (!sy.voices[v].second) { // main voices
|
| ︙ | |||
2035 2036 2037 2038 2039 2040 2041 | 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 | - + - - |
mid[st] = (sy.staves[st].stafflines.length - 1) * 3
for (s = tsfirst; s; s = s.ts_next) {
if (s.repeat_n)
set_repeat(s)
switch (s.type) {
|
| ︙ | |||
2098 2099 2100 2101 2102 2103 2104 | 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 | + + + + + + - - - - + + + + - - + + + - + |
staff_clef[st].clef = p_voice.clef
continue
}
// old staff
if (new_type == staff_clef[st].clef.clef_type
&& new_line == staff_clef[st].clef.clef_line)
continue
g = s.ts_prev
while (g
&& g.time == s.time
&& (g.v != v || g.st != st))
g = g.ts_prev
if (!g || g.time != s.time) {
|
| ︙ | |||
2206 2207 2208 2209 2210 2211 2212 2213 | 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 | + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + - + - + - + - + - - + + - + + - - + + + + - + - + - + |
[10, 10], /* crotchet */
[6, 4],
[10, 0],
[10, 4],
[10, 10]
]
// (possible hook)
function set_pitch(last_s) {
|
| ︙ | |||
2392 2393 2394 2395 2396 2397 2398 | 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 | - + - + - + - + + + + - - + + | break } } if (i == st_v.length) st_v.push(vobj) } |
| ︙ | |||
2489 2490 2491 2492 2493 2494 2495 | 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 | - + - + - + | && (!t || t.st != s.st || t.time != s.time)) s.multi = -1 } } } |
| ︙ | |||
2565 2566 2567 2568 2569 2570 2571 | 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 | - + |
/* check if clash with next symbols */
end_time = s.time + s.dur
for (s2 = s.ts_next; s2; s2 = s2.ts_next) {
if (s2.time >= end_time)
break
if (s2.st != s.st
|
| ︙ | |||
2675 2676 2677 2678 2679 2680 2681 | 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 | - + - + - + |
last_s.shrink = 0
}
return s
}
/* -- init the symbols at start of a music line -- */
function init_music_line() {
|
| ︙ | |||
2742 2743 2744 2745 2746 2747 2748 | 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 | - + - + - + |
s.seqst = true
} else {
s.ts_prev.ts_next = s
delete s.seqst
}
if (last_s) {
last_s.ts_prev = s
|
| ︙ | |||
2792 2793 2794 2795 2796 2797 2798 | 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 | - + - + + + + - - + - - - + - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + + - - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + | p_voice = voice_tb[v]; s2 = p_voice.meter if (cur_sy.voices[v].range < 0 || cur_sy.voices[v].second || !cur_sy.st_print[cur_sy.voices[v].st] || s2.a_meter.length == 0) continue |
| ︙ | |||
2945 2946 2947 2948 2949 2950 2951 | 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 | - + - + |
/* -- set the end of the repeat sequences -- */
function set_rb(p_voice) {
var s2, mx, n,
s = p_voice.sym
while (s) {
|
| ︙ | |||
2993 2994 2995 2996 2997 2998 2999 | 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 | - + |
if (s.rbstart != 2)
break
}
}
n = 0;
s2 = null
for (s = s.next; s; s = s.next) {
|
| ︙ | |||
3044 3045 3046 3047 3048 3049 3050 | 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 | - + - - + + - + | } /* set the staff of the floating voices */ set_float(); // set the clefs and adjust the pitches of all symbol set_clefs(); |
| ︙ | |||
3110 3111 3112 3113 3114 3115 3116 | 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 | - - + + |
/* -- decide on beams and on stem directions -- */
/* this routine is called only once per tune */
function set_beams(sym) {
var s, t, g, beam, s_opp, dy, avg, n, m, mid_p, pu, pd,
laststem = -1
for (s = sym; s; s = s.next) {
|
| ︙ | |||
3140 3141 3142 3143 3144 3145 3146 | 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 | - + |
if (beam) {
s.stem = laststem
} else if (s.beam_st && !s.beam_end) { // beam start
beam = true;
pu = s.notes[s.nhd].pit;
pd = s.notes[0].pit
for (g = s.next; g; g = g.next) {
|
| ︙ | |||
3207 3208 3209 3210 3211 3212 3213 | 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 | - + - + |
// check if there may be one head for unison when voice overlap
function same_head(s1, s2) {
var i1, i2, l1, l2, head, i11, i12, i21, i22, sh1, sh2
if (s1.shiftunison && s1.shiftunison >= 3)
return false
|
| ︙ | |||
3288 3289 3290 3291 3292 3293 3294 | 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 | - - + + - + - + - + |
head = 0
if (l1 != l2) {
if (l1 < l2) {
l1 = l2;
l2 = s1.dur
}
|
| ︙ | |||
3393 3394 3395 3396 3397 3398 3399 | 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 | - + | i = s.notes[m].pit * 2 if (i < 0) i = 0 else if (i >= MAXPIT - 1) i = MAXPIT - 2 if (w > left[i]) left[i] = w |
| ︙ | |||
3465 3466 3467 3468 3469 3470 3471 | 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 | - + | i = s.notes[m].pit * 2 if (i < 0) i = 0 else if (i >= MAXPIT - 1) i = MAXPIT - 2 if (w > right[i]) right[i] = w |
| ︙ | |||
3494 3495 3496 3497 3498 3499 3500 | 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 | - + |
d = d2;
pl = left1;
pr = right1;
dr2 = dr
}
for (s = tsfirst; s; s = s.ts_next) {
|
| ︙ | |||
3517 3518 3519 3520 3521 3522 3523 | 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 | - + |
s2 = s2.ts_next
if (!s2)
break
if (s2.time != s.time) {
s2 = null
break
}
|
| ︙ | |||
3546 3547 3548 3549 3550 3551 3552 | 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 | - + | /* compute the minimum space for 's1 s2' and 's2 s1' */ right1 = set_right(s1); left2 = set_left(s2); s3 = s1.ts_prev if (s3 && s3.time == s1.time |
| ︙ | |||
3756 3757 3758 3759 3760 3761 3762 3763 | 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 | + - + - - + + + + + + |
if (sd)
s1.xmx = s2.xmx // align the dots
}
}
/* -- set the stem height -- */
/* this routine is called only once per tune */
// (possible hook)
function set_stems() {
|
| ︙ | |||
3803 3804 3805 3806 3807 3808 3809 | 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 | - + |
/* if start or end of beam, adjust the number of flags
* with the other end */
nflags = s.nflags
if (s.beam_st && !s.beam_end) {
if (s.feathered_beam)
nflags = ++s.nflags
for (s2 = s.next; /*s2*/; s2 = s2.next) {
|
| ︙ | |||
3827 3828 3829 3830 3831 3832 3833 | 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 | - - - - + + + + |
if (s2.nflags > nflags)
nflags = s2.nflags
}
/* set height of stem end */
slen = cfmt.stemheight
switch (nflags) {
|
| ︙ | |||
3856 3857 3858 3859 3860 3861 3862 | 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 | - - |
s.y = ymx
}
if (nflags == -4) /* if longa */
ymn -= 6;
s.ymx = ymx + 4;
s.ymn = ymn - 4
} else if (s.stem >= 0) {
|
| ︙ | |||
3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 | 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 | + - - + + - + - + - + - + - + - + - + - + - - - - - + - - - - - - + - - - + - + - - + + + - + - + - + |
ymx += 3;
s.ymx = ymx + 4
}
}
}
/* -- split up unsuitable bars at end of staff -- */
// return true if the bar type has changed
function check_bar(s) {
var bar_type, i, b1, b2,
p_voice = s.p_v
/* search the last bar */
|
| ︙ | |||
4032 4033 4034 4035 4036 4037 4038 | 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 | - + |
break
}
}
/* -- define the start and end of a piece of tune -- */
/* tsnext becomes the beginning of the next line */
function set_piece() {
|
| ︙ | |||
4117 4118 4119 4120 4121 4122 4123 | 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 | - + - + - + + + - + - - - - + + + + - - + + - - - - - - + + + + + - - - - + + + + + - - - + + + |
* search the next end of line,
* and mark the empty staves
*/
for (s = tsfirst; s; s = s.ts_next) {
if (s.nl) {
//fixme: not useful
// // delay the next block symbols
|
| ︙ | |||
4225 4226 4227 4228 4229 4230 4231 | 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 | - + + + + + - + - - - - + + - - + - - + - - - + + + + + + - - + + + - + - - - + + + - - - - + + + - - - + + + + - + + - + - - - + + - - - - - + + - - - - - - - + + - - - + + - - - - + + - - - - - + + - - - - + + + - - - + - - - - - - + + + - - - - - - + - - - + - - - + + - - - - + - - + - - - - - - + + + + + + + + + - - - - - + - - - - + + - - - - + + - - - - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + - - - - + + + - - - - - - - + + - - - + - - + |
p_voice = voice_tb[v]
if (p_voice.sym
&& p_voice.sym.time <= tsnext.time) {
for (s = tsnext.ts_prev; s; s = s.ts_prev) {
if (s.v == v) {
p_voice.s_next = s.next;
s.next = null;
|
| ︙ | |||
4450 4451 4452 4453 4454 4455 4456 | 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 | - - - + + + - + - + + - - + + - - + - + - + - + - + + + + - + |
for ( ; s; s = s.ts_next) {
if (s.time != tim) {
set_page()
return
}
switch (s.type) {
|
| ︙ |
Changes to core/parse.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | // abc2svg - parse.js - ABC parse // |
| ︙ | |||
37 38 39 40 41 42 43 | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | - + |
}
// -- %% pseudo-comment
// clef definition (%%clef, K: and V:)
function new_clef(clef_def) {
var s = {
|
| ︙ | |||
92 93 94 95 96 97 98 | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | - + + | // s.clef_type = "t" // treble break case 'p': i = 4 case 'P': // perc s.clef_type = "p"; s.clef_line = 3; |
| ︙ | |||
118 119 120 121 122 123 124 125 126 127 128 129 130 131 | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | + + |
s.clef_oct_transp = true
case '-':
s.clef_octave = -7
break
}
return s
}
var note_pit = new Int8Array([0, 2, 4, 5, 7, 9, 11])
// get a transposition value
function get_transp(param,
type) { // undefined or "instr"
var i, val, tmp, note,
pit = []
|
| ︙ | |||
167 168 169 170 171 172 173 | 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | - + - - |
param = param.replace(/.*\//, 'c')
}
}
tmp = new scanBuf();
tmp.buffer = param
for (i = 0; i < 2; i++) {
|
| ︙ | |||
318 319 320 321 322 323 324 | 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 | - + + |
val += '|'
return val
}
// create a block symbol in the tune body
function new_block(subtype) {
var s = {
|
| ︙ | |||
385 386 387 388 389 390 391 | 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 | - - + | case "cue=": curvoice.scale = a.shift() == 'on' ? .7 : 1 break case "instrument=": curvoice.transp = get_transp(a.shift(), 'instr') break case "map=": // %%voicemap |
| ︙ | |||
445 446 447 448 449 450 451 452 453 454 455 456 457 458 | 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 | + + | if (curvoice.snm[0] == '"') curvoice.snm = curvoice.snm.slice(1, -1); break case "stafflines=": val = get_st_lines(a.shift()) if (val == undefined) syntax(1, "Bad %%stafflines value") else if (curvoice.st != undefined) par_sy.staves[curvoice.st].stafflines = val else curvoice.stafflines = val break case "staffnonote=": val = parseInt(a.shift()) if (isNaN(val)) syntax(1, "Bad %%staffnonote value") |
| ︙ | |||
510 511 512 513 514 515 516 | 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 | - + | if (info.V['*']) a = info.V['*'].concat(a) if (info.V[curvoice.id]) a = info.V[curvoice.id].concat(a) } } if (a.length != 0) |
| ︙ | |||
532 533 534 535 536 537 538 | 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 | - + - - - - - + + - + |
// K: key signature
// return the key and the voice/clef parameters
function new_key(param) {
var i, clef, key_end, c, tmp,
mode = 0,
s = {
|
| ︙ | |||
589 590 591 592 593 594 595 596 597 598 599 600 601 602 | 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 | + + + + + + + + |
if (!key_end) {
switch (param[i]) {
case '#': s.k_sf += 7; i++; break
case 'b': s.k_sf -= 7; i++; break
}
param = param.slice(i).trim()
switch (param.slice(0, 3).toLowerCase()) {
default:
if (param[0] != 'm'
|| (param[1] != ' ' && param[1] != '\t'
&& param[1] != '\n')) {
key_end = true
break
}
// fall thru ('m')
case "aeo":
case "m":
case "min": s.k_sf -= 3;
mode = 5
break
case "dor": s.k_sf -= 2;
mode = 1
|
| ︙ | |||
611 612 613 614 615 616 617 | 619 620 621 622 623 624 625 626 627 628 629 630 631 632 | - - - - - - - - - - | break case "mix": s.k_sf -= 1; mode = 4 break case "phr": s.k_sf -= 4; mode = 2 break |
| ︙ | |||
656 657 658 659 660 661 662 | 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 | - + - + - + - - + - + - + - - - + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + - + | param = param.replace(/\w+\s*/, '') } } s.k_delta = cgd2cde[(s.k_sf + 7) % 7]; s.k_mode = mode |
| ︙ | |||
752 753 754 755 756 757 758 | 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 | - + - + - + + + + - + - - + + - + | meter.bot = p[i++] while (p[i] >= '0' && p[i] <= '9') meter.bot += p[i++] break } if (p[i] != ' ' && p[i] != '+') break |
| ︙ | |||
819 820 821 822 823 824 825 | 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 | - + |
}
}
/* Q: tempo */
function new_tempo(text) {
var i = 0, j, c, nd, tmp,
s = {
|
| ︙ | |||
853 854 855 856 857 858 859 | 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 | - + | // c = tmp.char() c = text[tmp.index] if (c == undefined || c <= '0' || c > '9') break nd = parse_dur(tmp) if (!s.tempo_notes) s.tempo_notes = [] |
| ︙ | |||
879 880 881 882 883 884 885 | 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 | - + |
tmp.index += 4;
// c = text[tmp.index]
}
if (text[tmp.index + 1] != '/') {
s.tempo = tmp.get_int()
} else {
nd = parse_dur(tmp);
|
| ︙ | |||
920 921 922 923 924 925 926 | 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 | - + - + - + |
function do_info(info_type, text) {
var s, d1, d2, a, vid
switch (info_type) {
// info fields in any state
case 'I':
|
| ︙ | |||
976 977 978 979 980 981 982 | 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 | - + - + |
break
}
if (parse.state == 2)
goto_tune()
if (cfmt.writefields.indexOf(info_type) < 0)
break
s = {
|
| ︙ | |||
1029 1030 1031 1032 1033 1034 1035 | 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 | - + |
info[info_type] += '\n' + text
break
case 'r':
if (!user.keep_remark
|| parse.state != 3)
break
s = {
|
| ︙ | |||
1053 1054 1055 1056 1057 1058 1059 | 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 | - - + + - + - + | /* search the start of the measure */ s2 = curvoice.last_sym if (!s2) return; /* the bar time is correct if there are multi-rests */ |
| ︙ | |||
1087 1088 1089 1090 1091 1092 1093 | 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 | - + - - - - - - - - - + |
for ( ; s2; s2 = s2.next) {
s2.time = time
if (!s2.dur || s2.grace)
continue
s2.dur = s2.dur * curvoice.wmeasure / auto_time;
s2.dur_orig = s2.dur_orig * curvoice.wmeasure / auto_time;
time += s2.dur
|
| ︙ | |||
1146 1147 1148 1149 1150 1151 1152 | 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 | - + + + + + + + + + + + + + + + + + + + + |
} else {
s.rbstop = 2 // right repeat with end
}
}
// set the guitar chord and the decorations
if (a_gch)
|
| ︙ | |||
1224 1225 1226 1227 1228 1229 1230 | 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 | - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + + + + | && !curvoice.second) s.norepbra = true if (curvoice.ulen < 0) // L:auto adjust_dur(s); s2 = curvoice.last_sym |
| ︙ | |||
1293 1294 1295 1296 1297 1298 1299 | 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 | - - - - - - - + - - - - - - + - + | } s.bar_type = bar_type if (!curvoice.lyric_restart) curvoice.lyric_restart = s if (!curvoice.sym_restart) curvoice.sym_restart = s |
| ︙ | |||
1342 1343 1344 1345 1346 1347 1348 | 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 | + + - - + + + + + - - + - - - + + + | a_vf = [], err = false, flags = 0, brace = 0, bracket = 0, parenth = 0, flags_st = 0, e, a = p.match(/\w+|[^\s]/g) |
| ︙ | |||
1391 1392 1393 1394 1395 1396 1397 | 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 | - + - - - + + + + - - - - + - - - | if (brace && !parenth && !(flags & (OPEN_BRACE | OPEN_BRACE2))) flags |= FL_VOICE break case '+': flags |= MASTER_VOICE break default: |
| ︙ | |||
1452 1453 1454 1455 1456 1457 1458 | 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 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 | + - + + + - - + + - - - - + + + + - - + + - + - + - + + + - + - - + - + - + - + - + - + | flags |= STOP_BAR continue } break } a_vf.push([vid, flags]); flags = 0 if (!e) |
| ︙ | |||
1609 1610 1611 1612 1613 1614 1615 | 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 | - - - - - + + + + - + - + - - - - - - - - - + + + + + + + + + + + + - + - + |
}
while (c == ',') {
pit -= 7;
c = line.next_char()
}
note = {
pit: pit,
|
| ︙ | |||
1686 1687 1688 1689 1690 1691 1692 | 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 | - + - + - + - + |
function parse_vpos() {
var c,
line = parse.line,
ti1 = 0
if (line.buffer[line.index - 1] == '.' && !a_dcn)
|
| ︙ | |||
1720 1721 1722 1723 1724 1725 1726 | 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 | - |
dp += ((t / 3 / 12) | 0) * 7
for (i = 0; i <= m; i++) {
note = s.notes[i];
// pitch
n = note.pit;
note.pit += dp;
|
| ︙ | |||
1788 1789 1790 1791 1792 1793 1794 | 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 | - - + - + - + - + - + + + + + + + + + + + - + - + - + |
} else {
a = -i1
}
break
case 2: // double sharp
if (n > d / 2) {
note.pit += 1;
|
| ︙ | |||
1913 1914 1915 1916 1917 1918 1919 | 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 | - + |
if (in_chord) {
while (1) {
if (!c)
break
i = c.charCodeAt(0);
if (i >= 128) {
syntax(1, errs.not_ascii)
|
| ︙ | |||
1948 1949 1950 1951 1952 1953 1954 | 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 | - + - + - - - + | c = line.next_char() continue } break } } note = parse_basic_note(line, |
| ︙ | |||
2024 2025 2026 2027 2028 2029 2030 | 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 | - + - - - + + + | } } // the duration of the chord is the duration of the 1st note s.dur_orig = s.notes[0].dur; s.dur = s.notes[0].dur * curvoice.dur_fact } |
| ︙ | |||
2068 2069 2070 2071 2072 2073 2074 | 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 | - - - - - - - - - + - + - - + - - - - - - + + + - + - - - - - - - - - + + + + + + + + - - - - - + - + + + + + - - + + | s2.dur = s2.dur * n / num; s2.dur_orig = s2.dur_orig * n / num for (i = 0; i <= s2.nhd; i++) s2.notes[i].dur = s2.notes[i].dur * n / num } curvoice.time = s2.time + s2.dur; |
| ︙ | |||
2188 2189 2190 2191 2192 2193 2194 | 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 | - + + + |
"d", "d", "d", "d", /* h i j k */
"d", "d", "d", "d", /* l m n o */
"d", "d", "d", "d", /* p q r s */
"d", "!upbow!",
"!downbow!", "d", /* t u v w */
"n", "n", "n", "{", /* x y z { */
"|", "}", "!gmark!", nil, /* | } ~ (del) */
|
| ︙ | |||
2403 2404 2405 2406 2407 2408 2409 | 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 | - - - + + + |
continue
case ')': // slur end
if (curvoice.ignore)
break
s = curvoice.last_sym
if (s) {
switch (s.type) {
|
| ︙ | |||
2443 2444 2445 2446 2447 2448 2449 | 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 | - - - + + + + - + |
}
if (!c) {
line.index = i;
syntax(1, "No end of decoration")
break
}
}
|
| ︙ | |||
2499 2500 2501 2502 2503 2504 2505 | 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 | - + - + |
line.index = 0;
do_info(c_next, text);
line.index = i
continue
}
// fall thru ('[' is start of chord)
case 'n': // note/rest
|
| ︙ | |||
2542 2543 2544 2545 2546 2547 2548 | 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 | + + + - + + + + - + |
s.tq0 = tp.q;
s.tf = tp.f; // %%tuplets
tp.p = 0
}
tp.r--
if (tp.r == 0) {
if (tpn-- == 0) {
if (s.tp0) // if one note
s.tp0 = false
else
|
| ︙ | |||
2590 2591 2592 2593 2594 2595 2596 | 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 | - + - - - + + + |
break
}
last_note_sav = curvoice.last_note;
curvoice.last_note = null;
a_dcn_sav = a_dcn;
a_dcn = undefined;
grace = {
|
| ︙ | |||
2633 2634 2635 2636 2637 2638 2639 | 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 | - + - - - - | s.gr_end = true; grace.extra = grace.next; grace.extra.prev = null; grace.next = null; curvoice.last_sym = grace; grace = null if (!s.prev // if one grace note |
| ︙ |
Changes to core/subs.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | - + - - + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | // abc2svg - subs.js - text output // |
| ︙ | |||
92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | + - + - - - - - - - - - - - - - + - - - - - - + + + + + + + + + + + + + + - + + - - + + - - - - - - + + + + - - - - - - - + + + + + - + |
return [w, h]
}
// set the default and current font
function set_font(xxx) {
if (typeof xxx == "string")
xxx = get_font(xxx);
cw_tb = xxx.name.slice(0, 4) == 'sans' ? ssw_tb : sw_tb;
gene.curfont = gene.deffont = xxx
}
// output a string handling the font changes
function out_str(str) {
var n_font,
o_font = gene.curfont,
c_font = o_font;
|
| ︙ | |||
223 224 225 226 227 228 229 | 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 | - + - + + - + - + - - - - - + - + + - - + + + + + - - + + + + + + + - - + + + + + + - - + + + + |
return (img.width - img.lm - img.rm
- 2) // for bar thickness at eol
/ cfmt.scale
}
// header generation functions
function write_title(title, is_subtitle) {
|
| ︙ | |||
393 394 395 396 397 398 399 | 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 | - - + | if (k != 0) xy_str(x, 0, p.slice(j, k), 'r') if (i < p.length) xy_str(x + 5, 0, p.slice(i), 'l') return i >= p.length && k == 0 } // put_wline() |
| ︙ | |||
471 472 473 474 475 476 477 | 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 | - + + - - + + |
i2++
}
}
}
/* -- output history -- */
function put_history() {
|
| ︙ | |||
662 663 664 665 666 667 668 669 670 671 672 673 674 675 | 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 | + |
if (info_sz[c])
sz += info_sz[c];
set_font(font);
x = xa[align];
y = ya[align] + sz
if (c == 'Q') { /* special case for tempo */
set_width(glovar.tempo)
if (!glovar.tempo.del) {
if (align != 'l') {
var w = tempo_width(glovar.tempo)
if (align == 'c')
w *= .5;
x -= w
|
| ︙ | |||
738 739 740 741 742 743 744 | 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 | - + + | } write_title(info.T.slice(i, j), i != 0); i = j + 1 } } /* rhythm, composer, origin */ |
| ︙ |
Changes to core/svg.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | - + - - - + + + + + + + | // abc2svg - svg.js - svg functions // |
| ︙ | |||
41 42 43 44 45 46 47 48 | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 | + + + + + + + + + + + - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + - + - + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + - + + + + - + - - - - - - - + + + + + + - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + - - - - - - - - - - - - - - - + - - - + |
g: 0
// color: undefined
},
block = {} /* started & newpage */
// glyphs in music font
var tgls = {
"mtr ": {x:0, y:0, c:"\u0020"}, // space
brace: {x:0, y:0, c:"\ue000"},
hl: {x:-4, y:0, c:"\ue022"},
hl1: {x:-6, y:0, c:"\ue023"},
// hl2: {x:-6, y:0, c:"\ue023"}, // (unused)
ghl: {x:-4, y:0, c:"\ue024"},
lphr: {x:0, y:24, c:"\ue030"},
mphr: {x:0, y:24, c:"\ue038"},
sphr: {x:0, y:27, c:"\ue039"},
rdots: {x:-1, y:0, c:"\ue043"}, // repeat dots
dsgn: {x:-4, y:-4, c:"\ue045"}, // D.S.
dcap: {x:-4, y:-4, c:"\ue046"}, // D.C.
|
| ︙ | |||
299 300 301 302 303 304 305 | 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 | - + |
output += ">\n";
stv_g.started = true
}
/* set the color */
function set_color(color) {
if (color == stv_g.color)
|
| ︙ | |||
370 371 372 373 374 375 376 | 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 | - + - + |
// update the y offsets of delayed output
function delayed_update() {
var st, new_out, text
for (st = 0; st <= nstaff; st++) {
if (staff_tb[st].sc_out) {
output += '<g transform="translate(0,' +
|
| ︙ | |||
405 406 407 408 409 410 411 | 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 | - + | return var type = s.type, h = s.ymx - s.ymn + 4, wl = s.wl || 2, wr = s.wr || 2 if (s.grace) |
| ︙ | |||
433 434 435 436 437 438 439 | 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 | - - + + - + - + |
// A and B are replaced by a and b as string
// F and G are replaced by a and b as float
function out_XYAB(str, x, y, a, b) {
x = sx(x);
y = sy(y);
output += str.replace(/X|Y|A|B|F|G/g, function(c) {
switch (c) {
|
| ︙ | |||
476 477 478 479 480 481 482 | 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 | - + |
if (stv_g.g)
return x
return (x + posx) / stv_g.scale
}
Abc.prototype.sx = sx
function sy(y) {
if (stv_g.g)
|
| ︙ | |||
505 506 507 508 509 510 511 | 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 | - + - + - + |
return h
return h * stv_g.scale
}
// output scaled (x + <sep> + y)
function out_sxsy(x, sep, y) {
x = sx(x);
y = sy(y);
|
| ︙ | |||
551 552 553 554 555 556 557 | 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 | - - - - - - - - - + - + - + - + |
} else {
x -= 5;
y -= 4
}
out_XYAB('<path class="stroke" d="mX YlF G"/>\n',
x, y, dx, -dy)
}
|
| ︙ | |||
617 618 619 620 621 622 623 | 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 | - + - - - + - - - + - - - - - - + + + - + - - - + - - - - - - + + - - - - - - - - - - - + + + - + - - - + + + - + - + - + - + - + - + | slen = -h if (h < 0) dx = -dx; // down x += dx * stv_g.scale if (stv_g.st < 0) slen /= stv_g.scale; |
| ︙ | |||
823 824 825 826 827 828 829 | 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 | - - + - + - + - + - + + + + + + + + - + - + - + - + - + - + - + - + + - + |
out_str(str);
output += '</text>\n'
}
function out_arp(x, y, val) {
g_open(x, y, 270);
x = 0;
|
| ︙ | |||
976 977 978 979 980 981 982 | 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 | - + | a = ar / Math.PI * 180, len = (x2 - x1) / Math.cos(ar); g_open(x1, y1, a); x1 = de1.s.dots ? 13 + de1.s.xmx : 8; len -= x1 + 8; xypath(x1, 0); |
| ︙ | |||
1029 1030 1031 1032 1033 1034 1035 | 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 | - + - - + + - + |
}
if (style || font_style || musicfont) {
head += '<style type="text/css">' + style + font_style
if (musicfont) {
if (musicfont.indexOf('(') > 0) {
head += '\n\
|
| ︙ | |||
1063 1064 1065 1066 1067 1068 1069 | 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 | + - + |
user.img_out(head + output + g + "</svg>");
output = ""
font_style = ''
if (cfmt.fullsvg) {
defined_glyph = {}
for (var i = 0; i < font_tb.length; i++)
|
| ︙ |
Changes to core/tail.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | - + + - + + + + + + + + + + + + + | // abc2svg - tail.js // |
| ︙ | |||
45 46 47 48 49 50 51 52 53 54 | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 | + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + + + + + - - - + + - - - - - - - - - + - - + |
return true
}
};
Abc.prototype.get_posy = function() { var t = posy; posy = 0; return t };
Abc.prototype.get_staff_tb = function() { return staff_tb };
Abc.prototype.get_top_v = function() { return par_sy.top_voice };
Abc.prototype.get_tsfirst = function() { return tsfirst };
Abc.prototype.get_unit = get_unit;
Abc.prototype.get_voice_tb = function() { return voice_tb };
Abc.prototype.goto_tune = goto_tune;
Abc.prototype.info = function() { return info };
Abc.prototype.new_block = new_block;
Abc.prototype.new_note = new_note;
Abc.prototype.out_arp = out_arp;
Abc.prototype.out_deco_str = out_deco_str;
Abc.prototype.out_deco_val = out_deco_val;
Abc.prototype.out_ltr = out_ltr;
Abc.prototype.output_music = output_music;
Abc.prototype.param_set_font = param_set_font;
Abc.prototype.parse = parse;
Abc.prototype.psdeco = psdeco;
Abc.prototype.psxygl = psxygl;
Abc.prototype.set_bar_num = set_bar_num;
Abc.prototype.set_cur_sy = function(sy) { cur_sy = sy };
Abc.prototype.set_dscale = set_dscale;
Abc.prototype.set_font = set_font;
Abc.prototype.set_format = set_format;
Abc.prototype.set_pitch = set_pitch;
Abc.prototype.set_scale = set_scale;
Abc.prototype.set_stem_dir = set_stem_dir;
Abc.prototype.set_stems = set_stems;
Abc.prototype.set_sym_glue = set_sym_glue;
Abc.prototype.set_tsfirst = function(s) { tsfirst = s };
|
Changes to core/tune.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | // abc2svg - tune.js - tune generation // |
| ︙ | |||
33 34 35 36 37 38 39 | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | - + |
if (!parse.voice_opts.hasOwnProperty(opt))
continue
sel = new RegExp(opt)
if (sel.test(curvoice.id)
|| sel.test(curvoice.nm)) {
for (i in parse.voice_opts[opt])
if (parse.voice_opts[opt].hasOwnProperty(i))
|
| ︙ | |||
95 96 97 98 99 100 101 | 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | - - + + - - - + - + - + - - |
function mrest_expand(s) {
var p_voice, s2, next,
nb = s.nmes,
dur = s.dur / nb
/* change the multi-rest (type bar) to a single rest */
var a_dd = s.a_dd;
|
| ︙ | |||
201 202 203 204 205 206 207 | 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 | - + |
w = w_tb[s.type]
if (s.time < time) {
time = s.time;
wmin = w
} else if (w < wmin) {
wmin = w
}
|
| ︙ | |||
223 224 225 226 227 228 229 | 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 | - + - + - + | v = vn[ir] if (v == undefined) break s = vtb[v] if (!s || s.time != time || w_tb[s.type] != wmin) continue |
| ︙ | |||
343 344 345 346 347 348 349 | 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 | - + |
} // end set_feathered_beam()
/* if Q: from tune header, put it at start of the music */
s = glovar.tempo
if (s && staves_found <= 0) { // && !s.del) { - play problem
v = par_sy.top_voice;
p_voice = voice_tb[v];
|
| ︙ | |||
366 367 368 369 370 371 372 | 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 | - - + + - + - + - + |
p_voice.ignore = false
for (s = p_voice.sym; s; s = s.next) {
if (s.time >= staves_found)
break
}
for ( ; s; s = s.next) {
switch (s.type) {
|
| ︙ | |||
416 417 418 419 420 421 422 | 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 | - + |
//fixme: there may be other symbols before the %%staves at this same time
if (s.time >= staves_found)
break
}
p_voice2.clef = clone(p_voice.clef);
curvoice = p_voice2
for ( ; s; s = s.next) {
|
| ︙ | |||
478 479 480 481 482 483 484 485 486 487 | 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 | + - + - + + - + - - - + + + - + |
if (init) { /* first staff system */
cur_sy = par_sy = sy_new
return
}
// update the previous system
for (v = 0; v < voice_tb.length; v++) {
if (par_sy.voices[v].range >= 0) {
st = par_sy.voices[v].st
var sy_staff = par_sy.staves[st],
p_voice = voice_tb[v]
|
| ︙ | |||
540 541 542 543 544 545 546 | 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 | - + - + - + - + - - - + + + - - - - + - + + + + + + - + |
break
}
// at start of tune, check for an anacrusis
bar_time = s.time + wmeasure
if (s.time == 0) {
for (s2 = s.ts_next; s2; s2 = s2.ts_next) {
|
| ︙ | |||
644 645 646 647 648 649 650 | 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 | - - + - - - - - |
tmp = new scanBuf();
tmp.buffer = a[1];
note = parse_acc_pit(tmp)
if (!note) {
syntax(1, "Bad note in %%map")
return
}
|
| ︙ | |||
685 686 687 688 689 690 691 692 693 694 695 696 697 698 | 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 | + + |
for (; i < a.length; i++) {
switch (a[i]) {
case "heads=":
map[0] = a[++i].split(',')
break
case "print=":
if (cfmt.sound == "play")
break
tmp = new scanBuf();
tmp.buffer = a[++i];
map[1] = parse_acc_pit(tmp)
break
// case "transpose=":
// switch (a[++i][0]) {
// case "n":
|
| ︙ | |||
737 738 739 740 741 742 743 | 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 | - + - - - - - - - - - - - - - - - - - - - - - - - - - + |
if (curvoice.key.k_none)
curvoice.key.k_sf = 0
return
}
// set the transposition in the previous K:
while (1) {
|
| ︙ | |||
883 884 885 886 887 888 889 | 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 | - - - - - - - - - - - + - - - - - - - - - - - - - - + - + |
goto_tune()
}
n = parseInt(param)
if (isNaN(n) || n < -2 || n > 2) {
syntax(1, errs.bad_val, "%%ottava")
return
}
|
| ︙ | |||
980 981 982 983 984 985 986 | 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 | - + - + | s.sk2 = h2 return } blk_out(); vskip(h1); output += '<path class="stroke"\n\td="M'; out_sxsy((lwidth - len) / 2 / cfmt.scale, ' ', 0); |
| ︙ | |||
1024 1025 1026 1027 1028 1029 1030 | 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 | - + - + |
case "staffbreak":
if (parse.state != 3) {
if (parse.state != 2)
return
goto_tune()
}
s = {
|
| ︙ | |||
1082 1083 1084 1085 1086 1087 1088 | 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 | - + - + |
return
// case 2:
// goto_tune()
// break
}
for (s = curvoice.last_sym; s; s = s.prev) {
switch (s.type) {
|
| ︙ | |||
1143 1144 1145 1146 1147 1148 1149 | 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 | - + + + - + |
if (cmd == "newpage") {
blk_flush();
block.newpage = true;
return
}
break
}
|
| ︙ | |||
1222 1223 1224 1225 1226 1227 1228 | 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 | - + - + | if (voice_tb.length == 0) return voice_adj(); dupl_voice(); sort_all() /* define the time / vertical sequences */ if (!tsfirst) return |
| ︙ | |||
1345 1346 1347 1348 1349 1350 1351 | 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 | - + - + - + |
if (!s)
return //undefined;
time = s.time
for (; s; s = s.prev) {
switch (s.type) {
|
| ︙ | |||
1421 1422 1423 1424 1425 1426 1427 | 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 | - + |
if (par_sy.voices[v].range >= 0) {
curvoice = voice_tb[v]
break
}
}
curvoice.time = maxtime;
s = {
|
| ︙ | |||
1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 | 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 | + | delete p_voice.snm delete p_voice.new_name delete p_voice.lyric_restart delete p_voice.lyric_cont delete p_voice.ly_a_h; delete p_voice.sym_restart delete p_voice.sym_cont delete p_voice.have_ly voice_tb.push(p_voice) return p_voice } // clone_voice() /* treat the end of overlay */ if (curvoice.ignore) |
| ︙ | |||
1691 1692 1693 1694 1695 1696 1697 | 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 | - + |
if (!vover) { /* first '&' in a measure */
vover = {
bar: true,
p_voice: curvoice
}
time = p_voice2.time
for (s = curvoice.last_sym; /*s*/; s = s.prev) {
|
| ︙ | |||
1732 1733 1734 1735 1736 1737 1738 | 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 | - - - - - - - - - - - - - - - - - - - - - + - - - - - - |
if (is_voice_sig()) {
curvoice.clef = s
return
}
// clef change
|
| ︙ | |||
1787 1788 1789 1790 1791 1792 1793 | 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 | - - + + - + |
}
for (v = 0; v < voice_tb.length; v++) {
p_voice = voice_tb[v];
p_voice.key = clone(s_key);
p_voice.okey = clone(s_key);
p_voice.ckey = clone(s_key)
}
|
| ︙ | |||
1837 1838 1839 1840 1841 1842 1843 | 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 | - + | if (s_key.k_none) curvoice.key.k_sf = 0 return } /* the key signature must appear before a time signature */ s = curvoice.last_sym |
| ︙ | |||
1897 1898 1899 1900 1901 1902 1903 | 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 | - - - + + + - + | vol: 0 }, scale: 1, // st: 0, // cst: 0, ulen: glovar.ulen, dur_fact: 1, |
| ︙ | |||
1929 1930 1931 1932 1933 1934 1935 | 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 | - |
nstaff = -1;
voice_tb = [];
curvoice = null;
new_syst(true);
staves_found = -1;
gene = {}
a_de = [] // remove old decorations
|
| ︙ | |||
1966 1967 1968 1969 1970 1971 1972 | 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 | - + |
}
include--
}
// treat a 'V:' info
function get_voice(parm) {
var v, transp, vtransp, vs,
|
| ︙ | |||
2004 2005 2006 2007 2008 2009 2010 | 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 | - + |
delete curvoice.new
if (staves_found < 0) { // if no %%score/%%staves
curvoice.st = curvoice.cst = ++nstaff;
par_sy.nstaff = nstaff;
par_sy.voices[v].st = nstaff;
par_sy.voices[v].range = v;
par_sy.staves[nstaff] = {
|
| ︙ | |||
2033 2034 2035 2036 2037 2038 2039 | 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 | - + - + - + - + - + - - |
}
// change state from 'tune header after K:' to 'in tune body'
// curvoice is defined when called from get_voice()
function goto_tune(is_K) {
var v, p_voice,
s = {
|
Changes to edit-de.js.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | + + + + + - - + |
//JS - abc2svg edit - Text in Deutsch
function loadtxt() {
texts = {
bad_nb: 'fehlerhafte Zeilennummer',
fn: 'Filename: ',
load: 'Bitte öffne die eingebundene Datei ',
play: 'Wiedergabe',
stop: 'Stop',
}
var text_kv = {
a: 'Über ...',
b: 'ABC-Files:',
cmpa: 'Alles',
cmpt: 'Stück',
cmps: 'Auswahl',
cmpl: 'Schleife',
cmpc: 'Weiter',
// df: 'abc2svg features',
// dp: 'abc2svg parameters',
er: 'Fehler',
f: 'File',
fl: 'Lade File',
|
| ︙ |
Changes to edit-en.js.
1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | - - + + + + + - - + + + + + + + |
//JS - abc2svg edit - text in English
function loadtxt() {
texts = {
bad_nb: 'Bad line number',
fn: 'File name: ',
load: 'Please, load the included file ',
|
Changes to edit-fr.js.
1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | - - + + + + + - - + + + + + + + |
//JS - abc2svg edit - textes en français
function loadtxt() {
texts = {
bad_nb: 'Mauvais numéro de ligne',
fn: 'Nom de fichier: ',
load: 'SVP, ouvrez le fichier à inclure ',
|
Changes to edit-it.js.
1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | - - + + + + + - - + + + + + + + |
//JS - abc2svg edit - text in Italian
function loadtxt() {
texts = {
bad_nb: 'Numero di linea errato',
fn: 'Nome file: ',
load: 'Carica il file da includere ',
|
Changes to edit-pt_BR.js.
1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | - - + + + + + - - + - - + + + + + + + + + |
//JS - abc2svg edit - texto em português do Brasil
function loadtxt() {
texts = {
bad_nb: 'Número de linha incorreto',
fn: 'Nome do arquivo: ',
load: 'Por favor, inclua o arquivo ',
|
Changes to editor/edit.css.
| ︙ | |||
65 66 67 68 69 70 71 | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | + + + + + + + + + + + + + + - + + + + + + + + - + |
color: red;
}
#abckbd td {
border: 1px solid black;
padding: 0.5rem;
text-align: center;
}
#ctxMenu {
position:absolute;
display:none;
left:0px;
top:0px;
height:20px;
width:40px;
padding:0;
margin:0;
border:1px solid;
background-color:white;
font-weight:normal;
white-space:nowrap;
z-index:100;
|
| ︙ |
Changes to editor/edit.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | // edit.js - file used in the abc2svg editor // |
| ︙ | |||
28 29 30 31 32 33 34 | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | - - - - - + + + + + - - - - + - - - - - - |
alert("window error: " + msg)
return false
}
var abc_images, // image buffer
abc_fname = ["noname.abc", ""], // file names
abc, // Abc object
|
| ︙ | |||
79 80 81 82 83 84 85 | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | - + |
abc_images += str
},
// -- optional methods
// annotations
anno_stop: function(type, start, stop, x, y, w, h) {
if (["beam", "slur", "tuplet"].indexOf(type) >= 0)
return
|
| ︙ | |||
141 142 143 144 145 146 147 | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 | - - + + + + + + |
if (!no_memo)
storage(true, "lang", lang == "en" ? 0 : lang)
}
// show/hide a popup message
function popshow(area, visible) {
var e = document.getElementById(area)
|
| ︙ | |||
190 191 192 193 194 195 196 | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 | - + + - - - + - + + + - + - + - - - - - - - - - - - + - - - - + - + - - - - - - - - - - - - + - - - - - + + + + - - - - - - + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + + + - - + - - - - + + + - - - - - + + + + + + - - - + + - - - - - - + + + - - - - - + + + - - + - - - + - - + + - - - - - - - - - - + - - - - - - + + - - - + + - - + - - + - - - + - - - - - - - - - + - - - - + + - - - - - - + + + + + + + + + - - - + + + - - - - + + + + + - - - - - - + + + + + + + + + + + + - + + + + - - + + + + - - - - - - + + + + + - - - + - + - + - - - - - - + - + - + - + + + + + + + + - + + + + - - + - - - - + + + + - - + - - - + + - - - + - - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - + - + - - + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
}
// render the textarea content to the right side
function render() {
var i, j,
content = elt_ref.source.value;
|
| ︙ | |||
612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 | 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 | + + + - + - - + - + - + - - - - + + + + - - - - - - - - + + + + + + + + + - + - + - - - - - - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
s.onload = relay;
s.onerror = onerror || function() {
alert('error loading ' + fn)
}
document.head.appendChild(s)
}
// accept page formatting
abc2svg.abc_end = function() {}
function set_pref() {
var v = storage(true, "fontsz")
if (v) {
elt_ref.source.style.fontSize =
elt_ref.src1.style.fontSize =
v + "px";
document.getElementById("fontsize").value =
Number(v)
}
|
| ︙ | |||
716 717 718 719 720 721 722 | 860 861 862 863 864 865 866 867 868 869 870 871 872 | - + |
}
}
// render the music after 2 seconds on textarea change
var timer
function src_change() {
clearTimeout(timer);
|
Changes to editor/edit.xhtml.
| ︙ | |||
33 34 35 36 37 38 39 | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | - - - - - | </li> <li id="playdiv1" style="display: none"> <label id="sful">Sound font URL</label> <input id="sfu" type="text" maxlength="120" size="50" onblur="set_sfu(this.value)"/> </li> |
| ︙ | |||
62 63 64 65 66 67 68 | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | - |
<li onclick="loadlang('de')">Deutsch</li>
<li onclick="loadlang('en')">English</li>
<li onclick="loadlang('fr')">Français</li>
<li onclick="loadlang('it')">Italiano</li>
<li onclick="loadlang('pt_BR')">Português do Brasil</li>
</ul>
</li>
|
| ︙ | |||
92 93 94 95 96 97 98 | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 | - + + + + + + + + + + + - - - - - - - - - + - - - + + + + + + + + |
<label id="er" onclick="popshow('errlist', true)"
style="display: none; background: #ff8080">Errors</label>
<!-- ABC source in textarea (main and include) -->
</p>
<textarea id="source" rows="40" cols="73" wrap="off"
style="font: 14px monospace"
|
Changes to font.js.
1 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + + + - - - - + + + + + + + - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + - - - - + + - - - - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + | // abc2svg music font |
Changes to font/abc2svg.sfd.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 | + + - + + + + - + - - + + + + + - + - - - - - - - + + + + + + + + + + + + + + + + | SplineFontDB: 3.0 FontName: abc2svg FullName: abc2svg FamilyName: abc2svg Weight: Regular Copyright: Copyright \\251 2018 Jean-Francois Moine. This font is licensed under the SIL Open Font License \\(http://scripts.sil.org/OFL\\). Version: ItalicAngle: 0 UnderlinePosition: 0 UnderlineWidth: 0 Ascent: 819 Descent: 205 InvalidEm: 0 LayerCount: 2 Layer: 0 1 "Back" 1 Layer: 1 0 "Fore" 0 XUID: [1021 296 1430826605 13506888] OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 0 CreationTime: 1433498007 |
| ︙ | |||
91 92 93 94 95 96 97 98 99 | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - + | 29 39 0 91 0 160 c 0 0 193 5 228 18 269 c 0 42 335 53 385 53 419 c 0 53 463 35 499 0 515 c 9 EndSplineSet Validated: 1 EndChar StartChar: uniE022 Encoding: 3 57378 3 Width: 330 Flags: MW LayerCount: 2 Fore SplineSet -80 20 m 5 410 20 l 5 410 -20 l 5 -80 -20 l 5 -80 20 l 5 EndSplineSet Validated: 1 EndChar StartChar: uniE023 Encoding: 4 57379 4 Width: 531 Flags: MW LayerCount: 2 Fore SplineSet -80 20 m 1 610 20 l 5 610 -20 l 1 -80 -20 l 1 -80 20 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE024 Encoding: 5 57380 5 Width: 210 Flags: HMW LayerCount: 2 Fore SplineSet -80 20 m 1 290 20 l 1 290 -20 l 1 -80 -20 l 1 -80 20 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE030 Encoding: 6 57392 6 Width: 35 Flags: HMW LayerCount: 2 Fore SplineSet 0 1000 m 5 35 1000 l 5 35 0 l 5 0 0 l 5 0 1000 l 5 EndSplineSet Validated: 1 EndChar StartChar: uniE038 Encoding: 7 57400 7 Width: 35 Flags: HMW LayerCount: 2 Fore SplineSet 0 1000 m 1 35 1000 l 1 35 500 l 1 0 500 l 1 0 1000 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE039 Encoding: 8 57401 8 Width: 35 Flags: HMW LayerCount: 2 Fore SplineSet 0 1100 m 1 35 1110 l 5 35 760 l 1 0 760 l 1 0 1100 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE043 Encoding: 9 57411 9 Width: 100 Flags: W HStem: 320 100<8.4375 91.5625> 570 100<8.4375 91.5625> VStem: 0 100<328.438 411.562 578.438 661.562> LayerCount: 2 Fore SplineSet 50 570 m 3 22 570 0 592 0 620 c 3 0 648 22 670 50 670 c 3 78 670 100 648 100 620 c 3 100 592 78 570 50 570 c 3 50 320 m 7 22 320 0 342 0 370 c 7 0 398 22 420 50 420 c 7 78 420 100 398 100 370 c 7 100 342 78 320 50 320 c 7 EndSplineSet Validated: 1 EndChar StartChar: uniE045 Encoding: 10 57413 10 Width: 1059 Flags: HMW LayerCount: 2 Fore SplineSet 590 0 m 24 590 160 l 24 620 160 l 0 647 83 701 25 770 25 c 0 818 25 870 42 870 90 c 0 870 135 766 163 722 175 c 0 661 192 590 212 590 286 c 0 590 380 665 430 740 430 c 0 791 430 809 423 840 405 c 0 870 430 l 24 900 430 l 24 907 275 l 24 877 275 l 0 857 351 806 405 740 405 c 0 702 405 652 376 652 338 c 0 652 285 733 277 785 263 c 0 878 238 940 209 940 136 c 0 940 62 879 0 770 0 c 0 718 0 688 9 655 32 c 0 620 0 l 24 590 0 l 24 1010 0 m 3 982 0 960 22 960 50 c 3 960 78 982 100 1010 100 c 3 1038 100 1060 78 1060 50 c 3 1060 22 1038 0 1010 0 c 3 505 0 m 3 477 0 455 22 455 50 c 3 455 78 477 100 505 100 c 3 533 100 555 78 555 50 c 3 555 22 533 0 505 0 c 3 180 390 m 24 180 30 l 24 220 30 l 0 300 30 350 100 350 210 c 0 350 320 300 390 220 390 c 0 180 390 l 24 0 0 m 0 0 30 l 24 70 30 l 24 70 390 l 24 0 390 l 24 0 420 l 24 220 420 l 0 360 420 470 361 470 210 c 0 470 60 370 0 220 0 c 0 147 0 73 0 0 0 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE046 Encoding: 11 57414 11 Width: 1061 Flags: HMW LayerCount: 2 Fore SplineSet 770 0 m 0 636 0 550 70 550 210 c 0 550 350 656 430 770 430 c 0 818 430 838 425 875 400 c 0 905 430 l 24 935 430 l 24 943 264 l 24 910 260 l 0 886 354 841 400 780 400 c 0 700 400 670 305 670 215 c 0 670 125 700 30 780 30 c 0 855 30 906 86 928 165 c 0 963 155 l 0 939 65 890 0 770 0 c 0 1010 0 m 3 982 0 960 22 960 50 c 3 960 78 982 100 1010 100 c 3 1038 100 1060 78 1060 50 c 3 1060 22 1038 0 1010 0 c 3 505 0 m 3 477 0 455 22 455 50 c 3 455 78 477 100 505 100 c 3 533 100 555 78 555 50 c 3 555 22 533 0 505 0 c 3 180 390 m 24 180 30 l 24 220 30 l 0 300 30 350 100 350 210 c 0 350 320 300 390 220 390 c 0 180 390 l 24 0 0 m 0 0 30 l 24 70 30 l 24 70 390 l 24 0 390 l 24 0 420 l 24 220 420 l 0 360 420 470 361 470 210 c 0 470 60 370 0 220 0 c 0 147 0 73 0 0 0 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE047 |
| ︙ | |||
192 193 194 195 196 197 198 | 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 | - + - + - - - - - - - + + + + + + + - - + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + - - + - - + + - - - - - - + - + | 412 409 364 361 360 216 c 1 472 216 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE050 |
| ︙ | |||
321 322 323 324 325 326 327 | 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 | - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + | 0 -514 l 1 0 510 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE062 |
| ︙ | |||
383 384 385 386 387 388 389 | 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 | - + | 0 -250 l 1 0 250 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE07A |
| ︙ | |||
445 446 447 448 449 450 451 | 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 | - + | 442 749 433 790 401 820 c 1 331 792 299 728 290 658 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE07B |
| ︙ | |||
513 514 515 516 517 518 519 | 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 | - + | 0 -411 l 1 0 408 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE07C |
| ︙ | |||
551 552 553 554 555 556 557 558 559 | 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + | 500 58 484 76 484 102 c 0 484 125 499 139 523 139 c 0 545 139 562 123 562 102 c 0 562 76 546 58 524 58 c 0x3e EndSplineSet Validated: 1 EndChar StartChar: uniE07D Encoding: 21 57469 21 Width: 200 Flags: HMW LayerCount: 2 Fore SplineSet 80 119 m 1 55 105 45 90 45 70 c 0 45 42 68 20 88 20 c 0 113 20 125 44 125 64 c 0 125 84 103 102 80 119 c 1 123 220 m 28 105 220 90 209 90 189 c 0 90 169 99 159 122 141 c 1 145 148 157 161 157 185 c 0 157 205 144 220 123 220 c 28 90 0 m 0 41 0 0 30 0 70 c 0 0 104 32 118 69 130 c 1 49 148 40 157 40 180 c 0 40 215 70 240 110 240 c 0 154 240 200 220 200 180 c 0 200 156 178 139 140 129 c 1 164 110 180 90 180 70 c 0 180 27 140 0 90 0 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE080 |
| ︙ | |||
596 597 598 599 600 601 602 | 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 | - + | 115 100 l 29 0 0 l 25 EndSplineSet Validated: 1 EndChar StartChar: uniE082 |
| ︙ | |||
631 632 633 634 635 636 637 | 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 | - + | 28 25 0 60 0 128 c 0 0 213 102 250 199 250 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE083 |
| ︙ | |||
668 669 670 671 672 673 674 | 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 | - + | 252 177 223 213 175 213 c 0 131 213 109 193 102 170 c 1 EndSplineSet Validated: 1 EndChar StartChar: uniE084 |
| ︙ | |||
699 700 701 702 703 704 705 | 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 | - + | 325 -160 l 5 325 -209 l 5 EndSplineSet Validated: 1 EndChar StartChar: uniE085 |
| ︙ | |||
734 735 736 737 738 739 740 | 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 | - + | 25 -217 0 -176 0 -152 c 0 0 -135 3 -113 18 -95 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE086 |
| ︙ | |||
764 765 766 767 768 769 770 | 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 | - + | 1 133 74 250 200 250 c 0 257 250 298 244 340 205 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE087 |
| ︙ | |||
787 788 789 790 791 792 793 | 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 | - + | 305 125 280 121 268 121 c 0 194 121 173 161 97 161 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE088 |
| ︙ | |||
814 815 816 817 818 819 820 821 822 823 | 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 | + - + | 294 250 370 197 370 130 c 0 370 77 342 46 280 16 c 1 351 -16 388 -46 388 -121 c 4 388 -197 293 -250 194 -250 c 1 93 -250 0 -194 0 -130 c 0 0 -77 50 -44 108 -16 c 1 EndSplineSet Validated: 1 EndChar StartChar: uniE089 |
| ︙ | |||
847 848 849 850 851 852 853 | 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 | - + | 384 -133 311 -250 185 -250 c 0 128 -250 87 -244 45 -205 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE08A |
| ︙ | |||
881 882 883 884 885 886 887 | 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 | - + | 244 130 265 164 302 164 c 2 303 164 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE08B |
| ︙ | |||
928 929 930 931 932 933 934 | 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 | - + | 119 -58 126 -133 158 -175 c 0 165 -184 172 -191 180 -197 c 1 EndSplineSet Validated: 1 EndChar StartChar: uniE08C |
| ︙ | |||
953 954 955 956 957 958 959 | 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 | - + - + - - - + + + - - + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + - - - - + + + + - - - + + + - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + - - + + - - + - - - + - - - - - - - - + + + + + - + | 0 -35 l 25 0 35 l 25 EndSplineSet Validated: 1 EndChar StartChar: uniE094 |
| ︙ | |||
1116 1117 1118 1119 1120 1121 1122 | 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 | - - - + + + - - - - - - + + + + - - + - - + | 0 70 105 148 198 148 c 0 245 148 288 128 313 81 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE0A4 |
| ︙ | |||
1160 1161 1162 1163 1164 1165 1166 | 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 | - + | 132 -0 l 1 -2 113 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE0B3 |
| ︙ | |||
1196 1197 1198 1199 1200 1201 1202 | 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 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 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 | - + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + | 300 -83 233 -150 150 -150 c 24 67 -150 0 -83 0 0 c 24 EndSplineSet Validated: 1 EndChar StartChar: uniE101 |
| ︙ | |||
1284 1285 1286 1287 1288 1289 1290 | 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 | - - - + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + - + | 1 377 l 1 28 378 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE262 |
| ︙ | |||
1368 1369 1370 1371 1372 1373 1374 | 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 | - + - + - - - - + + - - + + - + | 267 -124 l 1 195 -124 l 9 EndSplineSet Validated: 1 EndChar StartChar: uniE264 |
| ︙ | |||
1440 1441 1442 1443 1444 1445 1446 1447 1448 | 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + | 269 236 269 40 269 -156 c 1 235 -156 183 -128 129 -74 c 0 76 -20 50 28 50 75 c 0 50 124 97 160 141 160 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE281 Encoding: 64 57985 64 Width: 366 Flags: HMW LayerCount: 2 Fore SplineSet 87 125 m 1 86 125 l 2 75 125 63 117 53 104 c 1 46 90 43 72 43 54 c 0 43 42 43 29 47 16 c 0 55 -19 69 -50 90 -79 c 0 111 -108 122 -120 134 -120 c 1 134 78 l 2 134 100 110 124 87 125 c 1 61 163 m 0 97 163 118 145 134 113 c 1 134 432 l 1 165 432 l 1 165 -150 l 1 135 -150 94 -121 65 -86 c 0 37 -52 15 -17 -2 23 c 1 -7 41 -11 57 -11 73 c 0 -11 116 21 163 61 163 c 0 265 125 m 1 242 124 219 100 219 78 c 2 219 -120 l 1 230 -120 244 -108 265 -79 c 0 283 -50 297 -19 305 16 c 0 309 29 311 42 311 54 c 0 311 72 307 90 300 104 c 1 290 117 280 125 269 125 c 2 265 125 l 1 291 163 m 0 333 163 364 119 364 73 c 0 364 57 360 41 353 23 c 0 337 -17 317 -52 288 -86 c 1 260 -121 219 -150 189 -150 c 1 189 432 l 1 219 432 l 1 219 113 l 1 235 143 256 163 291 163 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE282 Encoding: 65 57986 65 Width: 169 Flags: HMW LayerCount: 2 Fore SplineSet 68 320 m 8 98 320 l 1 98 158 l 1 169 172 l 1 169 80 l 1 98 66 l 1 98 -61 l 1 169 -47 l 1 169 -137 l 1 98 -152 l 1 98 -320 l 8 68 -320 l 1 68 -158 l 1 0 -172 l 1 0 -80 l 1 68 -66 l 1 68 61 l 1 0 47 l 1 0 137 l 1 68 152 l 1 68 320 l 8 EndSplineSet Validated: 1 EndChar StartChar: uniE283 Encoding: 66 57987 66 Width: 314 Flags: HMW LayerCount: 2 Fore SplineSet 233 192 m 17 233 360 l 1 263 360 l 1 263 202 l 1 314 217 l 1 314 125 l 1 263 110 l 1 263 -49 l 1 314 -34 l 1 314 -124 l 1 263 -139 l 1 263 -320 l 1 233 -320 l 1 233 -150 l 1 172 -168 l 1 172 -340 l 25 142 -340 l 25 142 -176 l 25 82 -192 l 17 81 -360 l 1 51 -360 l 1 51 -202 l 1 0 -217 l 1 0 -125 l 1 51 -110 l 1 51 49 l 1 0 34 l 1 0 124 l 1 51 139 l 1 51 320 l 1 81 320 l 1 81 150 l 1 142 168 l 1 142 340 l 25 172 340 l 25 172 176 l 25 233 192 l 17 142 -83 m 9 142 75 l 1 81 58 l 1 81 -101 l 1 142 -83 l 9 172 83 m 9 172 -75 l 1 233 -58 l 1 233 101 l 1 172 83 l 9 EndSplineSet Validated: 1 EndChar StartChar: uniE4A0 |
| ︙ | |||
1467 1468 1469 1470 1471 1472 1473 1474 1475 | 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - - - + + + - - - - - + + + + + - + + - + - + - - - + + - + - + - - - + - + - - - + - + - - - + - + - - | 305 136 l 1 314 132 319 124 319 116 c 0 319 109 314 101 305 98 c 1 18 1 l 0 EndSplineSet Validated: 1 EndChar StartChar: uniE4A2 Encoding: 68 58530 68 Width: 80 Flags: HMW LayerCount: 2 Fore SplineSet 0 40 m 24 0 63 17 80 40 80 c 24 62 80 80 63 80 40 c 24 80 18 63 0 40 0 c 24 18 0 0 18 0 40 c 24 EndSplineSet Validated: 1 EndChar StartChar: uniE4A4 Encoding: 69 58532 69 Width: 320 Flags: HMW LayerCount: 2 Fore SplineSet 0 0 m 25 0 40 l 25 320 40 l 25 320 0 l 25 0 0 l 25 EndSplineSet Validated: 1 EndChar StartChar: uniE4A8 Encoding: 70 58536 70 Width: 320 Flags: HMW LayerCount: 2 Fore SplineSet 40 0 m 29 0 280 l 25 100 280 l 25 60 0 l 25 40 0 l 29 EndSplineSet Validated: 1 EndChar StartChar: uniE4AC |
| ︙ | |||
1632 1633 1634 1635 1636 1637 1638 | 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 | - + | 122 193 l 1 41 391 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE4E6 |
| ︙ | |||
1656 1657 1658 1659 1660 1661 1662 | 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 | - + | 58 -227 l 1 171 60 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE4E7 |
| ︙ | |||
1687 1688 1689 1690 1691 1692 1693 | 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 | - + | 86 -488 l 1 171 -196 l 1xd0 EndSplineSet Validated: 1 EndChar StartChar: uniE4E8 |
| ︙ | |||
1725 1726 1727 1728 1729 1730 1731 | 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 | - + | 158 -176 182 -160 188 -142 c 1 246 60 l 1xf4 EndSplineSet Validated: 1 EndChar StartChar: uniE4E9 |
| ︙ | |||
1770 1771 1772 1773 1774 1775 1776 | 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 | - + | 86 -744 l 1 171 -452 l 1xf1 EndSplineSet Validated: 1 EndChar StartChar: uniE4EA |
| ︙ | |||
1822 1823 1824 1825 1826 1827 1828 | 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 | - + | 233 -178 257 -162 263 -144 c 1 319 52 l 1xfa EndSplineSet Validated: 1 EndChar StartChar: uniE4EE |
| ︙ | |||
1848 1849 1850 1851 1852 1853 1854 | 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 | - + | 0 -230 l 25 0 230 l 25 EndSplineSet Validated: 1 EndChar StartChar: uniE500 |
| ︙ | |||
1876 1877 1878 1879 1880 1881 1882 | 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 | - + | 109 -250 l 1 -16 -250 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE501 |
| ︙ | |||
1907 1908 1909 1910 1911 1912 1913 1914 1915 | 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - + | 652 250 l 5 775 250 l 5 334 -250 l 5 212 -250 l 5 EndSplineSet Validated: 1 EndChar StartChar: uniE520 Encoding: 87 58656 87 Width: 563 Flags: HMW LayerCount: 2 Fore SplineSet 197 40 m 0 199.179123831 39.0525548563 201.555731167 38.5988184777 204.0907001 38.5988184777 c 0 228.311569742 38.5988184777 266.989634802 80.0214592618 286 128 c 0 293.801273837 147.763227053 298.897664408 174.829638922 298.897664408 197.52305288 c 0 298.897664408 218.46369363 294.558131706 235.680764302 284 240 c 0 282.059714009 240.759242344 279.934395026 241.11995209 277.659464452 241.11995209 c 0 252.96754404 241.11995209 210.650235832 198.625589581 196 162 c 0 185.665333312 135.693575703 181.068143327 108.945807045 181.068143327 87.1471403297 c 0 181.068143327 62.5417301443 186.925393958 44.2419393862 197 40 c 0 200 0 m 0 183 0 173 6 153 32 c 1 108 -90 l 1 160 -90 l 2 175 -90 175 -120 160 -120 c 0 -65 -120 l 0 -79 -120 -80 -90 -65 -90 c 2 10 -90 l 1 114 195 l 0 115.167116963 197.917792406 120.420719938 212.754502351 120.420719938 224.605732511 c 0 120.420719938 233.06305846 117.745271893 240 109 240 c 0 83 240 72 207 28 135 c 0 21 124 -6 139 1 151 c 0 56 249 69 280 125 280 c 0 170 280 193 271 203 235 c 1 244 278 263 280 305 280 c 0 341 280 380 248 380 180 c 0 380 87 299 0 200 0 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE521 Encoding: 88 58657 88 Width: 440 Flags: W HStem: -10 44.404<309.482 391.648> 0 21G<-1 65.5 153 199> 212.877 67.1232<170.507 229.008 295.16 358.649> 221 59<37.7036 99.8884> VStem: 276.686 77.1955<12.819 101.414> 335.007 74.6509<146.188 236.074> LayerCount: 2 Fore SplineSet 80 21 m 0x64 76 11 74 1 57 0 c 0 4 0 l 0 -6 0 0 18 4 26 c 1 70 193 l 0 77 211 69 221 60 221 c 0 42 221 35 210 -11 138 c 0 -18 127 -39 139 -33 151 c 0 3 216 36 280 86 280 c 0x54 128 280 145 266 152 240 c 1 170 260 194 280 224 280 c 0 254 280 273 263 278 240 c 1 292 259 322 280 349 280 c 0 382.297060451 280 409.658220776 253.618221661 409.658220776 218.530504648 c 0x24 409.658220776 210.41331474 408.193901764 201.830198995 405 193 c 0 358 68 l 0 355.211869734 60.3326417674 353.881302664 53.2726015335 353.881302664 47.6241881024 c 0 353.881302664 39.5840041338 356.577277218 34.4040367054 361.602949871 34.4040367054 c 0 363.177144158 34.4040367054 364.979913018 34.9122608557 367 36 c 0 389 48 404 72 419 93 c 0 427 104 449 93 440 78 c 0 411 27 388 -10 323 -10 c 0 295.96461562 -10 276.685848474 4.31990873934 276.685848474 30.6552962356 c 0xa8 276.685848474 38.4136929968 278.359032859 47.2149008096 282 57 c 0 334 193 l 0 334.687448544 195.062345631 335.007330587 196.961328373 335.007330587 198.698285174 c 0 335.007330587 208.224115412 325.386390673 212.876768553 314.009865299 212.876768553 c 0 300.302784706 212.876768553 284.047157224 206.122608782 279 193 c 0 214 22 l 0 211 14 207 0 191 -1 c 1 153 0 l 16 134 -2 132 12 136 22 c 0 203 193 l 0 203.698722351 195.018531237 204.023750859 196.886379473 204.023750859 198.6021409 c 0 204.023750859 208.040661137 194.187819777 212.876768553 182.617370253 212.876768553 c 0 169.199127766 212.876768553 153.448127054 206.372675496 148 193 c 0 80 21 l 0x64 EndSplineSet Validated: 1 EndChar StartChar: uniE522 Encoding: 89 58658 89 Width: 351 Flags: HMW LayerCount: 2 Fore SplineSet -50 -160 m 0 -90 -160 -130 -135 -130 -90 c 0 -130 -55 -113 -30 -88 -30 c 0 -63 -30 -47 -45 -47 -65 c 0 -47 -75 -54 -83 -65 -90 c 0 -75 -97 -75 -100 -75 -110 c 0 -75 -120 -65 -124 -50 -124 c 0 13 -124 16 -35 83 230 c 1 64 230 65 230 30 230 c 0 17.239470207 230 10.992185238 240.421191718 10.992185238 250.625180963 c 0 10.992185238 260.412503619 16.7396874095 270 28 270 c 0 59 270 61 270 93 270 c 1 121 374 204 440 270 440 c 0 310 440 350 415 350 370 c 0 350 335 333 310 308 310 c 0 283 310 267 325 267 345 c 0 267 355 274 363 285 370 c 0 296 377 295 380 295 390 c 0 295 400 285 404 270 404 c 0 228 404 218 332 205 270 c 1 232 270 229 270 259 270 c 0 272 270 278.5 260 278.5 250 c 0 278.5 240 272 230 259 230 c 0 233 230 229 230 196 230 c 1 153 -26 80 -160 -50 -160 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE524 Encoding: 90 58660 90 Width: 563 Flags: W HStem: 0 30<56.2969 128.192> 250 30<86.1231 145.206> VStem: 0 67<48.3332 106.102> 30 50<188.851 246.418> 140 60<38.2418 104.228> 145.315 72.6848<183.703 229.735> LayerCount: 2 Fore SplineSet 80 0 m 0xd8 41 0 0 33 0 70 c 0xe0 0 92 14 108 30 108 c 0xd0 47 108 67 100 67 84 c 0 67 69 62 55 55 48 c 1 60 34 69 30 85 30 c 0 113 30 140 45 140 70 c 0xe8 140 100 116 103 90 120 c 0 57 141 30 167 30 200 c 0 30 247 70 280 130 280 c 0 175 280 218 253 218 220 c 0 218 199 202 180 180 180 c 0 163.575188443 180 145.315176651 194.681601887 145.315176651 213.518742217 c 0xd4 145.315176651 218.765893239 146.732008255 224.335480975 150 230 c 1 142 240 133 250 120 250 c 0 101 250 80 239 80 220 c 0 80 193 127 175 150 160 c 0 184 137 200 120 200 90 c 0 200 26 156 0 80 0 c 0xd8 EndSplineSet Validated: 1 EndChar StartChar: uniE525 Encoding: 91 58661 91 Width: 563 Flags: HMW LayerCount: 2 Fore SplineSet -10 3 m 0 -22 -6 -34 16 -23 26 c 0 153 219 l 0 141.918058124 224.910369 126.469558534 226.454180286 105.444752759 226.454180286 c 0 98.0113613903 226.454180286 89.8809317488 226.261203875 81 226 c 0 70 226 47 173 34 162 c 0 20 150 6 154 20 187 c 0 41 238 38 251 44 267 c 1 79.2709584661 264.544426942 105.57190844 263.63368868 125.594979066 263.63368868 c 0 183.112330324 263.63368868 188.827343421 271.148705903 206.551743542 271.148705903 c 0 210.297411805 271.148705903 214.579415356 270.813087697 220 270 c 0 235 268 233 254 224 245 c 0 66 78 l 0 64.6486486486 74.6216216216 63.972972973 72.1015339664 63.972972973 70.1929599431 c 0 63.972972973 57.9780861943 91.6486486486 70.8108108108 147 44 c 0 158 39 168 52 164 64 c 0 157 84 125 65 125 100 c 0 125 115 141 130 157 130 c 0 177 130 195 117 195 75 c 0 195 36.9571906054 164.866783384 2.35817739562 123.772791397 2.35817739562 c 0 120.578422501 2.35817739562 117.317823606 2.5672403992 114 3 c 0 69.8119048549 8.52351189314 48.9765181701 18.5669028431 29.7645164434 18.5669028431 c 0 17.6725183082 18.5669028431 6.22361116537 14.5882936895 -10 3 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE529 Encoding: 92 58665 92 Width: 703 Flags: HMW LayerCount: 2 Fore SplineSet 522 40 m 0 524.179123831 39.0525548563 526.555731167 38.5988184777 529.0907001 38.5988184777 c 0 553.311569742 38.5988184777 591.989634802 80.0214592618 611 128 c 0 618.801273837 147.763227053 623.897664408 174.829638922 623.897664408 197.52305288 c 0 623.897664408 218.46369363 619.558131706 235.680764302 609 240 c 0 607.059714009 240.759242344 604.934395026 241.11995209 602.659464452 241.11995209 c 0 577.96754404 241.11995209 535.650235832 198.625589581 521 162 c 0 510.665333312 135.693575703 506.068143327 108.945807045 506.068143327 87.1471403297 c 0 506.068143327 62.5417301443 511.925393958 44.2419393862 522 40 c 0 197 40 m 0 199.179123831 39.0525548563 201.555731167 38.5988184777 204.0907001 38.5988184777 c 0 228.311569742 38.5988184777 266.989634802 80.0214592618 286 128 c 0 293.801273837 147.763227053 298.897664408 174.829638922 298.897664408 197.52305288 c 0 298.897664408 218.46369363 294.558131706 235.680764302 284 240 c 0 282.059714009 240.759242344 279.934395026 241.11995209 277.659464452 241.11995209 c 0 252.96754404 241.11995209 210.650235832 198.625589581 196 162 c 0 185.665333312 135.693575703 181.068143327 108.945807045 181.068143327 87.1471403297 c 0 181.068143327 62.5417301443 186.925393958 44.2419393862 197 40 c 0 200 0 m 0 183 0 173 6 153 32 c 1 108 -90 l 1 160 -90 l 2 175 -90 175 -120 160 -120 c 2 -65 -120 l 2 -79 -120 -80 -90 -65 -90 c 2 10 -90 l 1 114 195 l 2 115.167116963 197.917792406 120.420719938 212.754502351 120.420719938 224.605732511 c 0 120.420719938 233.06305846 117.745271893 240 109 240 c 0 83 240 72 207 28 135 c 0 21 124 -6 139 1 151 c 0 56 249 69 280 125 280 c 0 170 280 193 271 203 235 c 1 244 278 263 280 305 280 c 0 331 280 358 264 371 230 c 1 395 267 413 280 450 280 c 0 495 280 518 271 528 235 c 1 569 278 588 280 630 280 c 0 656 280 683 264 696 230 c 1 720 267 738 280 775 280 c 0 820 280 843 271 853 235 c 1 894 278 913 280 955 280 c 0 981 280 1008 264 1021 230 c 1 1045 267 1063 280 1100 280 c 0 1145 280 1168 271 1178 235 c 1 1219 278 1238 280 1280 280 c 0 1316 280 1355 248 1355 180 c 0 1355 87 1274 0 1175 0 c 0 1158 0 1148 6 1128 32 c 1 1083 -90 l 1 1135 -90 l 2 1150 -90 1150 -120 1135 -120 c 2 910 -120 l 2 896 -120 895 -90 910 -90 c 2 985 -90 l 1 1089 195 l 2 1090.16711696 197.917792406 1095.42071994 212.754502351 1095.42071994 224.605732511 c 0 1095.42071994 233.06305846 1092.74527189 240 1084 240 c 0 1064 240 1053 221 1030 181 c 0 1030 181 1030 180 1030 180 c 0 1030 87 949 0 850 0 c 0 833 0 823 6 803 32 c 1 758 -90 l 1 810 -90 l 2 825 -90 825 -120 810 -120 c 2 585 -120 l 2 571 -120 570 -90 585 -90 c 2 660 -90 l 1 764 195 l 2 765.167116963 197.917792406 770.420719938 212.754502351 770.420719938 224.605732511 c 0 770.420719938 233.06305846 767.745271893 240 759 240 c 0 739 240 728 221 705 181 c 0 705 181 705 180 705 180 c 0 705 87 624 0 525 0 c 0 508 0 498 6 478 32 c 1 433 -90 l 1 485 -90 l 2 500 -90 500 -120 485 -120 c 2 260 -120 l 2 246 -120 245 -90 260 -90 c 2 335 -90 l 1 439 195 l 2 440.167116963 197.917792406 445.420719938 212.754502351 445.420719938 224.605732511 c 0 445.420719938 233.06305846 442.745271893 240 434 240 c 0 414 240 403 221 380 181 c 0 380 181 380 180 380 180 c 0 380 87 299 0 200 0 c 0 1172 40 m 0 1174.17912383 39.0525548563 1176.55573117 38.5988184777 1179.0907001 38.5988184777 c 0 1203.31156974 38.5988184777 1241.9896348 80.0214592618 1261 128 c 0 1268.80127384 147.763227053 1273.89766441 174.829638922 1273.89766441 197.52305288 c 0 1273.89766441 218.46369363 1269.55813171 235.680764302 1259 240 c 0 1257.05971401 240.759242344 1254.93439503 241.11995209 1252.65946445 241.11995209 c 0 1227.96754404 241.11995209 1185.65023583 198.625589581 1171 162 c 0 1160.66533331 135.693575703 1156.06814333 108.945807045 1156.06814333 87.1471403297 c 0 1156.06814333 62.5417301443 1161.92539396 44.2419393862 1172 40 c 0 847 40 m 0 849.179123831 39.0525548563 851.555731167 38.5988184777 854.0907001 38.5988184777 c 0 878.311569742 38.5988184777 916.989634802 80.0214592618 936 128 c 0 943.801273837 147.763227053 948.897664408 174.829638922 948.897664408 197.52305288 c 0 948.897664408 218.46369363 944.558131706 235.680764302 934 240 c 0 932.059714009 240.759242344 929.934395026 241.11995209 927.659464452 241.11995209 c 0 902.96754404 241.11995209 860.650235832 198.625589581 846 162 c 0 835.665333312 135.693575703 831.068143327 108.945807045 831.068143327 87.1471403297 c 0 831.068143327 62.5417301443 836.925393958 44.2419393862 847 40 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE52A Encoding: 93 58666 93 Width: 563 Flags: W HStem: -120 30<-74.2249 10 108 169.668 250.775 335 433 494.668 575.775 660 758 819.668> 0 38.5988<191.014 237.319 516.014 562.319 841.014 887.319> 240 40<80.1149 147.5 239.117 318 404.386 472.5 564.117 643 729.386 797.5 889.117 973> VStem: 120.421 60.6474<87.1471 224.606> 298.898 81.1023<108.679 217.246> 445.421 60.6474<87.1471 224.606> 623.898 81.1023<108.679 217.246> 770.421 60.6474<87.1471 224.606> 948.898 81.1023<108.462 239.669> LayerCount: 2 Fore SplineSet 850 0 m 0 833 0 823 6 803 32 c 1 758 -90 l 1 810 -90 l 2 825 -90 825 -120 810 -120 c 2 585 -120 l 2 571 -120 570 -90 585 -90 c 2 660 -90 l 1 764 195 l 2 765.167116963 197.917792406 770.420719938 212.754502351 770.420719938 224.605732511 c 0 770.420719938 233.06305846 767.745271893 240 759 240 c 0 739 240 728 221 705 181 c 0 705 181 705 180 705 180 c 0 705 87 624 0 525 0 c 0 508 0 498 6 478 32 c 1 433 -90 l 1 485 -90 l 2 500 -90 500 -120 485 -120 c 2 260 -120 l 2 246 -120 245 -90 260 -90 c 2 335 -90 l 1 439 195 l 2 440.167116963 197.917792406 445.420719938 212.754502351 445.420719938 224.605732511 c 0 445.420719938 233.06305846 442.745271893 240 434 240 c 0 414 240 403 221 380 181 c 0 380 181 380 180 380 180 c 0 380 87 299 0 200 0 c 0 183 0 173 6 153 32 c 1 108 -90 l 1 160 -90 l 2 175 -90 175 -120 160 -120 c 2 -65 -120 l 2 -79 -120 -80 -90 -65 -90 c 2 10 -90 l 1 114 195 l 2 115.167116963 197.917792406 120.420719938 212.754502351 120.420719938 224.605732511 c 0 120.420719938 233.06305846 117.745271893 240 109 240 c 0 83 240 72 207 28 135 c 0 21 124 -6 139 1 151 c 0 56 249 69 280 125 280 c 0 170 280 193 271 203 235 c 1 244 278 263 280 305 280 c 0 331 280 358 264 371 230 c 1 395 267 413 280 450 280 c 0 495 280 518 271 528 235 c 1 569 278 588 280 630 280 c 0 656 280 683 264 696 230 c 1 720 267 738 280 775 280 c 0 820 280 843 271 853 235 c 1 894 278 913 280 955 280 c 0 991 280 1030 248 1030 180 c 0 1030 87 949 0 850 0 c 0 847 40 m 0 849.179123831 39.0525548563 851.555731167 38.5988184777 854.0907001 38.5988184777 c 0 878.311569742 38.5988184777 916.989634802 80.0214592618 936 128 c 0 943.801273837 147.763227053 948.897664408 174.829638922 948.897664408 197.52305288 c 0 948.897664408 218.46369363 944.558131706 235.680764302 934 240 c 0 932.059714009 240.759242344 929.934395026 241.11995209 927.659464452 241.11995209 c 0 902.96754404 241.11995209 860.650235832 198.625589581 846 162 c 0 835.665333312 135.693575703 831.068143327 108.945807045 831.068143327 87.1471403297 c 0 831.068143327 62.5417301443 836.925393958 44.2419393862 847 40 c 0 522 40 m 0 524.179123831 39.0525548563 526.555731167 38.5988184777 529.0907001 38.5988184777 c 0 553.311569742 38.5988184777 591.989634802 80.0214592618 611 128 c 0 618.801273837 147.763227053 623.897664408 174.829638922 623.897664408 197.52305288 c 0 623.897664408 218.46369363 619.558131706 235.680764302 609 240 c 0 607.059714009 240.759242344 604.934395026 241.11995209 602.659464452 241.11995209 c 0 577.96754404 241.11995209 535.650235832 198.625589581 521 162 c 0 510.665333312 135.693575703 506.068143327 108.945807045 506.068143327 87.1471403297 c 0 506.068143327 62.5417301443 511.925393958 44.2419393862 522 40 c 0 197 40 m 0 199.179123831 39.0525548563 201.555731167 38.5988184777 204.0907001 38.5988184777 c 0 228.311569742 38.5988184777 266.989634802 80.0214592618 286 128 c 0 293.801273837 147.763227053 298.897664408 174.829638922 298.897664408 197.52305288 c 0 298.897664408 218.46369363 294.558131706 235.680764302 284 240 c 0 282.059714009 240.759242344 279.934395026 241.11995209 277.659464452 241.11995209 c 0 252.96754404 241.11995209 210.650235832 198.625589581 196 162 c 0 185.665333312 135.693575703 181.068143327 108.945807045 181.068143327 87.1471403297 c 0 181.068143327 62.5417301443 186.925393958 44.2419393862 197 40 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE52B Encoding: 94 58667 94 Width: 703 Flags: HMW LayerCount: 2 Fore SplineSet 200 0 m 0 183 0 173 6 153 32 c 1 108 -90 l 1 160 -90 l 2 175 -90 175 -120 160 -120 c 2 -65 -120 l 2 -79 -120 -80 -90 -65 -90 c 2 10 -90 l 1 114 195 l 2 115.167116963 197.917792406 120.420719938 212.754502351 120.420719938 224.605732511 c 0 120.420719938 233.06305846 117.745271893 240 109 240 c 0 83 240 72 207 28 135 c 0 21 124 -6 139 1 151 c 0 56 249 69 280 125 280 c 0 170 280 193 271 203 235 c 1 244 278 263 280 305 280 c 0 331 280 358 264 371 230 c 1 395 267 413 280 450 280 c 0 495 280 518 271 528 235 c 1 569 278 588 280 630 280 c 0 666 280 705 248 705 180 c 0 705 87 624 0 525 0 c 0 508 0 498 6 478 32 c 1 433 -90 l 1 485 -90 l 2 500 -90 500 -120 485 -120 c 2 260 -120 l 2 246 -120 245 -90 260 -90 c 2 335 -90 l 1 439 195 l 2 440.167116963 197.917792406 445.420719938 212.754502351 445.420719938 224.605732511 c 0 445.420719938 233.06305846 442.745271893 240 434 240 c 0 414 240 403 221 380 181 c 0 380 181 380 180 380 180 c 0 380 87 299 0 200 0 c 0 197 40 m 0 199.179123831 39.0525548563 201.555731167 38.5988184777 204.0907001 38.5988184777 c 0 228.311569742 38.5988184777 266.989634802 80.0214592618 286 128 c 0 293.801273837 147.763227053 298.897664408 174.829638922 298.897664408 197.52305288 c 0 298.897664408 218.46369363 294.558131706 235.680764302 284 240 c 0 282.059714009 240.759242344 279.934395026 241.11995209 277.659464452 241.11995209 c 0 252.96754404 241.11995209 210.650235832 198.625589581 196 162 c 0 185.665333312 135.693575703 181.068143327 108.945807045 181.068143327 87.1471403297 c 0 181.068143327 62.5417301443 186.925393958 44.2419393862 197 40 c 0 522 40 m 0 524.179123831 39.0525548563 526.555731167 38.5988184777 529.0907001 38.5988184777 c 0 553.311569742 38.5988184777 591.989634802 80.0214592618 611 128 c 0 618.801273837 147.763227053 623.897664408 174.829638922 623.897664408 197.52305288 c 0 623.897664408 218.46369363 619.558131706 235.680764302 609 240 c 0 607.059714009 240.759242344 604.934395026 241.11995209 602.659464452 241.11995209 c 0 577.96754404 241.11995209 535.650235832 198.625589581 521 162 c 0 510.665333312 135.693575703 506.068143327 108.945807045 506.068143327 87.1471403297 c 0 506.068143327 62.5417301443 511.925393958 44.2419393862 522 40 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE52C Encoding: 95 58668 95 Width: 811 Flags: HMW LayerCount: 2 Fore SplineSet 429 119 m 0 480 232 500 280 556 280 c 0 601 280 624 271 634 235 c 1 675 278 694 280 736 280 c 0 772 280 811 248 811 180 c 0 811 87 730 0 631 0 c 0 614 0 604 6 584 32 c 1 539 -90 l 1 591 -90 l 2 606 -90 606 -120 591 -120 c 2 366 -120 l 2 352 -120 351 -90 366 -90 c 2 441 -90 l 1 545 195 l 2 546.167116963 197.917792406 551.420719938 212.754502351 551.420719938 224.605732511 c 0 551.420719938 233.06305846 548.745271893 240 540 240 c 0 514 240 491 175 454 100 c 0 423 37 388 -10 323 -10 c 0 295.96461562 -10 276.685848474 4.31990873934 276.685848474 30.6552962356 c 0 276.685848474 38.4136929968 278.359032859 47.2149008096 282 57 c 2 334 193 l 2 334.687448544 195.062345631 335.007330587 196.961328373 335.007330587 198.698285174 c 0 335.007330587 208.224115412 325.386390673 212.876768553 314.009865299 212.876768553 c 0 300.302784706 212.876768553 284.047157224 206.122608782 279 193 c 2 214 22 l 2 211 14 207 0 191 -1 c 2 153 0 l 2 134 -2 132 12 136 22 c 2 203 193 l 2 203.698722351 195.018531237 204.023750859 196.886379473 204.023750859 198.6021409 c 0 204.023750859 208.040661137 194.187819777 212.876768553 182.617370253 212.876768553 c 0 169.199127766 212.876768553 153.448127054 206.372675496 148 193 c 2 80 21 l 2 76 11 74 1 57 0 c 2 4 0 l 2 -6 0 0 18 4 26 c 2 70 193 l 2 77 211 69 221 60 221 c 0 42 221 35 210 -11 138 c 0 -18 127 -39 139 -33 151 c 0 3 216 36 280 86 280 c 0 128 280 145 266 152 240 c 1 170 260 194 280 224 280 c 0 254 280 273 263 278 240 c 1 292 259 322 280 349 280 c 0 382.297060451 280 409.658220776 253.618221661 409.658220776 218.530504648 c 0 409.658220776 210.41331474 408.193901764 201.830198995 405 193 c 2 358 68 l 2 355.211869734 60.3326417674 353.881302664 53.2726015335 353.881302664 47.6241881024 c 0 353.881302664 39.5840041338 356.577277218 34.4040367054 361.602949871 34.4040367054 c 0 363.177144158 34.4040367054 364.979913018 34.9122608557 367 36 c 0 389 48 418 94 429 119 c 0 628 40 m 0 630.179123831 39.0525548563 632.555731167 38.5988184777 635.0907001 38.5988184777 c 0 659.311569742 38.5988184777 697.989634802 80.0214592618 717 128 c 0 724.801273837 147.763227053 729.897664408 174.829638922 729.897664408 197.52305288 c 0 729.897664408 218.46369363 725.558131706 235.680764302 715 240 c 0 713.059714009 240.759242344 710.934395026 241.11995209 708.659464452 241.11995209 c 0 683.96754404 241.11995209 641.650235832 198.625589581 627 162 c 0 616.665333312 135.693575703 612.068143327 108.945807045 612.068143327 87.1471403297 c 0 612.068143327 62.5417301443 617.925393958 44.2419393862 628 40 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE52D Encoding: 96 58669 96 Width: 351 Flags: HMW LayerCount: 2 Fore SplineSet 80 21 m 0 76 11 74 1 57 0 c 0 4 0 l 0 -6 0 0 18 4 26 c 1 70 193 l 0 77 211 69 221 60 221 c 0 42 221 35 210 -11 138 c 0 -18 127 -39 139 -33 151 c 0 3 216 36 280 86 280 c 0 128 280 145 266 152 240 c 1 170 260 194 280 224 280 c 0 254 280 273 263 278 240 c 1 292 259 322 280 349 280 c 0 382.297060451 280 409.658220776 253.618221661 409.658220776 218.530504648 c 0 409.658220776 210.41331474 408.193901764 201.830198995 405 193 c 0 358 68 l 0 355.211869734 60.3326417674 353.881302664 53.2726015335 353.881302664 47.6241881024 c 0 353.881302664 39.5840041338 356.577277218 34.4040367054 361.602949871 34.4040367054 c 0 363.177144158 34.4040367054 364.979913018 34.9122608557 367 36 c 0 389 48 404 72 419 93 c 0 427 104 449 93 440 78 c 0 411 27 388 -10 323 -10 c 0 295.96461562 -10 276.685848474 4.31990873934 276.685848474 30.6552962356 c 0 276.685848474 38.4136929968 278.359032859 47.2149008096 282 57 c 0 334 193 l 0 334.687448544 195.062345631 335.007330587 196.961328373 335.007330587 198.698285174 c 0 335.007330587 208.224115412 325.386390673 212.876768553 314.009865299 212.876768553 c 0 300.302784706 212.876768553 284.047157224 206.122608782 279 193 c 0 214 22 l 0 211 14 207 0 191 -1 c 1 153 0 l 16 134 -2 132 12 136 22 c 0 203 193 l 0 203.698722351 195.018531237 204.023750859 196.886379473 204.023750859 198.6021409 c 0 204.023750859 208.040661137 194.187819777 212.876768553 182.617370253 212.876768553 c 0 169.199127766 212.876768553 153.448127054 206.372675496 148 193 c 0 80 21 l 0 393 -160 m 0 353 -160 313 -135 313 -90 c 0 313 -55 330 -30 355 -30 c 0 380 -30 396 -45 396 -65 c 0 396 -75 389 -83 378 -90 c 0 368 -97 368 -100 368 -110 c 0 368 -120 378 -124 393 -124 c 0 456 -124 459 -35 526 230 c 1 507 230 508 230 473 230 c 0 460.239470207 230 453.992185238 240.421191718 453.992185238 250.625180963 c 0 453.992185238 260.412503619 459.73968741 270 471 270 c 0 502 270 504 270 536 270 c 1 564 374 647 440 713 440 c 0 753 440 793 415 793 370 c 0 793 335 776 310 751 310 c 0 726 310 710 325 710 345 c 0 710 355 717 363 728 370 c 0 739 377 738 380 738 390 c 0 738 400 728 404 713 404 c 0 671 404 661 332 648 270 c 1 675 270 672 270 702 270 c 0 715 270 721.5 260 721.5 250 c 0 721.5 240 715 230 702 230 c 0 676 230 672 230 639 230 c 1 596 -26 523 -160 393 -160 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE52F Encoding: 97 58671 97 Width: 617 Flags: HMW LayerCount: 2 Fore SplineSet 351 230 m 9 196 230 l 1 153 -26 80 -160 -50 -160 c 0 -90 -160 -130 -135 -130 -90 c 0 -130 -55 -113 -30 -88 -30 c 0 -63 -30 -47 -45 -47 -65 c 0 -47 -75 -54 -83 -65 -90 c 0 -75 -97 -75 -100 -75 -110 c 0 -75 -120 -65 -124 -50 -124 c 0 13 -124 16 -35 83 230 c 1 64 230 65 230 30 230 c 0 17.239470207 230 10.992185238 240.421191718 10.992185238 250.625180963 c 0 10.992185238 260.412503619 16.7396874095 270 28 270 c 0 59 270 61 270 93 270 c 1 121 374 204 440 270 440 c 0 310 440 350 415 350 370 c 0 350 335 333 310 308 310 c 0 283 310 267 325 267 345 c 0 267 355 274 363 285 370 c 0 296 377 295 380 295 390 c 0 295 400 285 404 270 404 c 0 228 404 218 333 205 271 c 1 360 270 l 1 388 374 471 440 537 440 c 0 577 440 617 415 617 370 c 0 617 335 600 310 575 310 c 0 550 310 534 325 534 345 c 0 534 355 541 363 552 370 c 0 563 377 562 380 562 390 c 0 562 400 552 404 537 404 c 0 495 404 485 332 472 270 c 1 499 270 496 270 526 270 c 0 539 270 545.5 260 545.5 250 c 0 545.5 240 539 230 526 230 c 0 500 230 496 230 463 230 c 1 420 -26 347 -160 217 -160 c 0 177 -160 137 -135 137 -90 c 0 137 -55 154 -30 179 -30 c 0 204 -30 220 -45 220 -65 c 0 220 -75 213 -83 202 -90 c 0 192 -97 192 -100 192 -110 c 0 192 -120 202 -124 217 -124 c 0 280 -124 284 -35 351 230 c 9 EndSplineSet Validated: 1 EndChar StartChar: uniE530 Encoding: 98 58672 98 Width: 351 Flags: HMW LayerCount: 2 Fore SplineSet 204 270 m 9 360 270 l 1 388 374 471 440 537 440 c 0 577 440 617 415 617 370 c 0 617 335 600 310 575 310 c 0 550 310 534 325 534 345 c 0 534 355 541 363 552 370 c 0 563 377 562 380 562 390 c 0 562 400 552 404 537 404 c 0 495 404 485 333 472 271 c 1 627 270 l 1 655 374 738 440 804 440 c 0 844 440 884 415 884 370 c 0 884 335 867 310 842 310 c 0 817 310 801 325 801 345 c 0 801 355 808 363 819 370 c 0 830 377 829 380 829 390 c 0 829 400 819 404 804 404 c 0 762 404 752 332 739 270 c 1 766 270 763 270 793 270 c 0 806 270 812.5 260 812.5 250 c 0 812.5 240 806 230 793 230 c 0 767 230 763 230 730 230 c 1 687 -26 614 -160 484 -160 c 0 444 -160 404 -135 404 -90 c 0 404 -55 421 -30 446 -30 c 0 471 -30 487 -45 487 -65 c 0 487 -75 480 -83 469 -90 c 0 459 -97 459 -100 459 -110 c 0 459 -120 469 -124 484 -124 c 0 547 -124 551 -35 618 230 c 9 463 230 l 1 420 -26 347 -160 217 -160 c 0 177 -160 137 -135 137 -90 c 0 137 -55 154 -30 179 -30 c 0 204 -30 220 -45 220 -65 c 0 220 -75 213 -83 202 -90 c 0 192 -97 192 -100 192 -110 c 0 192 -120 202 -124 217 -124 c 0 280 -124 283 -35 351 230 c 9 196 230 l 1 153 -26 80 -160 -50 -160 c 0 -90 -160 -130 -135 -130 -90 c 0 -130 -55 -113 -30 -88 -30 c 0 -63 -30 -47 -45 -47 -65 c 0 -47 -75 -54 -83 -65 -90 c 0 -75 -97 -75 -100 -75 -110 c 0 -75 -120 -65 -124 -50 -124 c 0 13 -124 16 -35 83 230 c 1 64 230 65 230 30 230 c 0 17.239470207 230 10.992185238 240.421191718 10.992185238 250.625180963 c 0 10.992185238 260.412503619 16.7396874095 270 28 270 c 0 59 270 61 270 93 270 c 1 121 374 204 440 270 440 c 0 310 440 350 415 350 370 c 0 350 335 333 310 308 310 c 0 283 310 267 325 267 345 c 0 267 355 274 363 285 370 c 0 296 377 295 380 295 390 c 0 295 400 285 404 270 404 c 0 228 404 217 332 204 270 c 9 EndSplineSet Validated: 1 EndChar StartChar: uniE531 Encoding: 99 58673 99 Width: 617 Flags: HMW LayerCount: 2 Fore SplineSet 472 271 m 9 628 270 l 1 656 374 739 440 805 440 c 0 845 440 885 415 885 370 c 0 885 335 868 310 843 310 c 0 818 310 802 325 802 345 c 0 802 355 809 363 820 370 c 0 831 377 830 380 830 390 c 0 830 400 820 404 805 404 c 0 763 404 753 333 740 271 c 1 895 270 l 1 923 374 1006 440 1072 440 c 0 1112 440 1152 415 1152 370 c 0 1152 335 1135 310 1110 310 c 0 1085 310 1069 325 1069 345 c 0 1069 355 1076 363 1087 370 c 0 1098 377 1097 380 1097 390 c 0 1097 400 1087 404 1072 404 c 0 1030 404 1020 332 1007 270 c 1 1034 270 1031 270 1061 270 c 0 1074 270 1080.5 260 1080.5 250 c 0 1080.5 240 1074 230 1061 230 c 0 1035 230 1031 230 998 230 c 1 955 -26 882 -160 752 -160 c 0 712 -160 672 -135 672 -90 c 0 672 -55 689 -30 714 -30 c 0 739 -30 755 -45 755 -65 c 0 755 -75 748 -83 737 -90 c 0 727 -97 727 -100 727 -110 c 0 727 -120 737 -124 752 -124 c 0 815 -124 819 -35 886 230 c 9 731 230 l 1 688 -26 615 -160 485 -160 c 0 445 -160 405 -135 405 -90 c 0 405 -55 422 -30 447 -30 c 0 472 -30 488 -45 488 -65 c 0 488 -75 481 -83 470 -90 c 0 460 -97 460 -100 460 -110 c 0 460 -120 470 -124 485 -124 c 0 548 -124 551 -36 618 230 c 9 463 230 l 1 420 -26 347 -160 217 -160 c 0 177 -160 137 -135 137 -90 c 0 137 -55 154 -30 179 -30 c 0 204 -30 220 -45 220 -65 c 0 220 -75 213 -83 202 -90 c 0 192 -97 192 -100 192 -110 c 0 192 -120 202 -124 217 -124 c 0 280 -124 284 -35 351 230 c 9 196 230 l 1 153 -26 80 -160 -50 -160 c 0 -90 -160 -130 -135 -130 -90 c 0 -130 -55 -113 -30 -88 -30 c 0 -63 -30 -47 -45 -47 -65 c 0 -47 -75 -54 -83 -65 -90 c 0 -75 -97 -75 -100 -75 -110 c 0 -75 -120 -65 -124 -50 -124 c 0 13 -124 16 -35 83 230 c 1 64 230 65 230 30 230 c 0 17.239470207 230 10.992185238 240.421191718 10.992185238 250.625180963 c 0 10.992185238 260.412503619 16.7396874095 270 28 270 c 0 59 270 61 270 93 270 c 1 121 374 204 440 270 440 c 0 310 440 350 415 350 370 c 0 350 335 333 310 308 310 c 0 283 310 267 325 267 345 c 0 267 355 274 363 285 370 c 0 296 377 295 380 295 390 c 0 295 400 285 404 270 404 c 0 228 404 218 333 205 271 c 1 360 270 l 1 388 374 471 440 537 440 c 0 577 440 617 415 617 370 c 0 617 335 600 310 575 310 c 0 550 310 534 325 534 345 c 0 534 355 541 363 552 370 c 0 563 377 562 380 562 390 c 0 562 400 552 404 537 404 c 0 495 404 485 332 472 271 c 9 EndSplineSet Validated: 1 EndChar StartChar: uniE539 Encoding: 100 58681 100 Width: 351 Flags: HMW LayerCount: 2 Fore SplineSet 80 0 m 0xd8 41 0 0 33 0 70 c 0xe8 0 92 14 108 30 108 c 0xd8 47 108 67 100 67 84 c 0xe8 67 69 62 55 55 48 c 1 60 34 69 30 85 30 c 0 113 30 140 45 140 70 c 0 140 100 120 107 94 124 c 0 61 145 30 167 30 200 c 0 30 247 70 280 130 280 c 0 175 280 218 253 218 220 c 0 218 199 202 180 180 180 c 0 163.575188443 180 145.315176651 194.681601887 145.315176651 213.518742217 c 0 145.315176651 218.765893239 146.732008255 224.335480975 150 230 c 1 142 240 133 250 120 250 c 0 101 250 80 239 80 220 c 0 80 193 127 175 150 160 c 0 184 137 200 120 200 90 c 0 200 26 156 0 80 0 c 0xd8 494 3 m 0 482 -6 470 16 481 26 c 0 655 217 l 0 647.065121876 221.231935 637.451249329 222.385713558 625.122178884 222.385713558 c 0 614.144520003 222.385713558 601.014276252 221.471008125 585 221 c 0 574 221 554 173 541 162 c 0 527 150 511 153 524 187 c 0 543 238 542 251 548 267 c 1 580.854598393 264.712654542 605.061346797 263.852204333 623.335584921 263.852204333 c 0 678.854023456 263.852204333 679.616120157 271.794054171 701.762784585 271.794054171 c 0 707.383128795 271.794054171 714.380713088 271.282571588 724 270 c 0 739 268 737 254 728 245 c 0 574 82 l 0 571.290722326 77.5296918374 570.067832218 74.1420610385 570.067832218 71.5487518924 c 0 570.067832218 54.9981455171 619.876699814 70.8006196048 651 44 c 0 660 36 672 52 668 64 c 0 661 84 629 65 629 100 c 0 629 115 645 130 661 130 c 0 681 130 699 117 699 75 c 0 699 35.6904170379 666.82658183 2.81551770962 623.631918047 2.81551770962 c 0 621.774432159 2.81551770962 619.896565457 2.87631094845 618 3 c 0 574.626134889 6.18925478761 553.222377354 17.5155864555 532.50873405 17.5155864555 c 0 520.748265557 17.5155864555 509.210259784 13.8644712743 494 3 c 0 182 -160 m 0 142 -160 102 -135 102 -90 c 0 102 -55 119 -30 144 -30 c 0 169 -30 185 -45 185 -65 c 0 185 -75 178 -83 167 -90 c 0 157 -97 165 -100 165 -110 c 0 165 -120 167 -124 182 -124 c 0 245 -124 248 -35 315 230 c 1 296 230 297 230 262 230 c 0 249.239470207 230 242.992185238 240.421191718 242.992185238 250.625180963 c 0 242.992185238 260.412503619 248.73968741 270 260 270 c 0 291 270 293 270 325 270 c 1 353 374 436 440 502 440 c 0 542 440 582 415 582 370 c 0 582 335 565 310 540 310 c 0 515 310 499 325 499 345 c 0 499 355 506 363 517 370 c 0 528 377 527 380 527 390 c 0 527 400 517 404 502 404 c 0 460 404 450 332 437 270 c 1 464 270 461 270 491 270 c 0 504 270 510.5 260 510.5 250 c 0 510.5 240 504 230 491 230 c 0 465 230 461 230 428 230 c 1 385 -26 312 -160 182 -160 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE566 Encoding: 101 58726 101 Width: 509 Flags: HMW LayerCount: 2 Fore SplineSet 310 265 m 1 183 258 l 1 126 74 l 0 125 70 124 67 124 63 c 0 124 51 132 42 144 42 c 0 176 42 230 60 254 80 c 9 310 265 l 1 242 40 m 1 192 9 164 -5 120 -5 c 0 72 -5 52 26 52 57 c 0 52 64 53 72 55 79 c 0 110 258 l 1 5 258 l 1 5 290 l 1 120 290 l 1 142 364 l 1 231 410 l 1 193 290 l 1 345 300 l 1 367 300 370 281 370 255 c 1 390 281 423 296 455 296 c 0 488 296 508 275 508 247 c 0 508 223 490 202 468 202 c 0 447 202 430 214 430 233 c 0 430 249 431 253 439 270 c 1 402 260 378 241 368 216 c 0 302 0 l 1 230 0 l 1 242 40 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE567 |
| ︙ | |||
1988 1989 1990 1991 1992 1993 1994 | 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 | - + | 92 61 102 51 102 32 c 0 102 11 93 -1 77 -3 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE56C |
| ︙ | |||
2013 2014 2015 2016 2017 2018 2019 | 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 | - + | 109 124 l 5 34 46 l 13 EndSplineSet Validated: 1 EndChar StartChar: uniE56D |
| ︙ | |||
2045 2046 2047 2048 2049 2050 2051 2052 2053 | 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - + - + - - + + - - - - + + + + - - - - - - - - - + - - + - - - - - - - + - - + - - - - + - - - - - - - - + + + + + + - - + + - + | 305 97 l 9 305 -53 l 25 278 -53 l 25 278 70 l 1xa0 EndSplineSet Validated: 1 EndChar StartChar: uniE582 Encoding: 106 58754 106 Width: 280 Flags: HMW LayerCount: 2 Fore SplineSet 123 0 m 25 123 123 l 25 0 123 l 25 0 157 l 25 123 157 l 25 123 280 l 25 157 280 l 25 157 157 l 25 280 157 l 25 280 123 l 25 157 123 l 25 157 0 l 25 123 0 l 25 EndSplineSet Validated: 1 EndChar StartChar: uniE5D0 Encoding: 107 58832 107 Width: 310 Flags: HMW LayerCount: 2 Fore SplineSet 0 0 m 1 0 60 l 1 93 79 229 114 280 370 c 1 310 370 l 1 310 175 152 13 0 0 c 1 EndSplineSet Validated: 1 EndChar StartChar: uniE5E2 Encoding: 108 58850 108 Width: 300 Flags: W HStem: 0 62<198.921 262.211> 96 64<38.8054 112.592> VStem: 283 16<88.1179 101.401> LayerCount: 2 Fore SplineSet 1 70 m 0 14 108 35 160 95 160 c 0 150 160 169 95 210 68 c 0 216 64 222 62 229 62 c 0 250 62 271 80 283 98 c 0 288 106 302 100 299 90 c 0 286 50 265 0 205 0 c 0 150 0 137 65 90 92 c 0 85 95 80 96 75 96 c 0 55 96 32 79 17 61 c 0 10 53 -2 61 1 70 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE610 Encoding: 109 58896 109 Width: 300 Flags: HMW LayerCount: 2 Fore SplineSet 0 0 m 25 0 300 l 25 300 300 l 25 300 0 l 25 265 0 l 25 265 180 l 25 35 180 l 29 35 0 l 29 0 0 l 25 EndSplineSet Validated: 1 EndChar StartChar: uniE612 Encoding: 110 58898 110 Width: 250 Flags: HMW LayerCount: 2 Fore SplineSet 105 0 m 25 0 450 l 29 40 450 l 29 125 90 l 25 210 450 l 29 250 450 l 29 145 0 l 25 105 0 l 25 EndSplineSet Validated: 1 EndChar StartChar: uniE614 Encoding: 111 58900 111 Width: 200 Flags: HMW LayerCount: 2 Fore SplineSet 100 25 m 28 141 25 175 59 175 100 c 28 175 141 141 175 100 175 c 28 59 175 25 141 25 100 c 28 25 59 59 25 100 25 c 28 100 0 m 28 45 0 0 45 0 100 c 28 0 155 45 200 100 200 c 28 155 200 200 155 200 100 c 28 200 45 155 0 100 0 c 28 EndSplineSet Validated: 1 EndChar StartChar: uniE618 Encoding: 112 58904 112 Width: 280 Flags: HMW LayerCount: 2 Fore SplineSet -200 0 m 1 -200 110 -110 200 0 200 c 24 110 200 200 110 200 0 c 1 170 0 l 1 170 99 99 170 0 170 c 24 -99 170 -170 99 -170 0 c 1 -200 0 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE624 Encoding: 113 58916 113 Width: 250 Flags: HMW LayerCount: 2 Fore SplineSet 90 120 m 0 110 120 132 165 132 200 c 28 132 235 110 280 90 280 c 0 70 280 48 235 48 200 c 24 48 165 70 120 90 120 c 0 72 0 m 25 72 100 l 17 37 110 0 144.818359375 0 200 c 0 0 255 45 300 90 300 c 0 135 300 180 255 180 200 c 0 180 144.818359375 143 110 108 100 c 0 108 0 l 25 72 0 l 25 EndSplineSet Validated: 1 EndChar StartChar: uniE630 Encoding: 114 58928 114 Width: 200 Flags: HMW LayerCount: 2 Fore SplineSet 84 102 m 1 36.534641833 109.00393025 -7.1054273576e-15 150.442560477 0 200 c 24 0 255 45 300 100 300 c 24 155 300 200 255 200 200 c 24 200 150.442560477 163.465358167 109.00393025 116 102 c 1 116 101.288034818 l 1 116 0 l 25 84 0 l 25 84 101.288034818 l 1 84 102 l 1 116 126 m 5 149.481193966 134.213607404 175 164.479867787 175 200 c 24 175 241 141 275 100 275 c 24 59 275 25 241 25 200 c 24 25 164.479867787 50.5188060342 134.213607404 84 126 c 1 84 126.757636954 l 1 84 200 l 25 116 200 l 25 116 126.757636954 l 1 116 126 l 5 EndSplineSet Validated: 1 EndChar StartChar: uniE650 |
| ︙ | |||
2198 2199 2200 2201 2202 2203 2204 | 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + - - - + - - + | 135 161 150 163 166 179 c 0 173 186 179 196 179 204 c 0 179 219 166 230 141 230 c 0xcb40 EndSplineSet Validated: 1 EndChar StartChar: uniE910 Encoding: 117 59664 117 Width: 500 Flags: HMW LayerCount: 2 Fore SplineSet 45 0 m 28 45 -113 137 -205 250 -205 c 28 363 -205 455 -113 455 0 c 28 455 113 363 205 250 205 c 28 137 205 45 113 45 0 c 28 0 0 m 28 0 139 111 250 250 250 c 28 388 250 500 139 500 0 c 28 500 -138 389 -250 250 -250 c 28 112 -250 0 -138 0 0 c 28 250 -60 m 7 217 -60 190 -33 190 0 c 7 190 33 217 60 250 60 c 7 283 60 310 33 310 0 c 7 310 -33 283 -60 250 -60 c 7 EndSplineSet Validated: 1 EndChar StartChar: uniE911 Encoding: 118 59665 118 Width: 500 Flags: HMW LayerCount: 2 Fore SplineSet 45 0 m 24 45 -113 137 -205 250 -205 c 24 363 -205 455 -113 455 0 c 24 455 113 363 205 250 205 c 24 137 205 45 113 45 0 c 24 0 0 m 24 0 139 111 250 250 250 c 24 388 250 500 139 500 0 c 24 500 -138 389 -250 250 -250 c 24 112 -250 0 -138 0 0 c 24 EndSplineSet Validated: 1 EndChar StartChar: uniE912 Encoding: 119 59666 119 Width: 500 Flags: HMW LayerCount: 2 Fore SplineSet 228 350 m 1 273 350 l 1 273 250 l 1 400 237 500 131 500 0 c 0 500 -130 401 -237 273 -250 c 1 273 -350 l 5 228 -350 l 5 228 -249 l 1 100 -238 0 -131 0 0 c 0 0 132 99 238 228 249 c 1 228 350 l 1 228 -203.826663616 m 1 228 203.826663616 l 1 125.298009966 192.809355922 45 105.569124751 45 0 c 0 45 -105.569124751 125.298009966 -192.809355922 228 -203.826663616 c 1 273 -203.716902537 m 1 375.222749877 -192.242459755 455 -105.22624212 455 0 c 0 455 105.22624212 375.222749877 192.242459755 273 203.716902537 c 1 273 -203.716902537 l 1 EndSplineSet Validated: 1 EndChar StartChar: uniE914 Encoding: 120 59668 120 Width: 500 Flags: HMW LayerCount: 2 Fore SplineSet 463 130 m 0 464 127 465 123 465 120 c 0 465 112 461 103 454 99 c 0 451 97 447 96 443 96 c 0 435 96 427 100 420 110 c 1 386 173 323 205 250 205 c 8 137 205 45 113 45 0 c 24 45 -113 137 -205 250 -205 c 16 330 -205 386 -174 420 -110 c 0 424 -102 434 -97 444 -97 c 0 448 -97 451 -97 454 -99 c 0 462 -104 466 -111 466 -118 c 0 466 -122 465 -126 463 -130 c 0 420 -211 350 -250 250 -250 c 8 112 -250 0 -138 0 0 c 24 0 139 111 250 250 250 c 0 344 250 420 210 463 130 c 0 250 -60 m 3 217 -60 190 -33 190 0 c 3 190 33 217 60 250 60 c 3 283 60 310 33 310 0 c 3 310 -33 283 -60 250 -60 c 3 EndSplineSet Validated: 1 EndChar StartChar: uniE915 Encoding: 121 59669 121 Width: 500 Flags: HMW LayerCount: 2 Fore SplineSet 463 130 m 0 464 127 465 123 465 120 c 0 465 112 461 103 454 99 c 0 451 97 447 96 443 96 c 0 435 96 427 100 420 110 c 1 386 173 323 205 250 205 c 8 137 205 45 113 45 0 c 24 45 -113 137 -205 250 -205 c 16 330 -205 386 -174 420 -110 c 0 424 -102 434 -97 444 -97 c 0 448 -97 451 -97 454 -99 c 0 462 -104 466 -111 466 -118 c 0 466 -122 465 -126 463 -130 c 0 420 -211 350 -250 250 -250 c 8 112 -250 0 -138 0 0 c 24 0 139 111 250 250 250 c 0 344 250 420 210 463 130 c 0 EndSplineSet Validated: 1 EndChar StartChar: uniE918 Encoding: 122 59672 122 Width: 500 Flags: HMW LayerCount: 2 Fore SplineSet 273 249 m 1 356 243 424 203 463 130 c 0 464 127 465 123 465 120 c 0 465 112 461 103 454 99 c 0 451 97 447 96 443 96 c 0 435 96 427 100 420 110 c 0 390 166 336 198 273 204 c 1 273 -204 l 1 341 -199 389 -168 420 -110 c 0 424 -102 434 -97 444 -97 c 0 448 -97 451 -97 454 -99 c 0 462 -104 466 -111 466 -118 c 0 466 -122 465 -126 463 -130 c 0 423 -205 361 -244 273 -249 c 1 273 -350 l 1 228 -350 l 1 228 -249 l 1 100 -238 0 -131 0 0 c 0 0 132 99 238 228 249 c 1 228 350 l 1 273 350 l 1 273 249 l 1 228 -204 m 1 228 204 l 1 125 193 45 106 45 0 c 0 45 -106 125 -193 228 -204 c 1 EndSplineSet Validated: 1 EndChar StartChar: uniE920 Encoding: 123 59680 123 Width: 120 Flags: HMW LayerCount: 2 Fore SplineSet 60 -60 m 3 27 -60 0 -33 0 0 c 3 0 33 27 60 60 60 c 3 93 60 120 33 120 0 c 3 120 -33 93 -60 60 -60 c 3 EndSplineSet Validated: 1 EndChar StartChar: uniE925 Encoding: 124 59685 124 Width: 45 Flags: HMW LayerCount: 2 Fore SplineSet 45 350 m 9 45 -350 l 1 0 -350 l 9 0 350 l 1 45 350 l 9 EndSplineSet Validated: 1 EndChar |
Changes to modules/MIDI.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | // MIDI.js - module to handle the %%MIDI parameters // |
| ︙ | |||
22 23 24 25 26 27 28 | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | - + - - + - + - + |
var pit = Number(p)
if (isNaN(pit))
return
p = ((pit / 12) | 0) * 7 - 19; // octave
pit = pit % 12; // in octave
p += pits[pit]
note = {
|
| ︙ | |||
93 94 95 96 97 98 99 | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | + + + - + + + + - + |
return
}
v = parseInt(a[3])
if (isNaN(v) || v < 0 || v > 127) {
this.syntax(1, "Bad controller value in %%MIDI")
return
}
if (this.cfmt().sound != "play")
break
if (this.parse.state >= 2) {
|
| ︙ | |||
133 134 135 136 137 138 139 140 141 142 | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | + + + + + - + - - - - - - - - |
else
of(text)
},
set_vp: function(of, a) {
abc2svg.MIDI.set_midi.call(this, a);
of(a)
},
set_hooks: function(abc) {
abc.do_pscom = abc2svg.MIDI.do_pscom.bind(abc, abc.do_pscom);
abc.set_vp = abc2svg.MIDI.set_vp.bind(abc, abc.set_vp)
}
} // MIDI
|
Changes to modules/ambitus.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | - + - + - - - - - + + + - + - + - + - + - - - - + - - - + - + - - + + + - + + + + + + + - + - - - - - - - - | // ambitus.js - module to insert an ambitus at start of a voice // |
Changes to modules/break.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | - + - - + + - + - + - + - + - + - + - | // break.js - module to handle the %%break command // |
| ︙ | |||
99 100 101 102 103 104 105 106 107 108 | 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | + + + + + - + - - - - - - - |
of(text)
},
set_bar_num: function(of) {
of()
if (this.cfmt().break)
abc2svg.break.do_break.call(this)
},
set_hooks: function(abc) {
abc.do_pscom = abc2svg.break.do_pscom.bind(abc, abc.do_pscom);
abc.set_bar_num = abc2svg.break.set_bar_num.bind(abc, abc.set_bar_num)
}
} // break
|
Changes to modules/capo.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | // capo.js - module to add a capo chord line // |
| ︙ | |||
53 54 55 56 57 58 59 | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | - + + - - + + + + + - + - - - - - - - - |
set_fmt: function(of, cmd, param, lock) {
if (cmd == "capo") {
this.cfmt().capo = param
return
}
of(cmd, param, lock)
|
Changes to modules/clip.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | - + - + - + - + | // clip.js - module to handle the %%clip command // |
| ︙ | |||
46 47 48 49 50 51 52 | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | - - - + - - - + - + - + - + |
return
}
this.cfmt().clip = [b, c]
}, // get_clip()
// cut the tune
do_clip: function() {
|
| ︙ | |||
122 123 124 125 126 127 128 | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | - + - + - + - + |
return
}
// update the start of voices
sy = this.get_cur_sy()
for (s2 = this.get_tsfirst(); s2 != s; s2 = s2.ts_next) {
switch (s2.type) {
|
| ︙ | |||
189 190 191 192 193 194 195 196 197 198 | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 | + + + + + - + - - - - - - - - |
of(text)
},
set_bar_num: function(of) {
of()
if (this.cfmt().clip)
abc2svg.clip.do_clip.call(this)
},
set_hooks: function(abc) {
abc.do_pscom = abc2svg.clip.do_pscom.bind(abc, abc.do_pscom);
abc.set_bar_num = abc2svg.clip.set_bar_num.bind(abc, abc.set_bar_num)
}
} // clip
|
Changes to modules/combine.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | - + - - + - - - - - + - + | // combine.js - module to add a combine chord line // |
| ︙ | |||
75 76 77 78 79 80 81 | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | - - + + - - + + - + - + | } s.ymx = 3 * (s.notes[nhd].pit - 18) + 4; s.ymn = 3 * (s.notes[0].pit - 18) - 4; // force the tie directions type = s.notes[0].ti1 |
| ︙ | |||
123 124 125 126 127 128 129 | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | - + - + |
}
} // do_combine()
var s, s2, g, i, r
for (s = this.get_tsfirst(); s; s = s.ts_next) {
switch (s.type) {
|
| ︙ | |||
156 157 158 159 160 161 162 | 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | - + - + |
break
}
//fixme: may have rests in beam
if (s2.beam_end)
break
do {
s2 = s2.next
|
| ︙ | |||
205 206 207 208 209 210 211 212 213 214 | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 | + + + + + + + - + - - - - - - - - - - |
for (i = 0; i < a.length; i++) {
if (a[i] == "combine=") { // %%voicecombine
curvoice.combine = a[i + 1]
break
}
}
of(a)
},
set_hooks: function(abc) {
abc.do_pscom = abc2svg.combine.do_pscom.bind(abc, abc.do_pscom);
abc.new_note = abc2svg.combine.new_note.bind(abc, abc.new_note);
abc.set_stem_dir = abc2svg.combine.set_stem_dir.bind(abc, abc.set_stem_dir);
abc.set_vp = abc2svg.combine.set_vp.bind(abc, abc.set_vp)
}
} // combine
|
Changes to modules/diag.js.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | // diag.js - module to insert guitar chord diagrams // |
| ︙ | |||
484 485 486 487 488 489 490 491 492 493 | 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 | + + + + + - + - - - - - - |
set_fmt: function(of, cmd, param, lock) {
if (cmd == "diagram") {
this.cfmt().diag = param
return
}
of(cmd, param, lock)
},
set_hooks: function(abc) {
abc.output_music = abc2svg.diag.output_music.bind(abc, abc.output_music);
abc.set_format = abc2svg.diag.set_fmt.bind(abc, abc.set_format)
}
} // diag
|
Added modules/equalbars.js.