The Birdfont Source Code


All Repositories / birdfont.git / commitdiff – RSS feed

Draw text without cache in expander

These changes was commited to the Birdfont repository Fri, 13 Mar 2015 08:25:27 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
[Fri, 13 Mar 2015 08:25:27 +0000]

Updated Files

libbirdfont/Expander.vala
resources/icons.bf
--- a/libbirdfont/Expander.vala +++ b/libbirdfont/Expander.vala @@ -232,7 +232,7 @@ if (headline != null) { title = new Text (); title.set_text ((!) headline); - title.use_cache (true); // FIXME: shapen text + title.use_cache (false); Theme.text_color (title, "Foreground 2"); title.set_font_size (17 * Toolbox.get_scale ()); title.draw_at_baseline (cr, x, yt + HEADLINE_MARGIN + 13 * Toolbox.get_scale ());
--- a/resources/icons.bf +++ b/resources/icons.bf @@ -70,10 +70,10 @@ <collection name="foresight"> <selected id="1"/> <glyph id="1" left="-28" right="44.054140127388528"> - <path stroke="0" skew="0" data="B 1.7352501208,51.1497314336 M 1.1409314853,49.8422304356 M -5.3965735046,37.7181302725 M -5.5156274136,37.5990763634 M -5.5156274136,37.3613489092 C -10.5595573727,20.2818675093 -12.7015387894,9.4281448249 -14.3115432183,2.5342768720 M -14.6679442176,0.8701846928 M -13.0038520384,0.7511307836 M -5.6343009588,0.3947297844 M -4.9211185962,0.3947297844 M -4.4456636878,0.9890484198 C 3.8827468145,12.2591174584 13.9097865406,20.7964618657 25.6268592658,27.2579321066 M 26.3400416282,27.6143331060 M 26.4590955373,28.4463791955 M 26.5781494464,41.7591166296 M 26.5781494464,42.9477539004 M 25.3895121756,43.1854813546 C 25.3895121756,43.1854813546 18.5789439226,44.3706953502 14.0974581019,45.4438921693 C 12.3494196042,45.8624826707 9.5305045071,47.0266625410 7.2033619308,48.1777578924 C 4.8762193546,49.3288532436 3.0431314827,50.4361687070 3.0431314827,50.4361687070 M 1.7356304847,51.1493510696 M 1.7352501208,51.1497314336" /> - <path stroke="0" skew="0" data="B -11.1020324049,3.4853768707 C -9.5168657405,10.4284258792 -7.5605399563,20.4386535198 -2.9004352357,36.2917655474 M -2.9004352357,36.4108194564 C -2.8662024823,36.5329162769 -2.8178962636,36.5260697262 -2.7813813267,36.6485469105 C -0.8795616932,40.1748374809 1.0222579402,43.7011280512 2.9240775736,47.2274186215 C 2.9240141796,47.2273552275 2.9239507857,47.2272918336 2.9238873917,47.2272284396 C 3.6395421198,46.8346928673 4.2330239545,46.5043467969 5.8954805689,45.6819999875 C 8.2971364384,44.4940473716 11.2285251485,43.1361481533 13.5027591027,42.5915430832 C 17.6790028720,41.5914522107 22.5539371384,40.7720342034 23.7250396323,40.5708597225 M 23.4873121782,29.1599419219 C 12.0678361892,22.7190874058 2.0357756592,14.2266639783 -6.2286195942,3.2476494166 M -9.4948507735,3.4680384229 C -8.6198048572,5.9359548336 -6.8796276693,10.5766917379 -5.3000751764,14.0093240306 C -2.4664019591,20.1674160037 0.4748762132,24.8393880787 0.4036720862,24.6880032360 C 2.6550842047,26.3646093884 3.1176067395,28.9240021782 2.9204641163,31.1637751606 C 0.4798589807,30.1822840842 -0.9150116112,27.5883162133 -0.8880438088,25.2625429472 C -0.8880438088,25.2625429472 -4.3657492269,19.7384035307 -6.8750861240,14.0347703773 C -8.4322032682,10.4954376537 -10.2719000680,5.6928510460 -11.1020324049,3.4853768707" /> - <path stroke="0" skew="0" data="B 29.5493622597,56.6174628797 C 29.7474684715,57.0532965457 29.9455746833,57.4891302117 30.1436808951,57.9249638776 C 29.6682259868,58.0834488471 29.1927710784,58.2419338166 28.7173161701,58.4004187861 C 22.6156448462,60.5399658737 16.5139735223,62.6795129613 10.4123021984,64.8190600488 C 10.0160897747,64.9775450183 9.6198773511,65.1360299877 9.2236649274,65.2945149572 C 9.0255587156,64.8983025336 8.8274525038,64.5020901100 8.6293462920,64.1058776863 M 6.2522619321,58.1625011499 C 6.2521985381,58.1625645439 6.2521351442,58.1626279379 6.2520717502,58.1626913319 C 5.9747230536,57.6872364235 5.6973743571,57.2117815151 5.4200256606,56.7363266068 C 3.9936609355,54.4779157921 2.5672962104,52.2195049773 1.1409314853,49.9610941626 M 3.5182060272,48.4158657105 M 7.0841178398,54.2401883379 C 9.1581662592,52.8021084039 11.7426630682,51.1122655868 14.4536689194,50.1988216169 C 17.7246465433,49.0967171392 21.0143380723,49.1400786270 24.0816308136,48.7724568918 M 23.7252298143,41.6406332664 M 26.5779592645,41.5215793573 M 26.9343602638,49.8420402536 C 26.8919569619,49.8674342288 26.7674657219,49.9338721731 26.8071503582,49.9182221793 C 27.7212209921,52.1513024127 28.6380736854,54.3590520650 29.5493622597,56.6174628797" /> - <path stroke="0" skew="0" data="B 15.4047689181,52.9324971579 C 13.2237591708,53.6673594096 10.6537957932,55.0848270522 8.8069016564,56.3207143514 C 8.6765661551,56.4013037537 8.5003842887,56.5766633932 8.2855596512,56.6430719605 C 9.0737163183,58.3382490219 9.8618729854,60.0334260832 10.6500296525,61.7286031445 M 26.3400416282,56.2608716984 C 25.6483751530,54.6753594020 24.9156647087,53.1308910748 24.2650422025,51.5043348093 C 21.1934528293,51.8097465832 17.9738324608,52.0669058959 15.4047689181,52.9324971579" /> + <path stroke="0" skew="0" data="B 1.7356304847,51.1493510696 M 3.0431314827,50.4361687070 C 3.0431314827,50.4361687070 4.8762193546,49.3288532436 7.2033619308,48.1777578924 C 9.5305045071,47.0266625410 12.3494196042,45.8624826707 14.0974581019,45.4438921693 C 18.5789439226,44.3706953502 25.3895121756,43.1854813546 25.3895121756,43.1854813546 M 26.5781494464,42.9477539004 M 26.5781494464,41.7591166296 M 26.4590955373,28.4463791955 M 26.3400416282,27.6143331060 M 25.6268592658,27.2579321066 C 13.9097865406,20.7964618657 3.8827468145,12.2591174584 -4.4456636878,0.9890484198 M -4.9211185962,0.3947297844 M -5.6343009588,0.3947297844 M -13.0038520384,0.7511307836 M -14.6679442176,0.8701846928 M -14.3115432183,2.5342768720 C -12.7015387894,9.4281448249 -10.5595573727,20.2818675093 -5.5156274136,37.3613489092 M -5.5156274136,37.5990763634 M -5.3965735046,37.7181302725 M 1.1409314853,49.8422304356 M 1.7352501208,51.1497314336 M 1.7356304847,51.1493510696" /> + <path stroke="0" skew="0" data="B -6.8750861240,14.0347703773 C -4.3657492269,19.7384035307 -0.8880438088,25.2625429472 -0.8880438088,25.2625429472 C -0.9150116112,27.5883162133 0.4798589807,30.1822840842 2.9204641163,31.1637751606 C 3.1176067395,28.9240021782 2.6550842047,26.3646093884 0.4036720862,24.6880032360 C 0.4748762132,24.8393880787 -2.4664019591,20.1674160037 -5.3000751764,14.0093240306 C -6.8796276693,10.5766917379 -8.6198048572,5.9359548336 -9.4948507735,3.4680384229 M -6.2286195942,3.2476494166 C 2.0357756592,14.2266639783 12.0678361892,22.7190874058 23.4873121782,29.1599419219 M 23.7250396323,40.5708597225 C 22.5539371384,40.7720342034 17.6790028720,41.5914522107 13.5027591027,42.5915430832 C 11.2285251485,43.1361481533 8.2971364384,44.4940473716 5.8954805689,45.6819999875 C 4.2330239545,46.5043467969 3.6395421198,46.8346928673 2.9238873917,47.2272284396 C 2.9239507857,47.2272918336 2.9240141796,47.2273552275 2.9240775736,47.2274186215 C 1.0222579402,43.7011280512 -0.8795616932,40.1748374809 -2.7813813267,36.6485469105 C -2.8178962636,36.5260697262 -2.8662024823,36.5329162769 -2.9004352357,36.4108194564 M -2.9004352357,36.2917655474 C -7.5605399563,20.4386535198 -9.5168657405,10.4284258792 -11.1020324049,3.4853768707 C -10.2719000680,5.6928510460 -8.4322032682,10.4954376537 -6.8750861240,14.0347703773" /> + <path stroke="0" skew="0" data="B 26.8071503582,49.9182221793 C 26.7674657219,49.9338721731 26.8919569619,49.8674342288 26.9343602638,49.8420402536 M 26.5779592645,41.5215793573 M 23.7252298143,41.6406332664 M 24.0816308136,48.7724568918 C 21.0143380723,49.1400786270 17.7246465433,49.0967171392 14.4536689194,50.1988216169 C 11.7426630682,51.1122655868 9.1581662592,52.8021084039 7.0841178398,54.2401883379 M 3.5182060272,48.4158657105 M 1.1409314853,49.9610941626 C 2.5672962104,52.2195049773 3.9936609355,54.4779157921 5.4200256606,56.7363266068 C 5.6973743571,57.2117815151 5.9747230536,57.6872364235 6.2520717502,58.1626913319 C 6.2521351442,58.1626279379 6.2521985381,58.1625645439 6.2522619321,58.1625011499 M 8.6293462920,64.1058776863 C 8.8274525038,64.5020901100 9.0255587156,64.8983025336 9.2236649274,65.2945149572 C 9.6198773511,65.1360299877 10.0160897747,64.9775450183 10.4123021984,64.8190600488 C 16.5139735223,62.6795129613 22.6156448462,60.5399658737 28.7173161701,58.4004187861 C 29.1927710784,58.2419338166 29.6682259868,58.0834488471 30.1436808951,57.9249638776 C 29.9455746833,57.4891302117 29.7474684715,57.0532965457 29.5493622597,56.6174628797 C 28.6380736854,54.3590520650 27.7212209921,52.1513024127 26.8071503582,49.9182221793" /> + <path stroke="0" skew="0" data="B 24.2650422025,51.5043348093 C 24.9156647087,53.1308910748 25.6483751530,54.6753594020 26.3400416282,56.2608716984 M 10.6500296525,61.7286031445 C 9.8618729854,60.0334260832 9.0737163183,58.3382490219 8.2855596512,56.6430719605 C 8.5003842887,56.5766633932 8.6765661551,56.4013037537 8.8069016564,56.3207143514 C 10.6537957932,55.0848270522 13.2237591708,53.6673594096 15.4047689181,52.9324971579 C 17.9738324608,52.0669058959 21.1934528293,51.8097465832 24.2650422025,51.5043348093" /> </glyph> </collection> <collection unicode="U+67"> @@ -144,8 +144,8 @@ <collection name="move_canvas"> <selected id="1"/> <glyph id="1" left="-28" right="44.524681528662434"> - <path stroke="0" skew="0" data="B 10.6961492707,63.3315307860 C 11.4129992707,62.5180207860 11.7528992707,61.5258607860 11.9773992707,60.4565307860 C 12.4263992707,58.3178807860 12.4019392707,55.7530007860 12.5711492707,53.0815312860 C 12.7745892707,49.8714912860 13.1609692707,46.6222012860 13.5711492707,43.7690312860 C 14.4111992707,45.9815312860 15.1462492707,47.5688312860 15.9773992707,50.4252812860 C 16.7020192707,52.9156212860 17.3379792707,55.4965007860 18.3836492707,57.6440307860 C 18.9064792707,58.7177907860 19.5269992707,59.7083607860 20.4148992707,60.4565307860 C 21.3027992707,61.2047007860 22.4705192707,61.6929307860 23.7586492707,61.7065307860 C 25.0884192707,61.7203207860 26.3680892707,61.1124307860 26.9773992707,60.0815307860 C 27.5867492707,59.0506307860 27.6128392707,57.8999007860 27.5086492707,56.6752807860 C 27.3002792707,54.2260312860 26.3964992707,51.2385912860 25.6023992707,48.0815312860 C 24.8214792707,44.9768612860 24.4161392707,41.8109712860 24.1648992707,38.9565312860 C 25.2212392707,40.4025512860 26.1402792707,41.9518912860 26.8836492707,43.5502812860 C 28.1589392707,46.2924012860 29.0180292707,48.8934712860 30.0711492707,50.6440312860 M 30.2898992707,51.0190312860 M 30.6648992707,51.1752812860 C 32.3143192707,51.8919812860 33.7798892707,52.1897012860 35.1023992707,51.8002812860 C 36.4249092707,51.4108612860 37.3117792707,50.2357812860 37.6336492707,48.9252812860 C 38.2773892707,46.3042912860 37.4930592707,42.8267612860 35.9148992707,38.4877812860 C 35.0725992707,36.1720112860 33.8146092707,32.8334212860 32.2273992707,29.7065312860 C 30.7403492707,26.7769712860 28.9945292707,24.0903412860 26.8211492707,22.4877812860 C 25.9592892707,21.1950112860 25.2416492707,18.4521812860 24.6648992707,15.6752812860 C 24.0881492707,12.8983812860 23.6318892707,10.1092712860 22.6336492707,8.1128312860 C 22.6053892707,8.0562312860 22.5959992707,7.0502312860 22.7586492707,5.8940312860 C 22.8399992707,5.3159312860 22.9489992707,4.6783312860 22.9148992707,4.0190312860 C 22.8808292707,3.3597312860 22.6895992707,2.5750312860 22.0711492707,1.9565312860 C 21.4024492707,1.2878312860 20.6563592707,1.0706312860 19.7273992707,0.8315312860 C 18.7984392707,0.5924312860 17.6952992707,0.4323312860 16.4461492707,0.3002312860 C 13.9478492707,0.0360312860 10.8682292707,-0.0579687140 7.7898992707,0.0190312860 C 4.7115692707,0.0961312860 1.6462492707,0.3329312860 -0.8976007293,0.7378312860 C -2.1695307293,0.9402312860 -3.3138407293,1.1858312860 -4.2726007293,1.4878312860 C -5.2313607293,1.7897312860 -6.0256007293,2.0845312860 -6.6788507293,2.7378312860 C -7.2834007293,3.3423312860 -7.0955507293,3.5342312860 -7.1163507293,3.7065312860 C -7.1371507293,3.8788312860 -7.1143507293,4.0143312860 -7.1163507293,4.1752312860 C -7.1203507293,4.4971312860 -7.1264507293,4.8806312860 -7.1163507293,5.3315312860 C -7.0962507293,6.2333312860 -7.0759507293,7.3969312860 -7.1476507293,8.6440312860 C -7.2910107293,11.1381812860 -7.8973807293,13.8625212860 -9.1789007293,15.1440312860 C -13.7380908293,19.7031812860 -15.0554208293,20.7080412860 -18.7101508293,24.3627812860 C -20.0175508293,25.6701912860 -20.4994008293,27.2998412860 -20.8976508293,28.6127812860 C -21.2959008293,29.9257212860 -21.6623408293,30.9086912860 -22.1789008293,31.4252812860 C -22.3572008293,31.6035612860 -22.3530008293,31.6325612860 -22.4289008293,31.7377812860 C -22.5048208293,31.8430012860 -22.5869007993,31.9973712860 -22.6789007993,32.1440312860 C -22.8629307993,32.4373612860 -23.0891907993,32.8033412860 -23.2726507993,33.2377812860 C -23.4561107993,33.6722212860 -23.6182507993,34.1523712860 -23.6476507993,34.7377812860 C -23.6770707993,35.3231912860 -23.5156607993,36.0885112860 -22.9601507993,36.6440312860 C -21.8077308293,37.7964712860 -20.8413408293,38.6394412860 -19.8039008293,39.1440312860 C -18.7664608293,39.6486212860 -17.5405908293,39.7234612860 -16.5226508293,39.2690312860 C -14.5427908293,38.3851912860 -13.2372707293,36.3336712860 -10.9914007293,33.3627812860 C -9.4804807293,32.3675412860 -8.4690207293,31.7284512860 -7.1164007293,30.5502812860 C -6.9519507293,31.0319712860 -6.8926507293,31.5893712860 -6.8976507293,32.2690312860 C -6.9066507293,33.5634012860 -7.2350807293,35.2113112860 -7.7726507293,36.9877812860 C -8.8477807293,40.5407312860 -10.6664007293,44.6460612860 -11.6164007293,48.4877812860 C -12.2693007293,51.1279312860 -12.8946007293,53.5333012860 -12.6164007293,55.7690307860 C -12.4773007293,56.8869007860 -12.0836507293,57.9895507860 -11.2726507293,58.8627807860 C -10.4616507293,59.7360107860 -9.3182807293,60.3153607860 -7.8976507293,60.6752807860 C -6.8023307293,60.9527907860 -5.6593207293,60.8365807860 -4.7726507293,60.3315307860 C -3.8859807293,59.8264807860 -3.2722807293,59.0553107860 -2.8039007293,58.1752807860 C -1.8671307293,56.4152207860 -1.4119507293,54.1513212860 -0.8976507293,51.7690312860 C -0.3370007293,49.1720712860 0.8122492707,46.0211912860 1.9773492707,43.1440312860 C 2.1311592707,46.2581712860 2.3457992707,49.0978512860 2.3210992707,52.2690312860 C 2.2986692707,55.1561707860 2.1372892707,57.9644007860 2.6335992707,60.3002807860 C 2.8817492707,61.4682207860 3.3118192707,62.5853807860 4.1648492707,63.4252807860 C 5.0178792707,64.2651808160 6.2828192707,64.7012808160 7.6648492707,64.6752808160 C 8.8745692707,64.6526808160 9.9792992707,64.1450408160 10.6961492707,63.3315307860" /> - <path stroke="0" skew="0" data="B 6.0709492707,61.4877807860 C 5.7604292707,61.1820407860 5.4739992707,60.6052007860 5.2896992707,59.7377807860 C 4.9210892707,58.0029307860 5.0166992707,55.2552407860 5.0396992707,52.3002812860 C 5.0810592707,46.9801012860 4.8143292707,40.4747812860 4.4771992707,37.0502812860 M 4.0084492707,32.3315312860 M 1.8834492707,36.5815312860 C 0.5010792707,39.3639612860 -2.4576907293,46.1281212860 -3.5540507293,51.2065312860 C -4.0638507293,53.5679412860 -4.5695307293,55.6901207860 -5.2103007293,56.8940307860 C -5.5306807293,57.4959907860 -5.8504707293,57.8362207860 -6.1165507293,57.9877807860 C -6.3826307293,58.1393807860 -6.6384507293,58.1951707860 -7.2103007293,58.0502807860 C -8.2765507293,57.7801507860 -8.8995307293,57.4209507860 -9.2728007293,57.0190307860 C -9.6460707293,56.6171107860 -9.8411507293,56.1316907860 -9.9290507293,55.4252807860 C -10.1048507293,54.0124612860 -9.6104807293,51.7731812860 -8.9603007293,49.1440312860 C -8.0988807293,45.6605512860 -6.3280307293,41.5660112860 -5.1790507293,37.7690312860 C -4.6045607293,35.8705412860 -4.1599007293,34.0381712860 -4.1478007293,32.3002812860 C -4.1357107293,30.5623912860 -4.6077907293,28.8376512860 -5.8353007293,27.5502812860 M -6.8040507293,26.5190312860 M -7.7728007293,27.5502812860 C -10.0626907293,29.8810212860 -10.3400107293,29.6612612860 -12.6478007293,31.2065312860 M -12.8353007293,31.3315312860 M -12.9915507293,31.5190312860 C -15.3741408293,34.6507312860 -16.9038208293,36.4508612860 -17.6165508293,36.7690312860 C -17.9729108293,36.9281712860 -18.0891208293,36.9318612860 -18.6165508293,36.6753312860 C -19.1214808293,36.4297412860 -19.9307808293,35.8154112860 -20.9290508293,34.8315812860 C -20.9197508293,34.7299912860 -20.8428708293,34.5402712860 -20.7415508293,34.3003312860 C -20.6348908293,34.0477612860 -20.4896108293,33.7777312860 -20.3665508293,33.5815812860 C -20.3140508293,33.4978312860 -20.2776508293,33.4140312860 -20.2415508293,33.3628312860 C -20.1056708293,33.2269812860 -20.1732508293,33.2802312860 -20.2102508293,33.3315312860 C -19.0432808293,32.1437712860 -18.6876308293,30.6587612860 -18.3040008293,29.3940312860 C -17.9168108293,28.1175512860 -17.5472908293,27.0435712860 -16.8040008293,26.3002812860 C -13.2021507293,22.6984212860 -11.8425907293,21.6513312860 -7.2415007293,17.0502812860 C -5.0480907293,14.8568912860 -4.5869807293,11.5487712860 -4.4290007293,8.8002312860 C -4.3500007293,7.4260312860 -4.3773007293,6.1797312860 -4.3977007293,5.2690312860 C -4.4047007293,4.9476312860 -4.3957007293,4.7358312860 -4.3977007293,4.5190312860 C -4.2017707293,4.4024312860 -4.0194207293,4.2576312860 -3.4602007293,4.0815312860 C -2.6968807293,3.8411312860 -1.6756707293,3.6137312860 -0.4914507293,3.4252312860 C 1.8769892707,3.0483312860 4.9015992707,2.8128312860 7.8835492707,2.7378312860 C 10.8654992707,2.6630312860 13.8392092707,2.7420312860 16.1647992707,2.9878312860 C 17.3275892707,3.1106312860 18.3129792707,3.2694312860 19.0397992707,3.4565312860 C 19.7666192707,3.6436312860 20.2318992707,3.9610312860 20.1647992707,3.8940312860 C 20.1187992707,3.8480312860 20.1803992707,3.8718312860 20.1960992707,4.1752312860 C 20.2117792707,4.4787312860 20.1475992707,4.9754312860 20.0710992707,5.5190312860 C 19.9181492707,6.6062312860 19.5107092707,7.8982312860 20.2273492707,9.3315312860 C 20.8757392707,10.6283212860 21.4228092707,13.4173312860 22.0085992707,16.2377812860 C 22.5943892707,19.0582312860 23.2028692707,21.9354512860 24.5710992707,23.9877812860 M 24.7273492707,24.2377812860 M 24.9460992707,24.3940312860 C 26.4471492707,25.3599312860 28.2907192707,27.9719212860 29.7898492707,30.9252812860 C 31.2889792707,33.8786412860 32.5567292707,37.1519512860 33.3835992707,39.4252812860 C 34.8842392707,43.5511012860 35.3544992707,46.8606712860 35.0085992707,48.2690312860 C 34.8356492707,48.9732112860 34.6815192707,49.1004012860 34.3210992707,49.2065312860 C 34.0224392707,49.2944712860 33.1682292707,49.1362712860 32.1960992707,48.8002812860 C 31.4913392707,47.4983312860 30.6187292707,45.1170112860 29.3523492707,42.3940312860 C 27.9999692707,39.4861512860 26.2040392707,36.3327812860 23.3835992707,34.0190312860 M 21.1335992707,32.1752812860 M 21.1648992707,35.0815312860 C 21.1912592707,38.5348112860 21.7166992707,43.8498912860 22.9461492707,48.7377812860 C 23.7592892707,51.9705212860 24.6577492707,54.9733807860 24.8211492707,56.8940307860 C 24.9028492707,57.8543607860 24.7521592707,58.5060307860 24.6336492707,58.7065307860 C 24.5151392707,58.9070807860 24.5048692707,58.9947807860 23.7898992707,58.9877807860 C 23.0953992707,58.9804207860 22.6362092707,58.7599207860 22.1648992707,58.3627807860 C 21.6935892707,57.9656407860 21.2418092707,57.3204707860 20.8211492707,56.4565307860 C 19.9798192707,54.7286607860 19.3481792707,52.2070912860 18.6023992707,49.6440312860 C 17.1193692707,44.5472312860 15.2492292707,39.7081612860 14.2898992707,37.7065312860 M 12.4773992707,33.9252812860 M 11.7273992707,38.0815312860 C 11.2649892707,40.6474312860 10.2208992707,47.0795712860 9.8523992707,52.8940312860 C 9.6757392707,55.6830607860 9.6655192707,58.2537307860 9.3211492707,59.8940307860 C 9.1489592707,60.7141807860 8.9072992707,61.2751907860 8.6648992707,61.5502807860 C 8.4224992707,61.8253707860 8.2150192707,61.9451307860 7.6023992707,61.9565307860 C 7.0919159373,61.8002807860 6.3814692707,61.7935207860 6.0709492707,61.4877807860" /> + <path stroke="0" skew="0" data="B 12.3702108270,66.4187575274 C 13.1219732101,65.5656275612 13.4784271879,64.5251468944 13.7138608979,63.4037378561 C 14.1847283179,61.1609302666 14.1590770549,58.4711342129 14.3365280039,55.6695574846 C 14.5498760394,52.3031805296 14.9550737091,48.8956420018 15.3852304983,45.9035155060 C 16.2661930287,48.2237697747 17.0370417971,49.8883752440 17.9086708753,52.8839414840 C 18.6685816768,55.4955672538 19.3355145151,58.2021420231 20.4321112523,60.4542620907 C 20.9804043775,61.5803168811 21.6311452493,62.6191301109 22.5622881940,63.4037378561 C 23.4934311387,64.1883456013 24.7180220154,64.7003536201 26.0688871595,64.7146159741 C 27.4634202754,64.7290775814 28.8054133964,64.0915818222 29.4443983132,63.0104744207 C 30.0834251781,61.9293670193 30.1107858262,60.7225935980 30.0015215133,59.4383315493 C 29.7830033746,56.8697974894 28.8352070342,53.7368617097 28.0024323835,50.4260450129 C 27.1834796316,47.1701698397 26.7583985625,43.8500930999 26.4949225478,40.8566347519 C 27.6027089407,42.3730795328 28.5665084811,43.9978762554 29.3460824543,45.6741118353 C 30.6834822584,48.5497799191 31.5844120842,51.2775285161 32.6888216551,53.1133451546 M 32.9182253257,53.5066085900 M 33.3114887611,53.6704683548 C 35.0412396293,54.4220734325 36.5781865440,54.7342931391 37.9651060798,54.3259074137 C 39.3520256156,53.9175216884 40.2820883968,52.6852123613 40.6196342686,51.3108877425 C 41.2947260123,48.5622489918 40.4721971849,44.9153546066 38.8171768565,40.3650554577 C 37.9338547455,37.9365016823 36.6145974946,34.4353140217 34.9500864085,31.1561366791 C 33.3906133643,28.0838997998 31.5597675756,25.2664242174 29.2805385484,23.5858155480 C 28.3767038167,22.2300844244 27.6241129586,19.3536717618 27.0192737950,16.4415298053 C 26.4144346314,13.5293878487 25.9359536313,10.6044412347 24.8890968533,8.5107696269 C 24.8594605209,8.4514130657 24.8496132044,7.3964183564 25.0201846651,6.1839085324 C 25.1054966131,5.5776536204 25.2198051849,4.9090009100 25.1840444299,4.2175913555 C 25.1483151359,3.5261818009 24.9477717579,2.7032649536 24.2992017003,2.0546424609 C 23.5979343423,1.3533751029 22.8155078983,1.1255969211 21.8413052291,0.8748521547 C 20.8671025600,0.6241073883 19.7102368904,0.4562101190 18.4002501695,0.3176765195 C 15.7802767279,0.0406093205 12.5506715522,-0.0579687140 9.3224192028,0.0227813781 C 6.0941668534,0.1036363404 2.8795581234,0.3519690910 0.2118162831,0.7765887310 C -1.1220598805,0.9888461159 -2.3221006318,1.2464074485 -3.3275546353,1.5631156018 C -4.3330086388,1.8797188848 -5.1659301079,2.1888763801 -5.8509950123,2.8739937197 C -6.4849881053,3.5079343775 -6.2879893417,3.7091803862 -6.3098023536,3.8898718260 C -6.3316153655,4.0705632658 -6.3077049486,4.2126624537 -6.3098023536,4.3813986851 C -6.3139971636,4.7189760180 -6.3203942488,5.1211534246 -6.3098023536,5.5940133793 C -6.2887234335,6.5397332887 -6.2674347729,7.7600035111 -6.3426267417,9.0678403919 C -6.4929687313,11.6834617181 -7.1288704628,14.5404838716 -8.4728036834,15.8844066051 C -13.2540377134,20.6655985823 -14.6355249703,21.7193977707 -18.4682494375,25.5521327249 C -19.8393230786,26.9232168531 -20.3446403755,28.6322348730 -20.7622861439,30.0091183259 C -21.1799319123,31.3860017789 -21.5642184543,32.4168448697 -22.1059362148,32.9585940913 C -22.2929198695,33.1455567720 -22.2885153191,33.1759691443 -22.3681118384,33.2863136208 C -22.4477293318,33.3966580972 -22.5338068010,33.5585463013 -22.6302874305,33.7123490091 C -22.8232801505,34.0199649118 -23.0605595769,34.4037690507 -23.2529545365,34.8593673623 C -23.4453494961,35.3149656740 -23.6153861186,35.8185001766 -23.6462179719,36.4324211038 C -23.6770707993,37.0463420311 -23.5077997297,37.8489350240 -22.9252350070,38.4315102337 C -21.7166893100,39.6400769363 -20.7032337065,40.5241016780 -19.6152677907,41.0532664696 C -18.5273018750,41.5824312612 -17.2417289482,41.6609161559 -16.1742127311,41.1843542814 C -14.0979286107,40.2574690688 -12.7288264254,38.1060349276 -10.3735769544,34.9904551741 C -8.7890713816,33.9467445036 -7.7283507567,33.2765292265 -6.3098547888,32.0409794087 C -6.1373956636,32.5461289133 -6.0752076056,33.1306756836 -6.0804511181,33.8434368209 C -6.0898894406,35.2008458685 -6.4343148008,36.9290131960 -6.9980658007,38.7920017161 C -8.1255573134,42.5179892434 -10.0327486437,46.8232590546 -11.0290160133,50.8520804012 C -11.7137138719,53.6208122917 -12.3694675416,56.1433298105 -12.0777185077,58.4879449138 C -11.9318439907,59.6602579712 -11.5190222538,60.8166097766 -10.6685245309,61.7323682557 C -9.8180268080,62.6481267349 -8.6189718370,63.2556925250 -7.1291536125,63.6331415268 C -5.9804887963,63.9241669560 -4.7818113583,63.8022972391 -3.8519583176,63.2726500443 C -2.9221052769,62.7430028495 -2.2785165562,61.9342749470 -1.7873252819,61.0113852909 C -0.8049322462,59.1656059787 -0.3275838448,56.7914489260 0.2117638480,54.2931354608 C 0.7997189015,51.5696970310 2.0049402431,48.2653613156 3.2267835193,45.2480764470 C 3.3880844499,48.5138828328 3.6131779533,51.4918623319 3.5872750017,54.8174867080 C 3.5637526047,57.8452371031 3.3945129962,60.7902349089 3.9149945312,63.2398780914 C 4.1752300552,64.4646996826 4.6262455369,65.6362681612 5.5208202257,66.5170733862 C 6.4153949144,67.3978786427 7.7419406476,67.8552178005 9.1912789559,67.8279515356 C 10.4599153374,67.8042508592 11.6184484439,67.2718875250 12.3702108270,66.4187575274" /> + <path stroke="0" skew="0" data="B 7.5197520501,64.4852123034 C 7.1941089516,64.1645820028 6.8937290961,63.5596484559 6.7004532264,62.6499829383 C 6.3138910000,60.8306414160 6.4141574455,57.9491320593 6.4382776028,54.8502586609 C 6.4816519380,49.2709726245 6.2019315217,42.4488273139 5.8483824498,38.8575456220 M 5.3568031555,33.9089807268 M 3.1283103550,38.3659663278 C 1.6786154879,41.2839076092 -1.4242539913,48.3774990734 -2.5740094580,53.7032403077 C -3.1086379896,56.1796568649 -3.6389458670,58.4051918000 -4.3109229643,59.6677352200 C -4.6469062694,60.2990121735 -4.9822708401,60.6558122231 -5.2613095998,60.8147535732 C -5.5403483595,60.9737368713 -5.8086274316,61.0322439835 -6.4083279530,60.8802974791 C -7.5265069876,60.5970114743 -8.1798276675,60.2203175383 -8.5712768476,59.7988230318 C -8.9627260276,59.3773285252 -9.1673069102,58.8682673604 -9.2594878595,58.1274534314 C -9.4438497580,56.6458260977 -8.9254027059,54.2974875761 -8.2435573181,51.5402914131 C -7.3401840154,47.8871572481 -5.4830892033,43.5932029369 -4.2781510113,39.6113005399 C -3.6756819153,37.6203493413 -3.2093658642,35.6987383518 -3.1966765640,33.8762087739 C -3.1839977509,32.0536791960 -3.6790692244,30.2449400558 -4.9663620232,28.8948719257 M -5.9822925646,27.8133974784 M -6.9982231060,28.8948719257 C -9.3996364608,31.3391247774 -9.6904626366,31.1086619172 -12.1106477660,32.7291904207 M -12.3072794837,32.8602782325 M -12.4711392484,33.0569099502 C -14.9697674293,36.3411315517 -16.5739466609,38.2289323729 -17.3213883897,38.5625980455 C -17.6951040106,38.7294885605 -17.8169737274,38.7333582727 -18.3700908840,38.4643346218 C -18.8996122345,38.2067837762 -19.7483271632,37.5625343728 -20.7952154022,36.5307893978 C -20.7854624690,36.4242517114 -20.7048382213,36.2252918742 -20.5985836845,35.9736661977 C -20.4867290765,35.7087954087 -20.3343735781,35.4256142741 -20.2053202492,35.2199112799 C -20.1502633682,35.1320824460 -20.1120905974,35.0442011769 -20.0742324374,34.9905076092 C -19.9317347424,34.8480413754 -20.0026060570,34.9038847832 -20.0414080493,34.9576832212 C -18.8176036995,33.7120763465 -18.4446326573,32.1547426553 -18.0423189194,30.8284171497 C -17.6362718006,29.4897693897 -17.2487552549,28.3634838848 -16.4692651779,27.5839938078 C -12.6919959938,23.8067142414 -11.2662220305,22.7086283466 -6.4410474708,17.8834957350 C -4.1408129327,15.5832821709 -3.6572457255,12.1140484753 -3.4915717054,9.2316477215 C -3.4087242084,7.7905207537 -3.4373537865,6.4835228350 -3.4587473174,5.5284694734 C -3.4660882348,5.1914164917 -3.4566499124,4.9693013034 -3.4587473174,4.7419426026 C -3.2532750376,4.6196638918 -3.0620441378,4.4678117706 -2.4755887289,4.2831352614 C -1.6750931409,4.0310271817 -0.6041476667,3.7925522345 0.6377468012,3.5948718143 C 3.1215357369,3.1996158442 6.2934517884,2.9526464068 9.4206301914,2.8739937197 C 12.5478085944,2.7955507731 15.6663456889,2.8783982702 18.1051977228,3.1361693433 C 19.3246184962,3.2649500096 20.3579994471,3.4314839657 21.1202173940,3.6276962024 C 21.8824353410,3.8239084391 22.3703756375,4.1567666108 22.3000077002,4.0865035437 C 22.2517673854,4.0382632289 22.3163674591,4.0632223483 22.3328320882,4.3813986851 C 22.3492757433,4.6996798921 22.2819700173,5.2205704211 22.2017442764,5.7906450970 C 22.0413452299,6.9307944489 21.6140618856,8.2857180716 22.3656040412,9.7888233567 C 23.0455722515,11.1487702644 23.6192859251,14.0736120081 24.2336053593,17.0314249583 C 24.8479247934,19.9892379085 25.4860392872,23.0065856993 26.9209055010,25.1588692896 M 27.0847652658,25.4210449132 M 27.3141689364,25.5849046779 C 28.8883238156,26.5978464172 30.8216802731,29.3370468454 32.3938216434,32.4342428441 C 33.9659630138,35.5314388429 35.2954556010,38.9641672046 36.1625962325,41.3482140461 C 37.7363211436,45.6749717714 38.2294839786,49.1457260856 37.8667377858,50.6226767305 C 37.6853646894,51.3611520530 37.5237281740,51.4945365233 37.1457548210,51.6058353190 C 36.8325493340,51.6980582164 35.9367371763,51.5321534817 34.9172620205,51.1797999307 C 34.1781784505,49.8144417182 33.2630701669,47.3171454943 31.9350143021,44.4615495762 C 30.5167700228,41.4120485670 28.6333737522,38.1051015823 25.6755712890,35.6786661860 M 23.3159906767,33.7451209621 M 23.3488150648,36.7929125863 C 23.3764588625,40.4143759360 23.9274891011,45.9883135897 25.2168163828,51.1142560248 C 26.0695583291,54.5044385264 27.0117755722,57.6535447742 27.1831335597,59.6677352200 C 27.2688125535,60.6748356864 27.1107835747,61.3582436409 26.9865018420,61.5685084910 C 26.8622201094,61.7788257762 26.8514499348,61.8707969850 26.1016591124,61.8634560675 C 25.3733352301,61.8557376172 24.8917815317,61.6244987172 24.3975175591,61.2080170086 C 23.9032535865,60.7915353000 23.4294707736,60.1149439117 22.9883235823,59.2089278787 C 22.1060187128,57.3969062998 21.4436162692,54.7525300755 20.6615149230,52.0646426603 C 19.1062576628,46.7196157871 17.1450371800,41.6448710077 16.1389854161,39.5457566340 M 14.2382121451,35.5803503272 M 13.4516852743,39.9390200693 C 12.9667547539,42.6298857996 11.8718149666,49.3752870616 11.4853680974,55.4729257669 C 11.3001043148,58.3977879604 11.2893865753,61.0936560016 10.9282448973,62.8138427030 C 10.7476688148,63.6739360538 10.4942393700,64.2622686401 10.2400338854,64.5507562093 C 9.9858284007,64.8392437785 9.7682436072,64.9648363892 9.1257874851,64.9767915976 C 8.5904423401,64.8129318329 7.8453951487,64.8058426040 7.5197520501,64.4852123034" /> </glyph> </collection> <collection unicode="U+6e"> @@ -177,8 +177,8 @@ <collection name="point_tool"> <selected id="1"/> <glyph id="1" left="-28" right="40.354299363057336"> - <path stroke="0" skew="0" data="B 29.9752984992,19.5314631223 M 33.6101092106,16.4055259105 M 28.8848552858,15.8603043038 M 11.6195044068,13.7521140911 M 6.2036364469,-2.6772303243 M 4.4589273054,-8.0204020700 M 2.2780408786,-2.8589708599 M -24.7286027070,61.1500457676 M -21.4209249596,63.5490208371 M 29.9752984992,19.5314631223" /> - <path stroke="0" skew="0" data="B 3.9500538057,3.9744732775 M 8.0210418025,16.3328296962 M 8.4572190879,17.6050134452 M 9.7657509439,17.7867539808 M 23.5780316473,19.4587669080 M -17.3499369629,54.5346902728 M 3.9500538057,3.9744732775" /> + <path stroke="0" skew="0" data="B 26.8955827937,15.5321912760 M 30.0429005484,12.8254980069 M 25.9513874672,12.3534003437 M 11.0016281322,10.5279560459 M 6.3121246776,-3.6979202056 M 4.8014121553,-8.3244773051 M 2.9130215025,-3.8552860934 M -20.4715494155,51.5689795681 M -17.6074902586,53.6462092862 M 26.8955827937,15.5321912760" /> + <path stroke="0" skew="0" data="B 4.3607876695,2.0616712856 M 7.8857835549,12.7625516518 M 8.2634616855,13.8641128659 M 9.3964960772,14.0214787537 M 21.3563035454,15.4692449209 M -14.0824943733,45.8408612543 M 4.3607876695,2.0616712856" /> </glyph> </collection> <collection unicode="U+71"> @@ -195,7 +195,7 @@ <selected id="1"/> <glyph id="1" left="-28" right="28"> <path stroke="0" skew="0" data="B -12.6075353516,43.9448258786 M 20.4549646484,43.9448258786 M 22.2362146484,43.9448258786 M 22.2362146484,42.1323258786 M 22.2362146484,7.8198258786 M 22.2362146484,3.4448258786 M 19.1737146484,6.5385258786 M 12.5799646484,13.1323258786 M 9.5799646484,10.0073258786 M 16.1112146484,3.3198258786 M 19.0799646484,0.2261258786 M 14.7987146484,0.2261258786 M -19.1387853516,0.2261258786 M -20.9512853516,0.2261258786 M -20.9512853516,2.0385258786 M -20.9512853516,34.6948258786 M -20.9512853516,38.8198258786 M -17.9200353516,36.0073258786 M -10.6075353516,29.2260758786 M -6.4200353516,33.4135758786 M -13.8887853516,40.8823258786 M -16.9512853516,43.9448258786 M -12.6075353516,43.9448258786" /> - <path stroke="0" skew="0" data="B -2.5762853516,34.6948258786 M -1.2950353516,33.4135758786 M -2.5762853516,32.1323258786 M -9.2637853516,25.4448258786 M -10.4825353516,24.2260758786 M -11.7637853516,25.3823258786 M -17.3575353516,30.5385758786 M -17.3575353516,3.8511258786 M 10.5487146484,3.8511258786 M 5.7674646484,8.7573258786 M 4.5487146484,10.0073258786 M 5.7674646484,11.2573258786 M 11.2362146484,16.9760758786 M 12.5174646484,18.3198258786 M 13.8299646484,17.0073258786 M 18.6424646484,12.1948258786 M 18.6424646484,40.3510758786 M -8.2637853516,40.3510758786 M -2.5762853516,34.6948258786" /> + <path stroke="0" skew="0" data="B -8.2637853516,40.3510758786 M 18.6424646484,40.3510758786 M 18.6424646484,12.1948258786 M 13.8299646484,17.0073258786 M 12.5174646484,18.3198258786 M 11.2362146484,16.9760758786 M 5.7674646484,11.2573258786 M 4.5487146484,10.0073258786 M 5.7674646484,8.7573258786 M 10.5487146484,3.8511258786 M -17.3575353516,3.8511258786 M -17.3575353516,30.5385758786 M -11.7637853516,25.3823258786 M -10.4825353516,24.2260758786 M -9.2637853516,25.4448258786 M -2.5762853516,32.1323258786 M -1.2950353516,33.4135758786 M -2.5762853516,34.6948258786 M -8.2637853516,40.3510758786" /> </glyph> </collection> <collection unicode="U+73"> @@ -264,11 +264,11 @@ <ligature sequence="m o v e _ b a c k g r o u n d" replacement="move_background"/> - <ligature sequence="m o v e _ c a n v a s" replacement="move_canvas"/> <ligature sequence="s p i n _ b u t t o n" replacement="spin_button"/> + <ligature sequence="m o v e _ c a n v a s" replacement="move_canvas"/> <ligature sequence="p o i n t _ t o o l" replacement="point_tool"/> - <ligature sequence="z o o m _ t o o l" replacement="zoom_tool"/> <ligature sequence="f o r e s i g h t" replacement="foresight"/> + <ligature sequence="z o o m _ t o o l" replacement="zoom_tool"/> <ligature sequence="p e n _ t o o l" replacement="pen_tool"/> <ligature sequence="r e s i z e" replacement="resize"/> <ligature sequence="t r a c k" replacement="track"/>