From b054c8f82d25b6029a25b86146eeed4de677f883 Mon Sep 17 00:00:00 2001 From: Matthias Neeracher Date: Sun, 24 Jul 2011 03:32:43 +0000 Subject: [PATCH] Add Lilypond 2.14 spacing model --- English.lproj/VLDocument.xib | 2505 +++++++++++++++++++++++-------- Resources/Templates/default.lyt | 33 +- Sources/VLDocument.h | 5 + Sources/VLDocument.mm | 5 + Sources/VLLilypondDocument.mm | 20 +- 5 files changed, 1936 insertions(+), 632 deletions(-) diff --git a/English.lproj/VLDocument.xib b/English.lproj/VLDocument.xib index 70ef153..2a7ca34 100644 --- a/English.lproj/VLDocument.xib +++ b/English.lproj/VLDocument.xib @@ -1,20 +1,54 @@ - + 1040 - 9C7010 - 652 - 949.26 - 352.00 - + 11A500 + 1617 + 1133 + 566.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 1617 + + YES - - + NSStepper + NSMenuItem + NSMenu + NSButton + NSCustomObject + NSTableView + NSCustomView + NSComboBox + NSTextField + NSComboBoxCell + NSNumberFormatter + NSWindowTemplate + NSTextFieldCell + NSStepperCell + NSButtonCell + NSTableColumn + NSBox + NSView + NSPopUpButtonCell + NSScrollView + NSUserDefaultsController + NSProgressIndicator + NSScroller + NSTableHeaderView + NSPopUpButton YES com.apple.InterfaceBuilder.CocoaPlugin + + YES + + YES + + + YES @@ -31,7 +65,7 @@ Window NSWindow View - {3.40282e+38, 3.40282e+38} + {890, 350} @@ -45,7 +79,7 @@ YES - 256 + 274 YES @@ -59,7 +93,7 @@ 16779264 LucidaGrande - 1.300000e+01 + 13 1044 @@ -67,7 +101,7 @@ 1 LucidaGrande - 1.300000e+01 + 13 16 @@ -142,7 +176,7 @@ - QuKZrQ + B♭ 1048576 2147483647 @@ -154,7 +188,7 @@ - ReKZrQ + E♭ 1048576 2147483647 @@ -166,7 +200,7 @@ - QeKZrQ + A♭ 1048576 2147483647 @@ -178,7 +212,7 @@ - ROKZrQ + D♭ 1048576 2147483647 @@ -190,7 +224,7 @@ - R+KZrQ + G♭ 1048576 2147483647 @@ -361,7 +395,7 @@ - QuKZrW0 + B♭m 1048576 2147483647 @@ -373,7 +407,7 @@ - ReKZrW0 + E♭m 1048576 2147483647 @@ -736,7 +770,7 @@ controlColor 3 - MC42NjY2NjY2OQA + MC42NjY2NjY2NjY3AA @@ -856,10 +890,10 @@ 917024 0 - 2.000000e+01 - 2.000000e+01 - 3.000000e+02 - 1.000000e+00 + 20 + 20 + 300 + 1 YES YES @@ -978,7 +1012,7 @@ Title LucidaGrande - 1.100000e+01 + 11 3100 @@ -1012,7 +1046,7 @@ NSView - {{1, 1}, {954, 328}} + {{1, 1}, {969, 343}} @@ -1022,29 +1056,29 @@ 256 - {{955, 1}, {15, 312}} + {{955, 1}, {15, 337}} _doScroller: - 1.000000e+00 - 2.560976e-01 + 1 + 0.25609759999999998 256 - {{1, 329}, {954, 15}} + {{1, 329}, {963, 15}} YES 1 _doScroller: - 9.655870e-01 + 0.98076923076923073 {{0, -17}, {971, 345}} - 178 + 133298 @@ -1056,7 +1090,7 @@ YES - 256 + 274 YES @@ -1085,10 +1119,10 @@ 67239424 134217728 - 4oiaA + LucidaGrande-Bold - 1.300000e+01 + 13 2072 @@ -1153,7 +1187,8 @@ {{0, 0}, {1280, 778}} {890, 372} - {3.40282e+38, 3.40282e+38} + {10000000000000, 10000000000000} + YES 15 @@ -1169,7 +1204,7 @@ View - {3.40282e+38, 3.40282e+38} + {213, 107} @@ -1181,6 +1216,7 @@ 256 {{25, 254}, {75, 78}} + YES 67239424 @@ -1188,7 +1224,7 @@ Preview LucidaGrande - 1.000000e+01 + 10 16 @@ -1209,6 +1245,7 @@ 256 {{110, 276}, {58, 56}} + YES 67239424 @@ -1233,6 +1270,7 @@ 256 {{267, 271}, {58, 56}} + YES 67239424 @@ -1257,6 +1295,7 @@ 256 {{149, 197}, {58, 56}} + YES 67239424 @@ -1281,6 +1320,7 @@ 256 {{218, 197}, {58, 56}} + YES 67239424 @@ -1305,6 +1345,7 @@ 256 {{318, 191}, {58, 56}} + YES 67239424 @@ -1330,14 +1371,16 @@ {{369, 292}, {16, 16}} + 28938 - 1.000000e+02 + 100 256 {{18, 122}, {58, 65}} + YES 67239424 @@ -1362,6 +1405,7 @@ 256 {{218, 94}, {58, 56}} + 1 YES @@ -1387,6 +1431,7 @@ 256 {{329, 94}, {58, 56}} + -1 YES @@ -1412,6 +1457,7 @@ 256 {{218, 31}, {58, 56}} + -2 YES @@ -1437,6 +1483,7 @@ 256 {{329, 31}, {58, 56}} + 2 YES @@ -1460,10 +1507,12 @@ {480, 360} + {{0, 0}, {1280, 778}} {213, 129} - {3.40282e+38, 3.40282e+38} + {10000000000000, 10000000000000} + YES 7 @@ -1477,10 +1526,10 @@ View - {3.40282e+38, 3.40282e+38} + {213, 107} - + 256 YES @@ -1514,7 +1563,7 @@ YES - + YES allowsFloats attributedStringForZero @@ -1532,17 +1581,13 @@ YES - + 0 - + YES - - YES - - - YES - + + . @@ -1565,11 +1610,11 @@ AgAAAAAAAAAAAAAAAAAAAA -0 - LeKIng + -∞ 0 - K+KIng - + +∞ + 0 @@ -1582,7 +1627,7 @@ NaN - + @@ -1609,10 +1654,10 @@ 917024 0 - 2.000000e+00 - 2.000000e+00 - 1.600000e+01 - 1.000000e+00 + 2 + 2 + 16 + 1 YES @@ -1642,15 +1687,15 @@ 67239424 134217728 - RG9uJ3QgUmVwZWF0A + Don't Repeat - 1002 + 1002 -2038284033 1 - fw +  200 25 @@ -1667,8 +1712,8 @@ 134217728 Cancel - 1001 + 1001 -2038284033 1 @@ -1690,8 +1735,8 @@ 134217728 Repeat - 1000 + 1000 -2038284033 1 @@ -1702,11 +1747,13 @@ - {{1, 9}, {338, 127}} + {338, 127} + {{0, 0}, {1280, 778}} {213, 129} - {3.40282e+38, 3.40282e+38} + {10000000000000, 10000000000000} + YES 7 @@ -1718,10 +1765,10 @@ View - {3.40282e+38, 3.40282e+38} + {213, 107} - + 256 YES @@ -1753,13 +1800,13 @@ 134217728 Delete Ending - 1002 + 1002 -2038284033 1 - fw +  200 25 @@ -1776,8 +1823,8 @@ 134217728 Cancel - 1001 + 1001 -2038284033 1 @@ -1799,8 +1846,8 @@ 134217728 Add Ending - 1000 + 1000 -2038284033 1 @@ -1833,22 +1880,21 @@ - - + + 256 {{-26, 0}, {16, 17}} - YES 1 - 2.000000e+01 - 2.000000e+01 - 2.000000e+01 + 20 + 20 + 20 - 75628032 - 134217728 + 75628096 + 134219776 1 @@ -1868,7 +1914,7 @@ LucidaGrande - 1.200000e+01 + 12 16 @@ -1881,7 +1927,7 @@ YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -1907,7 +1953,7 @@ AAAAxQAAAJkAAABBAAAACAAAAAAAAAAAAAAAAgAAAA0AAAAlAAAANgAAAEEAAABDAAAAQwAAAEMAAABE AAAAQwAAAEQAAABBAAAANgAAACUAAAANAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAwAAAAYAAAAG AAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAAwAAAAMAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAA+4AAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAPuGFw cGwCAAAAbW50clJHQiBYWVogB9YADAAHABEAFQAbYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsJNLJy134Mnx572GDPUg6gwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -1996,12 +2042,12 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 2 - 2.000000e+01 - 2.000000e+01 - 2.000000e+01 + 20 + 20 + 20 - 75628032 - 134217728 + 75628096 + 134219776 2 @@ -2029,12 +2075,12 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 4 - 2.000000e+01 - 2.000000e+01 - 2.000000e+01 + 20 + 20 + 20 - 67239424 - 134217728 + 75628096 + 134219776 3 @@ -2064,12 +2110,12 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 8 - 2.000000e+01 - 2.000000e+01 - 2.000000e+01 + 20 + 20 + 20 - 67239424 - 134217728 + 75628096 + 134219776 4 @@ -2094,12 +2140,12 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 16 - 2.000000e+01 - 2.000000e+01 - 2.000000e+01 + 20 + 20 + 20 - 67239424 - 134217728 + 75628096 + 134219776 5 @@ -2124,12 +2170,12 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 32 - 2.000000e+01 - 2.000000e+01 - 2.000000e+01 + 20 + 20 + 20 - 67239424 - 134217728 + 75628096 + 134219776 6 @@ -2154,12 +2200,12 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 64 - 2.000000e+01 - 2.000000e+01 - 2.000000e+01 + 20 + 20 + 20 - 67239424 - 134217728 + 75628096 + 134219776 7 @@ -2184,12 +2230,12 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 128 - 1.995557e+01 - 1.495557e+01 - 2.000000e+01 + 19.955570000000002 + 14.95557 + 20 - 67239424 - 134217728 + 75628096 + 134219776 8 @@ -2213,8 +2259,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA - 3.000000e+00 - 2.000000e+00 + 3 + 2 6 @@ -2225,12 +2271,16 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAMC41AA - 1.700000e+01 + 17 306184192 + + 4 -1 0 YES + 0 + 1 {{1, 17}, {184, 19}} @@ -2247,22 +2297,22 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA - 256 + -2147483392 {{-100, -100}, {15, 37}} _doScroller: - 1.947368e-01 + 0.19473679999999999 - 256 + -2147483392 {{-100, -100}, {143, 15}} 1 _doScroller: - 9.904762e-01 + 0.99047620000000003 @@ -2278,40 +2328,40 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 4 - {{95, 60}, {186, 37}} - 2 + 133122 - QSAAAEEgAABBmAAAQZgAAA - {{1, 9}, {372, 142}} + {372, 142} + {{0, 0}, {1280, 778}} {213, 129} - {3.40282e+38, 3.40282e+38} + {10000000000000, 10000000000000} + YES 7 2 - {{417, 204}, {543, 189}} + {{417, 204}, {537, 336}} 1886912512 Window NSWindow View - {3.40282e+38, 3.40282e+38} + {213, 107} - + 256 YES @@ -2320,6 +2370,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA256 {{334, 12}, {82, 32}} + + 1001 YES @@ -2327,8 +2379,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA134217728 Cancel - 1001 + 1001 -2038284033 1 @@ -2343,6 +2395,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA256 {{416, 12}, {113, 32}} + + 1000 YES @@ -2350,8 +2404,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA134217728 OK - 1000 + 1000 -2038284033 1 @@ -2368,7 +2422,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAYES - 256 + 274 YES @@ -2376,6 +2430,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA256 {{109, 72}, {69, 17}} + + YES 67239424 @@ -2392,6 +2448,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA256 {{164, 66}, {65, 26}} + + YES -2076049856 @@ -2484,6 +2542,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA256 {{109, 46}, {62, 17}} + + YES 67239424 @@ -2500,6 +2560,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA256 {{164, 40}, {65, 26}} + + YES -2076049856 @@ -2592,6 +2654,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA256 {{15, 72}, {92, 17}} + + YES 67239424 @@ -2608,6 +2672,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA256 {{15, 14}, {114, 17}} + + YES 67239424 @@ -2624,6 +2690,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA256 {{164, 8}, {65, 26}} + + YES -2076049856 @@ -2759,10 +2827,14 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA {{1, 1}, {244, 100}} + + - {{17, 53}, {246, 116}} + {{17, 200}, {246, 116}} + + {0, 0} 67239424 @@ -2788,14 +2860,16 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAYES - 256 + 274 YES 268 - {{156, 10}, {60, 26}} + {{156, 153}, {60, 26}} + + YES 343014976 @@ -2826,10 +2900,9 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA YES - - 1.000000e+01 - 1.000000e+01 - 1.000000e+03 + 10 + 10 + 1000 75628032 0 @@ -2856,11 +2929,11 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA - 3.000000e+00 - 2.000000e+00 + 3 + 2 - 1.900000e+01 + 19 tableViewAction: -765427712 @@ -2870,18 +2943,22 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA15 0 YES + 0 + 1 268 - {{97, 15}, {54, 17}} + {{99, 158}, {54, 17}} + + YES 67239488 - 272630784 + 71304192 Lyrics: @@ -2892,8 +2969,10 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 268 - {{97, 67}, {54, 17}} + {{97, 214}, {54, 17}} + + YES 67239488 @@ -2908,8 +2987,10 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 268 - {{15, 43}, {69, 17}} + {{15, 185}, {69, 17}} + + YES 67239488 @@ -2924,12 +3005,14 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 268 - {{97, 43}, {54, 17}} + {{99, 185}, {54, 17}} + + YES 67239488 - 272630784 + 71304192 Chords: @@ -2940,8 +3023,10 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 268 - {{156, 38}, {60, 26}} + {{156, 181}, {60, 26}} + + YES 343014976 @@ -2972,10 +3057,9 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA YES - - 1.000000e+01 - 1.000000e+01 - 1.000000e+03 + 10 + 10 + 1000 75628032 0 @@ -3001,11 +3085,11 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA - 3.000000e+00 - 2.000000e+00 + 3 + 2 - 1.900000e+01 + 19 tableViewAction: -765427712 @@ -3015,14 +3099,551 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA15 0 YES + 0 + 1 + + + + + + 268 + {{76, 103}, {77, 17}} + + + + YES + + 67239488 + 71304192 + Below Title: + + + + + + + + + 268 + {{15, 130}, {55, 17}} + + + + YES + + 67239488 + 272630784 + Padding + + + + + + + + + 268 + {{120, 130}, {33, 17}} + + + + YES + + 67239488 + 71304192 + Top: + + + + + + + + + 268 + {{156, 126}, {60, 26}} + + + + YES + + 343014976 + 272630784 + 6 + + + YES + + + 5 + YES + + YES + 0 + 1 + 2 + 3 + 4 + + + + + 274 + {13, 84} + + + YES + + YES + + 10 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5OQA + + + + + 338820672 + 1024 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -765427712 + + + + 1 + 15 + 0 + YES + 0 + 1 + + + + + + 268 + {{156, 99}, {60, 26}} + + + + YES + + 343014976 + 272630784 + 6 + + + YES + + + 5 + YES + + YES + 0 + 1 + 2 + 3 + 4 + + + + + 274 + {13, 105} + + + YES + + YES + + 10 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5OQA + + + + + 338820672 + 1024 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -765427712 + + + + 1 + 15 + 0 + YES + 0 + 1 + + + + + + 268 + {{55, 75}, {98, 17}} + + + + YES + + 67239488 + 71304192 + Between Lines: + + + + + + + + + 268 + {{156, 71}, {60, 26}} + + + + YES + + 343014976 + 272630784 + 6 + + + YES + + + 5 + YES + + YES + 0 + 1 + 2 + 3 + 4 + + + + + 274 + {13, 105} + + + YES + + YES + + 10 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5OQA + + + + + 338820672 + 1024 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -765427712 + + + + 1 + 15 + 0 + YES + 0 + 1 + + + + + + 268 + {{59, 47}, {94, 17}} + + + + YES + + 67239488 + 71304192 + Below Chords: + + + + + + + + + 268 + {{156, 43}, {60, 26}} + + + + YES + + 343014976 + 272630784 + 6 + + + YES + + + 5 + YES + + YES + 0 + 1 + 2 + 3 + 4 + + + + + 274 + {13, 105} + + + YES + + YES + + 10 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5OQA + + + + + 338820672 + 1024 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -765427712 + + + + 1 + 15 + 0 + YES + 0 + 1 + + + + + + 268 + {{65, 19}, {88, 17}} + + + + YES + + 67239488 + 71304192 + Above Lyrics: + + + + + + + + + 268 + {{156, 15}, {60, 26}} + + + + YES + + 343014976 + 272630784 + 6 + + + YES + + + 5 + YES + + YES + 0 + 1 + 2 + 3 + 4 + + + + + 274 + {13, 105} + + + YES + + YES + + 10 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5OQA + + + + + 338820672 + 1024 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -765427712 + + + + 1 + 15 + 0 + YES + 0 + 1 268 - {{156, 62}, {60, 26}} + {{156, 209}, {60, 26}} + + YES 343014976 @@ -3053,10 +3674,9 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA YES - - 1.000000e+01 - 1.000000e+01 - 1.000000e+03 + 10 + 10 + 1000 75628032 0 @@ -3082,11 +3702,11 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA - 3.000000e+00 - 2.000000e+00 + 3 + 2 - 1.900000e+01 + 19 tableViewAction: -765427712 @@ -3096,14 +3716,18 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA15 0 YES + 0 + 1 268 - {{15, 67}, {69, 17}} + {{15, 214}, {69, 17}} + + YES 67239488 @@ -3116,12 +3740,16 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA - {{1, 1}, {231, 96}} + {{1, 1}, {231, 243}} + + - {{293, 56}, {233, 112}} + {{293, 56}, {233, 259}} + + {0, 0} 67239424 @@ -3141,11 +3769,15 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAANO - {543, 189} + {537, 336} + + + {{0, 0}, {1280, 778}} {213, 129} - {3.40282e+38, 3.40282e+38} + {10000000000000, 10000000000000} + YES NSApplication @@ -3713,22 +4345,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 100350 - - - value: document.lyricSize - - - - - - value: document.lyricSize - value - document.lyricSize - 2 - - - 100379 - value: document.chordSize @@ -3849,28 +4465,122 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 100444 + + + value: document.lyricSize + + + + + + value: document.lyricSize + value + document.lyricSize + 2 + + + 100450 + + + + value: document.topPadding + + + + + + value: document.topPadding + value + document.topPadding + 2 + + + 100481 + + + + value: document.titlePadding + + + + + + value: document.titlePadding + value + document.titlePadding + 2 + + + 100482 + + + + value: document.staffPadding + + + + + + value: document.staffPadding + value + document.staffPadding + 2 + + + 100483 + + + + value: document.chordPadding + + + + + + value: document.chordPadding + value + document.chordPadding + 2 + + + 100484 + + + + value: document.lyricPadding + + + + + + value: document.lyricPadding + value + document.lyricPadding + 2 + + + 100485 + YES 0 - - YES - + -2 - - RmlsZSdzIE93bmVyA + + File's Owner -1 - + First Responder @@ -3880,7 +4590,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAYES - + Sheet Music Window @@ -3950,7 +4660,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAYES - + Toolbar Items @@ -4048,7 +4758,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAYES - + Repeat @@ -4136,7 +4846,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAYES - + Endings @@ -4330,7 +5040,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAYES - + Display @@ -4338,10 +5048,10 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA YES - - + + @@ -4505,7 +5215,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA -3 - + Application @@ -5296,6 +6006,17 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA + + + + + + + + + + + @@ -5414,7 +6135,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 100371 - + 100416 @@ -5522,17 +6243,222 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA + + 100452 + + + YES + + + + + + 100453 + + + YES + + + + + + 100454 + + + YES + + + + + + 100455 + + + YES + + + + + + 100456 + + + + + 100457 + + + + + 100458 + + + + + 100459 + + + + + 100463 + + + YES + + + + + + 100464 + + + + + 100466 + + + YES + + + + + + 100467 + + + YES + + + + + + 100468 + + + + + 100469 + + + + + 100471 + + + YES + + + + + + 100472 + + + YES + + + + + + 100473 + + + + + 100474 + + + + + 100476 + + + YES + + + + + + 100477 + + + YES + + + + + + 100478 + + + + + 100479 + + + YES - + YES -1.IBPluginDependency -2.IBPluginDependency + -3.IBPluginDependency 100.IBPluginDependency - 100.ImportedFromIB2 + 100023.IBPluginDependency + 100061.IBPluginDependency + 100073.IBPluginDependency + 100097.IBPluginDependency + 100100.IBPluginDependency + 100101.IBPluginDependency + 100146.IBPluginDependency + 100147.IBPluginDependency + 100162.IBPluginDependency + 100163.IBPluginDependency + 100164.IBPluginDependency + 100165.IBPluginDependency + 100166.IBPluginDependency + 100167.IBPluginDependency + 100171.IBPluginDependency + 100176.IBPluginDependency + 100177.IBPluginDependency + 100178.IBPluginDependency + 100181.IBPluginDependency + 100188.IBPluginDependency + 100189.IBPluginDependency + 100198.IBPluginDependency + 100199.IBPluginDependency + 100201.IBPluginDependency + 100202.IBPluginDependency + 100205.IBPluginDependency + 100206.IBPluginDependency + 100207.IBPluginDependency + 100218.IBPluginDependency + 100219.IBPluginDependency + 100220.IBPluginDependency + 100221.IBPluginDependency + 100224.IBPluginDependency 100224.IBShouldRemoveOnLegacySave + 100249.IBPluginDependency + 100254.IBPluginDependency + 100268.IBPluginDependency + 100269.IBPluginDependency + 100270.IBPluginDependency + 100290.IBPluginDependency + 100296.IBPluginDependency + 100305.IBPluginDependency + 100306.IBPluginDependency + 100313.IBPluginDependency + 100314.IBPluginDependency + 100339.IBPluginDependency + 100340.IBPluginDependency + 100341.IBPluginDependency + 100342.IBPluginDependency + 100343.IBPluginDependency + 100344.IBPluginDependency + 100351.IBPluginDependency 100352.IBPluginDependency 100353.IBPluginDependency 100354.IBPluginDependency @@ -5549,6 +6475,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA100365.IBPluginDependency 100366.IBPluginDependency 100367.IBPluginDependency + 100368.IBPluginDependency + 100371.IBPluginDependency 100416.IBPluginDependency 100417.IBPluginDependency 100419.IBPluginDependency @@ -5561,339 +6489,252 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA100427.IBPluginDependency 100428.IBAttributePlaceholdersKey 100428.IBPluginDependency - 100428.ImportedFromIB2 + 100429.IBPluginDependency 100430.IBAttributePlaceholdersKey 100430.IBPluginDependency - 100430.ImportedFromIB2 + 100431.IBPluginDependency 100432.IBAttributePlaceholdersKey 100432.IBPluginDependency - 100432.ImportedFromIB2 + 100433.IBPluginDependency 100434.IBAttributePlaceholdersKey 100434.IBPluginDependency - 100434.ImportedFromIB2 + 100435.IBPluginDependency + 100452.IBPluginDependency + 100453.IBPluginDependency + 100454.IBPluginDependency + 100455.IBPluginDependency + 100456.IBComboBoxObjectValuesKey.objectValues + 100456.IBPluginDependency + 100457.IBPluginDependency + 100458.IBPluginDependency + 100459.IBPluginDependency + 100463.IBPluginDependency + 100464.IBComboBoxObjectValuesKey.objectValues + 100464.IBPluginDependency + 100466.IBPluginDependency + 100467.IBPluginDependency + 100468.IBComboBoxObjectValuesKey.objectValues + 100468.IBPluginDependency + 100469.IBPluginDependency + 100471.IBPluginDependency + 100472.IBPluginDependency + 100473.IBComboBoxObjectValuesKey.objectValues + 100473.IBPluginDependency + 100474.IBPluginDependency + 100476.IBPluginDependency + 100477.IBPluginDependency + 100478.IBComboBoxObjectValuesKey.objectValues + 100478.IBPluginDependency + 100479.IBPluginDependency 101.IBPluginDependency - 101.ImportedFromIB2 102.IBPluginDependency - 102.ImportedFromIB2 114.IBPluginDependency - 114.ImportedFromIB2 130.IBPluginDependency - 130.ImportedFromIB2 - 144.IBEditorWindowLastContentRect 144.IBPluginDependency 144.IBWindowTemplateEditedContentRect - 144.ImportedFromIB2 - 144.editorWindowContentRectSynchronizationRect - 144.windowTemplate.hasMaxSize - 144.windowTemplate.hasMinSize - 144.windowTemplate.maxSize - 144.windowTemplate.minSize 145.IBPluginDependency - 145.ImportedFromIB2 146.IBAttributePlaceholdersKey 146.IBPluginDependency - 146.ImportedFromIB2 147.IBAttributePlaceholdersKey 147.IBPluginDependency - 147.ImportedFromIB2 162.IBPluginDependency - 162.ImportedFromIB2 163.IBPluginDependency - 163.ImportedFromIB2 164.IBPluginDependency - 164.ImportedFromIB2 165.IBPluginDependency - 165.ImportedFromIB2 166.IBPluginDependency - 166.ImportedFromIB2 167.IBPluginDependency - 167.ImportedFromIB2 171.IBAttributePlaceholdersKey 171.IBPluginDependency - 171.ImportedFromIB2 176.IBPluginDependency - 176.ImportedFromIB2 177.IBPluginDependency - 177.ImportedFromIB2 178.IBPluginDependency - 178.ImportedFromIB2 181.IBPluginDependency - 181.ImportedFromIB2 188.IBAttributePlaceholdersKey 188.IBPluginDependency - 188.ImportedFromIB2 189.IBAttributePlaceholdersKey 189.IBPluginDependency - 189.ImportedFromIB2 196.IBPluginDependency - 196.ImportedFromIB2 - 196.windowTemplate.hasMaxSize - 196.windowTemplate.hasMinSize - 196.windowTemplate.maxSize - 196.windowTemplate.minSize 197.IBPluginDependency - 197.ImportedFromIB2 198.IBPluginDependency - 198.ImportedFromIB2 199.IBPluginDependency - 199.ImportedFromIB2 200.IBPluginDependency - 200.ImportedFromIB2 201.IBPluginDependency - 201.ImportedFromIB2 202.IBPluginDependency - 202.ImportedFromIB2 205.IBPluginDependency - 205.ImportedFromIB2 206.IBPluginDependency - 206.ImportedFromIB2 207.IBPluginDependency - 207.ImportedFromIB2 216.IBPluginDependency - 216.ImportedFromIB2 - 216.windowTemplate.hasMaxSize - 216.windowTemplate.hasMinSize - 216.windowTemplate.maxSize - 216.windowTemplate.minSize 217.IBPluginDependency - 217.ImportedFromIB2 218.IBPluginDependency - 218.ImportedFromIB2 219.IBPluginDependency - 219.ImportedFromIB2 22.IBPluginDependency - 22.ImportedFromIB2 220.IBPluginDependency - 220.ImportedFromIB2 221.IBPluginDependency - 221.ImportedFromIB2 222.IBPluginDependency - 222.ImportedFromIB2 223.IBPluginDependency - 223.ImportedFromIB2 224.IBPluginDependency - 224.ImportedFromIB2 225.IBPluginDependency - 225.ImportedFromIB2 226.IBPluginDependency - 226.ImportedFromIB2 227.IBPluginDependency - 227.ImportedFromIB2 228.IBPluginDependency - 228.ImportedFromIB2 229.IBPluginDependency - 229.ImportedFromIB2 23.IBPluginDependency - 23.ImportedFromIB2 230.IBPluginDependency - 230.ImportedFromIB2 231.IBPluginDependency - 231.ImportedFromIB2 233.IBPluginDependency - 233.ImportedFromIB2 234.IBPluginDependency - 234.ImportedFromIB2 235.IBPluginDependency - 235.ImportedFromIB2 236.IBPluginDependency - 236.ImportedFromIB2 237.IBPluginDependency - 237.ImportedFromIB2 238.IBPluginDependency - 238.ImportedFromIB2 239.IBPluginDependency - 239.ImportedFromIB2 - 24.IBEditorWindowLastContentRect 24.IBPluginDependency - 24.ImportedFromIB2 - 24.editorWindowContentRectSynchronizationRect 249.IBAttributePlaceholdersKey 249.IBPluginDependency - 249.ImportedFromIB2 25.IBPluginDependency - 25.ImportedFromIB2 254.IBPluginDependency - 254.ImportedFromIB2 255.IBPluginDependency - 255.ImportedFromIB2 256.IBPluginDependency - 256.ImportedFromIB2 257.IBPluginDependency - 257.ImportedFromIB2 258.IBPluginDependency - 258.ImportedFromIB2 259.IBPluginDependency - 259.ImportedFromIB2 26.IBPluginDependency - 26.ImportedFromIB2 263.IBPluginDependency - 263.ImportedFromIB2 266.IBPluginDependency 266.IBWindowTemplateEditedContentRect - 266.ImportedFromIB2 - 266.editorWindowContentRectSynchronizationRect - 266.windowTemplate.hasMaxSize - 266.windowTemplate.hasMinSize - 266.windowTemplate.maxSize - 266.windowTemplate.minSize 267.IBPluginDependency - 267.ImportedFromIB2 268.IBPluginDependency - 268.ImportedFromIB2 269.IBPluginDependency - 269.ImportedFromIB2 27.IBPluginDependency - 27.ImportedFromIB2 270.IBPluginDependency - 270.ImportedFromIB2 29.IBPluginDependency - 29.ImportedFromIB2 290.IBPluginDependency - 290.ImportedFromIB2 291.IBPluginDependency - 291.ImportedFromIB2 292.IBPluginDependency - 292.ImportedFromIB2 293.IBPluginDependency - 293.ImportedFromIB2 294.IBPluginDependency - 294.ImportedFromIB2 295.IBPluginDependency - 295.ImportedFromIB2 296.IBPluginDependency - 296.ImportedFromIB2 30.IBPluginDependency - 30.ImportedFromIB2 303.IBPluginDependency - 303.ImportedFromIB2 305.IBPluginDependency - 305.ImportedFromIB2 306.IBPluginDependency - 306.ImportedFromIB2 307.IBPluginDependency - 307.ImportedFromIB2 308.IBPluginDependency - 308.ImportedFromIB2 309.IBPluginDependency - 309.ImportedFromIB2 31.IBPluginDependency - 31.ImportedFromIB2 310.IBPluginDependency - 310.ImportedFromIB2 311.IBPluginDependency - 311.ImportedFromIB2 312.IBPluginDependency - 312.ImportedFromIB2 313.IBPluginDependency - 313.ImportedFromIB2 314.IBPluginDependency - 314.ImportedFromIB2 315.IBPluginDependency - 315.ImportedFromIB2 316.IBPluginDependency - 316.ImportedFromIB2 317.IBPluginDependency - 317.ImportedFromIB2 318.IBPluginDependency - 318.ImportedFromIB2 319.IBPluginDependency - 319.ImportedFromIB2 32.IBPluginDependency - 32.ImportedFromIB2 320.IBPluginDependency - 320.ImportedFromIB2 321.IBPluginDependency - 321.ImportedFromIB2 322.IBPluginDependency - 322.ImportedFromIB2 323.IBPluginDependency - 323.ImportedFromIB2 324.IBPluginDependency - 324.ImportedFromIB2 33.IBPluginDependency - 33.ImportedFromIB2 339.IBAttributePlaceholdersKey 339.IBPluginDependency - 339.ImportedFromIB2 34.IBPluginDependency - 34.ImportedFromIB2 35.IBPluginDependency - 35.ImportedFromIB2 36.IBPluginDependency - 36.ImportedFromIB2 37.IBPluginDependency - 37.ImportedFromIB2 38.IBPluginDependency - 38.ImportedFromIB2 39.IBPluginDependency - 39.ImportedFromIB2 40.IBPluginDependency - 40.ImportedFromIB2 43.IBPluginDependency - 43.ImportedFromIB2 44.IBPluginDependency - 44.ImportedFromIB2 45.IBPluginDependency - 45.ImportedFromIB2 46.IBPluginDependency - 46.ImportedFromIB2 47.IBPluginDependency - 47.ImportedFromIB2 48.IBPluginDependency - 48.ImportedFromIB2 - 5.IBEditorWindowLastContentRect 5.IBPluginDependency 5.IBWindowTemplateEditedContentRect - 5.ImportedFromIB2 - 5.editorWindowContentRectSynchronizationRect - 5.windowTemplate.hasMaxSize - 5.windowTemplate.hasMinSize - 5.windowTemplate.maxSize - 5.windowTemplate.minSize 6.IBPluginDependency - 6.ImportedFromIB2 61.IBPluginDependency - 61.ImportedFromIB2 62.IBPluginDependency - 62.ImportedFromIB2 - 62.editorWindowContentRectSynchronizationRect 63.IBPluginDependency - 63.ImportedFromIB2 64.IBPluginDependency - 64.ImportedFromIB2 65.IBPluginDependency - 65.ImportedFromIB2 66.IBPluginDependency - 66.ImportedFromIB2 67.IBPluginDependency - 67.ImportedFromIB2 73.IBPluginDependency - 73.ImportedFromIB2 74.IBPluginDependency - 74.ImportedFromIB2 - 74.editorWindowContentRectSynchronizationRect 75.IBPluginDependency - 75.ImportedFromIB2 76.IBPluginDependency - 76.ImportedFromIB2 77.IBPluginDependency - 77.ImportedFromIB2 78.IBPluginDependency - 78.ImportedFromIB2 79.IBPluginDependency - 79.ImportedFromIB2 80.IBPluginDependency - 80.ImportedFromIB2 97.IBPluginDependency - 97.ImportedFromIB2 YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5929,7 +6770,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -5939,7 +6780,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -5949,7 +6790,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -5959,26 +6800,76 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{56, 92}, {480, 360}} + com.apple.InterfaceBuilder.CocoaPlugin + + YES + 0 + 1 + 2 + 3 + 4 + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + YES + 0 + 1 + 2 + 3 + 4 + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + YES + 0 + 1 + 2 + 3 + 4 + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + YES + 0 + 1 + 2 + 3 + 4 + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + YES + 0 + 1 + 2 + 3 + 4 + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{56, 92}, {480, 360}} - - {{687, 67}, {480, 360}} - - - {3.40282e+38, 3.40282e+38} - {213, 107} com.apple.InterfaceBuilder.CocoaPlugin - ToolTip @@ -5988,7 +6879,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA com.apple.InterfaceBuilder.CocoaPlugin - ToolTip @@ -5998,19 +6888,12 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTip @@ -6020,15 +6903,10 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTip @@ -6038,7 +6916,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA com.apple.InterfaceBuilder.CocoaPlugin - ToolTip @@ -6048,89 +6925,42 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - {3.40282e+38, 3.40282e+38} - {213, 107} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - {3.40282e+38, 3.40282e+38} - {213, 107} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{642, 151}, {104, 573}} com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 171}, {117, 573}} ToolTip @@ -6140,109 +6970,55 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin {{245, 314}, {543, 189}} - - {{245, 314}, {543, 189}} - - - {3.40282e+38, 3.40282e+38} - {213, 107} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTip @@ -6252,101 +7028,53 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{0, 337}, {971, 397}} com.apple.InterfaceBuilder.CocoaPlugin {{0, 337}, {971, 397}} - - {{-34, 357}, {971, 397}} - - - {3.40282e+38, 3.40282e+38} - {890, 350} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{751, 588}, {103, 103}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{844, 568}, {163, 123}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + + YES - - YES - - - YES - + + - 100444 + 100485 @@ -6357,21 +7085,337 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAplayMusic: id + + playMusic: + + playMusic: + id + + IBUserSource + + IKImageView + + YES + + YES + copy: + crop: + cut: + paste: + + + YES + id + id + id + id + + + + YES + + YES + copy: + crop: + cut: + paste: + + + YES + + copy: + id + + + crop: + id + + + cut: + id + + + paste: + id + + + + + IBProjectSource + ./Classes/IKImageView.h + + + + NSDocument + + YES + + YES + printDocument: + revertDocumentToSaved: + runPageLayout: + saveDocument: + saveDocumentAs: + saveDocumentTo: + + + YES + id + id + id + id + id + id + + + + YES + + YES + printDocument: + revertDocumentToSaved: + runPageLayout: + saveDocument: + saveDocumentAs: + saveDocumentTo: + + + YES + + printDocument: + id + + + revertDocumentToSaved: + id + + + runPageLayout: + id + + + saveDocument: + id + + + saveDocumentAs: + id + + + saveDocumentTo: + id + + + + + IBProjectSource + ./Classes/NSDocument.h + + + + QLPreviewPanel + NSPanel + + YES + + YES + start: + stop: + + + YES + id + id + + + + YES + + YES + start: + stop: + + + YES + + start: + id + + + stop: + id + + + + + IBProjectSource + ./Classes/QLPreviewPanel.h + + + + QLPreviewView + NSView + + YES + + YES + start: + stop: + + + YES + id + id + + + + YES + + YES + start: + stop: + + + YES + + start: + id + + + stop: + id + + + + + delegate + id + + + delegate + + delegate + id + + + + IBProjectSource + ./Classes/QLPreviewView.h + + + + VLDocument + NSDocument + + YES + + YES + adjustTempo: + dump: + play: + playMusic: + playStop: + showLog: + showOutput: + stop: + togglePlayElements: + + + YES + id + id + id + id + id + id + id + id + id + + + + YES + + YES + adjustTempo: + dump: + play: + playMusic: + playStop: + showLog: + showOutput: + stop: + togglePlayElements: + + + YES + + adjustTempo: + id + + + dump: + id + + + play: + id + + + playMusic: + id + + + playStop: + id + + + showLog: + id + + + showOutput: + id + + + stop: + id + + + togglePlayElements: + id + + + + + IBProjectSource + ./Classes/VLDocument.h + + VLSheetView NSView YES - + YES + copy: + cut: + delete: editDisplayOptions: + editRepeat: + editRepeatEnding: endSheetWithButton: hideFieldEditor: + insertBreak: + insertJumpToCoda: + insertStartCoda: + paste: selectGroove: setDivisions: setKey: @@ -6388,11 +7432,114 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAid id id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + copy: + cut: + delete: + editDisplayOptions: + editRepeat: + editRepeatEnding: + endSheetWithButton: + hideFieldEditor: + insertBreak: + insertJumpToCoda: + insertStartCoda: + paste: + selectGroove: + setDivisions: + setKey: + setTime: + transposeOctave: + + + YES + + copy: + id + + + cut: + id + + + delete: + id + + + editDisplayOptions: + id + + + editRepeat: + id + + + editRepeatEnding: + id + + + endSheetWithButton: + id + + + hideFieldEditor: + id + + + insertBreak: + id + + + insertJumpToCoda: + id + + + insertStartCoda: + id + + + paste: + id + + + selectGroove: + id + + + setDivisions: + id + + + setKey: + id + + + setTime: + id + + + transposeOctave: + id + YES - + YES fDisplaySheet fDivisionMenu @@ -6419,64 +7566,68 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAid - - IBProjectSource - Sources/VLSheetView.h - - - - VLSheetView - - IBProjectSource - Sources/VLSheetViewChords.h - - - - VLSheetView - - IBProjectSource - Sources/VLSheetViewLyrics.h - - - - VLSheetView - - IBProjectSource - Sources/VLSheetViewNotes.h - - - - VLSheetView - + YES - + YES - copy: - cut: - delete: - editRepeat: - editRepeatEnding: - insertBreak: - insertJumpToCoda: - insertStartCoda: - paste: + fDisplaySheet + fDivisionMenu + fEndingMsg + fEndingSheet + fFieldEditor + fGrooveMenu + fKeyMenu + fRepeatMsg + fRepeatSheet + fTimeMenu YES - id - id - id - id - id - id - id - id - id + + fDisplaySheet + id + + + fDivisionMenu + id + + + fEndingMsg + id + + + fEndingSheet + id + + + fFieldEditor + id + + + fGrooveMenu + id + + + fKeyMenu + id + + + fRepeatMsg + id + + + fRepeatSheet + id + + + fTimeMenu + id + IBProjectSource - Sources/VLSheetViewSelection.h + ./Classes/VLSheetView.h @@ -6484,7 +7635,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAANSWindowController YES - + YES bckToolItem displayToolItem @@ -6517,15 +7668,135 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAid + + YES + + YES + bckToolItem + displayToolItem + fwdToolItem + logToolItem + outputToolItem + playToolItem + progressToolItem + sheetView + stopToolItem + tobegToolItem + toendToolItem + zoomInToolItem + zoomOutToolItem + + + YES + + bckToolItem + id + + + displayToolItem + id + + + fwdToolItem + id + + + logToolItem + id + + + outputToolItem + id + + + playToolItem + id + + + progressToolItem + id + + + sheetView + id + + + stopToolItem + id + + + tobegToolItem + id + + + toendToolItem + id + + + zoomInToolItem + id + + + zoomOutToolItem + id + + + IBProjectSource - Sources/VLSheetWindow.h + ./Classes/VLSheetWindow.h 0 - ../VocalEasel.xcodeproj + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES 3 + + YES + + YES + NSMenuCheckmark + NSMenuMixedState + NSSwitch + bck + console + display + fwd + music + play + stop + tobeg + toend + zoomin + zoomout + + + YES + {9, 8} + {7, 2} + {15, 15} + {128, 128} + {48, 48} + {32.640000000000001, 47.519999999999996} + {128, 128} + {128, 128} + {128, 128} + {128, 128} + {128, 128} + {128, 128} + {32, 32} + {32, 32} + + diff --git a/Resources/Templates/default.lyt b/Resources/Templates/default.lyt index 6f7ad15..2db6a99 100644 --- a/Resources/Templates/default.lyt +++ b/Resources/Templates/default.lyt @@ -1,19 +1,32 @@ -\version "2.8.0" +\version "2.14.0" \header { title = "<{TITLE}>" - poet = "<{POET}>" - composer= "<{COMPOSER}>" - arranger = "<{ARRANGER}>" - tagline = #(string-append "Created with VocalEasel <{VLVERSION}> / Lilypond " (lilypond-version)) + poet = "<{POET}>" + composer = "<{COMPOSER}>" + arranger = "<{ARRANGER}>" + tagline = #(string-append "Created with VocalEasel <{VLVERSION}> / Lilypond " (lilypond-version)) } \paper { - #(set-paper-size <{PAPERSIZE}>) - indent = 0.0\cm - pagenumber = no - page-top-space = #.1 - <{FORMATTING}> + #(set-paper-size <{PAPERSIZE}>) + indent = 0.0\cm + pagenumber = no + top-markup-spacing #'padding = #<{TOPPADDING}> + markup-system-spacing #'padding = #<{TITLEPADDING}> + system-system-spacing #'padding = #<{STAFFPADDING}> + <{FORMATTING}> +} + +\layout { + \context { + \ChordNames + \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #<{CHORDPADDING}> + } + \context { + \Lyrics + \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #<{LYRICPADDING}> + } } #(set-global-staff-size <{STAFFSIZE}>) diff --git a/Sources/VLDocument.h b/Sources/VLDocument.h index b8d278f..91139d7 100644 --- a/Sources/VLDocument.h +++ b/Sources/VLDocument.h @@ -48,6 +48,11 @@ enum { float chordSize; float lyricSize; float staffSize; + float topPadding; + float titlePadding; + float staffPadding; + float chordPadding; + float lyricPadding; int playElements; NSString * tmpPath; NSFileWrapper * vcsWrapper; diff --git a/Sources/VLDocument.mm b/Sources/VLDocument.mm index f20cacc..5425e8c 100644 --- a/Sources/VLDocument.mm +++ b/Sources/VLDocument.mm @@ -84,6 +84,11 @@ chordSize = 6.0f; lyricSize = 0.0f; staffSize = 20.0f; + topPadding = 2.0f; + titlePadding = 4.0f; + staffPadding = 3.0f; + chordPadding = 1.5f; + lyricPadding = 1.0f; playElements = kVLPlayAccompaniment|kVLPlayMelody|kVLPlayCountIn; sheetWin = nil; pdfWin = nil; diff --git a/Sources/VLLilypondDocument.mm b/Sources/VLLilypondDocument.mm index e5447ba..a2d0686 100644 --- a/Sources/VLLilypondDocument.mm +++ b/Sources/VLLilypondDocument.mm @@ -154,17 +154,27 @@ static const char * sPaperNames[] = { [ly substituteMacro:@"COMPOSER" withValue:songComposer]; [ly substituteMacro:@"ARRANGER" withValue:songArranger]; [ly substituteMacro:@"VLVERSION" withValue: - [bndl objectForInfoDictionaryKey:@"CFBundleVersion"]]; + [bndl objectForInfoDictionaryKey:@"CFBundleVersion"]]; [ly substituteMacro:@"PAPERSIZE" withValue:paper]; // [ly substituteMacro:@"FORMATTING" withValue:@"ragged-last-bottom = ##f"]; [ly substituteMacro:@"VLVERSION" withValue: - [bndl objectForInfoDictionaryKey:@"CFBundleVersion"]]; + [bndl objectForInfoDictionaryKey:@"CFBundleVersion"]]; [ly substituteMacro:@"CHORDSIZE" withValue: - [NSString stringWithFormat:@"%f", chordSize]]; + [NSString stringWithFormat:@"%f", chordSize]]; [ly substituteMacro:@"LYRICSIZE" withValue: - [NSString stringWithFormat:@"%f", lyricSize]]; + [NSString stringWithFormat:@"%f", lyricSize]]; [ly substituteMacro:@"STAFFSIZE" withValue: - [NSString stringWithFormat:@"%f", staffSize*scaling]]; + [NSString stringWithFormat:@"%f", staffSize*scaling]]; + [ly substituteMacro:@"TOPPADDING" withValue: + [NSString stringWithFormat:@"%f", topPadding]]; + [ly substituteMacro:@"TITLEPADDING" withValue: + [NSString stringWithFormat:@"%f", titlePadding]]; + [ly substituteMacro:@"STAFFPADDING" withValue: + [NSString stringWithFormat:@"%f", staffPadding]]; + [ly substituteMacro:@"CHORDPADDING" withValue: + [NSString stringWithFormat:@"%f", chordPadding]]; + [ly substituteMacro:@"LYRICPADDING" withValue: + [NSString stringWithFormat:@"%f", lyricPadding]]; [ly substituteMacro:@"CHORDS" withValue: [NSString stringWithUTF8String:writer.Chords().c_str()]]; [ly substituteMacro:@"NOTES" withValue: