diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-19 20:10:36 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-19 20:10:36 +0000 |
| commit | 968cf01eb9a0b5248a91a697c502383e8dd7b00d (patch) | |
| tree | 63eaa397c29b2a562c585b1e924feb7c8e0f2329 | |
| parent | Start fixing Krzysztof review (diff) | |
| parent | Merge lp:~inkscape.dev/inkscape/copy-rotate-lpe-improvements (diff) | |
| download | inkscape-968cf01eb9a0b5248a91a697c502383e8dd7b00d.tar.gz inkscape-968cf01eb9a0b5248a91a697c502383e8dd7b00d.zip | |
update to trunk
(bzr r13682.1.35)
132 files changed, 671 insertions, 374 deletions
diff --git a/doc/extension_system.txt b/doc/extension_system.txt index e1918701c..4902fe004 100644 --- a/doc/extension_system.txt +++ b/doc/extension_system.txt @@ -321,7 +321,7 @@ Inkscape, such as in the case of compiled-in printing modules. Most users will never need to write this type of extension, they are pretty much for Inkscape core developers only. -=== Writeing Your Extension === +=== Writing Your Extension === This section provides some guidance and examples for implementing different kinds of Extensions. @@ -334,7 +334,7 @@ different kinds of Extensions. === Creating an INX File === -Every extension must have a corrosponding *.inx file. This is an XML +Every extension must have a corresponding *.inx file. This is an XML file that provides Inkscape with information about the module and allows it to load the info without needing to access the module itself. The *.inx file contains enough info for Inkscape to set up menu items and @@ -342,7 +342,7 @@ know what kinds of functionality to expect from the extension. === Packaging Your Extension === -=== Contributing Your Extensino to the Inkscape Community === +=== Contributing Your Extension to the Inkscape Community === Once your extension is complete, you may wish to share it with the community. There are of course no hard and fast rules for how to share diff --git a/inkscape.desktop.in b/inkscape.desktop.in index 771ceccc7..4ce25a287 100644 --- a/inkscape.desktop.in +++ b/inkscape.desktop.in @@ -7,7 +7,7 @@ _Comment=Create and edit Scalable Vector Graphics images _Keywords=image;editor;vector;drawing; Type=Application Categories=Graphics;VectorGraphics;GTK; -MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; +MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;application/visio;application/x-visio;application/vnd.visio;application/visio.drawing;application/vsd;application/x-vsd;image/x-vsd; Exec=inkscape %F TryExec=inkscape Terminal=false diff --git a/share/branding/CMakeLists.txt b/share/branding/CMakeLists.txt index ff12059ca..0bfd54267 100644 --- a/share/branding/CMakeLists.txt +++ b/share/branding/CMakeLists.txt @@ -1,2 +1,2 @@ -file(GLOB _FILES "README" "*.svg") +file(GLOB _FILES "README" "*.svg" "*.oft") install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/branding) diff --git a/share/branding/EuphoriaScript-Regular.otf b/share/branding/EuphoriaScript-Regular.otf Binary files differnew file mode 100644 index 000000000..6f475a68e --- /dev/null +++ b/share/branding/EuphoriaScript-Regular.otf diff --git a/share/branding/LinLibertine_DR.otf b/share/branding/LinLibertine_DR.otf Binary files differnew file mode 100644 index 000000000..4ff287426 --- /dev/null +++ b/share/branding/LinLibertine_DR.otf diff --git a/share/branding/Makefile.am b/share/branding/Makefile.am index f992c8165..1561dbf2c 100644 --- a/share/branding/Makefile.am +++ b/share/branding/Makefile.am @@ -5,10 +5,12 @@ iconsdir = $(datadir)/inkscape/icons branding_DATA = \ README \ inkscape.svg \ + inkscape-flat.svg \ + inkscape-text.svg \ sodipodi.svg \ - tux.svg \ - draw-freely.svg \ - draw-freely.ru.svg + LinLibertine_DR.otf \ + EuphoriaScript-Regular.otf \ + tux.svg icons_DATA = \ inkscape.svg diff --git a/share/branding/draw-freely.ru.svg b/share/branding/draw-freely.ru.svg deleted file mode 100644 index 61e98a9f7..000000000 --- a/share/branding/draw-freely.ru.svg +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="svg1725" - sodipodi:version="0.32" - inkscape:version="0.45+devel" - width="210mm" - height="297mm" - sodipodi:docname="draw-freely.ru.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - > - <defs - id="defs1727" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="1.0000000" - inkscape:pageshadow="2" - inkscape:zoom="0.36631945" - inkscape:cx="453.44213" - inkscape:cy="474.56956" - inkscape:window-width="820" - inkscape:window-height="656" - inkscape:window-x="415" - inkscape:window-y="342" - inkscape:current-layer="svg1725" /> - <metadata - id="metadata1728"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <path - style="fill:#000000;fill-opacity:1;stroke-width:1pt" - d="M 466.69088,586.64433 L 451.12888,586.64433 L 451.12888,587.64017 L 451.59482,587.64017 C 453.69245,587.64017 453.92518,587.7465 453.92518,588.6361 L 453.92518,589.2504 L 453.92518,599.33459 L 453.92518,599.94907 C 453.92518,600.83858 453.69245,600.94491 451.59482,600.94491 L 451.12888,600.94491 L 451.12888,601.94065 L 467.02734,601.94065 L 467.54529,596.2837 L 466.40568,596.2837 C 466.06987,597.76657 465.47369,599.08028 464.85241,599.69486 C 464.04945,600.54225 462.57338,600.94491 460.39873,600.94491 L 458.68975,600.94491 C 457.91263,600.94491 457.26569,600.81786 457.03237,600.62703 C 456.85147,600.50054 456.8254,600.37272 456.8254,599.92808 L 456.8254,594.52581 L 457.34326,594.52581 C 458.92248,594.52581 459.57001,594.65285 460.08843,595.0974 C 460.76104,595.64878 461.02011,596.32665 461.07211,597.57633 L 462.28902,597.57633 L 462.28902,590.62758 L 461.07211,590.62758 C 460.94253,592.70366 459.90656,593.53006 457.44641,593.53006 L 456.8254,593.53006 L 456.8254,588.69948 C 456.8254,587.78861 457.05862,587.64017 458.45671,587.64017 L 459.80292,587.64017 C 462.08177,587.64017 463.19503,587.83109 464.07588,588.42437 C 464.93017,588.97509 465.55155,590.16126 465.94029,592.06791 L 467.05368,592.06791 L 466.69088,586.64433 z M 432.32964,595.13989 L 435.25552,595.13989 C 437.58637,595.13989 438.80309,594.99163 439.83925,594.58938 C 441.67716,593.86856 442.71344,592.51292 442.71344,590.8395 C 442.71344,589.22977 441.80674,588.00044 440.09813,587.30149 C 439.08801,586.87811 437.48245,586.64433 435.69581,586.64433 L 426.6333,586.64433 L 426.6333,587.64017 L 427.09924,587.64017 C 429.1966,587.64017 429.42941,587.7465 429.42941,588.6361 L 429.42941,589.2504 L 429.42941,599.33459 L 429.42941,599.94907 C 429.42941,600.83858 429.1966,600.94491 427.09924,600.94491 L 426.6333,600.94491 L 426.6333,601.94065 L 435.33337,601.94065 L 435.33337,600.94491 L 434.6599,600.94491 C 432.56236,600.94491 432.32964,600.83858 432.32964,599.94907 L 432.32964,599.33459 L 432.32964,595.13989 z M 432.32964,594.14424 L 432.32964,588.72079 C 432.32964,587.7465 432.48525,587.64017 433.90922,587.64017 L 435.5666,587.64017 C 438.25929,587.64017 439.52808,588.67849 439.52808,590.9241 C 439.52808,593.10651 438.20756,594.14424 435.46296,594.14424 L 432.32964,594.14424 z M 409.80201,586.34804 L 408.7146,586.34804 L 402.75859,598.69884 C 402.24105,599.80081 402.13768,599.94907 401.74934,600.28776 C 401.33472,600.69051 400.60964,600.94491 399.91029,600.94491 L 399.80705,600.94491 L 399.80705,601.94065 L 406.66866,601.94065 L 406.66866,600.94491 L 406.15065,600.94491 C 404.75299,600.94491 404.05357,600.54225 404.05357,599.73725 C 404.05357,599.48285 404.13133,599.18674 404.28648,598.84774 L 405.14127,596.98311 L 412.00279,596.98311 L 413.40119,599.82221 C 413.55671,600.14 413.60844,600.28776 413.60844,600.3944 C 413.60844,600.73299 412.96044,600.94491 412.00279,600.94491 L 410.91528,600.94491 L 410.91528,601.94065 L 418.94266,601.94065 L 418.94266,600.94491 L 418.58026,600.94491 C 417.28481,600.94491 417.00018,600.77547 416.40502,599.58927 L 409.80201,586.34804 z M 408.5331,589.82258 L 411.45908,595.83933 L 405.65882,595.83933 L 408.5331,589.82258 z M 390.66641,586.49617 L 389.68232,586.49617 L 388.64663,587.7465 C 386.80766,586.64433 385.7986,586.32674 384.06355,586.32674 C 381.5517,586.32674 379.47983,587.15314 377.7194,588.86886 C 376.06224,590.47905 375.28512,592.25843 375.28512,594.44084 C 375.28512,598.9959 378.93603,602.25834 384.03761,602.25834 C 388.18059,602.25834 390.82183,600.26704 391.41755,596.70763 L 390.20046,596.53829 C 389.94157,597.66098 389.6305,598.42344 389.16446,599.05929 C 388.10311,600.52126 386.44573,601.26288 384.3481,601.26288 C 380.51599,601.26288 378.70339,599.08028 378.70339,594.52581 C 378.70339,592.13129 379.09145,590.52144 379.97199,589.2504 C 380.77459,588.06391 382.38014,587.32211 384.03761,587.32211 C 385.8502,587.32211 387.45566,588.1063 388.43957,589.46241 C 388.93164,590.16126 389.32001,590.98748 389.91582,592.61888 L 391.05419,592.61888 L 390.66641,586.49617 z M 364.74664,586.51729 L 363.78889,586.51729 L 362.75293,587.78861 C 361.53574,586.83526 359.87864,586.32674 358.04018,586.32674 C 354.64807,586.32674 352.36959,588.1063 352.36959,590.75503 C 352.36959,593.06384 353.76725,594.20802 357.57358,595.01293 L 360.03361,595.52164 C 361.94996,595.9238 362.13102,595.96619 362.67507,596.30565 C 363.45179,596.79259 363.86601,597.49155 363.86601,598.31785 C 363.86601,599.16515 363.47763,599.8642 362.70111,600.43666 C 361.84623,601.05087 360.99222,601.284 359.56797,601.284 C 357.65153,601.284 356.27919,600.79646 355.06229,599.69486 C 353.97468,598.69884 353.43088,597.70309 353.04269,596.07215 L 351.92934,596.07215 L 352.03257,602.11027 L 353.04269,602.11027 L 354.2075,600.66951 C 355.94255,601.83441 357.39332,602.25834 359.64518,602.25834 C 363.45179,602.25834 365.88588,600.43666 365.88588,597.59732 C 365.88588,596.2837 365.34207,595.16119 364.3327,594.35615 C 363.63319,593.80518 362.62335,593.4451 360.55156,593.02117 L 357.78101,592.44945 C 355.4766,591.96232 354.3889,591.13592 354.3889,589.84357 C 354.3889,588.36089 355.86488,587.34319 358.06575,587.34319 C 359.87864,587.34319 361.35425,587.97944 362.39003,589.18683 C 363.14099,590.05531 363.60694,590.94509 363.94395,592.02571 L 365.05725,592.02571 L 364.74664,586.51729 z M 329.73795,595.01293 L 329.73795,589.2504 L 329.73795,588.6361 C 329.73795,587.7465 329.97071,587.64017 332.06844,587.64017 L 332.56042,587.64017 L 332.56042,586.64433 L 324.04134,586.64433 L 324.04134,587.64017 L 324.50756,587.64017 C 326.60491,587.64017 326.83727,587.7465 326.83727,588.6361 L 326.83727,589.2504 L 326.83727,599.33459 L 326.83727,599.94907 C 326.83727,600.83858 326.60491,600.94491 324.50756,600.94491 L 324.04134,600.94491 L 324.04134,601.94065 L 332.56042,601.94065 L 332.56042,600.94491 L 332.06844,600.94491 C 329.97071,600.94491 329.73795,600.83858 329.73795,599.94907 L 329.73795,599.33459 L 329.73795,596.64415 L 332.74182,594.16563 L 337.2471,599.56772 C 337.66173,600.07612 337.76496,600.24559 337.76496,600.45806 C 337.76496,600.79646 337.27354,600.94491 336.00435,600.94491 L 335.20138,600.94491 L 335.20138,601.94065 L 344.05729,601.94065 L 344.05729,600.94491 L 343.56541,600.94491 C 342.14125,600.94491 341.77826,600.79646 341.02758,599.88569 L 334.7616,592.49184 L 338.62002,589.33536 C 339.86259,588.25456 341.4418,587.64017 342.99554,587.64017 L 342.99554,586.64433 L 335.01998,586.64433 L 335.01998,587.64017 L 335.66789,587.64017 C 336.85932,587.64017 337.35074,587.83109 337.35074,588.27583 C 337.35074,588.57234 336.83288,589.18683 336.08211,589.8009 L 329.73795,595.01293 z M 300.78851,586.64433 L 295.45429,586.64433 L 295.45429,587.64017 L 296.10173,587.64017 C 297.42234,587.64017 298.01796,587.8097 298.484,588.3399 L 298.484,597.3431 C 298.484,600.24559 297.96577,600.85985 295.48026,600.94491 L 295.48026,601.94065 L 302.86048,601.94065 L 302.86048,600.94491 C 300.39986,600.85985 299.88231,600.24559 299.88231,597.3431 L 299.88231,589.4834 L 311.43138,602.23735 L 312.5188,602.23735 L 312.5188,591.24188 C 312.5188,588.3399 313.03625,587.72514 315.52225,587.64017 L 315.52225,586.64433 L 308.14232,586.64433 L 308.14232,587.64017 C 310.60225,587.72514 311.12021,588.3399 311.12021,591.24188 L 311.12021,597.89411 L 300.78851,586.64433 z M 283.95759,589.2504 L 283.95759,588.6361 C 283.95759,587.7465 284.19054,587.64017 286.26182,587.64017 L 286.77978,587.64017 L 286.77978,586.64433 L 278.20888,586.64433 L 278.20888,587.64017 L 278.72683,587.64017 C 280.82428,587.64017 281.05719,587.7465 281.05719,588.6361 L 281.05719,589.2504 L 281.05719,599.33459 L 281.05719,599.94907 C 281.05719,600.83858 280.82428,600.94491 278.72683,600.94491 L 278.20888,600.94491 L 278.20888,601.94065 L 286.77978,601.94065 L 286.77978,600.94491 L 286.26182,600.94491 C 284.19054,600.94491 283.95759,600.83858 283.95759,599.94907 L 283.95759,599.33459 L 283.95759,589.2504 z" - id="path1790" /> - <rect - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;" - id="rect2417" - width="121.38228" - height="108.26424" - x="154.73230" - y="423.67596" - rx="6.1828303" - ry="0.0000000" - inkscape:export-filename="/home/d/ink/draw-freely.png" - inkscape:export-xdpi="475.20001" - inkscape:export-ydpi="475.20001" /> - <path - style="font-size:91.1083374px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Pushkin" - d="M 511.84498,930.29223 C 498.54088,930.33085 485.37228,933.1155 472.75748,937.19828 C 470.75608,937.99628 468.46258,938.58775 467.01298,940.26858 C 467.19898,942.0437 470.20868,941.14355 471.50118,941.15628 C 476.19768,940.43544 480.71018,938.86292 485.36768,937.94311 C 497.71198,935.20606 510.47658,933.52838 523.10458,935.09361 C 532.97988,936.32964 542.86888,938.4426 551.97028,942.57282 C 556.78128,944.72603 561.19498,947.67918 565.16578,951.13445 C 570.37228,955.5321 575.68238,959.95453 579.78298,965.44334 C 584.73928,972.38588 586.77788,981.15001 586.24218,989.59614 C 585.39438,996.92523 581.11148,1003.272 576.47248,1008.7822 C 571.86958,1014.0406 566.82678,1019.2175 560.42158,1022.2433 C 557.93028,1023.311 555.10328,1024.1536 552.39188,1023.535 C 550.50808,1022.8131 551.57388,1020.4111 552.49858,1019.3107 C 554.74138,1016.6409 557.77868,1014.7277 560.98448,1013.4207 C 562.76248,1012.6436 565.07158,1011.856 565.42598,1009.6481 C 566.19708,1007.6349 564.03118,1005.9866 562.19368,1006.9191 C 558.40488,1008.3558 555.22978,1010.9922 552.05008,1013.4313 C 550.76338,1014.7157 548.70438,1014.2079 547.04538,1014.6819 C 544.06538,1015.0952 541.05018,1015.5554 538.04108,1015.46 C 536.34598,1015.0959 534.62548,1014.7365 533.04698,1013.9937 C 534.22618,1011.4074 535.75388,1008.7499 535.67158,1005.8242 C 535.45848,1003.4725 533.47018,1001.4661 531.22968,1000.917 C 528.15088,1000.9056 525.25918,1002.2221 522.43668,1003.3163 C 517.24068,1005.4203 512.64728,1008.8127 508.89748,1012.9576 C 505.72438,1016.5226 502.73568,1020.4984 501.38178,1025.136 C 500.85208,1026.8841 500.92368,1028.9098 502.21678,1030.3151 C 503.23558,1031.8335 505.03118,1032.8166 506.88138,1032.5277 C 513.07768,1032.2345 518.35528,1028.4131 522.66368,1024.2636 C 525.01828,1022.0651 527.30918,1019.8045 529.58698,1017.5287 C 533.06618,1019.0813 536.94038,1019.3863 540.69578,1019.0255 C 542.83708,1018.8782 544.96868,1018.5867 547.07118,1018.1549 C 545.53508,1019.9144 544.23458,1022.2832 545.00248,1024.6734 C 545.58788,1027.1877 547.83398,1029.4981 550.56868,1029.2346 C 558.75648,1029.1102 566.18808,1024.7038 572.18658,1019.445 C 579.55298,1012.9194 585.36008,1004.6026 588.90708,995.42035 C 590.87648,990.33367 591.46168,984.73992 590.48558,979.36603 C 589.07978,970.47975 583.89388,962.68994 577.61538,956.44724 C 573.15898,951.996 568.38428,947.84564 563.30798,944.11601 C 553.90918,937.6774 542.71498,934.58667 531.66238,932.40491 C 525.13408,931.1439 518.50238,930.29937 511.84498,930.29223 z M 118.57791,951.01584 C 109.47238,951.53248 100.93169,955.23731 92.965294,959.4326 C 84.104329,964.17896 75.959667,970.40636 69.410098,978.05555 C 67.270128,980.74666 64.905278,983.94387 65.469748,987.59094 C 65.709818,990.65561 67.970368,993.2687 70.836628,994.24918 C 73.328318,995.20443 76.029287,995.43295 78.676882,995.44409 C 68.976888,1004.1837 58.949828,1012.5494 49.068399,1021.0768 C 47.106267,1022.9268 44.902109,1024.641 43.488895,1026.9685 C 42.852141,1028.7536 44.589579,1030.9633 46.499757,1030.2966 C 49.855338,1027.9377 52.713088,1024.9438 55.734358,1022.1849 C 61.201998,1017.003 66.759058,1011.9065 72.714258,1007.2898 C 81.921368,999.80436 91.205189,992.41061 100.28398,984.76997 C 103.4415,981.92946 106.8215,979.17526 109.11005,975.54975 C 109.99927,974.08213 109.74705,971.51931 107.96874,970.86107 C 106.06142,970.426 104.66592,972.33066 103.19394,973.23442 C 98.100871,977.35594 93.300982,981.90832 87.598975,985.20857 C 84.442812,987.06171 81.498069,989.64312 77.76037,990.17199 C 75.687156,990.17917 73.368808,989.52944 72.033118,987.85715 C 71.132958,986.25945 72.232408,984.4078 72.937908,982.95179 C 75.772185,978.2233 79.984291,974.52068 84.157299,971.00085 C 90.886667,965.59449 98.398604,961.05455 106.53478,958.11459 C 112.20439,956.17027 118.67206,955.0126 124.39075,957.39989 C 126.12127,958.09 127.4686,959.84014 127.18014,961.76405 C 126.84536,967.79442 123.25467,973.00632 119.46759,977.47279 C 116.75893,980.72805 113.57053,983.53245 110.16955,986.0427 C 105.22389,989.90432 99.898958,993.2741 95.120826,997.34767 C 93.371098,998.96744 96.12844,1000.79 97.592686,999.24219 C 103.18015,996.43332 108.38864,992.914 113.41288,989.20357 C 118.72082,985.16604 123.42722,980.35854 127.60704,975.17226 C 130.82575,970.96968 133.92826,966.19623 134.18105,960.74884 C 134.39509,957.43263 131.52999,955.00564 128.8103,953.69338 C 125.61774,952.20435 122.17323,950.78692 118.57791,951.01584 z M 452.14098,952.37759 C 448.78408,952.65035 445.79298,954.42734 442.85088,955.92362 C 437.05428,959.09035 431.68118,962.95368 426.12668,966.51419 C 419.48088,970.79914 412.95518,975.2801 406.78678,980.23493 C 399.33188,986.12432 392.18998,992.39748 384.85848,998.43515 C 379.37148,1002.6294 373.43728,1006.3621 368.86148,1011.6173 C 367.53548,1012.7243 366.74768,1014.8961 364.77828,1014.53 C 353.84098,1017.8531 343.05498,1021.6944 331.98698,1024.5783 C 329.52758,1025.1057 327.03048,1025.9417 324.49468,1025.7317 C 322.46658,1025.4293 322.30028,1023.0099 323.59838,1021.754 C 325.99698,1018.6047 329.19038,1016.1596 332.33938,1013.8106 C 334.73738,1012.3666 337.13708,1010.9218 339.65248,1009.6874 C 340.61298,1010.9465 341.74448,1013.2107 343.62418,1012.5695 C 345.43548,1011.4661 346.70808,1009.5697 347.47268,1007.625 C 347.71258,1004.8645 344.60908,1002.9548 342.11078,1003.5595 C 337.96608,1004.5392 334.39718,1007.0285 330.85528,1009.2837 C 326.41798,1012.3122 321.83898,1015.4403 318.70088,1019.8828 C 316.87138,1022.3331 316.60548,1026.1228 318.78508,1028.439 C 321.19158,1030.6446 324.75928,1030.3111 327.75358,1029.8753 C 336.38838,1028.3542 344.69558,1025.4459 352.98968,1022.6768 C 355.88768,1021.673 358.77688,1020.6442 361.62778,1019.5162 C 359.92108,1021.8294 358.25278,1024.5299 358.37518,1027.511 C 359.05438,1029.6639 361.12778,1031.3381 363.33618,1031.7395 C 367.64548,1032.0582 371.82068,1030.3935 375.61258,1028.5037 C 379.03818,1026.6183 382.48078,1024.7636 385.92128,1022.9062 C 389.79468,1025.0917 394.12268,1027.1955 398.69728,1026.5577 C 404.15688,1025.9932 409.52328,1024.7126 414.77978,1023.1599 C 413.90868,1025.324 413.11428,1028.0912 414.75038,1030.1056 C 415.78008,1031.7277 417.64948,1032.8377 419.60698,1032.5277 C 425.80388,1032.2344 431.08158,1028.4131 435.38948,1024.2636 C 437.74408,1022.0651 440.03498,1019.8045 442.31278,1017.5287 C 445.79748,1019.084 449.67778,1019.3837 453.43928,1019.0363 C 456.63038,1018.8026 459.83268,1018.3555 462.88898,1017.3837 C 460.92488,1019.6296 458.75078,1021.9202 457.90678,1024.8488 C 457.17488,1027.9923 459.79318,1031.3076 463.02068,1031.3418 C 468.67348,1031.5905 473.82478,1028.5209 478.14118,1025.1762 C 491.32178,1014.5335 502.79078,1001.8599 512.51268,988.00329 C 516.37028,982.57794 520.05888,977.01589 524.35998,971.92334 C 527.82808,971.41567 531.30228,971.00002 534.79228,970.75222 C 541.76078,970.03568 548.68038,968.86167 555.52678,967.39344 C 559.19148,966.37691 562.96938,965.04326 565.80018,962.40847 C 567.45268,961.26182 567.67338,957.84836 564.92648,958.74224 C 560.98768,958.51889 557.46148,960.6343 553.67918,961.36252 C 550.61008,961.90832 547.46438,961.56384 544.36118,961.65375 C 542.23208,961.23294 540.86378,964.18177 543.31828,964.898 C 544.03588,965.41477 541.10758,965.36906 540.29968,965.6442 C 536.41398,966.27417 532.47108,966.38722 528.58128,966.98941 C 526.64368,967.13203 524.67088,967.67616 522.74048,967.32209 C 520.82638,967.73902 519.62958,969.54235 518.35098,970.88669 C 514.49228,975.53767 511.40658,980.75771 507.90258,985.6702 C 505.53048,989.10368 503.24638,992.60573 500.50898,995.76645 C 496.35758,1000.8417 492.20108,1005.9205 487.77198,1010.7587 C 487.83508,1008.1846 487.10238,1004.9436 484.35298,1004.0257 C 481.58218,1002.9607 478.86838,1004.6626 476.54298,1006.003 C 472.63118,1008.3853 468.92778,1011.1564 465.72328,1014.4387 C 464.12308,1013.6862 462.31448,1014.4423 460.64348,1014.5505 C 457.37558,1015.0185 454.07098,1015.5482 450.76728,1015.46 C 449.06058,1015.0933 447.32698,1014.7375 445.73598,1013.9937 C 446.91148,1011.4034 448.47408,1008.7544 448.39728,1005.8242 C 448.18468,1003.4725 446.19598,1001.4661 443.95548,1000.917 C 440.87668,1000.9055 437.98488,1002.2221 435.16288,1003.3163 C 429.96638,1005.4203 425.37358,1008.8128 421.62328,1012.9576 C 419.78958,1014.9429 418.13748,1017.0977 416.73048,1019.4074 C 411.74098,1020.1615 406.94558,1021.9924 401.87008,1022.2364 C 398.81478,1022.4254 395.37768,1022.6425 392.80498,1020.6599 C 395.83218,1018.4843 399.06898,1016.1563 400.65668,1012.6622 C 401.36028,1011.2198 401.29948,1008.5648 399.17498,1008.52 C 396.42708,1008.58 394.16908,1010.4729 392.01168,1011.9683 C 389.43658,1014.0026 386.80638,1016.0121 384.63298,1018.4862 C 380.20158,1021.059 376.00218,1024.0373 371.42578,1026.3517 C 369.51298,1027.1879 367.46038,1028.2941 365.31268,1027.9544 C 363.34178,1026.6813 365.36448,1024.2204 366.26098,1022.8757 C 369.41218,1018.6714 372.91418,1014.712 376.71468,1011.0868 C 380.01348,1007.9434 383.77818,1005.3625 387.49478,1002.7545 C 394.74438,999.05727 402.25528,995.89896 409.67228,992.55635 C 418.62648,988.53955 427.53858,984.24254 435.44178,978.36027 C 442.31608,973.38454 449.00618,968.02314 454.62068,961.62694 C 455.81918,960.15066 457.44278,958.33323 456.63878,956.28433 C 455.95648,954.41862 454.29808,952.38443 452.14098,952.37759 z M 566.43278,958.70909 C 566.71418,958.64356 565.57288,958.57374 566.43278,958.70909 z M 451.25748,956.90534 C 453.04238,958.11523 450.26188,960.29957 449.40148,961.43253 C 443.97088,966.90125 437.97178,971.79529 431.71338,976.28442 C 423.91758,981.92779 415.14418,986.03392 406.17148,989.42431 C 405.01938,989.80595 402.51088,990.9801 402.24938,990.82148 C 409.21148,984.99513 416.06838,979.01947 423.40148,973.65819 C 430.73488,968.4979 438.04728,963.25149 445.91778,958.92936 C 447.61548,958.09555 449.33728,957.07533 451.25748,956.90534 z M 287.05273,975.05209 C 284.47022,975.39318 282.31973,977.0807 280.1636,978.4195 C 274.41197,982.43771 268.898,986.81975 263.76273,991.60296 C 262.47934,992.98581 260.78922,994.2742 260.32923,996.18059 C 260.42944,998.26654 263.53545,998.57299 264.64928,997.08255 C 269.47898,992.92065 273.59316,987.91149 278.98021,984.4146 C 282.10182,982.13816 285.57099,980.25912 288.26117,977.44832 C 289.01908,976.59293 288.27197,974.88352 287.05273,975.05209 z M 610.82418,997.35809 C 608.50288,997.97688 606.60568,999.61554 604.60358,1000.8816 C 599.74288,1004.0626 595.38628,1007.9215 591.23588,1011.9668 C 587.22038,1015.8981 583.02928,1019.7317 579.72618,1024.3033 C 578.68658,1025.4098 578.35258,1027.6985 580.05568,1028.3534 C 582.25378,1029.2303 584.17618,1027.3814 585.52678,1025.8681 C 587.90388,1023.045 590.33878,1020.0035 593.88008,1018.6099 C 598.18028,1016.6035 603.07848,1015.1399 607.82488,1016.1973 C 608.83598,1016.5344 611.23738,1017.0963 609.48628,1018.2461 C 607.59888,1020.6655 605.67668,1023.5776 605.95428,1026.7829 C 606.75798,1028.6938 608.96548,1029.4194 610.73838,1030.1682 C 616.24638,1032.1562 622.26318,1031.7977 627.89368,1030.5474 C 632.03678,1029.6851 636.13378,1028.6089 640.19778,1027.4299 C 640.30208,1029.4658 641.80708,1031.2927 643.56268,1032.2094 C 645.74618,1032.9829 648.15478,1032.3154 650.31418,1031.7542 C 656.53008,1029.8192 661.10458,1024.9348 665.66918,1020.558 C 667.15028,1019.5767 668.18498,1016.6657 670.16978,1018.0789 C 674.79858,1019.7441 679.83108,1019.1577 684.59078,1018.4868 C 687.11768,1017.9856 689.86198,1017.6129 691.95168,1015.9893 C 693.64438,1014.2101 690.49028,1013.768 689.25678,1014.2443 C 685.24978,1014.7695 681.22948,1015.5641 677.17908,1015.46 C 675.48398,1015.0959 673.76348,1014.7365 672.18498,1013.9937 C 673.36418,1011.4074 674.89138,1008.7499 674.80958,1005.8242 C 674.59638,1003.4726 672.60818,1001.466 670.36768,1000.917 C 667.28888,1000.9055 664.39718,1002.2221 661.57468,1003.3163 C 656.37868,1005.4203 651.78528,1008.8127 648.03548,1012.9576 C 645.11628,1016.1867 642.48848,1019.7835 640.89748,1023.8587 C 633.49678,1025.8532 625.96568,1028.0958 618.22098,1027.7847 C 616.05708,1027.5433 613.43708,1027.282 612.03858,1025.3993 C 611.69378,1023.4607 613.95918,1022.1981 615.01198,1020.812 C 616.27038,1019.5772 617.46078,1018.2239 619.18588,1017.6551 C 623.83288,1015.2009 628.34988,1012.3977 632.33318,1008.9521 C 633.63808,1007.6442 635.48208,1006.1155 635.19948,1004.062 C 634.52228,1002.4013 632.43718,1001.171 630.71268,1002.0974 C 626.21098,1004.1214 622.28888,1007.2024 618.46748,1010.2804 C 617.09418,1011.0582 615.63048,1013.1772 614.34428,1013.1832 C 612.06088,1010.7397 608.44098,1010.7353 605.37658,1011.1909 C 603.25488,1011.4065 601.14838,1011.8927 599.00848,1011.8612 C 602.45728,1006.7932 608.16098,1004.1123 612.72448,1000.2431 C 613.43928,999.17359 611.92948,997.50339 610.82418,997.35809 z M 205.96248,1000.8923 C 202.70921,1001.1526 199.89108,1003.0759 197.23562,1004.8153 C 193.61022,1007.4562 190.32969,1010.8357 188.52551,1014.9952 C 187.23615,1016.0338 185.10401,1016.1955 183.46529,1016.8736 C 173.90121,1019.8349 164.44608,1023.2302 154.65031,1025.3678 C 152.88558,1025.6102 150.6666,1026.4316 149.24445,1024.9378 C 148.00139,1023.1249 150.061,1021.4246 151.50678,1020.5761 C 152.15209,1019.369 152.59276,1018.2626 153.92208,1017.4134 C 156.26105,1015.3341 158.76189,1013.4465 161.53293,1011.9816 C 162.94374,1011.325 164.57463,1009.9202 165.90684,1009.9015 C 166.84996,1011.1781 168.23397,1013.5562 170.07683,1012.3804 C 171.67355,1011.1965 172.88749,1009.4734 173.58712,1007.625 C 173.82428,1004.8845 170.75312,1002.9502 168.26014,1003.5595 C 164.10442,1004.5376 160.51967,1007.0222 156.96973,1009.2837 C 152.5642,1012.296 148.00179,1015.4035 144.86876,1019.8102 C 143.85785,1021.5892 141.36687,1021.6076 139.60981,1022.4246 C 136.23464,1023.3522 132.87009,1024.5874 129.34689,1024.7411 C 127.52458,1024.7347 124.89728,1024.3085 124.63419,1022.0902 C 124.63693,1020.0996 126.90215,1019.2476 128.27988,1018.2195 C 131.02295,1016.3673 134.37226,1014.6426 135.38039,1011.2304 C 136.08082,1009.6851 135.73261,1006.1133 133.2662,1007.2347 C 129.51683,1009.2794 126.44275,1012.3208 123.01231,1014.8316 C 115.77415,1020.5331 106.92613,1024.9193 97.520855,1024.7371 C 96.086435,1024.7969 93.502314,1024.2133 94.14531,1022.2647 C 95.54591,1019.6951 97.95952,1017.8667 100.07023,1015.9008 C 103.11504,1013.2071 106.37111,1010.6899 108.99729,1007.5633 C 110.16014,1005.643 107.85488,1004.0959 106.29526,1005.5734 C 101.84756,1008.0358 98.030252,1011.4701 94.24808,1014.8325 C 92.01895,1016.9947 89.554772,1019.0877 88.125044,1021.8983 C 87.27873,1024.6785 89.407407,1027.5526 91.95493,1028.5393 C 94.437167,1029.5351 97.169092,1029.0098 99.767792,1029.0005 C 104.24125,1028.8032 108.73378,1027.9895 112.77507,1025.9924 C 114.42359,1025.2498 116.0466,1024.4552 117.65766,1023.6412 C 119.63385,1025.5638 121.88439,1027.3956 124.6837,1027.8728 C 129.97194,1029.0772 135.29501,1027.3617 140.28488,1025.7094 C 141.54763,1025.5787 143.8311,1023.5422 143.57405,1025.9047 C 144.00855,1028.3959 146.44243,1029.9585 148.84163,1030.1041 C 153.25213,1030.4731 157.57683,1029.1353 161.81536,1028.1071 C 170.41743,1025.7195 178.89448,1022.8786 187.24377,1019.7192 C 188.7116,1018.7569 189.27428,1021.4507 190.88261,1021.6482 C 194.50074,1023.3077 198.54174,1022.036 202.1955,1021.19 C 203.43169,1020.9371 205.60234,1020.1051 206.207,1020.1423 C 199.72001,1026.0734 193.46511,1032.2533 187.04248,1038.2524 C 176.68894,1044.5014 165.83811,1050.0062 156.21696,1057.3952 C 146.19334,1064.9039 136.40171,1072.9111 128.35705,1082.5712 C 126.18517,1085.3573 123.82003,1088.2935 123.21196,1091.8631 C 122.93146,1093.7083 124.13304,1095.6125 125.72428,1096.4488 C 128.72705,1096.7053 131.53323,1095.1617 134.05046,1093.6967 C 140.32386,1089.8523 145.31467,1084.3683 150.74031,1079.4771 C 162.24391,1068.6875 174.06201,1058.2369 185.29651,1047.1599 C 189.34766,1043.2193 193.38621,1039.2666 197.34898,1035.2349 C 204.97046,1031.2078 212.77946,1027.5563 220.69213,1024.1437 C 223.89357,1022.7624 227.05156,1021.2767 230.29323,1019.9974 C 229.06895,1021.3378 228.45024,1023.2481 229.27856,1024.9702 C 230.44428,1027.9324 233.83632,1029.4306 236.88291,1029.1181 C 242.49479,1029.0522 248.29071,1028.6572 253.40689,1026.135 C 255.16164,1025.3571 256.88649,1024.5087 258.59898,1023.6412 C 260.53017,1025.5023 262.69329,1027.3164 265.40905,1027.8184 C 270.15165,1028.9793 275.00493,1027.7325 279.53381,1026.2842 C 283.72868,1024.844 288.03462,1023.4929 291.81702,1021.1297 C 293.71953,1020.4907 293.08984,1017.7454 291.05266,1018.5818 C 286.76147,1019.9645 282.68766,1021.991 278.3004,1023.0943 C 274.82644,1023.9567 271.14922,1025.463 267.56258,1024.3163 C 265.357,1023.8395 264.96316,1020.7978 266.97043,1019.786 C 269.90789,1017.4852 273.71141,1016.0076 275.71238,1012.6926 C 276.57253,1011.0905 277.49877,1008.0196 275.39364,1007.0378 C 273.51162,1007.0518 272.10167,1008.6765 270.5939,1009.632 C 264.92272,1014.0766 259.39545,1018.9054 252.67796,1021.7296 C 247.84685,1023.8065 242.52185,1025.1118 237.24229,1024.6186 C 235.34325,1024.7025 234.24709,1022.5133 235.74895,1021.2054 C 239.32915,1016.8069 244.10415,1013.6177 248.09305,1009.6202 C 249.31089,1008.5117 251.18812,1006.774 249.69594,1005.109 C 247.863,1004.6527 246.20147,1006.3108 244.6757,1007.1393 C 241.37969,1009.436 238.30316,1012.0307 235.33598,1014.7337 C 227.01343,1017.6887 218.6743,1020.5997 210.34273,1023.5274 C 214.57043,1018.6738 219.79497,1014.8097 224.18019,1010.1074 C 225.59476,1009.2782 225.31761,1005.9221 223.30544,1006.5942 C 219.26828,1008.0473 215.72617,1010.5627 211.97254,1012.5956 C 207.27898,1015.3445 202.25636,1018.0734 196.70984,1018.374 C 195.3078,1018.7263 192.48857,1017.5443 194.10998,1016.0224 C 193.88504,1014.4065 195.56074,1013.1165 196.31155,1011.7328 C 198.08774,1009.1227 200.58628,1007.1633 203.21829,1005.4784 C 204.6212,1004.4057 206.41819,1003.6911 207.39408,1002.162 C 207.66932,1001.2812 206.69931,1000.8045 205.96248,1000.8923 z M 435.02468,1009.5062 C 436.59088,1010.7904 436.86508,1013.0285 436.92908,1014.9381 C 437.10238,1016.7286 435.28138,1017.5872 434.28418,1018.7914 C 430.77378,1022.1191 427.20448,1025.6013 422.73798,1027.5992 C 421.08128,1028.7119 418.23308,1028.2228 419.07988,1025.6986 C 419.94088,1022.191 422.53308,1019.4683 424.84658,1016.8235 C 427.60108,1013.6044 431.10518,1011.1084 435.02468,1009.5062 z M 522.29898,1009.5062 C 523.89088,1010.77 524.18078,1013.0257 524.24008,1014.9381 C 524.41338,1016.7289 522.59198,1017.5875 521.59418,1018.7914 C 518.07608,1022.123 514.49328,1025.6035 510.01658,1027.5992 C 508.35398,1028.713 505.53438,1028.222 506.39088,1025.6986 C 507.25188,1022.191 509.84408,1019.4683 512.15708,1016.8235 C 514.91618,1013.6107 518.37778,1011.1093 522.29898,1009.5062 z M 661.43648,1009.5062 C 663.02888,1010.77 663.31878,1013.0257 663.37808,1014.9381 C 663.55138,1016.7289 661.72998,1017.5875 660.73208,1018.7914 C 657.21398,1022.123 653.63118,1025.6035 649.15458,1027.5992 C 647.40858,1028.8027 644.57648,1028.0946 645.56928,1025.5414 C 646.01808,1023.8034 646.96998,1022.0876 648.12168,1020.6043 C 651.21788,1016.6283 654.70098,1012.7283 659.31388,1010.4987 C 660.00898,1010.1409 660.71768,1009.8109 661.43648,1009.5062 z M 480.48398,1010.7224 C 482.53338,1010.4014 483.69208,1013.0938 483.04198,1014.6225 C 478.68968,1018.5462 474.31638,1022.5862 469.12628,1025.3804 C 467.72458,1026.003 465.11618,1027.4412 464.38808,1025.3271 C 463.70608,1023.0537 465.64038,1021.2175 467.05108,1019.7301 C 470.34128,1016.6058 473.91138,1013.7047 477.91638,1011.5514 C 478.72748,1011.1608 479.57848,1010.8025 480.48398,1010.7224 z M 701.85298,1020.7687 C 698.69678,1020.6541 696.21558,1024.6398 697.82918,1027.4103 C 699.21048,1029.9248 703.45668,1030.0668 704.79368,1027.4158 C 706.07398,1025.3681 705.70748,1021.8013 703.09228,1021.0098 C 702.69108,1020.878 702.27308,1020.8052 701.85298,1020.7687 z M 175.26348,1050.5862 C 172.54381,1054.2715 168.98773,1057.2307 165.7706,1060.4678 C 156.60996,1069.1121 147.35014,1077.6524 138.21115,1086.321 C 135.35731,1088.7434 132.53155,1091.3783 129.04172,1092.8503 C 126.59082,1094.042 126.76676,1090.6459 128.16356,1089.57 C 132.76975,1083.3002 138.28907,1077.7574 143.91662,1072.4099 C 151.09377,1065.8631 159.09079,1060.2864 167.2229,1055.0007 C 169.8171,1053.383 172.4422,1051.7808 175.26348,1050.5862 z" - id="text2418" /> - <g - id="inkscape-logo" - transform="matrix(0.4657141,0,0,0.4657141,284.1543,392.3856)"> - <path - d="M 163.15,27.83 L 28.81,165.3 C -16.58,221.51 59.7,214.97 92.4,231.16 C 104.13,243.15 47.44,252 59.17,264 C 70.9,275.99 130.1,287.1 141.85,299.09 C 153.58,311.08 117.84,323.8 129.57,335.79 C 141.3,347.78 168.43,336.42 173.51,364.1 C 177.13,383.88 222.4,372.6 244.54,356.4 C 256.27,344.4 222.1,345.53 233.83,333.54 C 263,303.71 290.16,322.7 300.14,292.81 C 305.07,278.04 257.2,270.04 268.95,258.05 C 302.7,238.34 419.35,225.51 364,170.16 L 224.75,27.83 C 207.72,11.48 179.3,11.3 163.15,27.83 z M 317.46,292.81 C 317.46,299.63 367.71,304.1 367.71,291.2 C 360.55,270.48 323.4,271.88 317.46,292.81 z M 91.1,329.05 C 103,339.34 121.38,326.49 126.89,312.13 C 115.36,296.81 72.2,312.68 91.1,329.05 z M 311.16,306.82 C 295.82,320.58 312.88,334.54 328,325.65 C 331.37,322.23 327.91,310.24 311.16,306.82 z" - id="path2313" /> - <path - d="M 131,238.6 C 134.59,240.83 188.89,251.86 202.16,254.06 C 206.76,255.03 203.5,259.77 197.16,262.97 C 182.86,266.77 113.5,238.6 131,238.6 z" - id="path2315" - style="fill:#ffffff" /> - <path - d="M 216.63,37.47 L 269.78,91.45 C 274.82,96.6 274.75,106.58 271.93,109.45 L 245.54,88.34 L 240.35,119.6 L 218.3,107.96 L 182.99,130.27 L 171.3,83.24 L 152.33,116.06 L 123.33,116.06 C 111.51,116.06 110.12,101.06 120.86,90.32 C 139.62,70.07 161.15,49.43 172.85,37.47 C 184.61,25.45 205.1,25.79 216.63,37.47 z" - id="path2317" - style="fill:#ffffff" /> - </g> -</svg> diff --git a/share/branding/draw-freely.svg b/share/branding/draw-freely.svg deleted file mode 100644 index bcf2fb16e..000000000 --- a/share/branding/draw-freely.svg +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="svg1725" - sodipodi:version="0.32" - inkscape:version="0.45+devel" - width="210mm" - height="297mm" - sodipodi:docname="draw-freely.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - > - <defs - id="defs1727" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="1.0000000" - inkscape:pageshadow="2" - inkscape:zoom="0.36631945" - inkscape:cx="441.95763" - inkscape:cy="529.64183" - inkscape:window-width="820" - inkscape:window-height="656" - inkscape:window-x="134" - inkscape:window-y="214" - inkscape:current-layer="svg1725" /> - <metadata - id="metadata1728"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <path - style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Pushkin" - d="M 217.14156,941.97541 C 216.84284,941.93075 216.4695,942.14531 216.15378,942.30477 C 214.12212,943.29422 212.57482,945.12957 210.88563,946.58527 C 208.28238,948.83484 205.54164,950.86433 202.98321,953.17068 C 202.17437,952.54596 201.52162,951.77159 200.67842,951.19484 C 192.87828,945.79669 183.44166,942.92589 174.00767,942.30477 C 169.25477,941.92756 164.52521,942.36434 159.84903,943.29242 C 150.40056,945.16971 141.02046,947.95257 132.52009,952.51185 C 126.22582,956.00958 120.17217,960.04199 114.41018,964.36583 C 109.77875,967.93234 105.05646,971.89272 101.89791,976.87782 C 100.3607,979.4297 99.180422,982.42336 99.922482,985.43894 C 100.89488,988.77785 103.95087,991.09435 107.16659,992.02423 C 110.57107,993.01218 114.12907,991.74308 117.37368,990.7071 C 126.66856,987.47818 135.85531,983.31119 143.3856,976.87782 C 147.92975,973.00781 152.20194,968.43589 154.2514,962.71946 C 154.938,960.6047 155.64737,958.35868 155.23958,956.13417 C 155.02143,954.60927 152.89833,953.70102 151.61738,954.48769 C 150.65253,955.08874 149.92148,956.00992 149.64194,957.12183 C 150.13273,959.19152 150.19977,961.72217 149.31259,963.70712 C 147.60352,967.63895 144.59537,970.49978 141.41017,973.2559 C 135.93931,977.99384 129.33022,981.42248 122.64196,984.12181 C 119.06507,985.5154 115.32422,986.90625 111.44669,987.08531 C 109.82331,987.04308 108.3312,986.74122 106.83712,986.09725 C 105.238,984.96997 105.32204,982.85991 105.8491,981.15832 C 107.01214,977.77458 109.30672,975.09375 111.77604,972.59719 C 121.13101,963.55253 132.74143,956.69705 145.03197,952.51185 C 151.67408,950.31983 158.4659,948.86482 165.44666,948.23175 C 172.16391,947.74178 179.10369,948.14596 185.532,950.20719 C 190.34398,951.81057 194.93255,954.29372 198.37323,958.10949 C 193.14201,962.16754 187.86712,965.99329 182.56851,969.96305 C 174.31362,976.08244 166.14766,982.30816 157.87372,988.40244 C 150.52563,993.72182 143.26299,999.24836 136.14189,1004.8657 C 131.0538,1008.9618 126.027,1013.1626 121.32483,1017.7066 C 119.7411,1017.2032 118.3039,1016.5494 116.71497,1016.0603 C 112.22051,1014.738 107.6145,1012.9792 102.88597,1012.7676 C 95.495882,1012.5356 88.088944,1013.8136 81.154228,1016.3899 C 78.284912,1017.5332 75.20528,1018.831 73.251845,1021.3286 C 72.044638,1022.8268 72.144442,1024.8439 72.593137,1026.5968 C 73.316591,1029.5956 76.03594,1031.5944 78.849479,1032.5243 C 82.868008,1033.8689 87.166461,1034.113 91.361361,1033.8411 C 99.201612,1033.115 106.71515,1030.5724 114.08083,1027.9148 C 117.08702,1026.7563 120.22811,1025.6832 122.97131,1023.9633 C 128.16981,1025.8159 133.61578,1027.5635 139.10538,1028.2432 C 144.02001,1028.9086 148.80552,1028.1708 153.59309,1026.9264 C 162.20742,1024.6767 170.55352,1020.9774 177.95906,1016.0603 C 187.53946,1009.698 195.24381,1000.9667 201.00737,991.03646 C 203.96636,985.87317 206.86382,980.3912 208.25149,974.57303 C 209.09694,971.29271 208.85497,968.04222 208.90979,964.69477 C 208.73661,962.42996 207.68933,960.2373 206.93436,958.10949 C 208.94222,956.2757 211.16063,954.32156 213.19029,952.51185 C 215.05432,950.80284 216.9387,949.18995 218.12933,946.9147 C 218.52602,946.03654 218.88381,945.23537 218.78792,944.2806 C 218.84454,943.30855 218.03853,942.10917 217.14156,941.97541 z M 545.42132,942.63412 C 543.46997,942.90634 541.66923,944.10867 540.15304,945.26826 C 536.57935,948.31163 533.44123,951.67959 530.2749,955.1464 C 529.60403,956.36155 528.24218,956.58511 526.98194,956.79248 C 520.29817,957.99121 513.33887,958.06917 506.56776,958.10949 C 500.60959,957.9549 494.94754,956.61863 489.11656,955.47535 C 482.76943,954.09598 476.15777,952.84823 469.68952,952.1829 C 459.94721,951.15192 449.80633,951.13811 440.38475,954.15834 C 433.59923,956.35581 427.14268,960.06978 422.6046,965.68296 C 418.77549,970.39978 416.94746,976.4364 417.33592,982.47533 C 417.41843,983.7634 418.23546,985.07525 419.64111,985.10947 C 420.94125,985.2948 421.51059,984.11126 421.94589,983.13416 C 423.011,980.35251 423.85361,977.35642 424.90939,974.57303 C 426.95857,969.46525 430.64367,965.04014 435.44595,962.39011 C 442.13549,958.65764 449.94768,957.46812 457.5066,957.12183 C 465.05586,956.684 472.53248,957.87979 479.89713,959.42662 C 488.06134,961.3151 496.52284,962.95566 504.92128,963.04882 C 513.63836,963.0744 522.49209,962.41644 530.93321,960.08532 C 536.13358,958.66083 540.91748,956.24688 545.09197,952.84121 C 547.5658,950.75725 550.01598,947.68239 550.03077,944.2806 C 550.02645,944.02648 549.88905,944.08884 549.70142,943.95113 C 548.41051,943.24242 546.92102,942.59787 545.42132,942.63412 z M 201.6662,962.71946 C 202.34306,965.05087 202.93553,967.5208 202.98321,969.96305 C 202.982,973.72812 202.01812,977.32759 200.67842,980.82897 C 197.65783,988.475 193.05799,995.2107 187.50744,1001.2438 C 182.33428,1006.9537 175.97267,1011.97 169.06846,1015.4023 C 161.97566,1018.8581 154.60395,1021.4108 146.67845,1021.9877 C 139.85458,1022.4971 133.09965,1020.9044 126.59311,1019.0246 C 128.1127,1017.4009 129.83952,1015.8528 131.53203,1014.4139 C 139.66162,1007.6609 148.30211,1001.8021 156.88554,995.64603 C 164.48771,990.43349 171.86482,985.17612 179.60502,980.17067 C 187.14835,974.66654 194.59678,968.82052 201.6662,962.71946 z M 461.1288,974.24368 C 458.95464,975.25372 457.04233,977.02283 455.20181,978.52418 C 449.54353,983.49054 444.24418,988.86689 438.73839,993.99955 C 437.64741,993.12233 436.69835,992.32975 435.44595,991.69488 C 432.74625,990.55501 429.82562,989.49271 426.88482,989.39009 C 424.74173,989.25935 422.29974,990.38291 421.28756,992.35359 C 420.16445,994.46922 420.11616,996.91502 420.29941,999.26826 C 420.41886,1000.5803 421.64131,1001.6333 422.93355,1001.5734 C 424.10819,1001.3336 423.85805,999.56306 424.25068,998.60914 C 424.54801,997.082 425.85306,995.44139 427.54353,995.31668 C 430.10148,995.22079 432.62664,996.26746 434.78712,997.62186 C 432.4735,999.82886 430.14234,1001.9541 427.87288,1004.207 C 422.35764,1009.6041 416.78724,1014.9559 410.42168,1019.3526 C 407.96637,1020.9366 405.17477,1022.7098 402.1899,1022.9749 C 401.07622,1023.2153 400.2417,1022.0975 400.54354,1021.0002 C 401.26024,1018.6348 403.0771,1016.9244 404.16534,1014.7435 C 404.91644,1013.4721 403.38215,1012.2453 402.1899,1012.4384 C 400.28163,1012.4176 399.17472,1014.2869 398.23875,1015.7319 C 396.87434,1018.0931 395.52633,1020.623 394.94591,1023.3045 C 394.50872,1024.9417 395.52966,1026.401 396.59227,1027.5852 C 397.4921,1028.5353 398.4049,1029.8011 399.88524,1029.5612 C 404.65997,1029.2578 408.81938,1026.8859 412.72646,1024.2929 C 417.77558,1020.8294 422.34729,1016.8586 426.88482,1012.7676 C 431.02784,1009.0657 434.87408,1004.9026 438.73839,1000.9142 C 439.84596,1002.0174 440.99488,1003.1068 442.36059,1003.8774 C 446.26427,1005.8645 450.87675,1006.352 455.20181,1006.5121 C 457.22379,1006.521 459.13132,1006.5353 461.1288,1006.1825 C 462.49593,1005.9397 463.54047,1004.9297 463.43359,1003.549 C 463.28044,1002.9758 462.59886,1002.7263 462.11658,1002.5606 C 458.51483,1001.7938 454.85711,1002.0034 451.25066,1001.2438 C 448.09645,1000.7769 445.17363,999.20526 442.68973,997.29246 C 447.29423,992.93561 451.74255,988.31044 456.18959,983.79246 C 458.5508,981.30618 461.17327,979.06885 463.10423,976.2194 C 464.19927,974.90001 462.2326,973.80678 461.1288,974.24368 z M 623.78673,982.8048 C 621.57255,982.54918 619.29321,983.12423 617.20144,983.79246 C 611.01162,985.96952 605.55478,989.45146 600.07959,993.01189 C 595.95532,995.65467 591.93287,998.70602 588.22602,1001.903 C 583.18716,1006.2835 578.28958,1010.8361 573.73791,1015.7319 C 573.2514,1016.2976 572.57895,1016.7934 572.09195,1017.3783 C 567.37954,1019.0671 562.7414,1021.2289 557.93319,1022.6465 C 554.07095,1023.8214 550.07496,1024.1475 546.07962,1023.3045 C 544.7464,1023.0326 543.10078,1022.2669 543.11613,1020.6706 C 543.26587,1018.8472 544.73918,1017.7336 546.07962,1016.7191 C 548.61448,1015.3623 551.25063,1014.0269 553.65271,1012.4384 C 557.99426,1009.5088 562.50509,1006.6805 566.16496,1002.8902 C 567.64811,1001.2533 569.26332,999.31146 569.12846,996.96302 C 569.11688,995.63425 567.77686,994.47322 566.49432,994.3289 C 565.15458,993.95831 564.02817,994.69422 562.87252,995.31668 C 557.54001,998.21304 552.41977,1001.6855 547.72611,1005.5237 C 543.99718,1008.674 540.20078,1012.0451 537.84785,1016.3899 C 537.60138,1016.878 537.71611,1017.4982 537.5189,1018.0358 C 533.38419,1019.5961 529.25038,1021.3957 525.00662,1022.6465 C 521.14448,1023.8214 517.14839,1024.1475 513.15305,1023.3045 C 511.81993,1023.0326 510.17421,1022.267 510.18956,1020.6706 C 510.22958,1020.1835 510.29919,1019.7572 510.51891,1019.3526 C 510.81371,1019.1658 510.94536,1018.9387 511.17722,1018.695 C 511.34583,1018.4923 511.31238,1018.2204 511.50657,1018.0358 C 512.03551,1017.534 512.60349,1017.1353 513.15305,1016.7191 C 515.68791,1015.3623 518.32365,1014.0269 520.726,1012.4384 C 525.06764,1009.5088 529.5788,1006.6806 533.2384,1002.8902 C 534.72155,1001.2533 536.33635,999.31146 536.20189,996.96302 C 536.18991,995.63425 535.17915,994.47322 533.8967,994.3289 C 532.55737,993.95831 531.10161,994.69422 529.94555,995.31668 C 524.61303,998.21304 519.4933,1001.6855 514.79942,1005.5237 C 511.07061,1008.674 507.60366,1012.0451 505.25064,1016.3899 C 504.997,1016.8925 504.79263,1017.4814 504.59193,1018.0358 C 503.49455,1018.5393 502.41984,1018.9121 501.29949,1019.3526 C 497.80971,1020.8898 494.10172,1021.9473 490.43357,1022.9749 C 486.11518,1024.1681 481.76038,1025.3778 477.26299,1025.6097 C 476.20638,1025.6266 474.65773,1025.8478 474.2995,1024.6213 C 474.03208,1021.7746 475.82805,1019.1174 477.9213,1017.3783 C 481.29286,1014.5298 485.71332,1013.0299 489.77486,1011.4508 C 492.30898,1010.3606 494.96085,1009.7812 497.01886,1007.8289 C 498.1302,1006.8833 498.13678,1005.1345 497.67728,1003.8774 C 497.08979,1002.109 495.0727,1001.6618 493.39707,1001.903 C 489.55835,1002.4801 486.84463,1005.7786 483.18958,1006.8417 C 481.98069,1007.2636 480.3183,1006.9569 479.89713,1005.5237 C 479.53217,1003.8548 479.48724,1002.2699 479.23831,1000.585 C 478.5998,998.80476 476.62266,998.38296 474.9578,998.60914 C 472.83515,999.34106 471.2454,1001.0239 469.68952,1002.5606 C 466.88353,1005.6057 464.14022,1008.6994 461.7871,1012.11 C 460.9395,1013.1674 460.64575,1014.7447 461.1288,1016.0603 C 461.41946,1017.484 463.0286,1018.3296 464.42124,1018.0358 C 465.92684,1016.9661 467.10106,1015.4131 468.37251,1014.0855 C 469.83788,1012.5902 470.97651,1011.0646 472.65302,1009.8048 C 473.87528,1009.8303 475.17981,1010.6463 476.27481,1011.1216 C 477.74206,1011.4038 476.49815,1012.1169 475.94586,1012.7676 C 473.1839,1015.9562 469.85529,1018.971 467.71421,1022.6465 C 466.78153,1024.0392 467.30367,1025.7406 468.37251,1026.9264 C 469.9589,1028.6922 472.01296,1029.9942 474.2995,1030.5484 C 476.27277,1030.7758 478.25046,1030.3591 480.22608,1030.2188 C 483.65104,1029.9512 487.20468,1029.0545 490.43357,1027.9148 C 495.20787,1026.3632 499.71921,1024.451 504.26257,1022.3169 C 504.34243,1022.5442 504.47165,1022.7556 504.59193,1022.9749 C 506.02385,1025.3568 508.56985,1026.6154 511.17722,1027.256 C 517.10476,1028.6058 523.28933,1027.4671 528.95777,1025.6097 C 531.6584,1024.6802 534.23819,1023.4541 536.86019,1022.3169 C 536.94089,1022.5493 537.06645,1022.7509 537.18955,1022.9749 C 538.62147,1025.3568 541.49642,1026.6154 544.10419,1027.256 C 550.03123,1028.6058 556.21599,1027.4671 561.88434,1025.6097 C 564.72174,1024.6341 567.36898,1023.1981 570.11611,1021.9877 C 570.35195,1024.1783 571.65118,1026.4443 573.73791,1027.256 C 575.84465,1028.0878 578.14219,1027.4538 580.32372,1027.256 C 586.52306,1026.3617 592.87203,1025.1157 598.76258,1022.9749 C 602.58246,1021.5261 606.18072,1019.5912 609.95744,1018.0358 C 610.79999,1017.685 611.43637,1017.1426 612.26252,1016.7191 C 612.37761,1016.9459 612.41942,1017.1701 612.59146,1017.3783 C 614.28205,1019.2418 617.04867,1020.0657 619.50623,1020.0118 C 623.68995,1019.7974 627.69344,1018.5418 631.68915,1017.3783 C 624.98802,1023.4696 618.53222,1029.9456 611.93316,1036.1462 C 611.07209,1037.1263 609.74646,1037.4674 608.64031,1038.1218 C 602.00606,1042.0654 595.4249,1045.8742 588.88433,1049.9755 C 582.15637,1054.1411 575.65773,1058.9008 569.45781,1063.8044 C 563.6059,1068.4066 558.16085,1073.258 552.99426,1078.6221 C 549.44884,1082.3594 545.87874,1086.224 543.44548,1090.805 C 542.55257,1092.6422 541.51149,1095.0703 542.45783,1097.0604 C 543.0359,1098.0433 543.65616,1099.2555 544.76261,1099.694 C 546.11381,1099.9232 547.75643,1099.4322 549.04312,1099.0364 C 553.5589,1097.4196 557.24042,1094.4879 560.89668,1091.463 C 564.22458,1088.5253 567.50619,1085.2478 570.77482,1082.2428 C 580.23942,1073.3356 589.96685,1064.8207 599.42089,1055.9026 C 607.0257,1048.6308 614.412,1041.3226 621.81118,1033.8411 C 624.0638,1032.6703 626.45583,1031.3581 628.72566,1030.2188 C 636.49915,1026.2506 644.45731,1022.8857 652.4332,1019.3526 C 656.62235,1017.3853 660.96258,1016.0777 665.27443,1014.4139 C 666.33558,1013.8704 667.95056,1013.5347 668.56739,1012.4384 C 668.57904,1011.9393 668.35499,1011.3904 667.90856,1011.1216 C 666.55116,1010.4387 664.99312,1011.0774 663.62806,1011.4508 C 655.01753,1014.5191 646.241,1017.3115 637.61614,1020.3414 C 637.15551,1020.3872 635.46523,1021.533 636.29913,1020.6706 C 639.57205,1017.0805 643.26602,1014.0793 646.83557,1010.792 C 648.515,1009.1628 650.14234,1007.488 651.44514,1005.5237 C 651.78607,1004.4528 651.35624,1002.3564 649.79906,1002.8902 C 647.0081,1003.7499 644.75711,1005.4211 642.22571,1006.8417 C 638.3303,1009.0198 634.47785,1011.3178 630.37214,1013.0972 C 627.04755,1014.5052 623.50175,1015.7322 619.83558,1015.4023 C 618.52299,1015.4044 617.10858,1014.0515 617.85974,1012.7676 C 619.29092,1009.9961 621.26241,1007.4134 623.45738,1005.1953 C 625.72545,1003.0503 628.48759,1001.7124 631.03085,999.92706 C 631.85285,999.31226 633.47707,998.05226 632.34786,996.96302 C 631.22164,996.36742 629.8693,996.96122 628.72566,997.29246 C 625.13437,998.62042 621.72334,1000.7069 618.84793,1003.2198 C 616.25334,1005.6107 614.05507,1008.2098 612.59146,1011.4508 C 612.44252,1011.8083 612.38326,1012.3768 612.26252,1012.7676 C 610.19413,1013.5523 608.04615,1014.2214 606.00617,1015.0731 C 603.01594,1016.4376 599.92571,1017.7269 596.78675,1018.695 C 592.09061,1020.1581 587.49789,1021.5378 582.62839,1022.3169 C 581.26342,1022.4962 579.45978,1022.7257 578.67724,1021.3286 C 577.84517,1019.4372 578.90928,1017.5693 579.99437,1016.0603 C 582.88749,1012.2807 586.79728,1009.0837 590.53081,1006.1825 C 593.2075,1004.5277 595.99571,1003.0768 598.76258,1001.5734 C 603.22476,999.12226 608.01734,997.20954 612.59146,994.98773 C 615.49218,993.55662 618.37812,992.37731 621.15259,990.7071 C 623.23015,989.39195 625.41953,987.43706 625.43321,984.78012 C 625.50819,983.8 624.77791,982.92174 623.78673,982.8048 z M 206.27565,998.60914 C 204.15351,999.34106 202.56317,1001.0239 201.00737,1002.5606 C 198.20137,1005.6057 195.45807,1008.6994 193.10507,1012.11 C 192.25745,1013.1674 191.96342,1014.7447 192.44665,1016.0603 C 192.73731,1017.484 194.34654,1018.3296 195.73909,1018.0358 C 197.24478,1016.9661 198.41891,1015.4131 199.69036,1014.0855 C 201.15583,1012.5902 202.62371,1011.0646 204.30022,1009.8048 C 205.5226,1009.8303 206.49776,1010.6463 207.59266,1011.1216 C 209.05992,1011.4038 207.81599,1012.1169 207.26371,1012.7676 C 204.50188,1015.9562 201.17305,1018.971 199.03206,1022.6465 C 198.09919,1024.0392 198.62162,1025.7406 199.69036,1026.9264 C 201.27676,1028.6922 203.66027,1029.9942 205.9467,1030.5484 C 207.91988,1030.7758 209.89777,1030.3591 211.87328,1030.2188 C 215.29825,1029.9512 218.52253,1029.0545 221.75142,1027.9148 C 226.61907,1026.333 231.28324,1024.5053 235.90977,1022.3169 C 236.10501,1023.8044 236.73224,1025.2614 237.88561,1026.2684 C 240.02963,1028.3236 242.98142,1028.4858 245.78791,1028.2432 C 253.32734,1027.6596 260.40514,1024.2538 266.53155,1020.0118 C 267.0508,1020.9923 267.65861,1021.9945 268.17804,1022.9749 C 268.88062,1024.7301 270.5743,1025.8026 272.45854,1025.9393 C 278.77176,1026.1243 285.0668,1024.6634 290.89752,1022.3169 C 292.47523,1021.6413 293.94004,1021.0464 295.50738,1020.3414 C 295.4571,1020.4712 295.22737,1020.5394 295.17802,1020.6706 C 294.48862,1022.2307 294.50829,1024.0392 295.17802,1025.6097 C 295.92165,1027.4663 297.93696,1028.0017 299.7876,1027.9148 C 303.7586,1027.5823 307.72112,1026.9576 311.64157,1026.2684 C 318.99102,1025.0687 325.88241,1022.2272 332.71457,1019.3526 C 332.19081,1021.2029 331.91477,1023.0311 331.72691,1024.9505 C 331.44811,1026.6811 333.11331,1027.903 334.68988,1027.9148 C 336.79107,1027.8485 338.50883,1026.6122 340.28751,1025.6097 C 344.09083,1023.2197 347.74993,1020.5326 351.48278,1018.0358 C 355.63907,1015.0399 360.49181,1012.8876 364.98283,1010.4636 C 365.90286,1009.8411 367.01268,1009.3375 367.28762,1008.1585 L 367.28762,1007.8289 C 367.37199,1006.3877 365.97889,1005.5918 364.65348,1005.8533 C 361.66568,1006.263 359.1017,1007.8484 356.42171,1009.1456 C 352.30083,1011.3223 348.26121,1013.709 344.23878,1016.0603 C 343.32852,1016.5884 342.48542,1014.7827 341.60464,1014.4139 C 340.17751,1013.4273 338.51213,1012.1005 336.66572,1012.4384 C 332.79761,1013.3475 329.24165,1015.163 325.47045,1016.3899 C 321.66266,1017.7915 317.53977,1018.3538 313.61688,1019.3526 C 310.28018,1020.1245 307.12211,1021.1166 303.73875,1021.6582 C 302.59767,1021.8592 301.13324,1020.9793 301.76331,1019.6822 C 302.63118,1017.9457 303.83698,1016.5808 305.05576,1015.0731 C 305.80065,1014.601 306.75742,1014.2623 307.03159,1013.4267 C 307.03453,1013.215 306.77166,1013.2498 306.70224,1013.0972 C 306.6561,1012.9961 306.77432,1012.8461 306.70224,1012.7676 C 308.85456,1010.2415 311.46372,1008.3684 313.94624,1006.1825 C 314.61973,1005.4284 315.88514,1004.7275 315.59272,1003.549 C 315.297,1001.9499 313.65851,1001.4715 312.29987,1001.5734 C 310.5529,1001.9618 309.02494,1003.0914 307.68999,1004.207 C 305.16041,1006.5125 302.85507,1009.3513 300.4463,1011.7804 C 299.34834,1012.807 298.58998,1013.8059 297.81216,1015.0731 C 296.14811,1015.8289 294.53158,1016.6155 292.87324,1017.3783 C 288.5507,1019.5844 283.9029,1020.9594 279.04395,1021.3286 C 277.68143,1021.2553 275.85017,1022.0842 274.76333,1021.0002 C 274.14897,1020.039 274.06537,1018.7825 274.43397,1017.7066 C 275.56057,1015.3808 277.79606,1014.057 279.70225,1012.4384 C 280.66335,1011.5394 282.15305,1010.7291 282.66575,1009.4752 C 282.63947,1008.2993 282.35146,1006.6281 281.01926,1006.1825 C 279.3066,1005.995 277.85424,1006.5802 276.40981,1007.4993 C 275.74431,1007.1964 274.93664,1005.9416 274.10503,1005.5237 C 271.75472,1003.8224 268.66899,1003.7246 265.87325,1003.8774 C 257.78983,1004.1044 249.52112,1005.7429 242.82442,1010.4636 C 240.232,1012.2958 237.80723,1014.7489 236.56848,1017.7066 C 235.28735,1018.2884 233.92313,1018.8399 232.61733,1019.3526 C 229.12765,1020.8898 225.74892,1021.9473 222.08077,1022.9749 C 217.76251,1024.1681 213.40723,1025.3778 208.90979,1025.6097 C 207.85309,1025.6266 206.30515,1025.8478 205.9467,1024.6213 C 205.67921,1021.7746 207.47517,1019.1174 209.5685,1017.3783 C 212.94015,1014.5298 217.03125,1013.0299 221.09271,1011.4508 C 223.62684,1010.3606 226.60795,1009.7812 228.66618,1007.8289 C 229.77743,1006.8833 229.45483,1005.1345 228.99513,1003.8774 C 228.40773,1002.109 226.39045,1001.6618 224.71491,1001.903 C 220.87612,1002.4801 218.1624,1005.7786 214.50742,1006.8417 C 213.29844,1007.2636 211.63614,1006.9569 211.21498,1005.5237 C 210.85002,1003.8548 211.13444,1002.2699 210.88563,1000.585 C 210.2466,998.80476 207.94052,998.38296 206.27565,998.60914 z M 264.8856,1009.4752 C 265.91754,1009.5296 267.73813,1009.0563 267.84868,1010.4636 C 267.66155,1011.3286 267.33034,1012.3479 266.86103,1013.0972 C 264.73103,1016.3342 261.3767,1018.032 257.97095,1019.6822 C 254.22962,1021.3614 250.23465,1023.2279 246.11738,1023.6337 C 244.97619,1023.6459 243.69802,1023.8688 242.82442,1022.9749 C 242.01476,1021.7744 242.43886,1020.1504 243.15389,1019.0246 C 244.93267,1016.4494 247.65853,1014.78 250.39748,1013.4267 C 254.92399,1011.3675 259.86705,1009.6966 264.8856,1009.4752 z M 676.14034,1018.3654 C 673.77058,1019.0642 672.0043,1021.4883 672.51854,1023.9633 C 672.83122,1025.9809 674.83386,1027.2766 676.79864,1027.256 C 679.32729,1027.4255 681.44781,1025.014 681.40862,1022.6465 C 681.40806,1022.0261 681.26045,1021.2644 681.07926,1020.6706 C 680.56277,1018.6441 678.05493,1017.9343 676.14034,1018.3654 z M 98.934822,1019.0246 C 101.46591,1019.1174 104.02581,1019.5178 106.50777,1020.0118 C 109.46037,1020.6543 112.44485,1021.6702 115.39784,1022.3169 C 112.94767,1023.5207 110.0825,1024.1031 107.49554,1024.9505 C 101.8743,1026.626 96.20892,1028.4776 90.373672,1029.2316 C 87.534099,1029.4845 84.610837,1029.4424 81.812555,1028.902 C 80.049215,1028.496 78.111128,1027.5436 77.532409,1025.6097 C 76.971567,1024.1377 78.80652,1023.4829 79.837171,1022.9749 C 83.629746,1021.3604 87.310848,1020.425 91.361361,1019.6822 C 93.861602,1019.2105 96.403316,1018.9314 98.934822,1019.0246 z M 598.10388,1050.3047 C 597.60264,1051.0951 597.0774,1051.583 596.45739,1052.2807 C 593.11051,1055.91 589.46487,1059.3831 585.92083,1062.8172 C 576.9219,1071.2726 567.87624,1079.6675 558.92125,1088.1702 C 556.06334,1090.7087 553.06971,1093.2374 549.70142,1095.0849 C 548.7549,1095.4711 547.0494,1096.6717 546.40898,1095.4145 C 545.9489,1094.1201 547.07549,1092.7987 547.72611,1091.7922 C 551.77397,1086.3065 556.38865,1081.4338 561.22604,1076.6465 C 568.15575,1069.7046 576.20566,1064.0681 584.27487,1058.5361 C 588.74279,1055.552 593.16674,1052.4714 598.10388,1050.3047 z" - id="text1784" /> - <path - style="fill:#000000;fill-opacity:1;stroke-width:1pt" - d="M 466.69088,586.64433 L 451.12888,586.64433 L 451.12888,587.64017 L 451.59482,587.64017 C 453.69245,587.64017 453.92518,587.7465 453.92518,588.6361 L 453.92518,589.2504 L 453.92518,599.33459 L 453.92518,599.94907 C 453.92518,600.83858 453.69245,600.94491 451.59482,600.94491 L 451.12888,600.94491 L 451.12888,601.94065 L 467.02734,601.94065 L 467.54529,596.2837 L 466.40568,596.2837 C 466.06987,597.76657 465.47369,599.08028 464.85241,599.69486 C 464.04945,600.54225 462.57338,600.94491 460.39873,600.94491 L 458.68975,600.94491 C 457.91263,600.94491 457.26569,600.81786 457.03237,600.62703 C 456.85147,600.50054 456.8254,600.37272 456.8254,599.92808 L 456.8254,594.52581 L 457.34326,594.52581 C 458.92248,594.52581 459.57001,594.65285 460.08843,595.0974 C 460.76104,595.64878 461.02011,596.32665 461.07211,597.57633 L 462.28902,597.57633 L 462.28902,590.62758 L 461.07211,590.62758 C 460.94253,592.70366 459.90656,593.53006 457.44641,593.53006 L 456.8254,593.53006 L 456.8254,588.69948 C 456.8254,587.78861 457.05862,587.64017 458.45671,587.64017 L 459.80292,587.64017 C 462.08177,587.64017 463.19503,587.83109 464.07588,588.42437 C 464.93017,588.97509 465.55155,590.16126 465.94029,592.06791 L 467.05368,592.06791 L 466.69088,586.64433 z M 432.32964,595.13989 L 435.25552,595.13989 C 437.58637,595.13989 438.80309,594.99163 439.83925,594.58938 C 441.67716,593.86856 442.71344,592.51292 442.71344,590.8395 C 442.71344,589.22977 441.80674,588.00044 440.09813,587.30149 C 439.08801,586.87811 437.48245,586.64433 435.69581,586.64433 L 426.6333,586.64433 L 426.6333,587.64017 L 427.09924,587.64017 C 429.1966,587.64017 429.42941,587.7465 429.42941,588.6361 L 429.42941,589.2504 L 429.42941,599.33459 L 429.42941,599.94907 C 429.42941,600.83858 429.1966,600.94491 427.09924,600.94491 L 426.6333,600.94491 L 426.6333,601.94065 L 435.33337,601.94065 L 435.33337,600.94491 L 434.6599,600.94491 C 432.56236,600.94491 432.32964,600.83858 432.32964,599.94907 L 432.32964,599.33459 L 432.32964,595.13989 z M 432.32964,594.14424 L 432.32964,588.72079 C 432.32964,587.7465 432.48525,587.64017 433.90922,587.64017 L 435.5666,587.64017 C 438.25929,587.64017 439.52808,588.67849 439.52808,590.9241 C 439.52808,593.10651 438.20756,594.14424 435.46296,594.14424 L 432.32964,594.14424 z M 409.80201,586.34804 L 408.7146,586.34804 L 402.75859,598.69884 C 402.24105,599.80081 402.13768,599.94907 401.74934,600.28776 C 401.33472,600.69051 400.60964,600.94491 399.91029,600.94491 L 399.80705,600.94491 L 399.80705,601.94065 L 406.66866,601.94065 L 406.66866,600.94491 L 406.15065,600.94491 C 404.75299,600.94491 404.05357,600.54225 404.05357,599.73725 C 404.05357,599.48285 404.13133,599.18674 404.28648,598.84774 L 405.14127,596.98311 L 412.00279,596.98311 L 413.40119,599.82221 C 413.55671,600.14 413.60844,600.28776 413.60844,600.3944 C 413.60844,600.73299 412.96044,600.94491 412.00279,600.94491 L 410.91528,600.94491 L 410.91528,601.94065 L 418.94266,601.94065 L 418.94266,600.94491 L 418.58026,600.94491 C 417.28481,600.94491 417.00018,600.77547 416.40502,599.58927 L 409.80201,586.34804 z M 408.5331,589.82258 L 411.45908,595.83933 L 405.65882,595.83933 L 408.5331,589.82258 z M 390.66641,586.49617 L 389.68232,586.49617 L 388.64663,587.7465 C 386.80766,586.64433 385.7986,586.32674 384.06355,586.32674 C 381.5517,586.32674 379.47983,587.15314 377.7194,588.86886 C 376.06224,590.47905 375.28512,592.25843 375.28512,594.44084 C 375.28512,598.9959 378.93603,602.25834 384.03761,602.25834 C 388.18059,602.25834 390.82183,600.26704 391.41755,596.70763 L 390.20046,596.53829 C 389.94157,597.66098 389.6305,598.42344 389.16446,599.05929 C 388.10311,600.52126 386.44573,601.26288 384.3481,601.26288 C 380.51599,601.26288 378.70339,599.08028 378.70339,594.52581 C 378.70339,592.13129 379.09145,590.52144 379.97199,589.2504 C 380.77459,588.06391 382.38014,587.32211 384.03761,587.32211 C 385.8502,587.32211 387.45566,588.1063 388.43957,589.46241 C 388.93164,590.16126 389.32001,590.98748 389.91582,592.61888 L 391.05419,592.61888 L 390.66641,586.49617 z M 364.74664,586.51729 L 363.78889,586.51729 L 362.75293,587.78861 C 361.53574,586.83526 359.87864,586.32674 358.04018,586.32674 C 354.64807,586.32674 352.36959,588.1063 352.36959,590.75503 C 352.36959,593.06384 353.76725,594.20802 357.57358,595.01293 L 360.03361,595.52164 C 361.94996,595.9238 362.13102,595.96619 362.67507,596.30565 C 363.45179,596.79259 363.86601,597.49155 363.86601,598.31785 C 363.86601,599.16515 363.47763,599.8642 362.70111,600.43666 C 361.84623,601.05087 360.99222,601.284 359.56797,601.284 C 357.65153,601.284 356.27919,600.79646 355.06229,599.69486 C 353.97468,598.69884 353.43088,597.70309 353.04269,596.07215 L 351.92934,596.07215 L 352.03257,602.11027 L 353.04269,602.11027 L 354.2075,600.66951 C 355.94255,601.83441 357.39332,602.25834 359.64518,602.25834 C 363.45179,602.25834 365.88588,600.43666 365.88588,597.59732 C 365.88588,596.2837 365.34207,595.16119 364.3327,594.35615 C 363.63319,593.80518 362.62335,593.4451 360.55156,593.02117 L 357.78101,592.44945 C 355.4766,591.96232 354.3889,591.13592 354.3889,589.84357 C 354.3889,588.36089 355.86488,587.34319 358.06575,587.34319 C 359.87864,587.34319 361.35425,587.97944 362.39003,589.18683 C 363.14099,590.05531 363.60694,590.94509 363.94395,592.02571 L 365.05725,592.02571 L 364.74664,586.51729 z M 329.73795,595.01293 L 329.73795,589.2504 L 329.73795,588.6361 C 329.73795,587.7465 329.97071,587.64017 332.06844,587.64017 L 332.56042,587.64017 L 332.56042,586.64433 L 324.04134,586.64433 L 324.04134,587.64017 L 324.50756,587.64017 C 326.60491,587.64017 326.83727,587.7465 326.83727,588.6361 L 326.83727,589.2504 L 326.83727,599.33459 L 326.83727,599.94907 C 326.83727,600.83858 326.60491,600.94491 324.50756,600.94491 L 324.04134,600.94491 L 324.04134,601.94065 L 332.56042,601.94065 L 332.56042,600.94491 L 332.06844,600.94491 C 329.97071,600.94491 329.73795,600.83858 329.73795,599.94907 L 329.73795,599.33459 L 329.73795,596.64415 L 332.74182,594.16563 L 337.2471,599.56772 C 337.66173,600.07612 337.76496,600.24559 337.76496,600.45806 C 337.76496,600.79646 337.27354,600.94491 336.00435,600.94491 L 335.20138,600.94491 L 335.20138,601.94065 L 344.05729,601.94065 L 344.05729,600.94491 L 343.56541,600.94491 C 342.14125,600.94491 341.77826,600.79646 341.02758,599.88569 L 334.7616,592.49184 L 338.62002,589.33536 C 339.86259,588.25456 341.4418,587.64017 342.99554,587.64017 L 342.99554,586.64433 L 335.01998,586.64433 L 335.01998,587.64017 L 335.66789,587.64017 C 336.85932,587.64017 337.35074,587.83109 337.35074,588.27583 C 337.35074,588.57234 336.83288,589.18683 336.08211,589.8009 L 329.73795,595.01293 z M 300.78851,586.64433 L 295.45429,586.64433 L 295.45429,587.64017 L 296.10173,587.64017 C 297.42234,587.64017 298.01796,587.8097 298.484,588.3399 L 298.484,597.3431 C 298.484,600.24559 297.96577,600.85985 295.48026,600.94491 L 295.48026,601.94065 L 302.86048,601.94065 L 302.86048,600.94491 C 300.39986,600.85985 299.88231,600.24559 299.88231,597.3431 L 299.88231,589.4834 L 311.43138,602.23735 L 312.5188,602.23735 L 312.5188,591.24188 C 312.5188,588.3399 313.03625,587.72514 315.52225,587.64017 L 315.52225,586.64433 L 308.14232,586.64433 L 308.14232,587.64017 C 310.60225,587.72514 311.12021,588.3399 311.12021,591.24188 L 311.12021,597.89411 L 300.78851,586.64433 z M 283.95759,589.2504 L 283.95759,588.6361 C 283.95759,587.7465 284.19054,587.64017 286.26182,587.64017 L 286.77978,587.64017 L 286.77978,586.64433 L 278.20888,586.64433 L 278.20888,587.64017 L 278.72683,587.64017 C 280.82428,587.64017 281.05719,587.7465 281.05719,588.6361 L 281.05719,589.2504 L 281.05719,599.33459 L 281.05719,599.94907 C 281.05719,600.83858 280.82428,600.94491 278.72683,600.94491 L 278.20888,600.94491 L 278.20888,601.94065 L 286.77978,601.94065 L 286.77978,600.94491 L 286.26182,600.94491 C 284.19054,600.94491 283.95759,600.83858 283.95759,599.94907 L 283.95759,599.33459 L 283.95759,589.2504 z" - id="path1790" /> - <rect - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;" - id="rect2417" - width="121.38228" - height="108.26424" - x="154.73230" - y="423.67596" - rx="6.1828303" - ry="0.0000000" - inkscape:export-filename="/home/d/ink/draw-freely.png" - inkscape:export-xdpi="475.20001" - inkscape:export-ydpi="475.20001" /> - <g - id="inkscape-logo" - transform="matrix(0.4657141,0,0,0.4657141,284.1543,392.3856)"> - <path - d="M 163.15,27.83 L 28.81,165.3 C -16.58,221.51 59.7,214.97 92.4,231.16 C 104.13,243.15 47.44,252 59.17,264 C 70.9,275.99 130.1,287.1 141.85,299.09 C 153.58,311.08 117.84,323.8 129.57,335.79 C 141.3,347.78 168.43,336.42 173.51,364.1 C 177.13,383.88 222.4,372.6 244.54,356.4 C 256.27,344.4 222.1,345.53 233.83,333.54 C 263,303.71 290.16,322.7 300.14,292.81 C 305.07,278.04 257.2,270.04 268.95,258.05 C 302.7,238.34 419.35,225.51 364,170.16 L 224.75,27.83 C 207.72,11.48 179.3,11.3 163.15,27.83 z M 317.46,292.81 C 317.46,299.63 367.71,304.1 367.71,291.2 C 360.55,270.48 323.4,271.88 317.46,292.81 z M 91.1,329.05 C 103,339.34 121.38,326.49 126.89,312.13 C 115.36,296.81 72.2,312.68 91.1,329.05 z M 311.16,306.82 C 295.82,320.58 312.88,334.54 328,325.65 C 331.37,322.23 327.91,310.24 311.16,306.82 z" - id="path2313" /> - <path - d="M 131,238.6 C 134.59,240.83 188.89,251.86 202.16,254.06 C 206.76,255.03 203.5,259.77 197.16,262.97 C 182.86,266.77 113.5,238.6 131,238.6 z" - id="path2315" - style="fill:#ffffff" /> - <path - d="M 216.63,37.47 L 269.78,91.45 C 274.82,96.6 274.75,106.58 271.93,109.45 L 245.54,88.34 L 240.35,119.6 L 218.3,107.96 L 182.99,130.27 L 171.3,83.24 L 152.33,116.06 L 123.33,116.06 C 111.51,116.06 110.12,101.06 120.86,90.32 C 139.62,70.07 161.15,49.43 172.85,37.47 C 184.61,25.45 205.1,25.79 216.63,37.47 z" - id="path2317" - style="fill:#ffffff" /> - </g> -</svg> diff --git a/share/branding/inkscape-flat.svg b/share/branding/inkscape-flat.svg new file mode 100644 index 000000000..a9534676d --- /dev/null +++ b/share/branding/inkscape-flat.svg @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="128" height="128" id="svg2" sodipodi:version="0.32" inkscape:version="0.91+devel r14706 custom" sodipodi:docname="inkscape-flat.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/valessio/Desenvolvimento/inkscape/inkscape/inkscape.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45" viewBox="0 0 128 128"> +<title id="title7387">Inkscape Logo</title> +<sodipodi:namedview bordercohor="#666666" inkscape:window-height="577" inkscape:window-width="862" inkscape:pageshadow="2" inkscape:pageopacity="0.0" guidetolerance="10.0" gridtolerance="10.0" objecttolerance="10.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base" inkscape:zoom="1" inkscape:cx="-232" inkscape:cy="64" inkscape:window-x="192" inkscape:window-y="122" inkscape:current-layer="svg2" showgrid="false" inkscape:window-maximized="0" inkscape:document-units="px" /> +<defs id="defs4" /> +<style type="text/css" id="style26"> + .specularity {opacity:0.5;} + .low-specularity {opacity:0.25;} + .full-specularity {opacity:1;} + .black {fill:#000000;} + .white {fill:#ffffff;} + .outline-big {stroke-width:16;stroke:none;opacity:0.1;fill:none;} + .outline-small {stroke-width:8;stroke:none;opacity:0.2;fill:none;} + .stroke-highlight {fill:none;stroke:none;opacity:0.2;} + .base-shadow {fill:black;opacity:75;} + </style> +<!-- Copyright License --> +<metadata id="metadata49"> +<rdf:RDF> +<cc:Work rdf:about="etiquette-icon"> +<dc:format>image/svg+xml</dc:format> +<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> +<dc:creator> +<cc:Agent> +<dc:title>Andy Fitzsimon</dc:title> +</cc:Agent> +</dc:creator> +<dc:rights> +<cc:Agent> +<dc:title>Andrew Michael Fitzsimon</dc:title> +</cc:Agent> +</dc:rights> +<dc:publisher> +<cc:Agent> +<dc:title>Fitzsimon IT Consulting Pty Ltd</dc:title> +</cc:Agent> +</dc:publisher> +<dc:identifier>http://andy.fitzsimon.com.au</dc:identifier> +<dc:date>2006</dc:date> +<cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> +<dc:title>Inkscape Logo</dc:title> +</cc:Work> +<cc:License rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> +<cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" /> +<cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" /> +<cc:requires rdf:resource="http://creativecommons.org/ns#Notice" /> +<cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" /> +<cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> +<cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" /> +</cc:License> +</rdf:RDF> +</metadata> +<g id="inkscape-logo" transform="matrix(0.3432319,0,0,0.3432319,-2.915043,-2.66029)"> +<path d="M 163.15,27.83 28.81,165.3 C -16.58,221.51 59.7,214.97 92.4,231.16 104.13,243.15 47.44,252 59.17,264 c 11.73,11.99 70.93,23.1 82.68,35.09 11.73,11.99 -24.01,24.71 -12.28,36.7 11.73,11.99 38.86,0.63 43.94,28.31 3.62,19.78 48.89,8.5 71.03,-7.7 11.73,-12 -22.44,-10.87 -10.71,-22.86 29.17,-29.83 56.33,-10.84 66.31,-40.73 4.93,-14.77 -42.94,-22.77 -31.19,-34.76 33.75,-19.71 150.4,-32.54 95.05,-87.89 L 224.75,27.83 c -17.03,-16.35 -45.45,-16.53 -61.6,0 z m 154.31,264.98 c 0,6.82 50.25,11.29 50.25,-1.61 -7.16,-20.72 -44.31,-19.32 -50.25,1.61 z M 91.1,329.05 c 11.9,10.29 30.28,-2.56 35.79,-16.92 -11.53,-15.32 -54.69,0.55 -35.79,16.92 z m 220.06,-22.23 c -15.34,13.76 1.72,27.72 16.84,18.83 3.37,-3.42 -0.09,-15.41 -16.84,-18.83 z" id="path2313" inkscape:connector-curvature="0" /> +<path d="m 131,238.6 c 3.59,2.23 57.89,13.26 71.16,15.46 4.6,0.97 1.34,5.71 -5,8.91 -14.3,3.8 -83.66,-24.37 -66.16,-24.37 z" id="path2315" style="fill:#ffffff" inkscape:connector-curvature="0" /> +<path d="m 216.63,37.47 53.15,53.98 c 5.04,5.15 4.97,15.13 2.15,18 L 245.54,88.34 240.35,119.6 218.3,107.96 182.99,130.27 171.3,83.24 152.33,116.06 h -29 c -11.82,0 -13.21,-15 -2.47,-25.74 18.76,-20.25 40.29,-40.89 51.99,-52.85 11.76,-12.02 32.25,-11.68 43.78,0 z" id="path2317" style="fill:#ffffff" inkscape:connector-curvature="0" /> +</g> +</svg> diff --git a/share/branding/inkscape-text.svg b/share/branding/inkscape-text.svg new file mode 100644 index 000000000..e025b1680 --- /dev/null +++ b/share/branding/inkscape-text.svg @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg1725" sodipodi:version="0.32" inkscape:version="0.91+devel r14709" width="210mm" height="297mm" sodipodi:docname="inkscape-text.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" viewBox="0 0 793.7008 1122.52"> +<defs id="defs1727"> +<filter inkscape:collect="always" id="filter6017" style="color-interpolation-filters:sRGB"> +<feGaussianBlur inkscape:collect="always" stdDeviation="0.80546496" id="feGaussianBlur6019" /> +</filter> +<filter inkscape:collect="always" id="filter6031" style="color-interpolation-filters:sRGB"> +<feGaussianBlur inkscape:collect="always" stdDeviation="3.4903482" id="feGaussianBlur6033" /> +</filter> +<linearGradient inkscape:collect="always" xlink:href="#linearGradient5785" id="linearGradient9175" gradientUnits="userSpaceOnUse" x1="82.11859" y1="20" x2="60" y2="40" /> +<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5785"> +<stop id="stop5787" offset="0" style="stop-color:#c0cdf9;stop-opacity:1" /> +<stop id="stop5789" offset="1" style="stop-color:#07092d;stop-opacity:0.28804347" /> +</linearGradient> +<filter inkscape:collect="always" id="filter8490" style="color-interpolation-filters:sRGB"> +<feGaussianBlur inkscape:collect="always" stdDeviation="2.4163949" id="feGaussianBlur8492" /> +</filter> +<linearGradient gradientUnits="userSpaceOnUse" y2="60" x2="58" y1="35" x1="33" xlink:href="#WhiteTransparent-4" id="shinySpecular-4" gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)" /> +<linearGradient gradientUnits="userSpaceOnUse" id="WhiteTransparent-4"> +<stop id="stop7606-4" offset="0" style="stop-color:white;stop-opacity:1" /> +<stop id="stop7608-7" offset="1" style="stop-color:white;stop-opacity:0" /> +</linearGradient> +<linearGradient gradientUnits="userSpaceOnUse" y2="50" x2="90" y1="20" x1="60" xlink:href="#WhiteTransparent-4" id="IcecapTip-6" /> +<radialGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="radialGradient9177" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.570052,0,0,1.05093,-75.50011,-22.09591)" cx="116.3104" cy="250.8974" fx="116.3104" fy="250.8974" r="30.59958" /> +<radialGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="radialGradient8574" cx="132.4443" cy="251.994" fx="132.4443" fy="251.994" r="30.59958" gradientTransform="matrix(2.003253,0,0,1.340898,-132.8752,-95.16607)" gradientUnits="userSpaceOnUse" /> +<filter inkscape:collect="always" id="filter8732" x="-0.07807916" width="1.156158" y="-0.1142206" height="1.228441" style="color-interpolation-filters:sRGB"> +<feGaussianBlur inkscape:collect="always" stdDeviation="1.9579068" id="feGaussianBlur8734" /> +</filter> +<radialGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="radialGradient8744" cx="210.25" cy="168.5" fx="210.25" fy="168.5" r="34.25" gradientTransform="matrix(1,0,0,0.4233577,0,97.16423)" gradientUnits="userSpaceOnUse" /> +<radialGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="radialGradient8768" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.4233577,0,97.16423)" cx="217.5" cy="182.0819" fx="217.5" fy="182.0819" r="34.25" /> +<filter inkscape:collect="always" id="filter8764" x="-0.07426214" width="1.148524" y="-0.1754123" height="1.350825" style="color-interpolation-filters:sRGB"> +<feGaussianBlur inkscape:collect="always" stdDeviation="2.1195652" id="feGaussianBlur8766" /> +</filter> +<linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="linearGradient8912" x1="231.625" y1="195.1875" x2="231.75" y2="201.5" gradientUnits="userSpaceOnUse" /> +<linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="linearGradient8910" x1="231.3765" y1="195.6213" x2="231.3765" y2="200.0714" gradientUnits="userSpaceOnUse" /> +<filter inkscape:collect="always" id="filter8906" x="-0.08544133" width="1.170883" y="-0.278232" height="1.556464" style="color-interpolation-filters:sRGB"> +<feGaussianBlur inkscape:collect="always" stdDeviation="0.56515877" id="feGaussianBlur8908" /> +</filter> +<radialGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="radialGradient8922" cx="228.2188" cy="204.8323" fx="228.2188" fy="204.8323" r="14.09375" gradientTransform="matrix(1,0,0,0.1477455,0,174.5692)" gradientUnits="userSpaceOnUse" /> +<filter inkscape:collect="always" id="filter8980" x="-0.06986277" width="1.139725" y="-0.4728589" height="1.945718" style="color-interpolation-filters:sRGB"> +<feGaussianBlur inkscape:collect="always" stdDeviation="0.82052366" id="feGaussianBlur8982" /> +</filter> +<radialGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="radialGradient8994" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.1477455,0,174.5692)" cx="228.2188" cy="204.8323" fx="228.2188" fy="204.8323" r="14.09375" /> +<radialGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="radialGradient9004" cx="89.875" cy="187.8694" fx="89.875" fy="187.8694" r="22.75" gradientTransform="matrix(1,0,0,0.4070844,0,115.7601)" gradientUnits="userSpaceOnUse" /> +<radialGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="radialGradient9046" cx="90.28125" cy="230.8363" fx="90.28125" fy="230.8363" r="10.46875" gradientTransform="matrix(1.185075,-0.3283582,0.1228557,0.4433973,-45.06831,152.9216)" gradientUnits="userSpaceOnUse" /> +<filter inkscape:collect="always" id="filter9068" x="-0.07617928" width="1.152359" y="-0.1655701" height="1.33114" style="color-interpolation-filters:sRGB"> +<feGaussianBlur inkscape:collect="always" stdDeviation="0.66458488" id="feGaussianBlur9070" /> +</filter> +<radialGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="radialGradient11553" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.722153,0,0,1.694977,-49.39526,-14.07806)" cx="68.39994" cy="21.22575" fx="68.39994" fy="21.22575" r="54.7834" /> +<filter inkscape:collect="always" id="filter9298" style="color-interpolation-filters:sRGB"> +<feGaussianBlur inkscape:collect="always" stdDeviation="0.32610678" id="feGaussianBlur9300" /> +</filter> +<linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="linearGradient5905" x1="95.5" y1="208.1644" x2="153.5" y2="223.5" gradientUnits="userSpaceOnUse" /> +<filter inkscape:collect="always" id="filter5983-5" x="-0.08250898" width="1.165018" y="-0.1223357" height="1.244671" style="color-interpolation-filters:sRGB"> +<feGaussianBlur inkscape:collect="always" stdDeviation="3.6868363" id="feGaussianBlur5985-9" /> +</filter> +<linearGradient inkscape:collect="always" xlink:href="#linearGradient5793-6" id="linearGradient5801" x1="57.2252" y1="76.24634" x2="53.63158" y2="84.48032" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.8852575,0,0,0.8852575,5.177215,9.229337)" /> +<linearGradient inkscape:collect="always" id="linearGradient5793-6"> +<stop style="stop-color:#eeeeec;stop-opacity:1;" offset="0" id="stop5795-2" /> +<stop style="stop-color:#eeeeec;stop-opacity:0;" offset="1" id="stop5797-1" /> +</linearGradient> +<radialGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="radialGradient5811" cx="181.2273" cy="214.5512" fx="181.2273" fy="214.5512" r="22.4664" gradientTransform="matrix(1.351523,0,0,1.717571,-63.70565,-153.9557)" gradientUnits="userSpaceOnUse" /> +<filter inkscape:collect="always" id="filter5845" style="color-interpolation-filters:sRGB"> +<feGaussianBlur inkscape:collect="always" stdDeviation="1.2409356" id="feGaussianBlur5847" /> +</filter> +<linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="linearGradient5822" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.4927913,0,0,0.4927913,-6.000388,-9.722518)" x1="73.7121" y1="180.4757" x2="82.75407" y2="187.6597" /> +<linearGradient y2="144.5" x2="153.7005" y1="217.5" x1="180.8129" gradientTransform="translate(-130.1657,-83.35279)" gradientUnits="userSpaceOnUse" id="linearGradient1030" xlink:href="#linearGradient10981-3" inkscape:collect="always" /> +<linearGradient inkscape:collect="always" id="linearGradient10981-3"> +<stop style="stop-color:#729fcf;stop-opacity:1;" offset="0" id="stop10983-2" /> +<stop style="stop-color:#729fcf;stop-opacity:0;" offset="1" id="stop10985-3" /> +</linearGradient> +<filter inkscape:collect="always" id="filter10997-7" style="color-interpolation-filters:sRGB"> +<feGaussianBlur inkscape:collect="always" stdDeviation="2.7696726" id="feGaussianBlur10999-0" /> +</filter> +<linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="linearGradient10664" gradientUnits="userSpaceOnUse" x1="231.625" y1="195.1875" x2="231.75" y2="201.5" /> +<linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="linearGradient10666" gradientUnits="userSpaceOnUse" x1="231.3765" y1="195.6213" x2="231.3765" y2="200.0714" /> +<linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="linearGradient10668" gradientUnits="userSpaceOnUse" x1="231.625" y1="195.1875" x2="231.75" y2="201.5" /> +<linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent-4" id="linearGradient10670" gradientUnits="userSpaceOnUse" x1="231.3765" y1="195.6213" x2="231.3765" y2="200.0714" /> +</defs> +<sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="1.0000000" inkscape:pageshadow="2" inkscape:zoom="0.3663194" inkscape:cx="441.9576" inkscape:cy="529.6418" inkscape:window-width="820" inkscape:window-height="656" inkscape:window-x="134" inkscape:window-y="214" inkscape:current-layer="svg1725" inkscape:document-units="px" showgrid="false" /> +<metadata id="metadata1728"> +<rdf:RDF> +<cc:Work rdf:about=""> +<dc:format>image/svg+xml</dc:format> +<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> +<dc:title /> +</cc:Work> +</rdf:RDF> +</metadata> +<text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:95.7550049px;line-height:100%;font-family:'Euphoria Script';-inkscape-font-specification:'Euphoria Script';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.498724px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="203.6835" y="814.5174" id="text9320"><tspan sodipodi:role="line" id="tspan9318" x="203.6835" y="814.5174" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Euphoria Script';-inkscape-font-specification:'Euphoria Script';stroke-width:0.498724px">Draw Freely</tspan></text> +<g style="display:inline;enable-background:new" transform="matrix(3.080382,0,0,3.079418,199.7108,215.352)" id="g9139"> +<g style="opacity:0.7832512" transform="translate(3.68968e-7,0.4883067)" id="g6035"> +<path inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccc" style="fill:#000000;fill-opacity:1;filter:url(#filter6017)" d="m 54.1,12.98831 -41.2,42.2 c -15.6,15.6 10.1,14.3 19.4,20.2 4.3,2.8 -13.8,6.4 -10.1,10.1 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.69999 -7.3,7.59999 -3.7,11.29999 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.09999 17,-4.1 20.3,-12.49999 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 l -42.7,-43.7 c -5.3,-5.000003 -14,-5.000003 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z M 31.9,105.3883 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.69999 -16.9,0.3 -11.1,5.2 z m 67.5,-6.69999 c -4.6,4.19999 0.8,8.59999 5.3,5.69999 1.2,-0.8 -0.1,-4.7 -5.3,-5.69999 z" id="path5987" /> +<path inkscape:connector-curvature="0" id="path6021" d="m 54.1,13.96492 -41.2,42.2 c -15.6,15.6 10.1,14.3 19.4,20.2 4.3,2.8 -13.8,6.4 -10.1,10.1 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.69998 -7.3,7.59998 -3.7,11.29998 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.09998 17,-4.1 20.3,-12.49998 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 l -42.7,-43.7 c -5.3,-5 -14,-5 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z M 31.9,106.3649 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.69998 -16.9,0.3 -11.1,5.2 z m 67.5,-6.69998 c -4.6,4.19998 0.8,8.59998 5.3,5.69998 1.2,-0.8 -0.1,-4.7 -5.3,-5.69998 z" style="opacity:0.5763547;fill:#000000;fill-opacity:1;filter:url(#filter6031)" sodipodi:nodetypes="ccccccccccccccccccccccc" /> +</g> +<path inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccc" style="fill:#000000;fill-opacity:1" d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" id="use7631" /> +<path inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccc" style="fill:none" d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" id="use7639" /> +<path inkscape:connector-curvature="0" d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m -9.9,64.7 c 0.9,0 30.8,4 19.3,7.1 -4.4,1.2 -24.6,-7.1 -19.3,-7.1 z m 57.2,16.6 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" id="use7641" style="fill:url(#linearGradient9175);filter:url(#filter8490)" transform="matrix(0.9905442,0,0,0.9905442,0.6051535,0.604136)" /> +<path inkscape:connector-curvature="0" id="path7643" d="m 16.56522,57.03937 c -11.201945,11.10103 8.47714,7.97256 23.6149,13.92674 l 31.2847,-55.00052 c -4.74316,-4.84409 -10.79826,-4.44041 -15.13776,0 z" style="opacity:0.5052631;fill:url(#shinySpecular-4);stroke:none" class="specularity" /> +<path inkscape:connector-curvature="0" d="m 70.5,15.5 16.3,16.6 c 1.5,1.5 1.5,4.6 0.6,5.5 L 79.3,31 77.7,40.7 71,37.1 60.1,44 56.5,29.5 50.7,42.1 36.2,42 c -2.8,0 -2.4,-2.9 0.5,-5.8 5.7,-6.3 16.8,-17 20.3,-20.7 3.6,-3.7 9.9,-3.6 13.5,0 z" style="opacity:1;fill:url(#IcecapTip-6)" class="full-specularity" id="icecap-7" /> +<path inkscape:connector-curvature="0" style="opacity:0.2167488;fill:url(#radialGradient9177);fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 113,203.5 c 0,0 3.3405,5.1007 3,7.5 -0.6682,4.7087 -10.8094,7.0584 -8.5625,11.25 2.2199,4.1411 10.2214,1.794 16.9375,6.125 6.6875,4.3125 4.8895,13.1015 9.75,15.3125 9.4792,4.312 34.375,-7.4375 33.125,-7.1875 -1.25,0.25 -24.5701,5.0954 -29.8201,0.8454 -5.986,-4.8457 -7.7022,-8.2302 -12.1174,-11.0954 -4.1375,-2.685 -9.9497,-3.7804 -11.3025,-5.9787 -1.3528,-2.1982 2.7092,-5.0346 2.99,-9.2713 0.1686,-2.5444 -4,-7.5 -4,-7.5 z" id="path8566" transform="matrix(0.5296484,0,0,0.5296484,-11.72226,-13.86416)" sodipodi:nodetypes="csszsszszsc" /> +<path inkscape:connector-curvature="0" sodipodi:nodetypes="csszscssc" transform="matrix(0.5296484,0,0,0.5296484,-11.72226,-13.86416)" id="path8718" d="m 113,203.5 c 0,0 3.3405,5.1007 3,7.5 -0.6682,4.7087 -10.8094,7.0584 -8.5625,11.25 2.2199,4.1411 10.2214,1.794 16.9375,6.125 6.6875,4.3125 4.8895,13.1015 9.75,15.3125 9.4792,4.312 34.375,-7.4375 33.125,-7.1875 -41.3396,0.1574 -33.6249,-10.4946 -49.5625,-17.5 -2.303,-1.0123 -0.9683,-3.7633 -0.6875,-8 0.1686,-2.5444 -4,-7.5 -4,-7.5 z" style="opacity:0.2758621;fill:url(#radialGradient8574);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8732)" /> +<path inkscape:connector-curvature="0" style="opacity:0.453202;fill:url(#radialGradient8744);fill-opacity:1;fill-rule:evenodd;stroke:none" d="M 183.25,181.75 C 220.3537,168.0954 232.2736,166.2194 244.5,154 230.3393,165.9537 200.4015,172.3658 176,183 Z" id="path8736" transform="matrix(0.5296484,0,0,0.5296484,-11.72226,-13.86416)" sodipodi:nodetypes="cccc" /> +<path inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" transform="matrix(0.5296484,0,0,0.5296484,-11.72226,-14.79104)" id="path8746" d="m 183.25,181.75 c 61.1037,-21.6546 50.7736,-21.5306 61.25,-27.75 -19.4277,7.4367 -55.7345,8.2298 -68.5,29 z" style="opacity:0.5123153;fill:url(#radialGradient8768);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8764)" /> +<ellipse style="display:inline;overflow:visible;visibility:visible;opacity:0.2857143;fill:url(#linearGradient10664);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" id="path8864" transform="matrix(0.5296484,0,0,0.5296484,-12.38432,-14.79104)" cx="229.9375" cy="199.0625" rx="7.9375" ry="2.4375" /> +<ellipse transform="matrix(0.7131486,0,0,1.140781,-54.5779,-134.955)" id="path8874" style="display:inline;overflow:visible;visibility:visible;opacity:0.6206894;fill:url(#linearGradient10666);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;filter:url(#filter8906);enable-background:accumulate" cx="229.9375" cy="199.0625" rx="7.9375" ry="2.4375" /> +<path inkscape:connector-curvature="0" style="fill:url(#radialGradient8922);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8980)" d="m 214.125,203.75 c 3.7695,3.4842 24.7558,5.2722 28.1875,-1 -6.7366,4.7839 -21.7168,3.1026 -28.1875,1 z" id="path8914" transform="matrix(0.5296484,0,0,0.5296484,-11.72226,-14.23868)" sodipodi:nodetypes="ccc" /> +<ellipse transform="matrix(0.2042516,-0.1035605,0.2395168,0.4723972,5.754795,30.28656)" id="path8984" style="display:inline;overflow:visible;visibility:visible;opacity:0.2857143;fill:url(#linearGradient10668);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" cx="229.9375" cy="199.0625" rx="6.508443" ry="3.082082" /> +<ellipse style="display:inline;overflow:visible;visibility:visible;opacity:0.6206894;fill:url(#linearGradient10670);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;filter:url(#filter8906);enable-background:accumulate" id="path8986" transform="matrix(0.2750159,-0.1394397,0.5158824,1.017471,-65.3535,-69.30064)" cx="229.9375" cy="199.0625" rx="7.055552" ry="2.140048" /> +<path inkscape:connector-curvature="0" sodipodi:nodetypes="ccc" transform="matrix(0.2042516,-0.1035605,0.2395168,0.4723972,6.259901,30.64976)" id="path8988" d="m 217.0575,201.9403 c 3.7695,3.4842 26.9713,8.9112 25.255,0.8097 -3.3174,5.3233 -18.7842,1.2929 -25.255,-0.8097 z" style="fill:url(#radialGradient8994);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8980)" /> +<path inkscape:connector-curvature="0" style="fill:url(#radialGradient9004);fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 68.25,186 c 0,-0.6206 38.8462,11.8385 45.5,18.5 -5.4712,-5.3385 -33.15971,-17.6161 -37.375,-17.75 -4.21529,-0.1339 -7.625,-0.5 -8.125,-0.75 z" id="path8996" transform="matrix(0.5296484,0,0,0.5296484,-11.72226,-13.86416)" sodipodi:nodetypes="cczc" /> +<g id="g9018" transform="matrix(0.8790148,-0.1929959,0.2338341,0.6959295,-20.20953,36.72556)"> +<ellipse style="display:inline;overflow:visible;visibility:visible;opacity:0.2857143;fill:url(#linearGradient8912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" id="path9006" transform="matrix(0.5296484,0,0,0.5296484,-84.4165,-4.727724)" cx="229.9375" cy="199.0625" rx="7.9375" ry="2.4375" /> +<ellipse transform="matrix(0.7131486,0,0,1.140781,-126.6101,-124.8917)" id="path9008" style="display:inline;overflow:visible;visibility:visible;opacity:0.6206894;fill:url(#linearGradient8910);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;filter:url(#filter8906);enable-background:accumulate" cx="229.9375" cy="199.0625" rx="7.9375" ry="2.4375" /> +</g> +<path inkscape:connector-curvature="0" style="opacity:0.6157635;fill:url(#radialGradient9046);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter9068)" d="m 80.5,220.0625 c 0,0 2.10339,5.6508 7.875,5.9375 5.83887,0.2901 12.5032,-7.007 13.0625,-9.625 -1,2.25 -6.59033,9.0333 -13.8125,8.9375 -4.09986,-0.054 -7.125,-5.25 -7.125,-5.25 z" id="path9038" transform="matrix(0.5296484,0,0,0.5296484,-11.62295,-14.42691)" sodipodi:nodetypes="czczc" /> +<path inkscape:label="top_inner_highlight" d="m 64.08984,10.40625 c -1.75641,-0.0642 -3.53481,0.19172 -5.23632,0.67383 C 48.75344,18.29439 41.15155,28.7189 32.0332,37.1875 24.68746,45.58535 15.17856,52.47861 9.548828,62.14258 c 0.596672,6.24231 9.564872,5.67737 14.029292,7.91406 3.46379,1.38101 13.30841,2.59285 9.56836,7.99805 -1.74307,2.41658 -13.64572,4.65125 -7.34375,7.45898 7.47175,4.02082 17.59234,3.98525 23.45118,10.40039 2.7408,4.48694 -9.36857,9.27724 -1.70899,11.40044 5.57964,0.1822 10.71821,3.3659 11.73438,9.1289 6.17264,2.7286 13.71658,-0.6452 18.86328,-4.3223 -5.55418,-1.5174 -5.55274,-7.3567 -0.32617,-9.5156 C 82.57834,98.029 92.5197,99.83023 94.50391,92.71484 92.16265,88.92491 82.47771,88.09048 85.26758,82.42188 95.3438,75.35726 110.0656,75.75354 118.1523,65.88281 119.068,57.88155 109.7179,53.64169 105.5312,47.87695 93.28559,35.96979 82.14809,22.68263 69.19336,11.65625 c -1.61304,-0.80102 -3.3471,-1.1858 -5.10352,-1.25 z m 46.28906,79.89453 c -1.1032,-0.20204 -2.1672,0.11783 -3.2578,0.25391 -0.9653,0.43818 -2.0399,0.69494 -2.7793,1.5039 -0.4961,0.33192 -0.8508,0.77967 -1.0742,1.33203 1.4228,0.55094 2.9817,0.47581 4.4726,0.71485 1.0356,0.1537 2.0722,0.24151 3.1114,0.0664 1.1999,-0.13042 2.4232,-0.17871 3.6093,-0.35938 0.6225,-0.16463 0.9685,-0.49543 0.4786,-1.06641 -0.2173,-0.79852 -1.0187,-1.14865 -1.5762,-1.68554 -0.9745,-0.34629 -1.9259,-0.79917 -2.9844,-0.75977 z m -71.52929,9.01563 c -1.10482,0.12695 -2.20964,0.2539 -3.31445,0.38086 -0.92467,0.47913 -1.89749,0.89393 -2.79297,1.41213 -0.44958,0.4196 -0.95034,1.001 -0.66992,1.6523 0.33451,0.5928 0.83812,1.1316 1.47265,1.4278 0.42182,0.2925 0.99531,0.3742 1.48828,0.3457 0.84734,-0.2763 1.77522,-0.3976 2.57227,-0.7715 0.7857,-0.6845 1.67666,-1.275 2.39648,-2.0176 0.35256,-0.5641 0.70604,-1.1273 1.0586,-1.6914 -0.59122,-0.55877 -1.47261,-0.4951 -2.21094,-0.73829 z m 61.0293,0.49414 c -0.0293,0.0312 -0.0586,0.0625 -0.0879,0.0937 -0.45772,0.5953 -0.86608,1.3787 -0.57032,2.1367 0.43895,0.9727 1.6036,1.3792 2.6094,1.3184 0.6259,-0.029 1.2477,-0.2146 1.789,-0.5313 -0.1335,-0.6783 -0.629,-1.208 -1.1074,-1.6758 -0.7477,-0.6609 -1.683,-1.0654 -2.63279,-1.34175 z" inkscape:href="#use7639" id="87235" style="fill:none;stroke:url(#radialGradient11553);stroke-width:1.0035907;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter9298)" xlink:href="#use7639" inkscape:original="M 63.40039 8.75 C 59.95039 8.75 56.54961 10 54.09961 12.5 L 12.90039 54.69922 C -2.699609 70.29922 23.00078 69.00039 32.30078 74.90039 C 36.60078 77.70039 18.49922 81.3 22.19922 85 C 25.79922 88.7 43.9 92.09922 47.5 95.69922 C 51.1 99.39922 40.20078 103.3 43.80078 107 C 47.30078 110.7 55.69922 107.1996 57.19922 115.5996 C 58.29922 121.7996 72.6 118.7004 79 113.4004 C 83 110.0004 72.09922 110.0008 75.69922 106.3008 C 84.69922 97.20078 92.7 102.2008 96 93.80078 C 97.8 89.30078 82.4 86.09922 86.5 83.19922 C 96.3 76.29922 132.2992 72.79922 115.6992 56.19922 L 73 12.5 C 70.35 10 66.85039 8.75 63.40039 8.75 z M 109.2871 88.75 C 105.8246 88.875 102.3004 90.60078 101.4004 93.80078 C 101.4004 95.90078 117.7008 97.10078 116.8008 93.30078 C 116.1508 90.10078 112.7496 88.625 109.2871 88.75 z M 38.93164 97.83984 C 33.94414 97.49297 27.55039 101.2254 31.90039 104.9004 C 35.60039 108.1004 41.2 104.1992 43 99.69922 C 42.1 98.52422 40.59414 97.95547 38.93164 97.83984 z M 99.40039 98.19922 C 94.80039 102.3992 100.1992 106.8004 104.6992 103.9004 C 105.8992 103.1004 104.6004 99.19922 99.40039 98.19922 z " inkscape:radius="-1.456531" sodipodi:type="inkscape:offset" /> +<path inkscape:connector-curvature="0" sodipodi:nodetypes="csssssscs" transform="matrix(0.4883067,0,0,0.4883067,-5.810401,-7.704252)" id="path5897" d="m 95.5,172 c -5.09061,1.5019 -21.59202,7.7371 -19.25,12.5 2.2436,4.5627 40.6114,6.4013 46.5,20 2.5679,5.9301 -5.8924,10.4033 -3.75,16.5 1.6497,4.6948 14.412,16.4908 22.486,22.0678 6.333,4.3744 14.651,-3.5224 11.264,-10.0678 -5.3959,-10.4276 18.4427,-23.1991 29.25,-29 6.3052,-3.3844 -13,-20 -13,-20 0,0 -73.5,-12 -73.5,-12 z" style="opacity:0.3251231;fill:url(#linearGradient5905);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter5983-5)" /> +<path inkscape:connector-curvature="0" sodipodi:nodetypes="cssssssssss" id="path5783" d="m 41.74217,78.53304 c 2.23193,1.63922 6.63675,0.65053 9.28212,1.84176 6.34952,2.85921 14.15494,6.04542 12.71857,0.40455 0,0 -1.61577,1.34204 -1.61577,1.34204 0,0 -0.0315,-2.55754 -0.0315,-2.55754 0,0 -3.75198,0.91629 -3.75198,0.91629 0,0 -2.90617,-2.33276 -4.23852,-3.10199 -0.27829,-0.16067 -1.7077,1.29281 -1.7077,1.29281 0,0 -0.25697,-1.5438 -0.25697,-1.5438 -1.85737,-0.19764 -3.69616,-0.28481 -5.31515,-0.27182 -3.88094,0.0311 -6.49906,0.63774 -5.08307,1.6777 z" style="fill:url(#linearGradient5801);fill-opacity:1;fill-rule:evenodd;stroke:none" /> +<path inkscape:connector-curvature="0" sodipodi:nodetypes="csssssc" transform="matrix(0.4883067,0,0,0.4883067,-5.810401,-7.704252)" id="path5803" d="m 182.75,187.25 c -1.7598,6.4783 21.6278,15.2799 19.875,19.75 -3.859,9.8416 -24.976,3.1375 -41.125,23.75 -2.3132,2.9525 3.25,13.5 2.5,12.25 -0.75,-1.25 -6.4649,-9.9629 -5,-14.25 4.5942,-13.4452 49.0128,-18.4575 40.875,-24.875 -4.6799,-3.6906 -21.5055,-13.8872 -17.125,-16.625 z" style="opacity:0.4778325;fill:url(#radialGradient5811);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter5845)" /> +<ellipse transform="matrix(0.4883067,0,0,0.4883067,-6.359746,-8.009444)" id="path6041" style="display:inline;overflow:visible;visibility:visible;opacity:0.5862069;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" cx="233.9375" cy="201.1875" rx="2.5625" ry="1.0625" /> +<ellipse style="display:inline;overflow:visible;visibility:visible;opacity:0.5862069;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" id="path6043" transform="matrix(0.3096579,0,0,0.4883067,27.52844,1.573576)" cx="233.9375" cy="201.1875" rx="2.5625" ry="1.0625" /> +<ellipse style="display:inline;overflow:visible;visibility:visible;opacity:0.5862069;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" id="path6045" transform="matrix(0.5478563,0,0,0.4883067,-92.10223,1.115795)" cx="233.9375" cy="201.1875" rx="2.5625" ry="1.0625" /> +<path inkscape:connector-curvature="0" sodipodi:nodetypes="ccc" id="path5049" d="m 36.67228,76.52865 c -7.15299,4.42411 -18.27403,6.03423 -6.10383,8.97264 -1.44971,-3.2281 3.13858,-2.87202 6.10383,-8.97264 z" style="display:inline;overflow:visible;visibility:visible;opacity:0.2512315;fill:url(#linearGradient5822);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.0478933;marker:none;enable-background:accumulate" /> +<path inkscape:connector-curvature="0" style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.3631579;fill:url(#linearGradient1030);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;filter:url(#filter10997-7);enable-background:accumulate" d="m 8.83428,171.6472 c 0,0 22.59178,-2.1279 27.81802,-8.6464 3.05755,-3.8136 -12.15146,-8.2638 -8.86827,-12 12.35008,-14.0541 22.73076,-13.4673 37.05025,-19.3536 14.31949,-5.8862 9.03544,-8.769 4.40381,-11.3535 -7.9325,-4.4264 -25.58722,-9.1424 -19.74696,-19.6465 5.87688,-10.56993 57.34317,-25.24999 57.34317,-25.24999 15.5962,-5.32843 13.6391,-14.96447 6,-23 L 66.83428,6.647214 c 0,0 2.28296,43.388646 -7,61.999996 -11.4715,22.99914 -72.54408,48.66179 -47,51.49999 9,1 13.32065,4.0705 17,11 7.57631,14.2688 -21,40.5 -21,40.5 z" id="path10207" sodipodi:nodetypes="csszsscccsssc" transform="matrix(0.4883067,0,0,0.4883067,57.7504,32.99748)" /> +</g> +<text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.5288191px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.9080512px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="115.818" y="708.1778" id="text7847"><tspan sodipodi:role="line" id="tspan7845" x="115.818" y="708.1778" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:121.0734863px;font-family:'Linux Libertine Display O';-inkscape-font-specification:'Linux Libertine Display O';stroke-width:0.9080512px">INKSCAPE</tspan></text> +</svg> diff --git a/share/extensions/Barcode/Base.py b/share/extensions/Barcode/Base.py index b7429f84f..1aa1f8415 100644 --- a/share/extensions/Barcode/Base.py +++ b/share/extensions/Barcode/Base.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Base module for rendering barcodes for Inkscape. diff --git a/share/extensions/Barcode/BaseEan.py b/share/extensions/Barcode/BaseEan.py index 05c9b1c39..4ceaeed4a 100644 --- a/share/extensions/Barcode/BaseEan.py +++ b/share/extensions/Barcode/BaseEan.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Some basic common code shared between EAN and UCP generators. diff --git a/share/extensions/Barcode/Code128.py b/share/extensions/Barcode/Code128.py index 618ce7817..7ff92088f 100644 --- a/share/extensions/Barcode/Code128.py +++ b/share/extensions/Barcode/Code128.py @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for Code128/EAN128 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Code25i.py b/share/extensions/Barcode/Code25i.py index 51346be60..9812d8598 100644 --- a/share/extensions/Barcode/Code25i.py +++ b/share/extensions/Barcode/Code25i.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Generate barcodes for Code25-interleaved 2 of 5, for Inkscape. diff --git a/share/extensions/Barcode/Code39.py b/share/extensions/Barcode/Code39.py index ade397463..3cd8467a8 100644 --- a/share/extensions/Barcode/Code39.py +++ b/share/extensions/Barcode/Code39.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for Code39 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Code39Ext.py b/share/extensions/Barcode/Code39Ext.py index b6df47de2..3edf82d2e 100644 --- a/share/extensions/Barcode/Code39Ext.py +++ b/share/extensions/Barcode/Code39Ext.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for Code39 Extended barcodes. Designed for Inkscape. diff --git a/share/extensions/Barcode/Code93.py b/share/extensions/Barcode/Code93.py index 866ec6036..2b90fdda1 100644 --- a/share/extensions/Barcode/Code93.py +++ b/share/extensions/Barcode/Code93.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for Code93 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Ean13.py b/share/extensions/Barcode/Ean13.py index 3bad5d6e5..7e138f25a 100644 --- a/share/extensions/Barcode/Ean13.py +++ b/share/extensions/Barcode/Ean13.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for EAN13 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Ean5.py b/share/extensions/Barcode/Ean5.py index 1bd26a4bd..d2e38a063 100644 --- a/share/extensions/Barcode/Ean5.py +++ b/share/extensions/Barcode/Ean5.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for EAN5 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Ean8.py b/share/extensions/Barcode/Ean8.py index 83e82814a..010dff03e 100644 --- a/share/extensions/Barcode/Ean8.py +++ b/share/extensions/Barcode/Ean8.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for EAN8 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Rm4scc.py b/share/extensions/Barcode/Rm4scc.py index 0fb154280..d40cd2435 100644 --- a/share/extensions/Barcode/Rm4scc.py +++ b/share/extensions/Barcode/Rm4scc.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for RM4CC barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Upca.py b/share/extensions/Barcode/Upca.py index d69ed11e6..bc6ffdf29 100644 --- a/share/extensions/Barcode/Upca.py +++ b/share/extensions/Barcode/Upca.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for UPCA barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Upce.py b/share/extensions/Barcode/Upce.py index eee2a739c..d25c9c6cc 100644 --- a/share/extensions/Barcode/Upce.py +++ b/share/extensions/Barcode/Upce.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for UPCE barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/__init__.py b/share/extensions/Barcode/__init__.py index e4e328ae3..9ad412448 100644 --- a/share/extensions/Barcode/__init__.py +++ b/share/extensions/Barcode/__init__.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Renderer for barcodes, SVG extention for Inkscape. diff --git a/share/extensions/addnodes.py b/share/extensions/addnodes.py index d78ab55e7..4e57f0185 100755 --- a/share/extensions/addnodes.py +++ b/share/extensions/addnodes.py @@ -19,7 +19,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/bezmisc.py b/share/extensions/bezmisc.py index 0c7ad4957..c36e8e1b4 100755 --- a/share/extensions/bezmisc.py +++ b/share/extensions/bezmisc.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math, cmath diff --git a/share/extensions/chardataeffect.py b/share/extensions/chardataeffect.py index a1758c890..f81de6b80 100755 --- a/share/extensions/chardataeffect.py +++ b/share/extensions/chardataeffect.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import sys, optparse, inkex diff --git a/share/extensions/coloreffect.py b/share/extensions/coloreffect.py index 8f67c6090..a6b5cfe41 100755 --- a/share/extensions/coloreffect.py +++ b/share/extensions/coloreffect.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import sys, copy, simplestyle, inkex import random diff --git a/share/extensions/convert2dashes.py b/share/extensions/convert2dashes.py index 1228b247c..3910d8e82 100755 --- a/share/extensions/convert2dashes.py +++ b/share/extensions/convert2dashes.py @@ -18,7 +18,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library import inkex diff --git a/share/extensions/cubicsuperpath.py b/share/extensions/cubicsuperpath.py index 925efdb04..b505e8c4f 100755 --- a/share/extensions/cubicsuperpath.py +++ b/share/extensions/cubicsuperpath.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import simplepath diff --git a/share/extensions/dimension.py b/share/extensions/dimension.py index 30b674201..462a05bae 100755 --- a/share/extensions/dimension.py +++ b/share/extensions/dimension.py @@ -29,7 +29,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library diff --git a/share/extensions/dm2svg.py b/share/extensions/dm2svg.py index 908fedbad..74afe6adf 100755 --- a/share/extensions/dm2svg.py +++ b/share/extensions/dm2svg.py @@ -18,7 +18,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import struct diff --git a/share/extensions/dots.py b/share/extensions/dots.py index dc533ffb6..296a56dfc 100755 --- a/share/extensions/dots.py +++ b/share/extensions/dots.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, simplepath, math diff --git a/share/extensions/draw_from_triangle.py b/share/extensions/draw_from_triangle.py index 42cda7035..5efabfbba 100755 --- a/share/extensions/draw_from_triangle.py +++ b/share/extensions/draw_from_triangle.py @@ -28,7 +28,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import sys diff --git a/share/extensions/dxf_input.py b/share/extensions/dxf_input.py index acfed0921..30adb73f9 100755 --- a/share/extensions/dxf_input.py +++ b/share/extensions/dxf_input.py @@ -19,7 +19,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, math diff --git a/share/extensions/dxf_outlines.py b/share/extensions/dxf_outlines.py index b7ae0ef14..0e8cb7f62 100755 --- a/share/extensions/dxf_outlines.py +++ b/share/extensions/dxf_outlines.py @@ -28,7 +28,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import math diff --git a/share/extensions/edge3d.py b/share/extensions/edge3d.py index d2d8ead5c..86df52908 100755 --- a/share/extensions/edge3d.py +++ b/share/extensions/edge3d.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplepath, sys, copy from math import degrees, atan2 diff --git a/share/extensions/embedimage.py b/share/extensions/embedimage.py index bdc15bde2..136c20f98 100755 --- a/share/extensions/embedimage.py +++ b/share/extensions/embedimage.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import base64 diff --git a/share/extensions/extractimage.py b/share/extensions/extractimage.py index 62dc83c87..aae7bd062 100755 --- a/share/extensions/extractimage.py +++ b/share/extensions/extractimage.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import base64 diff --git a/share/extensions/extrude.py b/share/extensions/extrude.py index c91ea645e..8db6b1512 100755 --- a/share/extensions/extrude.py +++ b/share/extensions/extrude.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library import inkex diff --git a/share/extensions/ffgeom.py b/share/extensions/ffgeom.py index ef8799b97..a6d268239 100755 --- a/share/extensions/ffgeom.py +++ b/share/extensions/ffgeom.py @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with FretFind 2-D; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import math try: diff --git a/share/extensions/flatten.py b/share/extensions/flatten.py index f5add5fc5..7b4d2a7d6 100755 --- a/share/extensions/flatten.py +++ b/share/extensions/flatten.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, cubicsuperpath, simplepath, cspsubdiv diff --git a/share/extensions/foldablebox.py b/share/extensions/foldablebox.py index 9d58974c5..772083094 100755 --- a/share/extensions/foldablebox.py +++ b/share/extensions/foldablebox.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' __version__ = "0.2" diff --git a/share/extensions/fractalize.py b/share/extensions/fractalize.py index 901a8f761..c6bbe397a 100755 --- a/share/extensions/fractalize.py +++ b/share/extensions/fractalize.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import random, math, inkex, simplepath diff --git a/share/extensions/funcplot.py b/share/extensions/funcplot.py index f37bf335e..c0fb3e525 100755 --- a/share/extensions/funcplot.py +++ b/share/extensions/funcplot.py @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Changes: * This program is a modified version of wavy.py by Aaron Spike. diff --git a/share/extensions/gcodetools.py b/share/extensions/gcodetools.py index 12f438cca..4cb5b2696 100755 --- a/share/extensions/gcodetools.py +++ b/share/extensions/gcodetools.py @@ -59,7 +59,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ ### diff --git a/share/extensions/generate_voronoi.py b/share/extensions/generate_voronoi.py index 7acd1be5f..8907db493 100755 --- a/share/extensions/generate_voronoi.py +++ b/share/extensions/generate_voronoi.py @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ # standard library diff --git a/share/extensions/gimp_xcf.py b/share/extensions/gimp_xcf.py index bdb0d1e4c..39dec8c13 100755 --- a/share/extensions/gimp_xcf.py +++ b/share/extensions/gimp_xcf.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import os diff --git a/share/extensions/grid_cartesian.py b/share/extensions/grid_cartesian.py index ae4c6b6b4..26270002d 100755 --- a/share/extensions/grid_cartesian.py +++ b/share/extensions/grid_cartesian.py @@ -19,7 +19,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/grid_isometric.py b/share/extensions/grid_isometric.py index 6202fd9e2..d80be6c4d 100755 --- a/share/extensions/grid_isometric.py +++ b/share/extensions/grid_isometric.py @@ -20,7 +20,7 @@ #You should have received a copy of the GNU General Public License #along with this program; if not, write to the Free Software -#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import inkex diff --git a/share/extensions/grid_polar.py b/share/extensions/grid_polar.py index 350b21195..f3d5dbf41 100755 --- a/share/extensions/grid_polar.py +++ b/share/extensions/grid_polar.py @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/guides_creator.py b/share/extensions/guides_creator.py index a8c7bb18a..e0aa6cadf 100755 --- a/share/extensions/guides_creator.py +++ b/share/extensions/guides_creator.py @@ -25,7 +25,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # Inspired by hello_world turorial by Blackhex and Rubikcube diff --git a/share/extensions/handles.py b/share/extensions/handles.py index 0cbdef44c..6987a3bb2 100755 --- a/share/extensions/handles.py +++ b/share/extensions/handles.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplepath, simplestyle diff --git a/share/extensions/hershey.py b/share/extensions/hershey.py index d0b27b129..471959b10 100755 --- a/share/extensions/hershey.py +++ b/share/extensions/hershey.py @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import hersheydata #data file w/ Hershey font data import inkex diff --git a/share/extensions/hpgl_decoder.py b/share/extensions/hpgl_decoder.py index a54a81e81..8f3c18e42 100644 --- a/share/extensions/hpgl_decoder.py +++ b/share/extensions/hpgl_decoder.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard libraries diff --git a/share/extensions/hpgl_encoder.py b/share/extensions/hpgl_encoder.py index 0e4158725..b9975215f 100644 --- a/share/extensions/hpgl_encoder.py +++ b/share/extensions/hpgl_encoder.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard libraries diff --git a/share/extensions/hpgl_input.py b/share/extensions/hpgl_input.py index a85c32b34..8cc7edaaf 100755 --- a/share/extensions/hpgl_input.py +++ b/share/extensions/hpgl_input.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard libraries diff --git a/share/extensions/hpgl_output.py b/share/extensions/hpgl_output.py index 78edba53b..477db40e7 100755 --- a/share/extensions/hpgl_output.py +++ b/share/extensions/hpgl_output.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library diff --git a/share/extensions/image_attributes.py b/share/extensions/image_attributes.py index ddd5a8b87..80ad62c26 100755 --- a/share/extensions/image_attributes.py +++ b/share/extensions/image_attributes.py @@ -21,7 +21,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library diff --git a/share/extensions/ink2canvas.py b/share/extensions/ink2canvas.py index b5c0fbb7b..f44c3e48f 100755 --- a/share/extensions/ink2canvas.py +++ b/share/extensions/ink2canvas.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/ink2canvas/canvas.py b/share/extensions/ink2canvas/canvas.py index 139835f0e..a88d368d3 100644 --- a/share/extensions/ink2canvas/canvas.py +++ b/share/extensions/ink2canvas/canvas.py @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/ink2canvas/svg.py b/share/extensions/ink2canvas/svg.py index b60b2ca9f..f4dca8279 100644 --- a/share/extensions/ink2canvas/svg.py +++ b/share/extensions/ink2canvas/svg.py @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py index 0fdaeea75..16aff2fc8 100755 --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py @@ -24,7 +24,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import copy import gettext diff --git a/share/extensions/inkwebeffect.py b/share/extensions/inkwebeffect.py index 994f74dea..4e29892de 100755 --- a/share/extensions/inkwebeffect.py +++ b/share/extensions/inkwebeffect.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, sys, os, re diff --git a/share/extensions/interp.py b/share/extensions/interp.py index 093a98fda..9dbb996e4 100755 --- a/share/extensions/interp.py +++ b/share/extensions/interp.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, cubicsuperpath, simplestyle, copy, math, bezmisc, simpletransform, pathmodifier diff --git a/share/extensions/interp_att_g.py b/share/extensions/interp_att_g.py index 168e7ffb0..2ae46b46d 100755 --- a/share/extensions/interp_att_g.py +++ b/share/extensions/interp_att_g.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import math diff --git a/share/extensions/layers2svgfont.py b/share/extensions/layers2svgfont.py index 379e8e34c..e449ae380 100755 --- a/share/extensions/layers2svgfont.py +++ b/share/extensions/layers2svgfont.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/layout_nup.py b/share/extensions/layout_nup.py index 266a3950d..022aa0d3f 100755 --- a/share/extensions/layout_nup.py +++ b/share/extensions/layout_nup.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex import sys diff --git a/share/extensions/lindenmayer.py b/share/extensions/lindenmayer.py index eb0d84328..8e1c4ac22 100755 --- a/share/extensions/lindenmayer.py +++ b/share/extensions/lindenmayer.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, pturtle, random from simpletransform import computePointInNode diff --git a/share/extensions/lorem_ipsum.py b/share/extensions/lorem_ipsum.py index 20a2fdd18..efb2361ea 100755 --- a/share/extensions/lorem_ipsum.py +++ b/share/extensions/lorem_ipsum.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' ''' Example filltext sentences generated over at http://lipsum.com/ diff --git a/share/extensions/markers_strokepaint.py b/share/extensions/markers_strokepaint.py index d92716939..76284b234 100755 --- a/share/extensions/markers_strokepaint.py +++ b/share/extensions/markers_strokepaint.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import random diff --git a/share/extensions/measure.py b/share/extensions/measure.py index 9fc632c2a..fe981e39e 100755 --- a/share/extensions/measure.py +++ b/share/extensions/measure.py @@ -23,7 +23,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. TODO: * should use the standard attributes for text diff --git a/share/extensions/merge_styles.py b/share/extensions/merge_styles.py index f028bf4ce..cdd7b5ed5 100755 --- a/share/extensions/merge_styles.py +++ b/share/extensions/merge_styles.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Merges styles into class based styles and removes. diff --git a/share/extensions/motion.py b/share/extensions/motion.py index 9bf31e008..3af80d5c1 100755 --- a/share/extensions/motion.py +++ b/share/extensions/motion.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math, inkex, simplestyle, simplepath, bezmisc diff --git a/share/extensions/new_glyph_layer.py b/share/extensions/new_glyph_layer.py index cb7dba854..7261baa2d 100755 --- a/share/extensions/new_glyph_layer.py +++ b/share/extensions/new_glyph_layer.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/next_glyph_layer.py b/share/extensions/next_glyph_layer.py index f8a43aff5..5f152c71e 100755 --- a/share/extensions/next_glyph_layer.py +++ b/share/extensions/next_glyph_layer.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/param_curves.py b/share/extensions/param_curves.py index d8f880d0c..e38d5208a 100755 --- a/share/extensions/param_curves.py +++ b/share/extensions/param_curves.py @@ -18,7 +18,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Changes: * This program is derived by Michel Chatelain from funcplot.py. His changes are in the Public Domain. diff --git a/share/extensions/pathalongpath.py b/share/extensions/pathalongpath.py index 234430acd..93bb99d6b 100755 --- a/share/extensions/pathalongpath.py +++ b/share/extensions/pathalongpath.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr Quick description: diff --git a/share/extensions/pathmodifier.py b/share/extensions/pathmodifier.py index ff2bbfb3a..d80b6eeae 100755 --- a/share/extensions/pathmodifier.py +++ b/share/extensions/pathmodifier.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr This code defines a basic class (PathModifier) of effects whose purpose is diff --git a/share/extensions/pathscatter.py b/share/extensions/pathscatter.py index 5c2857979..92af6ad76 100755 --- a/share/extensions/pathscatter.py +++ b/share/extensions/pathscatter.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr Quick description: diff --git a/share/extensions/perfectboundcover.py b/share/extensions/perfectboundcover.py index 9f81dbb36..e69bcf4c2 100755 --- a/share/extensions/perfectboundcover.py +++ b/share/extensions/perfectboundcover.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import sys, inkex diff --git a/share/extensions/perspective.py b/share/extensions/perspective.py index a6ee5810b..febe34a22 100755 --- a/share/extensions/perspective.py +++ b/share/extensions/perspective.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Perspective approach & math by Dmitry Platonov, shadowjack@mail.ru, 2006 """ diff --git a/share/extensions/plotter.py b/share/extensions/plotter.py index 7e34f2953..60858cc6c 100755 --- a/share/extensions/plotter.py +++ b/share/extensions/plotter.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library diff --git a/share/extensions/polyhedron_3d.py b/share/extensions/polyhedron_3d.py index 8e4a8e8e6..7ce8b1c6d 100755 --- a/share/extensions/polyhedron_3d.py +++ b/share/extensions/polyhedron_3d.py @@ -46,7 +46,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import sys diff --git a/share/extensions/previous_glyph_layer.py b/share/extensions/previous_glyph_layer.py index 801570d65..5e9de1fb8 100755 --- a/share/extensions/previous_glyph_layer.py +++ b/share/extensions/previous_glyph_layer.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/print_win32_vector.py b/share/extensions/print_win32_vector.py index 37c2021ac..bf8e89845 100755 --- a/share/extensions/print_win32_vector.py +++ b/share/extensions/print_win32_vector.py @@ -25,7 +25,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library from ctypes import * diff --git a/share/extensions/printing_marks.py b/share/extensions/printing_marks.py index 0306048d6..6c718da01 100755 --- a/share/extensions/printing_marks.py +++ b/share/extensions/printing_marks.py @@ -21,7 +21,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' from subprocess import Popen, PIPE, STDOUT diff --git a/share/extensions/pturtle.py b/share/extensions/pturtle.py index b2740a4bc..a4925bf4c 100755 --- a/share/extensions/pturtle.py +++ b/share/extensions/pturtle.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math class pTurtle: diff --git a/share/extensions/radiusrand.py b/share/extensions/radiusrand.py index e272a50c4..e4585ccd4 100755 --- a/share/extensions/radiusrand.py +++ b/share/extensions/radiusrand.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import random, math, inkex, cubicsuperpath diff --git a/share/extensions/render_alphabetsoup.py b/share/extensions/render_alphabetsoup.py index a2cbcb978..06c82cb2d 100755 --- a/share/extensions/render_alphabetsoup.py +++ b/share/extensions/render_alphabetsoup.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import copy diff --git a/share/extensions/render_barcode.py b/share/extensions/render_barcode.py index 4f1464a92..381f3fc76 100755 --- a/share/extensions/render_barcode.py +++ b/share/extensions/render_barcode.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Inkscape's general barcode extension. Run from within inkscape or use the diff --git a/share/extensions/render_barcode_datamatrix.py b/share/extensions/render_barcode_datamatrix.py index 72ffddbe6..82c827bb8 100755 --- a/share/extensions/render_barcode_datamatrix.py +++ b/share/extensions/render_barcode_datamatrix.py @@ -43,7 +43,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ######VERSION HISTORY##### Ver. Date Notes diff --git a/share/extensions/render_gear_rack.py b/share/extensions/render_gear_rack.py index 63433aadb..95076ba64 100755 --- a/share/extensions/render_gear_rack.py +++ b/share/extensions/render_gear_rack.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/render_gears.py b/share/extensions/render_gears.py index 2584117f2..fbec5d052 100755 --- a/share/extensions/render_gears.py +++ b/share/extensions/render_gears.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/rtree.py b/share/extensions/rtree.py index c0dc1cca6..b336c4e3a 100755 --- a/share/extensions/rtree.py +++ b/share/extensions/rtree.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, pturtle, random from simpletransform import computePointInNode diff --git a/share/extensions/rubberstretch.py b/share/extensions/rubberstretch.py index 95d1cffb5..2e6b85ad5 100755 --- a/share/extensions/rubberstretch.py +++ b/share/extensions/rubberstretch.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr ''' diff --git a/share/extensions/setup_typography_canvas.py b/share/extensions/setup_typography_canvas.py index a1000f2d1..209c9757f 100755 --- a/share/extensions/setup_typography_canvas.py +++ b/share/extensions/setup_typography_canvas.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/simplepath.py b/share/extensions/simplepath.py index 514dd4666..5d99e46e7 100644 --- a/share/extensions/simplepath.py +++ b/share/extensions/simplepath.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import re, math diff --git a/share/extensions/simplestyle.py b/share/extensions/simplestyle.py index ca33e68a4..32328a40d 100644 --- a/share/extensions/simplestyle.py +++ b/share/extensions/simplestyle.py @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ svgcolors={ diff --git a/share/extensions/simpletransform.py b/share/extensions/simpletransform.py index 8b6f46935..f6f68d2be 100644 --- a/share/extensions/simpletransform.py +++ b/share/extensions/simpletransform.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr This code defines several functions to make handling of transform diff --git a/share/extensions/spirograph.py b/share/extensions/spirograph.py index e702344a5..02cb02bcd 100755 --- a/share/extensions/spirograph.py +++ b/share/extensions/spirograph.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, math from simpletransform import computePointInNode diff --git a/share/extensions/split.py b/share/extensions/split.py index 18d4327fe..4e83b3d33 100755 --- a/share/extensions/split.py +++ b/share/extensions/split.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/straightseg.py b/share/extensions/straightseg.py index f18658012..9222ed5b5 100755 --- a/share/extensions/straightseg.py +++ b/share/extensions/straightseg.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math, inkex, simplepath, sys diff --git a/share/extensions/summersnight.py b/share/extensions/summersnight.py index fbf88fe92..7af4bb571 100755 --- a/share/extensions/summersnight.py +++ b/share/extensions/summersnight.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ # standard library diff --git a/share/extensions/svg_and_media_zip_output.py b/share/extensions/svg_and_media_zip_output.py index 20a5dac18..c5963b721 100755 --- a/share/extensions/svg_and_media_zip_output.py +++ b/share/extensions/svg_and_media_zip_output.py @@ -26,7 +26,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. TODOs - fix bug: not saving existing .zip after a Collect for Output is run diff --git a/share/extensions/svgcalendar.py b/share/extensions/svgcalendar.py index a4269f5d7..9f221a807 100755 --- a/share/extensions/svgcalendar.py +++ b/share/extensions/svgcalendar.py @@ -25,7 +25,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' __version__ = "0.3" diff --git a/share/extensions/svgfont2layers.py b/share/extensions/svgfont2layers.py index 48100e3f5..1a392c72c 100755 --- a/share/extensions/svgfont2layers.py +++ b/share/extensions/svgfont2layers.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/tar_layers.py b/share/extensions/tar_layers.py index 3707af1f8..3ba5aa55e 100755 --- a/share/extensions/tar_layers.py +++ b/share/extensions/tar_layers.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ An extension to export multiple svg files from a single svg file containing layers. diff --git a/share/extensions/triangle.py b/share/extensions/triangle.py index ecd977d40..32bd2a1db 100755 --- a/share/extensions/triangle.py +++ b/share/extensions/triangle.py @@ -29,7 +29,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/voronoi2svg.py b/share/extensions/voronoi2svg.py index 26a89393c..c7033b23b 100755 --- a/share/extensions/voronoi2svg.py +++ b/share/extensions/voronoi2svg.py @@ -24,7 +24,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ # standard library diff --git a/share/extensions/web-set-att.py b/share/extensions/web-set-att.py index b224ed9aa..0dafcb974 100755 --- a/share/extensions/web-set-att.py +++ b/share/extensions/web-set-att.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library import inkwebeffect diff --git a/share/extensions/web-transmit-att.py b/share/extensions/web-transmit-att.py index 414eb12ea..bae6956b2 100755 --- a/share/extensions/web-transmit-att.py +++ b/share/extensions/web-transmit-att.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library import inkwebeffect diff --git a/share/extensions/webslicer_create_group.py b/share/extensions/webslicer_create_group.py index dd48c3e96..47e5f706f 100755 --- a/share/extensions/webslicer_create_group.py +++ b/share/extensions/webslicer_create_group.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library from webslicer_effect import * diff --git a/share/extensions/webslicer_create_rect.py b/share/extensions/webslicer_create_rect.py index b4e6858af..b68cd9ad8 100755 --- a/share/extensions/webslicer_create_rect.py +++ b/share/extensions/webslicer_create_rect.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library from webslicer_effect import * diff --git a/share/extensions/webslicer_effect.py b/share/extensions/webslicer_effect.py index d91d0ce85..acb78fcbd 100755 --- a/share/extensions/webslicer_effect.py +++ b/share/extensions/webslicer_effect.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/webslicer_export.py b/share/extensions/webslicer_export.py index a8a3c67ba..47db5369c 100755 --- a/share/extensions/webslicer_export.py +++ b/share/extensions/webslicer_export.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import os diff --git a/share/extensions/whirl.py b/share/extensions/whirl.py index 7ee9cc0a2..93e04c60d 100755 --- a/share/extensions/whirl.py +++ b/share/extensions/whirl.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math, inkex, cubicsuperpath from simpletransform import computePointInNode diff --git a/share/extensions/wireframe_sphere.py b/share/extensions/wireframe_sphere.py index bda06af21..64a1266b6 100755 --- a/share/extensions/wireframe_sphere.py +++ b/share/extensions/wireframe_sphere.py @@ -45,7 +45,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ######VERSION HISTORY##### Ver. Date Notes diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index c28302d22..d10c75cd8 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -1004,10 +1004,10 @@ objects_query_paintorder (const std::vector<SPItem*> &objects, SPStyle *style_re n_order ++; - if (!prev_order.empty() && prev_order.compare( style->paint_order.value ) != 0) { - same_order = false; - } if (style->paint_order.set) { + if (!prev_order.empty() && prev_order.compare( style->paint_order.value ) != 0) { + same_order = false; + } prev_order = style->paint_order.value; } } diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h index f6f933aaf..1232ae0c8 100644 --- a/src/extension/implementation/implementation.h +++ b/src/extension/implementation/implementation.h @@ -18,7 +18,7 @@ #include <2geom/forward.h> namespace Gtk { - class Widget; + class Widget; } class SPDocument; @@ -33,7 +33,7 @@ class View; } // namespace UI namespace XML { - class Node; + class Node; } // namespace XML namespace Extension { @@ -51,18 +51,18 @@ namespace Implementation { */ class ImplementationDocumentCache { - /** + /** * The document that this instance is working on. */ - Inkscape::UI::View::View * _view; + Inkscape::UI::View::View * _view; public: - ImplementationDocumentCache (Inkscape::UI::View::View * view) : - _view(view) - { - return; - }; - virtual ~ImplementationDocumentCache ( ) { return; }; - Inkscape::UI::View::View const * view ( ) { return _view; }; + ImplementationDocumentCache (Inkscape::UI::View::View * view) : + _view(view) + { + return; + }; + virtual ~ImplementationDocumentCache ( ) { return; }; + Inkscape::UI::View::View const * view ( ) { return _view; }; }; /** @@ -116,7 +116,7 @@ public: // ----- Effect functions ----- /** Find out information about the file. */ virtual Gtk::Widget * prefs_effect(Inkscape::Extension::Effect *module, - Inkscape::UI::View::View *view, + Inkscape::UI::View::View *view, sigc::signal<void> *changeSignal, ImplementationDocumentCache *docCache); virtual void effect(Inkscape::Extension::Effect * /*module*/, diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index 4cb0c9b73..2ec17f947 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -152,7 +152,7 @@ Script::Script() : } /** - * brief Destructor + * \brief Destructor */ Script::~Script() { @@ -232,11 +232,7 @@ bool Script::check_existence(const std::string &command) //Don't search when it is an absolute path. */ if (Glib::path_is_absolute(command)) { - if (Glib::file_test(command, Glib::FILE_TEST_EXISTS)) { - return true; - } else { - return false; - } + return Glib::file_test(command, Glib::FILE_TEST_EXISTS); } // First search in the current directory @@ -280,9 +276,9 @@ bool Script::check_existence(const std::string &command) /** \return none - \brief This function 'loads' an extention, basically it determines - the full command for the extention and stores that. - \param module The extention to be loaded. + \brief This function 'loads' an extension, basically it determines + the full command for the extension and stores that. + \param module The extension to be loaded. The most difficult part about this function is finding the actual command through all of the Reprs. Basically it is hidden down a @@ -292,7 +288,7 @@ bool Script::check_existence(const std::string &command) At that point all of the loops are exited, and there is an if statement to make sure they didn't exit because of not finding - the command. If that's the case, the extention doesn't get loaded + the command. If that's the case, the extension doesn't get loaded and should error out at a higher level. */ @@ -545,17 +541,17 @@ SPDocument *Script::open(Inkscape::Extension::Input *module, /** \return none - \brief This function uses an extention to save a document. It first + \brief This function uses an extension to save a document. It first creates an SVG file of the document, and then runs it through the script. - \param module Extention to be used + \param module Extension to be used \param doc Document to be saved \param filename The name to save the final file as \return false in case of any failure writing the file, otherwise true Well, at some point people need to save - it is really what makes the entire application useful. And, it is possible that someone - would want to use an extetion for this, so we need a function to + would want to use an extension for this, so we need a function to do that eh? First things first, the document is saved to a temporary file that @@ -563,7 +559,7 @@ SPDocument *Script::open(Inkscape::Extension::Input *module, ink_ext_ as a prefix. Don't worry, this file gets deleted at the end of the function. - After we have the SVG file, then extention_execute is called with + After we have the SVG file, then Script::execute is called with the temporary file name and the final output filename. This should put the output of the script into the final output file. We then delete the temporary file. diff --git a/src/extension/init.cpp b/src/extension/init.cpp index c16a5a899..af7af2cb1 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -1,6 +1,6 @@ /* * This is what gets executed to initialize all of the modules. For - * the internal modules this invovles executing their initialization + * the internal modules this involves executing their initialization * functions, for external ones it involves reading their .spmodule * files and bringing them into Sodipodi. * diff --git a/src/extension/output.cpp b/src/extension/output.cpp index 8de5583c7..83f0fed2f 100644 --- a/src/extension/output.cpp +++ b/src/extension/output.cpp @@ -192,8 +192,7 @@ Output::prefs (void) delete dialog; - if (response == Gtk::RESPONSE_OK) return true; - return false; + return (response == Gtk::RESPONSE_OK); } /** diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 22fa32bda..437aed5bd 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -109,7 +109,6 @@ const Util::EnumData<EffectType> LPETypeData[] = { {PATH_LENGTH, N_("Path length"), "path_length"}, {PERP_BISECTOR, N_("Perpendicular bisector"), "perp_bisector"}, {PERSPECTIVE_PATH, N_("Perspective path"), "perspective_path"}, - {COPY_ROTATE, N_("Rotate copies"), "copy_rotate"}, {RECURSIVE_SKELETON, N_("Recursive skeleton"), "recursive_skeleton"}, {TANGENT_TO_CURVE, N_("Tangent to curve"), "tangent_to_curve"}, {TEXT_LABEL, N_("Text label"), "text_label"}, @@ -145,6 +144,7 @@ const Util::EnumData<EffectType> LPETypeData[] = { {JOIN_TYPE, N_("Join type"), "join_type"}, {TAPER_STROKE, N_("Taper stroke"), "taper_stroke"}, {MIRROR_SYMMETRY, N_("Mirror symmetry"), "mirror_symmetry"}, + {COPY_ROTATE, N_("Rotate copies"), "copy_rotate"}, /* Ponyscape -> Inkscape 0.92*/ {ATTACH_PATH, N_("Attach path"), "attach_path"}, {FILL_BETWEEN_STROKES, N_("Fill between strokes"), "fill_between_strokes"}, @@ -467,6 +467,10 @@ void Effect::doBeforeEffect_impl(SPLPEItem const* lpeitem) pathvector_before_effect = sp_curve->get_pathvector(); } doBeforeEffect(lpeitem); + if (apply_to_clippath_and_mask && SP_IS_GROUP(sp_lpe_item)) { + sp_lpe_item->apply_to_clippath(sp_lpe_item); + sp_lpe_item->apply_to_mask(sp_lpe_item); + } } /** diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 8dfaf7525..f204f8608 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -5,7 +5,7 @@ * Authors: * Maximilian Albert <maximilian.albert@gmail.com> * Johan Engelen <j.b.c.engelen@alumnus.utwente.nl> - * + * Jabiertxo Arraiza Cenoz <jabier.arraiza@marker.es> * Copyright (C) Authors 2007-2012 * * Released under GNU GPL, read the file 'COPYING' for more information @@ -13,7 +13,8 @@ #include <glibmm/i18n.h> #include <gdk/gdk.h> - +#include <2geom/path-intersection.h> +#include <2geom/sbasis-to-bezier.h> #include "live_effects/lpe-copy_rotate.h" #include <2geom/path.h> #include <2geom/transforms.h> @@ -41,22 +42,39 @@ public: virtual Geom::Point knot_get() const; }; -class KnotHolderEntityOrigin : public LPEKnotHolderEntity { -public: - KnotHolderEntityOrigin(LPECopyRotate *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; -}; - } // namespace CR +int +pointSideOfLine(Geom::Point const &A, Geom::Point const &B, Geom::Point const &X) +{ + //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line + double pos = (B[Geom::X]-A[Geom::X])*(X[Geom::Y]-A[Geom::Y]) - (B[Geom::Y]-A[Geom::Y])*(X[Geom::X]-A[Geom::X]); + return (pos < 0) ? -1 : (pos > 0); +} + +bool +pointInTriangle(Geom::Point const &p, Geom::Point const &p1, Geom::Point const &p2, Geom::Point const &p3) +{ + //http://totologic.blogspot.com.es/2014/01/accurate-point-in-triangle-test.html + using Geom::X; + using Geom::Y; + double denominator = (p1[X]*(p2[Y] - p3[Y]) + p1[Y]*(p3[X] - p2[X]) + p2[X]*p3[Y] - p2[Y]*p3[X]); + double t1 = (p[X]*(p3[Y] - p1[Y]) + p[Y]*(p1[X] - p3[X]) - p1[X]*p3[Y] + p1[Y]*p3[X]) / denominator; + double t2 = (p[X]*(p2[Y] - p1[Y]) + p[Y]*(p1[X] - p2[X]) - p1[X]*p2[Y] + p1[Y]*p2[X]) / -denominator; + double s = t1 + t2; + + return 0 <= t1 && t1 <= 1 && 0 <= t2 && t2 <= 1 && s <= 1; +} + + LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : Effect(lpeobject), origin(_("Origin"), _("Origin of the rotation"), "origin", &wr, this, "Adjust the origin of the rotation"), starting_angle(_("Starting:"), _("Angle of the first copy"), "starting_angle", &wr, this, 0.0), rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 30.0), num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 5), - copiesTo360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copiesTo360", &wr, this, true), + copies_to_360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copies_to_360", &wr, this, true), + fuse_paths(_("Fuse paths"), _("Fuse paths by helper line"), "fuse_paths", &wr, this, false), dist_angle_handle(100.0) { show_orig_path = true; @@ -64,12 +82,13 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : apply_to_clippath_and_mask = true; // register all your parameters here, so Inkscape knows which parameters this effect has: - registerParameter(&copiesTo360); + registerParameter(&copies_to_360); + registerParameter(&fuse_paths); registerParameter(&starting_angle); registerParameter(&rotation_angle); registerParameter(&num_copies); registerParameter(&origin); - + num_copies.param_make_integer(true); num_copies.param_set_range(0, 1000); } @@ -93,15 +112,45 @@ LPECopyRotate::doOnApply(SPLPEItem const* lpeitem) dir = unit_vector(B - A); } +void +LPECopyRotate::transform_multiply(Geom::Affine const& postmul, bool set) +{ + if(fuse_paths) { + Geom::Coord angle = Geom::deg_from_rad(atan(-postmul[1]/postmul[0])); + angle += starting_angle; + starting_angle.param_set_value(angle); + } + // cycle through all parameters. Most parameters will not need transformation, but path and point params do. + + for (std::vector<Parameter *>::iterator it = param_vector.begin(); it != param_vector.end(); ++it) { + Parameter * param = *it; + param->param_transform_multiply(postmul, set); + } +} void LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) { using namespace Geom; original_bbox(lpeitem); - if(copiesTo360 ){ + if (copies_to_360) { rotation_angle.param_set_value(360.0/(double)num_copies); - } + } + if (fuse_paths && rotation_angle * num_copies > 360 && rotation_angle > 0) { + num_copies.param_set_value(floor(360/rotation_angle)); + } + if (fuse_paths && copies_to_360) { + num_copies.param_set_increments(2,2); + if ((int)num_copies%2 !=0) { + num_copies.param_set_value(num_copies+1); + } + } else { + num_copies.param_set_increments(1,1); + } + + if (dist_angle_handle < 1.0) { + dist_angle_handle = 1.0; + } A = Point(boundingbox_X.min(), boundingbox_Y.middle()); B = Point(boundingbox_X.middle(), boundingbox_Y.middle()); dir = unit_vector(B - A); @@ -109,27 +158,251 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) // likely due to SVG's choice of coordinate system orientation (max) start_pos = origin + dir * Rotate(-rad_from_deg(starting_angle)) * dist_angle_handle; rot_pos = origin + dir * Rotate(-rad_from_deg(rotation_angle+starting_angle)) * dist_angle_handle; - if(copiesTo360 ){ + if ( fuse_paths || copies_to_360 ) { rot_pos = origin; } + SPLPEItem * item = const_cast<SPLPEItem*>(lpeitem); + item->apply_to_clippath(item); + item->apply_to_mask(item); +} + +void +LPECopyRotate::split(Geom::PathVector &path_on, Geom::Path const ÷r) +{ + Geom::PathVector tmp_path; + double time_start = 0.0; + Geom::Path original = path_on[0]; + int position = 0; + Geom::Crossings cs = crossings(original,divider); + std::vector<double> crossed; + for(unsigned int i = 0; i < cs.size(); i++) { + crossed.push_back(cs[i].ta); + } + std::sort(crossed.begin(), crossed.end()); + for (unsigned int i = 0; i < crossed.size(); i++) { + double time_end = crossed[i]; + Geom::Path portion_original = original.portion(time_start,time_end); + if (!portion_original.empty()) { + Geom::Point side_checker = portion_original.pointAt(0.001); + position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), side_checker); + if (rotation_angle != 180) { + position = pointInTriangle(side_checker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); + } + if (position == 1) { + tmp_path.push_back(portion_original); + } + portion_original.clear(); + time_start = time_end; + } + } + position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), original.finalPoint()); + if (rotation_angle != 180) { + position = pointInTriangle(original.finalPoint(), divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); + } + if (cs.size() > 0 && position == 1) { + Geom::Path portion_original = original.portion(time_start, original.size()); + if(!portion_original.empty()){ + if (!original.closed()) { + tmp_path.push_back(portion_original); + } else { + if (tmp_path.size() > 0 && tmp_path[0].size() > 0 ) { + portion_original.setFinal(tmp_path[0].initialPoint()); + portion_original.append(tmp_path[0]); + tmp_path[0] = portion_original; + } else { + tmp_path.push_back(portion_original); + } + } + portion_original.clear(); + } + } + if (cs.size()==0 && position == 1) { + tmp_path.push_back(original); + } + path_on = tmp_path; } +void +LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double size_divider) +{ + split(path_on,divider); + Geom::PathVector tmp_path; + Geom::Affine pre = Geom::Translate(-origin); + for (Geom::PathVector::const_iterator path_it = path_on.begin(); path_it != path_on.end(); ++path_it) { + Geom::Path original = *path_it; + if (path_it->empty()) { + continue; + } + Geom::PathVector tmp_path_helper; + Geom::Path append_path = original; + + for (int i = 0; i < num_copies; ++i) { + Geom::Rotate rot(-Geom::rad_from_deg(rotation_angle * (i))); + Geom::Affine m = pre * rot * Geom::Translate(origin); + if (i%2 != 0) { + Geom::Point A = (Geom::Point)origin; + Geom::Point B = origin + dir * Geom::Rotate(-Geom::rad_from_deg((rotation_angle*i)+starting_angle)) * size_divider; + Geom::Affine m1(1.0, 0.0, 0.0, 1.0, A[0], A[1]); + double hyp = Geom::distance(A, B); + double c = (B[0] - A[0]) / hyp; // cos(alpha) + double s = (B[1] - A[1]) / hyp; // sin(alpha) + + Geom::Affine m2(c, -s, s, c, 0.0, 0.0); + Geom::Affine sca(1.0, 0.0, 0.0, -1.0, 0.0, 0.0); + + Geom::Affine tmp_m = m1.inverse() * m2; + m = tmp_m; + m = m * sca; + m = m * m2.inverse(); + m = m * m1; + } else { + append_path = original; + } + append_path *= m; + if (tmp_path_helper.size() > 0) { + if (Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(), append_path.finalPoint())) { + Geom::Path tmp_append = append_path.reversed(); + tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); + } else if (Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(), append_path.initialPoint())) { + Geom::Path tmp_append = append_path; + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); + tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); + } else if (Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(), append_path.initialPoint())) { + Geom::Path tmp_append = append_path; + tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); + } else if (Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(), append_path.finalPoint())) { + Geom::Path tmp_append = append_path.reversed(); + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); + tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); + } else if (Geom::are_near(tmp_path_helper[0].finalPoint(), append_path.finalPoint())) { + Geom::Path tmp_append = append_path.reversed(); + tmp_append.setInitial(tmp_path_helper[0].finalPoint()); + tmp_path_helper[0].append(tmp_append); + } else if (Geom::are_near(tmp_path_helper[0].initialPoint(), append_path.initialPoint())) { + Geom::Path tmp_append = append_path; + tmp_path_helper[0] = tmp_path_helper[0].reversed(); + tmp_append.setInitial(tmp_path_helper[0].finalPoint()); + tmp_path_helper[0].append(tmp_append); + tmp_path_helper[0] = tmp_path_helper[0].reversed(); + } else { + tmp_path_helper.push_back(append_path); + } + if ( Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),tmp_path_helper[tmp_path_helper.size()-1].initialPoint())) { + tmp_path_helper[tmp_path_helper.size()-1].close(); + } + } else { + tmp_path_helper.push_back(append_path); + } + } + if (tmp_path_helper.size() > 0) { + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1]; + tmp_path_helper[0] = tmp_path_helper[0]; + if (rotation_angle * num_copies != 360) { + Geom::Ray base_a(divider.pointAt(1),divider.pointAt(0)); + double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + double size_divider = Geom::distance(origin,bbox) + (diagonal * 2); + Geom::Point base_point = origin + dir * Geom::Rotate(-Geom::rad_from_deg((rotation_angle * num_copies) + starting_angle)) * size_divider; + Geom::Ray base_b(divider.pointAt(1), base_point); + if (Geom::are_near(tmp_path_helper[0].initialPoint(),base_a) && + Geom::are_near(tmp_path_helper[0].finalPoint(),base_a)) + { + tmp_path_helper[0].close(); + if (tmp_path_helper.size() > 1) { + tmp_path_helper[tmp_path_helper.size()-1].close(); + } + } else if (Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(),base_b) && + Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),base_b)) + { + tmp_path_helper[0].close(); + if (tmp_path_helper.size() > 1) { + tmp_path_helper[tmp_path_helper.size()-1].close(); + } + } else if ((Geom::are_near(tmp_path_helper[0].initialPoint(),base_a) && + Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),base_b)) || + (Geom::are_near(tmp_path_helper[0].initialPoint(),base_b) && + Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),base_a))) + { + Geom::Path close_path = Geom::Path(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + close_path.appendNew<Geom::LineSegment>((Geom::Point)origin); + close_path.appendNew<Geom::LineSegment>(tmp_path_helper[0].initialPoint()); + tmp_path_helper[0].append(close_path); + } + } + + if (Geom::are_near(tmp_path_helper[0].finalPoint(),tmp_path_helper[0].initialPoint())) { + tmp_path_helper[0].close(); + } + } + tmp_path.insert(tmp_path.end(), tmp_path_helper.begin(), tmp_path_helper.end()); + tmp_path_helper.clear(); + } + path_on = tmp_path; + tmp_path.clear(); +} Geom::Piecewise<Geom::D2<Geom::SBasis> > LPECopyRotate::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) { using namespace Geom; - if(num_copies == 1){ + if (num_copies == 1 && !fuse_paths) { return pwd2_in; } + double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + double size_divider = Geom::distance(origin,bbox) + (diagonal * 2); + Geom::Point line_start = origin + dir * Rotate(-rad_from_deg(starting_angle)) * size_divider; + Geom::Point line_end = origin + dir * Rotate(-rad_from_deg(rotation_angle + starting_angle)) * size_divider; + //Note:: beter way to do this + //Whith AppendNew have problems whith the crossing order + Geom::Path divider = Geom::Path(line_start); + divider.appendNew<Geom::LineSegment>((Geom::Point)origin); + divider.appendNew<Geom::LineSegment>(line_end); Piecewise<D2<SBasis> > output; Affine pre = Translate(-origin) * Rotate(-rad_from_deg(starting_angle)); - for (int i = 0; i < num_copies; ++i) { - Rotate rot(-rad_from_deg(rotation_angle * i)); - Affine t = pre * rot * Translate(origin); - output.concat(pwd2_in * t); + if (fuse_paths) { + Geom::PathVector path_out; + Geom::PathVector tmp_path; + PathVector const original_pathv = path_from_piecewise(remove_short_cuts(pwd2_in, 0.1), 0.001); + for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { + if (path_it->empty()) { + continue; + } + bool end_open = false; + if (path_it->closed()) { + const Geom::Curve &closingline = path_it->back_closed(); + if (!are_near(closingline.initialPoint(), closingline.finalPoint())) { + end_open = true; + } + } + Geom::Path original = (Geom::Path)(*path_it); + if (end_open && path_it->closed()) { + original.close(false); + original.appendNew<Geom::LineSegment>( original.initialPoint() ); + original.close(true); + } + tmp_path.push_back(original); + setFusion(tmp_path, divider, size_divider); + path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); + tmp_path.clear(); + } + if (path_out.size()>0) { + output = paths_to_pw(path_out); + } + } else { + for (int i = 0; i < num_copies; ++i) { + Rotate rot(-rad_from_deg(rotation_angle * i)); + Affine t = pre * rot * Translate(origin); + output.concat(pwd2_in * t); + } } return output; } @@ -148,8 +421,16 @@ LPECopyRotate::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geo hp_vec.push_back(pathv); } +void +LPECopyRotate::resetDefaults(SPItem const* item) +{ + Effect::resetDefaults(item); + original_bbox(SP_LPE_ITEM(item)); +} -void LPECopyRotate::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { +void +LPECopyRotate::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) +{ { KnotHolderEntity *e = new CR::KnotHolderEntityStartingAngle(this); e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, @@ -162,13 +443,6 @@ void LPECopyRotate::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *des _("Adjust the rotation angle")); knotholder->add(e); } -} - -void -LPECopyRotate::resetDefaults(SPItem const* item) -{ - Effect::resetDefaults(item); - original_bbox(SP_LPE_ITEM(item)); }; namespace CR { diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index 9392026a7..87af867df 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -22,24 +22,22 @@ namespace Inkscape { namespace LivePathEffect { namespace CR { - // we need a separate namespace to avoid clashes with LPEPerpBisector - class KnotHolderEntityStartingAngle; - class KnotHolderEntityRotationAngle; +// we need a separate namespace to avoid clashes with LPEPerpBisector +class KnotHolderEntityStartingAngle; +class KnotHolderEntityRotationAngle; } class LPECopyRotate : public Effect, GroupBBoxEffect { public: LPECopyRotate(LivePathEffectObject *lpeobject); virtual ~LPECopyRotate(); - virtual void doOnApply (SPLPEItem const* lpeitem); - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - + virtual void setFusion(Geom::PathVector &path_in, Geom::Path divider, double sizeDivider); + virtual void split(Geom::PathVector &path_in, Geom::Path const ÷r); virtual void resetDefaults(SPItem const* item); - + virtual void transform_multiply(Geom::Affine const& postmul, bool set); /* the knotholder entity classes must be declared friends */ friend class CR::KnotHolderEntityStartingAngle; friend class CR::KnotHolderEntityRotationAngle; @@ -53,16 +51,14 @@ private: ScalarParam starting_angle; ScalarParam rotation_angle; ScalarParam num_copies; - BoolParam copiesTo360; - + BoolParam copies_to_360; + BoolParam fuse_paths; Geom::Point A; Geom::Point B; Geom::Point dir; - Geom::Point start_pos; Geom::Point rot_pos; double dist_angle_handle; - LPECopyRotate(const LPECopyRotate&); LPECopyRotate& operator=(const LPECopyRotate&); }; diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index e0369e662..7ea1d465c 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -294,7 +294,12 @@ void PathParam::set_new_value (Geom::PathVector const &newpath, bool write_to_svg) { remove_link(); - _pathvector = newpath; + if (newpath.empty()) { + param_set_and_write_default(); + return; + } else { + _pathvector = newpath; + } must_recalculate_pwd2 = true; if (write_to_svg) { diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp index e2afbb55b..fdc2949d5 100644 --- a/src/sp-lpe-item.cpp +++ b/src/sp-lpe-item.cpp @@ -209,7 +209,7 @@ Inkscape::XML::Node* SPLPEItem::write(Inkscape::XML::Document *xml_doc, Inkscape /** * returns true when LPE was successful. */ -bool SPLPEItem::performPathEffect(SPCurve *curve, bool clip_paths) { +bool SPLPEItem::performPathEffect(SPCurve *curve, bool is_clip_or_mask) { if (!this) { return false; } @@ -217,7 +217,6 @@ bool SPLPEItem::performPathEffect(SPCurve *curve, bool clip_paths) { if (!curve) { return false; } - bool apply_to_clippath_and_mask = false; if (this->hasPathEffect() && this->pathEffectsEnabled()) { for (PathEffectList::iterator it = this->path_effect_list->begin(); it != this->path_effect_list->end(); ++it) { @@ -237,17 +236,13 @@ bool SPLPEItem::performPathEffect(SPCurve *curve, bool clip_paths) { g_warning("SPLPEItem::performPathEffect - lpeobj with invalid lpe in the stack!"); return false; } - if (lpe->isVisible()) { - if(lpe->apply_to_clippath_and_mask){ - apply_to_clippath_and_mask = true; - } if (lpe->acceptsNumClicks() > 0 && !lpe->isReady()) { // if the effect expects mouse input before being applied and the input is not finished // yet, we don't alter the path return false; } - if (clip_paths || lpe->apply_to_clippath_and_mask) { + if (!is_clip_or_mask || (is_clip_or_mask && lpe->apply_to_clippath_and_mask)) { // Groups have their doBeforeEffect called elsewhere if (!SP_IS_GROUP(this)) { lpe->doBeforeEffect_impl(this); @@ -270,10 +265,10 @@ bool SPLPEItem::performPathEffect(SPCurve *curve, bool clip_paths) { } } } - } - if(apply_to_clippath_and_mask && clip_paths){ - this->apply_to_clippath((SPItem *)this); - this->apply_to_mask((SPItem *)this); + if(!SP_IS_GROUP(this) && !is_clip_or_mask){ + this->apply_to_clippath(this); + this->apply_to_mask(this); + } } return true; } @@ -698,10 +693,10 @@ SPLPEItem::apply_to_clip_or_mask(SPItem *clip_mask, SPItem *item) try { if(SP_IS_GROUP(this)){ c->transform(i2anc_affine(SP_GROUP(item), SP_GROUP(this))); - success = this->performPathEffect(c, false); + success = this->performPathEffect(c, true); c->transform(i2anc_affine(SP_GROUP(item), SP_GROUP(this)).inverse()); } else { - success = this->performPathEffect(c, false); + success = this->performPathEffect(c, true); } } catch (std::exception & e) { g_warning("Exception during LPE execution. \n %s", e.what()); diff --git a/src/sp-lpe-item.h b/src/sp-lpe-item.h index d5e868b2e..9e5cb3329 100644 --- a/src/sp-lpe-item.h +++ b/src/sp-lpe-item.h @@ -69,7 +69,7 @@ public: virtual void update_patheffect(bool write); - bool performPathEffect(SPCurve *curve, bool clip_paths = true); + bool performPathEffect(SPCurve *curve, bool is_clip_or_mask = false); bool pathEffectsEnabled() const; bool hasPathEffect() const; diff --git a/src/sp-text.cpp b/src/sp-text.cpp index 4a5b1b1d6..7d4348d19 100644 --- a/src/sp-text.cpp +++ b/src/sp-text.cpp @@ -819,8 +819,8 @@ void TextTagAttributes::setFirstXY(Geom::Point &point) attributes.x.resize(1, zero_length); if (attributes.y.empty()) attributes.y.resize(1, zero_length); - attributes.x[0].computed = point[Geom::X]; - attributes.y[0].computed = point[Geom::Y]; + attributes.x[0] = point[Geom::X]; + attributes.y[0] = point[Geom::Y]; } void TextTagAttributes::mergeInto(Inkscape::Text::Layout::OptionalTextTagAttrs *output, Inkscape::Text::Layout::OptionalTextTagAttrs const &parent_attrs, unsigned parent_attrs_offset, bool copy_xy, bool copy_dxdyrotate) const diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index f4790c317..3b25439f3 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -1492,7 +1492,6 @@ void PathManipulator::_getGeometry() void PathManipulator::_setGeometry() { using namespace Inkscape::LivePathEffect; - if (empty()) return; if (!_lpe_key.empty()) { // copied from nodepath.cpp @@ -1505,6 +1504,7 @@ void PathManipulator::_setGeometry() LIVEPATHEFFECT(_path)->requestModified(SP_OBJECT_MODIFIED_FLAG); } } else { + if (empty()) return; //XML Tree being used here directly while it shouldn't be. if (_path->getRepr()->attribute("inkscape:original-d")) _path->set_original_curve(_spcurve, false, false); diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index c49f0bc05..60e932338 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -1106,9 +1106,11 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ lh_unit = unit_table.getUnit("%"); height = query.line_height.value * 100; } else { - lh_unit = tracker->getActiveUnit(); - // Can get unit like this: unit_table.getUnit(query.line_height.unit); - height = Inkscape::Util::Quantity::convert(query.line_height.computed, "px", lh_unit); + //Unit const *active = tracker->getActiveUnit(); + // This allows us to show the unit stored to the user, but right now + // it's always px (because Tav said other units are broken/2016) + lh_unit = unit_table.getUnit(query.line_height.unit); + height = query.line_height.computed; } // Set before value is set |
