[Libreoffice-commits] core.git: extras/source
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Thu Apr 9 19:51:58 UTC 2020
extras/source/palettes/standard.soe | 63 ++++++++++++++++++++----------------
1 file changed, 35 insertions(+), 28 deletions(-)
New commits:
commit 22a1557314ffa7c8ae57ebe5d0056893ed1103a8
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Thu Apr 9 13:14:23 2020 +0200
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Thu Apr 9 21:51:24 2020 +0200
tdf#126648 Update Arrow Style sorting after size and fill options
Change-Id: I977099f4e8cb23b5d2695ec48a5ffd43b60d260e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91966
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/extras/source/palettes/standard.soe b/extras/source/palettes/standard.soe
index 7e20a7aab8de..ff20d2bee71e 100644
--- a/extras/source/palettes/standard.soe
+++ b/extras/source/palettes/standard.soe
@@ -1,32 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<office:marker-table xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script">
- <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="M10 0l-10 30h20z" />
- <draw:marker draw:name="Square" svg:viewBox="0 0 10 10" svg:d="M0 0h10v10h-10z" />
- <draw:marker draw:name="Small Arrow" svg:viewBox="0 0 1321 3493" svg:d="M1321 3493h-1321l661-3493z" />
- <draw:marker draw:name="Dimension Lines" svg:viewBox="0 0 836 110" svg:d="M0 0h278 278 280v36 36 38h-278-278-280v-36-36z" />
- <draw:marker draw:name="Double Arrow" svg:viewBox="0 0 1131 1918" svg:d="M737 1131h394l-564-1131-567 1131h398l-398 787h1131z" />
- <draw:marker draw:name="Rounded short Arrow" svg:viewBox="0 0 1013 1130" svg:d="M1009 1050l-449-1008-22-30-29-12-34 12-21 26-449 1012-5 13v8l5 21 12 21 17 13 21 4h903l21-4 21-13 9-21 4-21v-8z" />
- <draw:marker draw:name="Symmetric Arrow" svg:viewBox="0 0 1131 902" svg:d="M564 0l-564 902h1131z" />
- <draw:marker draw:name="Line Arrow" svg:viewBox="0 0 1122 2243" svg:d="M0 2108v17 17l12 42 30 34 38 21 43 4 29-8 30-21 25-26 13-34 343-1532 339 1520 13 42 29 34 39 21 42 4 42-12 34-30 21-42v-39-12l-4 4-440-1998-9-42-25-39-38-25-43-8-42 8-38 25-26 39-8 42z" />
- <draw:marker draw:name="Rounded large Arrow" svg:viewBox="0 0 1131 2256" svg:d="M1127 2120l-449-2006-9-42-25-39-38-25-38-8-43 8-38 25-25 39-9 42-449 2006v13l-4 9 9 42 25 38 38 25 42 9h903l42-9 38-25 26-38 8-42v-9z" />
- <draw:marker draw:name="Circle" svg:viewBox="0 0 1131 1131" svg:d="M462 1118l-102-29-102-51-93-72-72-93-51-102-29-102-13-105 13-102 29-106 51-102 72-89 93-72 102-50 102-34 106-9 101 9 106 34 98 50 93 72 72 89 51 102 29 106 13 102-13 105-29 102-51 102-72 93-93 72-98 51-106 29-101 13z" />
- <draw:marker draw:name="Square 45" svg:viewBox="0 0 1131 1131" svg:d="M0 564l564 567 567-567-567-564z" />
- <draw:marker draw:name="Arrow concave" svg:viewBox="0 0 1131 1580" svg:d="M1013 1491l118 89-567-1580-564 1580 114-85 136-68 148-46 161-17 161 13 153 46z"></draw:marker>
- <draw:marker draw:name="Short line Arrow" svg:viewBox="0 0 3000 3000" svg:d="M1500 0l1500 2789v211h-114l-1286-2392v2392h-200v-2392l-1286 2392h-114v-211z"></draw:marker>
- <draw:marker draw:name="Triangle unfilled" svg:viewBox="0 0 3000 3000" svg:d="M1500 0l1500 3000h-3000zM1500 447l-1176 2353h2353z"></draw:marker>
- <draw:marker draw:name="Diamond unfilled" svg:viewBox="0 0 3000 6000" svg:d="M1500 0l1500 3000-1500 3000-1500-3000zM1500 447l-1276 2553 1276 2553 1276-2553z"></draw:marker>
- <draw:marker draw:name="Diamond" svg:viewBox="0 0 3000 6000" svg:d="M1500 0l1500 3000-1500 3000-1500-3000z"></draw:marker>
- <draw:marker draw:name="Circle unfilled" svg:viewBox="0 0 3000 3000" svg:d="M1500 3000c-276 0-511-63-750-201s-411-310-549-549-201-474-201-750 63-511 201-750 310-411 549-549 474-201 750-201 511 63 750 201 411 310 549 549 201 474 201 750-63 511-201 750-310 411-549 549-474 201-750 201zM1500 2800c-239 0-443-55-650-174s-356-269-476-476-174-411-174-650 55-443 174-650 269-356 476-476c207-119 411-174 650-174s443 55 650 174c207 120 356 269 476 476s174 411 174 650-55 443-174 650-269 356-476 476c-207 119-411 174-650 174z"></draw:marker>
- <draw:marker draw:name="Square 45 unfilled" svg:viewBox="0 0 3000 3000" svg:d="M1500 3000l-1500-1500 1500-1500 1500 1500zM1500 2715l-1215-1215 1215-1215 1215 1215z"></draw:marker>
- <draw:marker draw:name="Square unfilled" svg:viewBox="0 0 300 300" svg:d="M0 0h300v300h-300zM20 20h260v260h-260z"></draw:marker>
+ <draw:marker draw:name="Arrow short" svg:viewBox="0 0 20 20" svg:d="M 0,20 10,7 20,20 Z" />
+ <draw:marker draw:name="Concave short" svg:viewBox="0 0 1131 1580" svg:d="M 565.5 826.01953 L 0 1580 L 114 1495 L 250 1427 L 398 1381 L 559 1364 L 720 1377 L 873 1423 L 1013 1491 L 1131 1580 L 565.5 826.01953 z" />
+ <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 20" svg:d="M 0,20 10,0 20,20 Z" />
+ <draw:marker draw:name="Triangle" svg:viewBox="0 0 1013 1130" svg:d="M1009 1050l-449-1008-22-30-29-12-34 12-21 26-449 1012-5 13v8l5 21 12 21 17 13 21 4h903l21-4 21-13 9-21 4-21v-8z" />
+ <draw:marker draw:name="Concave" svg:viewBox="0 0 1131 1580" svg:d="M1013 1491l118 89-567-1580-564 1580 114-85 136-68 148-46 161-17 161 13 153 46z" />
+ <draw:marker draw:name="Arrow large" svg:viewBox="0 0 20 20" svg:d="M 0,40 10,0 20,40 Z" />
+ <draw:marker draw:name="Circle" svg:viewBox="0 0 1131 1131" svg:d="M462 1118l-102-29-102-51-93-72-72-93-51-102-29-102-13-105 13-102 29-106 51-102 72-89 93-72 102-50 102-34 106-9 101 9 106 34 98 50 93 72 72 89 51 102 29 106 13 102-13 105-29 102-51 102-72 93-93 72-98 51-106 29-101 13z" />
+ <draw:marker draw:name="Square" svg:viewBox="0 0 10 10" svg:d="M0 0h10v10h-10z" />
+ <draw:marker draw:name="Square 45" svg:viewBox="0 0 1131 1131" svg:d="M0 564l564 567 567-567-567-564z" />
+ <draw:marker draw:name="Diamond" svg:viewBox="0 0 3000 6000" svg:d="M1500 0l1500 3000-1500 3000-1500-3000z" />
+ <draw:marker draw:name="Half Circle" svg:viewBox="0 0 15000 8746" svg:d="M 29 600 L 0 1253 L 244 3196 L 1005 5000 L 2188 6560 L 3750 7742 L 5556 8502 L 7450 8746 L 9444 8502 L 11250 7742 L 12812 6560 L 13995 5000 L 14756 3196 L 15000 1253 L 14971 600 L 29 600 z" />
+
+ <draw:marker draw:name="Dimension Lines" svg:viewBox="0 0 836 110" svg:d="M0 0h278 278 280v36 36 38h-278-278-280v-36-36z" />
+ <draw:marker draw:name="Dimension Line Arrow" svg:viewBox="0 0 836 110" svg:d="M 0 0 L 0 110 L 418 110 L 836 110 L 836 0 L 0 0 z M 418 110 L 0 946 L 836 946 L 418 110 z" />
+ <draw:marker draw:name="Dimension Line" svg:viewBox="0 0 836 110" svg:d="M 0 0 L 0 110 L 418 110 L 413.51953 110.74609 L 408.66602 111.86719 L 402.69141 114.48047 L 397.46484 117.8418 L 392.98438 121.57422 L 388.87695 126.42969 L 12.921875 639.08008 L 7.28125 649.53516 L 4.6679688 659.24414 L 4.2929688 665.2168 L 5.4140625 674.55273 L 8.7753906 683.88672 L 13.255859 690.98047 L 17.361328 695.46094 L 21.84375 699.19531 L 28.9375 703.30273 L 36.404297 705.91602 L 46.486328 707.41016 L 55.447266 706.66211 L 65.154297 703.67578 L 74.115234 698.07422 L 81.957031 689.48633 L 422.48047 224.62891 L 763.00391 689.48633 L 767.85742 695.46094 L 772.33789 699.19531 L 778.3125 702.55469 L 783.91406 704.79492 L 791.00781 706.66211 L 798.10156 707.03711 L 802.95508 706.66211 L 811.16992 704.79492 L 816.39844 702.92969 L 823.11914 698.82227 L 829.0918 693.59375 L 833.19922 688.36719 L 837.30664 680.52539 L 839.54688 672.68555 L 840.29297 664.09766 L 839.91992 657.75 L 838.42773 651.40234 L 835.
8125 645.42773 L 831.70703 639.08008 L 456.45898 126.80273 L 452.72461 122.32227 L 449.36328 119.33398 L 445.25586 116.34766 L 439.2832 113.36133 L 433.30859 111.49414 L 428.08203 110.37305 L 426.40234 110 L 836 110 L 836 0 L 0 0 z" />
+
+ <draw:marker draw:name="Line short" svg:viewBox="0 0 2243 2243" svg:d="m 1126,641 -18,1 -12,2 -13,3 -16,7 -14,9 -12,10 -11,13 L 23.11,2059 8,2087 1,2113 0,2129 l 3,25 9,25 12,19 11,12 12,10 19,11 20,7 27,4 24,-2 26,-8 24,-15 21,-23 912,-1245 912,1245 13,16 12,10 16,9 15,6 19,5 19,1 13,-1 22,-5 14,-5 18,-11 16,-14 c 0,0 11,-14 11,-14 l 11,-21 6,-21 2,-23 -1,-17 -4,-17 -7,-16 -11,-17 -1005,-1372 -10,-12 -9,-8 -11,-8 -16,-8 -16,-5 -14,-3 z" />
+ <draw:marker draw:name="Line" svg:viewBox="0 0 2243 2243" svg:d="M 1125,0 1080,9 1042,34 1021,64 12,2074 1,2108 0,2142 l 12,41 27,32 23,15 23,9 26,4 37,-5 31,-15 23,-21 15,-23 905,-1804 899,1804 10,17 c 0,0 12,14 12,14 l 15,13 15,9 21,8 30,4 20,-2 15,-4 17,-7 16,-10 12,-10 13,-15 12,-21 7,-22 3,-27 -2,-20 -11,-30 L 1228,64 1204,31 1168,8 Z" />
+ <draw:marker draw:name="Triangle unfilled" svg:viewBox="0 0 3000 3000" svg:d="M1500 0l1500 3000h-3000zM1500 447l-1176 2353h2353z" />
+ <draw:marker draw:name="Diamond unfilled" svg:viewBox="0 0 3000 6000" svg:d="M1500 0l1500 3000-1500 3000-1500-3000zM1500 447l-1276 2553 1276 2553 1276-2553z" />
+ <draw:marker draw:name="Circle unfilled" svg:viewBox="0 0 3000 3000" svg:d="M1500 3000c-276 0-511-63-750-201s-411-310-549-549-201-474-201-750 63-511 201-750 310-411 549-549 474-201 750-201 511 63 750 201 411 310 549 549 201 474 201 750-63 511-201 750-310 411-549 549-474 201-750 201zM1500 2800c-239 0-443-55-650-174s-356-269-476-476-174-411-174-650 55-443 174-650 269-356 476-476c207-119 411-174 650-174s443 55 650 174c207 120 356 269 476 476s174 411 174 650-55 443-174 650-269 356-476 476c-207 119-411 174-650 174z" />
+ <draw:marker draw:name="Square 45 unfilled" svg:viewBox="0 0 3000 3000" svg:d="M1500 3000l-1500-1500 1500-1500 1500 1500zM1500 2715l-1215-1215 1215-1215 1215 1215z" />
+ <draw:marker draw:name="Square unfilled" svg:viewBox="0 0 300 300" svg:d="M0 0h300v300h-300zM20 20h260v260h-260z" />
<draw:marker draw:name="Half Circle unfilled" svg:viewBox="0 0 15000 8746" svg:d="M14971 0c21 229 29 423 29 653 0 690-79 1328-244 1943-165 614-416 1206-761 1804-345 597-733 1110-1183 1560-451 450-964 837-1562 1182s-1190 596-1806 760c-600 161-1223 240-1894 244v600h-100v-600c-671-4-1294-83-1894-244-616-164-1208-415-1806-760s-1111-732-1562-1182c-450-450-838-963-1183-1560-345-598-596-1190-761-1804-165-615-244-1253-244-1943 0-230 8-424 29-653l298 26 299 26c-18 211-26 390-26 601 0 635 72 1222 224 1787 151 566 383 1110 700 1659 318 550 674 1022 1088 1437 415 414 888 769 1438 1087 550 317 1095 548 1661 700 566 151 1154 223 1789 223s1223-72 1789-223c566-152 1111-383 1661-700 550-318 1023-673 1438-1087 414-415 770-887 1088-1437 317-549 549-1093 700-1659 152-565 224-1152 224-1787 0-211-8-390-26-601l299-26z" />
- <draw:marker draw:name="Half Arrow Left" svg:viewBox="0 0 10 10" svg:d="M0 0m-5 0 l-5 15h5z" />
- <draw:marker draw:name="Half Arrow Right" svg:viewBox="0 0 10 10" svg:d="M0 0m5 0 l5 15h-5z" />
- <draw:marker draw:name="CF One" svg:viewBox="0 0 10 10" svg:d="M0 0 h1 v-40 h-2 v40 h1 M1 0 h-20 v-2 h20 v2 M-1 0 h20 v-2 h-20 v2z" />
- <draw:marker draw:name="CF Only One" svg:viewBox="0 0 10 10" svg:d="M0 0 h1 v-40 h-2 v40 h1 M1 0 h-20 v-2 h20 v2 M-1 0 h20 v-2 h-20 v2 M1 -18 h-20 v-2 h20 v2 M-1 -18 h20 v-2 h-20 v2z" />
- <draw:marker draw:name="CF Many" svg:viewBox="0 0 10 10" svg:d="M1500 0l1500 -2789v-211h-114l-1286 2392v-2392h-200v2392l-1286 -2392h-114v211z" />
- <draw:marker draw:name="CF Many One" svg:viewBox="0 0 10 10" svg:d="M1500 0 h1500 v-200 h-3000 v200 M1500 -200l1500 -2789v-211h-114l-1286 2392v-2392h-200v2392l-1286 -2392h-114v211z" />
- <draw:marker draw:name="CF Zero One" svg:viewBox="0 0 10 10" svg:d="M-1500 0 A1500,1500 0 1 1 -1500,1 M-1350 0 A1350,1350 0 1 1 -1350,1 M0 -1500 h100 v-2800 h-200 v2800 h100 M100 -2900 v100 h1500 v-200 h-1500 v100z M-100 -2900 v100 h-1500 v-200 h1500 v100z" />
- <draw:marker draw:name="CF Zero Many" svg:viewBox="0 0 10 10" svg:d="M-1500 0 A1500,1500 0 1 1 -1500,1 M-1350 0 A1350,1350 0 1 1 -1350,1 M0 -1500l1500 -2789v-211h-114l-1286 2392v-2392h-200v2392l-1286 -2392h-114v211z" />
- <draw:marker draw:name="Reversed Arrow" svg:viewBox="0 0 20 30" svg:d="M10 30l-10 -30h20z" /><draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="m10 0-10 30h20z" />
+
+ <draw:marker draw:name="Half Arrow left" svg:viewBox="0 0 10 10" svg:d="M0 0m-5 0 l-5 15h5z" />
+ <draw:marker draw:name="Half Arrow right" svg:viewBox="0 0 10 10" svg:d="M0 0m5 0 l5 15h-5z" />
+ <draw:marker draw:name="Reversed Arrow" svg:viewBox="0 0 20 30" svg:d="M10 30l-10 -30h20z" />
+ <draw:marker draw:name="Double Arrow" svg:viewBox="0 0 1131 1918" svg:d="M737 1131h394l-564-1131-567 1131h398l-398 787h1131z" />
+
+ <draw:marker draw:name="CF One" svg:viewBox="0 0 10 10" svg:d="M0 0 h1 v-40 h-2 v40 h1 M1 0 h-20 v-2 h20 v2 M-1 0 h20 v-2 h-20 v2z" />
+ <draw:marker draw:name="CF Only One" svg:viewBox="0 0 10 10" svg:d="M0 0 h1 v-40 h-2 v40 h1 M1 0 h-20 v-2 h20 v2 M-1 0 h20 v-2 h-20 v2 M1 -18 h-20 v-2 h20 v2 M-1 -18 h20 v-2 h-20 v2z" />
+ <draw:marker draw:name="CF Many" svg:viewBox="0 0 10 10" svg:d="M1500 0l1500 -2789v-211h-114l-1286 2392v-2392h-200v2392l-1286 -2392h-114v211z" />
+ <draw:marker draw:name="CF Many One" svg:viewBox="0 0 10 10" svg:d="M1500 0 h1500 v-200 h-3000 v200 M1500 -200l1500 -2789v-211h-114l-1286 2392v-2392h-200v2392l-1286 -2392h-114v211z" />
+ <draw:marker draw:name="CF Zero One" svg:viewBox="0 0 10 10" svg:d="M-1500 0 A1500,1500 0 1 1 -1500,1 M-1350 0 A1350,1350 0 1 1 -1350,1 M0 -1500 h100 v-2800 h-200 v2800 h100 M100 -2900 v100 h1500 v-200 h-1500 v100z M-100 -2900 v100 h-1500 v-200 h1500 v100z" />
+ <draw:marker draw:name="CF Zero Many" svg:viewBox="0 0 10 10" svg:d="M-1500 0 A1500,1500 0 1 1 -1500,1 M-1350 0 A1350,1350 0 1 1 -1350,1 M0 -1500l1500 -2789v-211h-114l-1286 2392v-2392h-200v2392l-1286 -2392h-114v211z" />
</office:marker-table>
More information about the Libreoffice-commits
mailing list