[Libreoffice-commits] online.git: 8 commits - loleaflet/css loleaflet/images loleaflet/js

Pranav Kant pranavk at collabora.co.uk
Fri May 25 11:05:11 UTC 2018


 loleaflet/css/toolbar.css                                               |  112 +++++
 loleaflet/images/lc_arrowshapes.chevron.svg                             |    6 
 loleaflet/images/lc_arrowshapes.circular-arrow.svg                      |    6 
 loleaflet/images/lc_arrowshapes.corner-right-arrow.svg                  |    6 
 loleaflet/images/lc_arrowshapes.down-arrow-callout.svg                  |    6 
 loleaflet/images/lc_arrowshapes.down-arrow.svg                          |    6 
 loleaflet/images/lc_arrowshapes.left-arrow-callout.svg                  |    6 
 loleaflet/images/lc_arrowshapes.left-arrow.svg                          |    6 
 loleaflet/images/lc_arrowshapes.left-right-arrow-callout.svg            |    6 
 loleaflet/images/lc_arrowshapes.notched-right-arrow.svg                 |    6 
 loleaflet/images/lc_arrowshapes.pentagon-right.svg                      |    6 
 loleaflet/images/lc_arrowshapes.quad-arrow-callout.svg                  |    6 
 loleaflet/images/lc_arrowshapes.quad-arrow.svg                          |    6 
 loleaflet/images/lc_arrowshapes.right-arrow-callout.svg                 |    6 
 loleaflet/images/lc_arrowshapes.right-arrow.svg                         |    6 
 loleaflet/images/lc_arrowshapes.s-sharped-arrow.svg                     |    6 
 loleaflet/images/lc_arrowshapes.split-arrow.svg                         |    6 
 loleaflet/images/lc_arrowshapes.split-round-arrow.svg                   |    6 
 loleaflet/images/lc_arrowshapes.striped-right-arrow.svg                 |    6 
 loleaflet/images/lc_arrowshapes.svg                                     |    6 
 loleaflet/images/lc_arrowshapes.up-arrow-callout.svg                    |    6 
 loleaflet/images/lc_arrowshapes.up-arrow.svg                            |    6 
 loleaflet/images/lc_arrowshapes.up-down-arrow-callout.svg               |    6 
 loleaflet/images/lc_arrowshapes.up-down-arrow.svg                       |    6 
 loleaflet/images/lc_arrowshapes.up-right-arrow-callout.svg              |    6 
 loleaflet/images/lc_arrowshapes.up-right-arrow.svg                      |    6 
 loleaflet/images/lc_arrowshapes.up-right-down-arrow.svg                 |    6 
 loleaflet/images/lc_basicshapes.block-arc.svg                           |    7 
 loleaflet/images/lc_basicshapes.can.svg                                 |    7 
 loleaflet/images/lc_basicshapes.cross.svg                               |    7 
 loleaflet/images/lc_basicshapes.cube.svg                                |    7 
 loleaflet/images/lc_basicshapes.diamond.svg                             |    7 
 loleaflet/images/lc_basicshapes.hexagon.svg                             |    7 
 loleaflet/images/lc_basicshapes.isosceles-triangle.svg                  |    7 
 loleaflet/images/lc_basicshapes.octagon.svg                             |    7 
 loleaflet/images/lc_basicshapes.paper.svg                               |   11 
 loleaflet/images/lc_basicshapes.pentagon.svg                            |    7 
 loleaflet/images/lc_basicshapes.right-triangle.svg                      |    7 
 loleaflet/images/lc_basicshapes.ring.svg                                |    7 
 loleaflet/images/lc_basicshapes.round-quadrat.svg                       |    7 
 loleaflet/images/lc_basicshapes.trapezoid.svg                           |    7 
 loleaflet/images/lc_calloutshapes.cloud-callout.svg                     |    6 
 loleaflet/images/lc_calloutshapes.line-callout-1.svg                    |    6 
 loleaflet/images/lc_calloutshapes.line-callout-2.svg                    |    6 
 loleaflet/images/lc_calloutshapes.line-callout-3.svg                    |    6 
 loleaflet/images/lc_calloutshapes.rectangular-callout.svg               |    6 
 loleaflet/images/lc_calloutshapes.round-callout.svg                     |    6 
 loleaflet/images/lc_calloutshapes.svg                                   |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-card.svg                  |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-collate.svg               |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-data.svg                  |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-decision.svg              |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-delay.svg                 |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-direct-access-storage.svg |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-display.svg               |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-document.svg              |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-internal-storage.svg      |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-manual-input.svg          |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-multidocument.svg         |   10 
 loleaflet/images/lc_flowchartshapes.flowchart-off-page-connector.svg    |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-or.svg                    |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-predefined-process.svg    |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-preparation.svg           |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-sequential-access.svg     |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-sort.svg                  |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-stored-data.svg           |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-summing-junction.svg      |    6 
 loleaflet/images/lc_flowchartshapes.flowchart-terminator.svg            |    6 
 loleaflet/images/lc_flowchartshapes.svg                                 |   10 
 loleaflet/images/lc_starshapes.bang.svg                                 |    6 
 loleaflet/images/lc_starshapes.concave-star6.svg                        |    6 
 loleaflet/images/lc_starshapes.doorplate.svg                            |    6 
 loleaflet/images/lc_starshapes.horizontal-scroll.svg                    |    6 
 loleaflet/images/lc_starshapes.signet.svg                               |    6 
 loleaflet/images/lc_starshapes.star12.svg                               |    6 
 loleaflet/images/lc_starshapes.star24.svg                               |    6 
 loleaflet/images/lc_starshapes.star4.svg                                |    6 
 loleaflet/images/lc_starshapes.star5.svg                                |    6 
 loleaflet/images/lc_starshapes.star6.svg                                |    6 
 loleaflet/images/lc_starshapes.star8.svg                                |    6 
 loleaflet/images/lc_starshapes.svg                                      |    6 
 loleaflet/images/lc_starshapes.vertical-scroll.svg                      |    6 
 loleaflet/images/lc_symbolshapes.brace-pair.svg                         |    6 
 loleaflet/images/lc_symbolshapes.bracket-pair.svg                       |    6 
 loleaflet/images/lc_symbolshapes.cloud.svg                              |    6 
 loleaflet/images/lc_symbolshapes.diamond-bevel.svg                      |   10 
 loleaflet/images/lc_symbolshapes.flower.svg                             |    6 
 loleaflet/images/lc_symbolshapes.forbidden.svg                          |    6 
 loleaflet/images/lc_symbolshapes.heart.svg                              |    6 
 loleaflet/images/lc_symbolshapes.left-brace.svg                         |    6 
 loleaflet/images/lc_symbolshapes.left-bracket.svg                       |    6 
 loleaflet/images/lc_symbolshapes.lightning.svg                          |    6 
 loleaflet/images/lc_symbolshapes.moon.svg                               |    6 
 loleaflet/images/lc_symbolshapes.octagon-bevel.svg                      |   10 
 loleaflet/images/lc_symbolshapes.puzzle.svg                             |    6 
 loleaflet/images/lc_symbolshapes.quad-bevel.svg                         |   10 
 loleaflet/images/lc_symbolshapes.right-brace.svg                        |    6 
 loleaflet/images/lc_symbolshapes.right-bracket.svg                      |    6 
 loleaflet/images/lc_symbolshapes.sun.svg                                |    6 
 loleaflet/images/lc_symbolshapes.svg                                    |    6 
 loleaflet/js/toolbar.js                                                 |  215 +++++++---
 101 files changed, 899 insertions(+), 60 deletions(-)

New commits:
commit 8d98465e76bfa9234ce4d6e67d4778f04b8fafab
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri May 25 16:29:30 2018 +0530

    loleaflet shapes: increase width of the rows to 10
    
    ... so that we can accomodate more shapes without overflowing the height
    of the screen.
    
    Change-Id: I82802224e88819df65ea60fb87e70df4f1f06e01

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 6c08d655c..b9fdee9aa 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -444,7 +444,7 @@ var shapes = {
 };
 
 function insertShapes() {
-	var width = 6;
+	var width = 10;
 	var $grid = $('.insertshape-grid');
 
 	if ($grid.children().size() > 0)
commit 12eaff0f79016e70438549973fc6634d75e03907
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri May 25 16:25:48 2018 +0530

    loleaflet: Add flowchart shapes
    
    Couldn't find svg images for 8 flowchart shapes. The command works for
    them but no icon is currently shown in the toolbar.
    
    Change-Id: I0a992d51f01064f04b26b90adcdfd29515a77f6a

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 12fec9937..7eb36e655 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -351,6 +351,39 @@ button.leaflet-control-search-next
 .w2ui-icon.calloutshapes_line-callout-2 { background: url('images/lc_calloutshapes.line-callout-2.svg') no-repeat center !important; }
 .w2ui-icon.calloutshapes_line-callout-3 { background: url('images/lc_calloutshapes.line-callout-3.svg') no-repeat center !important; }
 
+.w2ui-icon.flowchartshapes_flowchart-process { background: url('images/lc_flowchartshapes.flowchart-process.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-alternate-process { background: url('images/lc_flowchartshapes.flowchart-alternate-process.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-decision { background: url('images/lc_flowchartshapes.flowchart-decision.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-data { background: url('images/lc_flowchartshapes.flowchart-data.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-predefined-process { background: url('images/lc_flowchartshapes.flowchart-predefined-process.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-internal-storage { background: url('images/lc_flowchartshapes.flowchart-internal-storage.svg') no-repeat center !important; }
+
+.w2ui-icon.flowchartshapes_flowchart-document { background: url('images/lc_flowchartshapes.flowchart-document.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-multidocument { background: url('images/lc_flowchartshapes.flowchart-multidocument.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-terminator { background: url('images/lc_flowchartshapes.flowchart-terminator.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-preparation { background: url('images/lc_flowchartshapes.flowchart-preparation.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-manual-input { background: url('images/lc_flowchartshapes.flowchart-manual-input.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-manual-operation { background: url('images/lc_flowchartshapes.flowchart-manual-operation.svg') no-repeat center !important; }
+
+.w2ui-icon.flowchartshapes_flowchart-connector { background: url('images/lc_flowchartshapes.flowchart-connector.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-off-page-connector { background: url('images/lc_flowchartshapes.flowchart-off-page-connector.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-card { background: url('images/lc_flowchartshapes.flowchart-card.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-punched-tape { background: url('images/lc_flowchartshapes.flowchart-punched-tape.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-summing-junction { background: url('images/lc_flowchartshapes.flowchart-summing-junction.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-or { background: url('images/lc_flowchartshapes.flowchart-or.svg') no-repeat center !important; }
+
+.w2ui-icon.flowchartshapes_flowchart-collate { background: url('images/lc_flowchartshapes.flowchart-collate.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-sort { background: url('images/lc_flowchartshapes.flowchart-sort.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-extract { background: url('images/lc_flowchartshapes.flowchart-extract.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-merge { background: url('images/lc_flowchartshapes.flowchart-merge.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-stored-data { background: url('images/lc_flowchartshapes.flowchart-stored-data.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-delay { background: url('images/lc_flowchartshapes.flowchart-delay.svg') no-repeat center !important; }
+
+.w2ui-icon.flowchartshapes_flowchart-sequential-access { background: url('images/lc_flowchartshapes.flowchart-sequential-access.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-magnetic-disk { background: url('images/lc_flowchartshapes.flowchart-magnetic-disk.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-direct-access-storage { background: url('images/lc_flowchartshapes.flowchart-direct-access-storage.svg') no-repeat center !important; }
+.w2ui-icon.flowchartshapes_flowchart-display { background: url('images/lc_flowchartshapes.flowchart-display.svg') no-repeat center !important; }
+
 .w2ui-icon.accepttrackedchanges{ background: url('images/lc_accepttrackedchanges.svg') no-repeat center !important; }
 .w2ui-icon.alignblock{ background: url('images/lc_alignblock.svg') no-repeat center !important; }
 .w2ui-icon.alignhorizontal{ background: url('images/lc_alignhorizontalcenter.svg') no-repeat center !important; }
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-card.svg b/loleaflet/images/lc_flowchartshapes.flowchart-card.svg
new file mode 100644
index 000000000..43b21280e
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-card.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 L 4 8 L 4 15 L 4 16 L 4 20 L 20 20 L 20 15 L 20 4 L 16 4 L 15 4 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-collate.svg b/loleaflet/images/lc_flowchartshapes.flowchart-collate.svg
new file mode 100644
index 000000000..b88e7aa1b
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-collate.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 12 12 L 20 4 L 4 4 z M 12 12 L 4 20 L 20 20 L 12 12 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-data.svg b/loleaflet/images/lc_flowchartshapes.flowchart-data.svg
new file mode 100644
index 000000000..253cdf383
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-data.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 L 4 20 L 16 20 L 20 4 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-decision.svg b/loleaflet/images/lc_flowchartshapes.flowchart-decision.svg
new file mode 100644
index 000000000..c19d42c70
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-decision.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 4 12 L 12 20 L 20 12 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-delay.svg b/loleaflet/images/lc_flowchartshapes.flowchart-delay.svg
new file mode 100644
index 000000000..b3f5d82bf
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-delay.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 4 20 L 16 20 C 18.209139 20 20 16.418278 20 12 C 20 7.581722 18.209139 4 16 4 L 4 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-direct-access-storage.svg b/loleaflet/images/lc_flowchartshapes.flowchart-direct-access-storage.svg
new file mode 100644
index 000000000..883dd7645
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-direct-access-storage.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 C 5.790861 4 4 7.581722 4 12 C 4 16.418278 5.790861 20 8 20 L 15 20 C 12.790861 20 11 16.418278 11 12 C 11 7.581722 12.790861 4 15 4 L 8 4 z M 16 4 A 4 8 0 0 0 12 12 A 4 8 0 0 0 16 20 A 4 8 0 0 0 20 12 A 4 8 0 0 0 16 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-display.svg b/loleaflet/images/lc_flowchartshapes.flowchart-display.svg
new file mode 100644
index 000000000..97cbe68f0
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-display.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 L 4 12 L 8 20 L 15 20 L 16 20 C 18.209139 20 20 16.418278 20 12 C 20 7.581722 18.209139 4 16 4 L 15 4 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-document.svg b/loleaflet/images/lc_flowchartshapes.flowchart-document.svg
new file mode 100644
index 000000000..61fb5c9ce
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-document.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 6 4 L 6 17 C 8.87198 20.1727 10.584947 19.1149 13.4375 17 C 15.501757 15.7323 16.425634 15.1915 18 15 L 18 5 L 18 4 L 6 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-internal-storage.svg b/loleaflet/images/lc_flowchartshapes.flowchart-internal-storage.svg
new file mode 100644
index 000000000..19f71d976
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-internal-storage.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 4 9 L 9 9 L 9 4 L 4 4 z M 10 4 L 10 9 L 20 9 L 20 4 L 10 4 z M 4 10 L 4 20 L 9 20 L 9 10 L 4 10 z M 10 10 L 10 20 L 20 20 L 20 10 L 10 10 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-manual-input.svg b/loleaflet/images/lc_flowchartshapes.flowchart-manual-input.svg
new file mode 100644
index 000000000..1e357a8f6
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-manual-input.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 20 4 L 4 8 L 4 15 L 4 16 L 4 20 L 20 20 L 20 15 L 20 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-multidocument.svg b/loleaflet/images/lc_flowchartshapes.flowchart-multidocument.svg
new file mode 100644
index 000000000..d2421f33a
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-multidocument.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#b3b3b3" 
+     d="M 6 7 L 6 8 L 6 9 L 7 9 L 16 9 L 16 12.5625 L 16 13 L 16 13.5625 C 16.649902 13.2714 17.249211 13.0914 18 13 L 18 11.5625 L 18 9 L 18 8 L 18 7 L 8 7 L 6 7 z "
+     />
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 5 L 8 6 L 8 7 L 18 7 L 18 8 L 18 9 L 18 11.5625 C 18.649902 11.2714 19.249211 11.0914 20 11 L 20 6 L 20 5 L 8 5 z M 4 9 L 4 10 L 4 16 L 4 17 C 6.8719799 20.1727 8.584947 19.1149 11.4375 17 C 13.501757 15.7323 14.425634 15.1915 16 15 L 16 13.5625 L 16 12.5625 L 16 10 L 16 9 L 7 9 L 6 9 L 4 9 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-off-page-connector.svg b/loleaflet/images/lc_flowchartshapes.flowchart-off-page-connector.svg
new file mode 100644
index 000000000..9966ac0af
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-off-page-connector.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 4 16 L 12 20 L 20 16 L 20 4 L 4 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-or.svg b/loleaflet/images/lc_flowchartshapes.flowchart-or.svg
new file mode 100644
index 000000000..9027ddae6
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-or.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 11 4 C 7.3448179 4.4586 4.4537561 7.3485 4 11 L 11 11 L 11 4 z M 13 4 L 13 11 L 20 11 C 19.540872 7.3577 16.649355 4.4582 13 4 z M 4 13 C 4.4591281 16.6424 7.3506448 19.5418 11 20 L 11 13 L 4 13 z M 13 13 L 13 20 C 16.649355 19.5418 19.540872 16.6424 20 13 L 13 13 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-predefined-process.svg b/loleaflet/images/lc_flowchartshapes.flowchart-predefined-process.svg
new file mode 100644
index 000000000..d48606185
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-predefined-process.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 4 20 L 9 20 L 9 4 L 4 4 z M 10 4 L 10 20 L 14 20 L 14 4 L 10 4 z M 15 4 L 15 20 L 20 20 L 20 4 L 15 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-preparation.svg b/loleaflet/images/lc_flowchartshapes.flowchart-preparation.svg
new file mode 100644
index 000000000..617396304
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-preparation.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 L 4 12 L 8 20 L 16 20 L 20 12 L 16 4 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-sequential-access.svg b/loleaflet/images/lc_flowchartshapes.flowchart-sequential-access.svg
new file mode 100644
index 000000000..8e918c32c
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-sequential-access.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 C 7.581722 4 4 6.6862868 4 10 C 4 13.313713 7.581722 16 12 16 L 16 20 L 16 15.1875 C 18.386944 14.149248 20 12.218458 20 10 C 20 6.6862868 16.418278 4 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-sort.svg b/loleaflet/images/lc_flowchartshapes.flowchart-sort.svg
new file mode 100644
index 000000000..76eeadc70
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-sort.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 11.65625 4.34375 L 5 11 L 19 11 L 12.34375 4.34375 L 12 4 z M 5 13 L 11.65625 19.65625 L 12 20 L 12.34375 19.65625 L 19 13 L 5 13 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-stored-data.svg b/loleaflet/images/lc_flowchartshapes.flowchart-stored-data.svg
new file mode 100644
index 000000000..3a51cb644
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-stored-data.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 C 5.790861 4 4 7.5817 4 12 C 4 16.4183 5.790861 20 8 20 L 13 20 L 15 20 L 20 20 C 17.7909 20 16 16.4183 16 12 C 16 7.5817 17.7909 4 20 4 L 15 4 L 13 4 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-summing-junction.svg b/loleaflet/images/lc_flowchartshapes.flowchart-summing-junction.svg
new file mode 100644
index 000000000..90ee4fb34
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-summing-junction.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 11.998047 4 C 10.261411 3.9999 8.5256402 4.5610437 7.0839844 5.6835938 L 12 10.597656 L 16.916016 5.6835938 C 15.471366 4.5614437 13.734682 4.0001 11.998047 4 z M 5.6796875 7.0878906 C 3.4439282 9.9675906 3.4383914 14.034069 5.6796875 16.917969 L 10.595703 12.001953 L 5.6796875 7.0878906 z M 18.320312 7.0878906 L 13.404297 12.001953 L 18.320312 16.917969 C 20.556002 14.038369 20.561608 9.9717906 18.320312 7.0878906 z M 12 13.40625 L 7.0839844 18.322266 C 9.9689105 20.562766 14.035323 20.557266 16.916016 18.322266 L 12 13.40625 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.flowchart-terminator.svg b/loleaflet/images/lc_flowchartshapes.flowchart-terminator.svg
new file mode 100644
index 000000000..c9936094c
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.flowchart-terminator.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 C 5.790861 4 4 7.5817 4 12 C 4 16.4183 5.790861 20 8 20 L 10 20 L 15 20 L 16 20 C 18.209139 20 20 16.418278 20 12 C 20 7.581722 18.209139 4 16 4 L 15 4 L 10 4 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_flowchartshapes.svg b/loleaflet/images/lc_flowchartshapes.svg
new file mode 100644
index 000000000..d7a78f22e
--- /dev/null
+++ b/loleaflet/images/lc_flowchartshapes.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#b3b3b3" 
+     d="M 5 5 L 5 19 L 19 19 L 19 5 L 5 5 z "
+     />
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 4 5 L 4 20 L 5 20 L 19 20 L 20 20 L 20 5 L 20 4 L 4 4 z M 5 5 L 9 5 L 9 9 L 5 9 L 5 5 z M 10 5 L 19 5 L 19 9 L 10 9 L 10 5 z M 5 10 L 9 10 L 9 19 L 5 19 L 5 10 z M 10 10 L 19 10 L 19 19 L 10 19 L 10 10 z "
+     />
+ </svg>
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 1c7b3bcce..6c08d655c 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -405,6 +405,41 @@ var shapes = {
 		{img: 'calloutshapes_line-callout-1', uno: 'CalloutShapes.line-callout-1'},
 		{img: 'calloutshapes_line-callout-2', uno: 'CalloutShapes.line-callout-2'},
 		{img: 'calloutshapes_line-callout-3', uno: 'CalloutShapes.line-callout-3'}
+	],
+
+	'Flowchart': [
+		{img: 'flowchartshapes_flowchart-process', uno: 'FlowchartShapes.flowchart-process'},
+		{img: 'flowchartshapes_flowchart-alternate-process', uno: 'FlowchartShapes.flowchart-alternate-process'},
+		{img: 'flowchartshapes_flowchart-decision', uno: 'FlowchartShapes.flowchart-decision'},
+		{img: 'flowchartshapes_flowchart-data', uno: 'FlowchartShapes.flowchart-data'},
+		{img: 'flowchartshapes_flowchart-predefined-process', uno: 'FlowchartShapes.flowchart-predefined-process'},
+		{img: 'flowchartshapes_flowchart-internal-storage', uno: 'FlowchartShapes.flowchart-internal-storage'},
+
+		{img: 'flowchartshapes_flowchart-document', uno: 'FlowchartShapes.flowchart-document'},
+		{img: 'flowchartshapes_flowchart-multidocument', uno: 'FlowchartShapes.flowchart-multidocument'},
+		{img: 'flowchartshapes_flowchart-terminator', uno: 'FlowchartShapes.flowchart-terminator'},
+		{img: 'flowchartshapes_flowchart-preparation', uno: 'FlowchartShapes.flowchart-preparation'},
+		{img: 'flowchartshapes_flowchart-manual-input', uno: 'FlowchartShapes.flowchart-manual-input'},
+		{img: 'flowchartshapes_flowchart-manual-operation', uno: 'FlowchartShapes.flowchart-manual-operation'},
+
+		{img: 'flowchartshapes_flowchart-connector', uno: 'FlowchartShapes.flowchart-connector'},
+		{img: 'flowchartshapes_flowchart-off-page-connector', uno: 'FlowchartShapes.flowchart-off-page-connector'},
+		{img: 'flowchartshapes_flowchart-card', uno: 'FlowchartShapes.flowchart-card'},
+		{img: 'flowchartshapes_flowchart-punched-tape', uno: 'FlowchartShapes.flowchart-punched-tape'},
+		{img: 'flowchartshapes_flowchart-summing-junction', uno: 'FlowchartShapes.flowchart-summing-junction'},
+		{img: 'flowchartshapes_flowchart-or', uno: 'FlowchartShapes.flowchart-or'},
+
+		{img: 'flowchartshapes_flowchart-collate', uno: 'FlowchartShapes.flowchart-collate'},
+		{img: 'flowchartshapes_flowchart-sort', uno: 'FlowchartShapes.flowchart-sort'},
+		{img: 'flowchartshapes_flowchart-extract', uno: 'FlowchartShapes.flowchart-extract'},
+		{img: 'flowchartshapes_flowchart-merge', uno: 'FlowchartShapes.flowchart-merge'},
+		{img: 'flowchartshapes_flowchart-stored-data', uno: 'FlowchartShapes.flowchart-stored-data'},
+		{img: 'flowchartshapes_flowchart-delay', uno: 'FlowchartShapes.flowchart-delay'},
+
+		{img: 'flowchartshapes_flowchart-sequential-access', uno: 'FlowchartShapes.flowchart-sequential-access'},
+		{img: 'flowchartshapes_flowchart-magnetic-disk', uno: 'FlowchartShapes.flowchart-magnetic-disk'},
+		{img: 'flowchartshapes_flowchart-direct-access-storage', uno: 'FlowchartShapes.flowchart-direct-access-storage'},
+		{img: 'flowchartshapes_flowchart-display', uno: 'FlowchartShapes.flowchart-display'}
 	]
 };
 
commit 9b69fcbd8254583f8768fba1346034c1da9a0c2c
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri May 25 16:10:58 2018 +0530

    loleaflet: Add callout shapes
    
    Change-Id: Idc280cf22e1e3459e35de30355b6bffed5fae6b0

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 1da4990c4..12fec9937 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -343,6 +343,14 @@ button.leaflet-control-search-next
 .w2ui-icon.starshapes_signet { background: url('images/lc_starshapes.signet.svg') no-repeat center !important; }
 .w2ui-icon.starshapes_doorplate { background: url('images/lc_starshapes.doorplate.svg') no-repeat center !important; }
 
+.w2ui-icon.calloutshapes_rectangular-callout { background: url('images/lc_calloutshapes.rectangular-callout.svg') no-repeat center !important; }
+.w2ui-icon.calloutshapes_round-rectangular-callout { background: url('images/lc_calloutshapes.svg') no-repeat center !important; }
+.w2ui-icon.calloutshapes_round-callout { background: url('images/lc_calloutshapes.round-callout.svg') no-repeat center !important; }
+.w2ui-icon.calloutshapes_cloud-callout { background: url('images/lc_calloutshapes.cloud-callout.svg') no-repeat center !important; }
+.w2ui-icon.calloutshapes_line-callout-1 { background: url('images/lc_calloutshapes.line-callout-1.svg') no-repeat center !important; }
+.w2ui-icon.calloutshapes_line-callout-2 { background: url('images/lc_calloutshapes.line-callout-2.svg') no-repeat center !important; }
+.w2ui-icon.calloutshapes_line-callout-3 { background: url('images/lc_calloutshapes.line-callout-3.svg') no-repeat center !important; }
+
 .w2ui-icon.accepttrackedchanges{ background: url('images/lc_accepttrackedchanges.svg') no-repeat center !important; }
 .w2ui-icon.alignblock{ background: url('images/lc_alignblock.svg') no-repeat center !important; }
 .w2ui-icon.alignhorizontal{ background: url('images/lc_alignhorizontalcenter.svg') no-repeat center !important; }
diff --git a/loleaflet/images/lc_calloutshapes.cloud-callout.svg b/loleaflet/images/lc_calloutshapes.cloud-callout.svg
new file mode 100644
index 000000000..a5431052d
--- /dev/null
+++ b/loleaflet/images/lc_calloutshapes.cloud-callout.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 A 8 5.00001 0 0 0 4 9 A 8 5.00001 0 0 0 12 14 A 8 5.00001 0 0 0 20 9 A 8 5.00001 0 0 0 12 4 z M 9 14 A 3.0000018 1.5000001 0 0 0 6 15.5 A 3.0000018 1.5000001 0 0 0 9 17 A 3.0000018 1.5000001 0 0 0 12 15.5 A 3.0000018 1.5000001 0 0 0 9 14 z M 7 17 A 1.9999974 1 0 0 0 5 18 A 1.9999974 1 0 0 0 7 19 A 1.9999974 1 0 0 0 9 18 A 1.9999974 1 0 0 0 7 17 z M 5 19 A 1 0.5 0 0 0 4 19.5 A 1 0.5 0 0 0 5 20 A 1 0.5 0 0 0 6 19.5 A 1 0.5 0 0 0 5 19 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_calloutshapes.line-callout-1.svg b/loleaflet/images/lc_calloutshapes.line-callout-1.svg
new file mode 100644
index 000000000..da2f1b03b
--- /dev/null
+++ b/loleaflet/images/lc_calloutshapes.line-callout-1.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 10 4 L 10 16 L 20 16 L 20 4 L 10 4 z M 6.1875 9 C 5.4817077 12.606692 4.7519992 16.208754 4.03125 19.8125 L 4 20 L 6 20 C 6.8177316 16.346927 7.3281877 12.621637 8.28125 9 L 6.1875 9 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_calloutshapes.line-callout-2.svg b/loleaflet/images/lc_calloutshapes.line-callout-2.svg
new file mode 100644
index 000000000..b98c2239d
--- /dev/null
+++ b/loleaflet/images/lc_calloutshapes.line-callout-2.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 10 4 L 10 9 L 6.1875 9 C 5.4817077 12.606692 4.7519992 16.208754 4.03125 19.8125 L 4 20 L 6 20 L 7.8125 11 L 10 11 L 10 16 L 20 16 L 20 4 L 10 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_calloutshapes.line-callout-3.svg b/loleaflet/images/lc_calloutshapes.line-callout-3.svg
new file mode 100644
index 000000000..ca5d06401
--- /dev/null
+++ b/loleaflet/images/lc_calloutshapes.line-callout-3.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 10 4 L 10 16 L 20 16 L 20 4 L 10 4 z M 6 9 L 6 20 L 8 20 L 8 9 L 6 9 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_calloutshapes.rectangular-callout.svg b/loleaflet/images/lc_calloutshapes.rectangular-callout.svg
new file mode 100644
index 000000000..0a9961874
--- /dev/null
+++ b/loleaflet/images/lc_calloutshapes.rectangular-callout.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 C 4.00002 3.99998 4 16 4 16 L 8 16 L 8 20 L 12 16 L 20 16 L 20 4 L 4 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_calloutshapes.round-callout.svg b/loleaflet/images/lc_calloutshapes.round-callout.svg
new file mode 100644
index 000000000..65c3dabc5
--- /dev/null
+++ b/loleaflet/images/lc_calloutshapes.round-callout.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 C 7.581722 4 4 6.6862868 4 10 C 4 12.218458 5.6130559 14.149248 8 15.1875 L 8 20 L 12 16 C 16.418278 16 20 13.313713 20 10 C 20 6.6862868 16.418278 4 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_calloutshapes.svg b/loleaflet/images/lc_calloutshapes.svg
new file mode 100644
index 000000000..bd085cd95
--- /dev/null
+++ b/loleaflet/images/lc_calloutshapes.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 6 4 C 4.8920104 4 4 4.8920001 4 6 L 4 14 C 4 15.108 4.8920104 16 6 16 L 8 16 L 8 20 L 12 16 L 18 16 C 19.10799 16 20 15.108 20 14 L 20 6 C 20 4.8920001 19.10799 4 18 4 L 6 4 z "
+     />
+ </svg>
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index a5f751807..1c7b3bcce 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -395,6 +395,16 @@ var shapes = {
 		{img: 'starshapes_horizontal-scroll', uno: 'StarShapes.horizontal-scroll'},
 		{img: 'starshapes_signet', uno: 'StarShapes.signet'},
 		{img: 'starshapes_doorplate', uno: 'StarShapes.doorplate'}
+	],
+
+	'Callout': [
+		{img: 'calloutshapes_rectangular-callout', uno: 'CalloutShapes.rectangular-callout'},
+		{img: 'calloutshapes_round-rectangular-callout', uno: 'CalloutShapes.round-rectangular-callout'},
+		{img: 'calloutshapes_round-callout', uno: 'CalloutShapes.round-callout'},
+		{img: 'calloutshapes_cloud-callout', uno: 'CalloutShapes.cloud-callout'},
+		{img: 'calloutshapes_line-callout-1', uno: 'CalloutShapes.line-callout-1'},
+		{img: 'calloutshapes_line-callout-2', uno: 'CalloutShapes.line-callout-2'},
+		{img: 'calloutshapes_line-callout-3', uno: 'CalloutShapes.line-callout-3'}
 	]
 };
 
commit d7f9cad3bcc5c681621a957bb57990f5ec5b6790
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri May 25 15:42:38 2018 +0530

    loleaflet: Add star shapes
    
    Change-Id: Ic68f422a18bffff9dfee86d83b9d463091423385

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 7560efa69..1da4990c4 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -329,6 +329,20 @@ button.leaflet-control-search-next
 .w2ui-icon.arrowshapes_split-round-arrow { background: url('images/lc_arrowshapes.split-round-arrow.svg') no-repeat center !important; }
 .w2ui-icon.arrowshapes_s-sharped-arrow { background: url('images/lc_arrowshapes.s-sharped-arrow.svg') no-repeat center !important; }
 
+.w2ui-icon.starshapes_bang { background: url('images/lc_starshapes.bang.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_star4 { background: url('images/lc_starshapes.star4.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_star5 { background: url('images/lc_starshapes.star5.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_star6 { background: url('images/lc_starshapes.star6.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_star8 { background: url('images/lc_starshapes.star8.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_star12 { background: url('images/lc_starshapes.star12.svg') no-repeat center !important; }
+
+.w2ui-icon.starshapes_star24 { background: url('images/lc_starshapes.star24.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_concave-star6 { background: url('images/lc_starshapes.concave-star6.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_vertical-scroll { background: url('images/lc_starshapes.vertical-scroll.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_horizontal-scroll { background: url('images/lc_starshapes.horizontal-scroll.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_signet { background: url('images/lc_starshapes.signet.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_doorplate { background: url('images/lc_starshapes.doorplate.svg') no-repeat center !important; }
+
 .w2ui-icon.accepttrackedchanges{ background: url('images/lc_accepttrackedchanges.svg') no-repeat center !important; }
 .w2ui-icon.alignblock{ background: url('images/lc_alignblock.svg') no-repeat center !important; }
 .w2ui-icon.alignhorizontal{ background: url('images/lc_alignhorizontalcenter.svg') no-repeat center !important; }
diff --git a/loleaflet/images/lc_starshapes.bang.svg b/loleaflet/images/lc_starshapes.bang.svg
new file mode 100644
index 000000000..bab825b3f
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.bang.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 14.019531 4 L 12.302734 7.9746094 L 11.146484 4.7382812 L 10.150391 8.0761719 L 7.90625 5.3632812 L 10.367188 9.7636719 L 6.2226562 6.96875 L 9.4140625 10.740234 L 5.3769531 9.2226562 L 7.7832031 11.074219 L 4.0527344 12.253906 L 8.3554688 12.875 L 4 14.830078 L 8.8203125 14.105469 L 7.0078125 17.716797 L 10.410156 14.871094 L 7.9433594 18.917969 L 11.322266 16.103516 L 10.464844 19.25 L 12.183594 15.404297 L 13.337891 20 L 14.335938 15.300781 L 16.578125 17.886719 L 15.744141 15.103516 L 19.15625 17.09375 L 15.072266 14.126953 L 20 15.042969 L 16.703125 12.46875 L 19.701172 11.808594 L 16.128906 11.992188 L 19.753906 9.2324219 L 15.666016 10.761719 L 18.369141 7.7050781 L 14.076172 8.5078125 L 16.542969 5.9472656 L 13.162109 8.9628906 L 14.019531 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.concave-star6.svg b/loleaflet/images/lc_starshapes.concave-star6.svg
new file mode 100644
index 000000000..99b724655
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.concave-star6.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 C 8 4 8.7454 7.5092906 8 9 C 7.2546 10.490712 4 12 4 12 C 4 12 7.2546 13.509288 8 15 C 8.7454 16.490715 8 20 8 20 C 8 20 10.3333 17.000002 12 17 C 13.6667 16.999998 16 20 16 20 C 16 20 15.2546 16.490709 16 15 C 16.7454 13.509288 20 12 20 12 C 20 12 16.7454 10.490712 16 9 C 15.2546 7.5092855 16 4 16 4 C 16 4 13.6667 6.9999977 12 7 C 10.3333 7.0000023 8 4 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.doorplate.svg b/loleaflet/images/lc_starshapes.doorplate.svg
new file mode 100644
index 000000000..b99e7e700
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.doorplate.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 C 8 6.2091389 6.2091389 8 4 8 L 4 16 C 6.2091389 16 8 17.790861 8 20 L 15 20 C 15 17.790861 16.790861 16 19 16 C 19.345951 16 19.679835 16.073685 20 16.15625 L 20 8 C 17.790861 8 16 6.2091389 16 4 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.horizontal-scroll.svg b/loleaflet/images/lc_starshapes.horizontal-scroll.svg
new file mode 100644
index 000000000..6e180c26a
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.horizontal-scroll.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 18 4 C 16.8954 4 16 4.8954 16 6 L 8 6 L 6 6 C 4.89199 6 4 6.892 4 8 L 4 9 L 4 16 L 4 17 L 4 18 C 4 19.1046 4.8954 20 6 20 C 7.1046 20 8 19.1046 8 18 L 17 18 L 18 18 C 19.10801 18 20 17.108 20 16 L 20 13 L 20 10 L 20 8 L 20 7 L 20 6 C 20 4.8954 19.1046 4 18 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.signet.svg b/loleaflet/images/lc_starshapes.signet.svg
new file mode 100644
index 000000000..62ac86153
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.signet.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 11.5 4 C 10.464199 4 10.259689 5.8008656 9.3027344 6.1972656 C 8.3463747 6.5933656 6.9292318 5.4652656 6.1972656 6.1972656 C 5.4652993 6.9292656 6.5934025 8.3463344 6.1972656 9.3027344 C 5.8008811 10.259534 4 10.4641 4 11.5 C 4 12.5359 5.8008811 12.740266 6.1972656 13.697266 C 6.5934025 14.653466 5.4652993 16.070734 6.1972656 16.802734 C 6.9292318 17.534634 8.3463747 16.406534 9.3027344 16.802734 C 10.259689 17.199034 10.464199 19 11.5 19 C 12.5358 19 12.740311 17.199034 13.697266 16.802734 C 13.715596 16.784404 13.760839 16.756399 13.787109 16.787109 L 17 20 L 18 18 L 20 17 C 20.01282 16.97235 18.094131 15.577238 16.775391 14.580078 C 16.719831 14.26777 16.692854 13.962662 16.802734 13.697266 C 17.1992 12.740266 19 12.5359 19 11.5 C 19 10.4641 17.199117 10.259534 16.802734 9.3027344 C 16.406598 8.3463344 17.5347 6.9292656 16.802734 6.1972656 C 16.070768 5.4652656 14.653626 6.5933656 13.697266 6.1972656 C 12.740311 5.8008656 12.5358 4 11.5 4 z M 11.5 8 C 13.432997 8 15 9.5
 670034 15 11.5 C 15 13.432997 13.432997 15 11.5 15 C 9.5670034 15 8 13.432997 8 11.5 C 8 9.5670034 9.5670034 8 11.5 8 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.star12.svg b/loleaflet/images/lc_starshapes.star12.svg
new file mode 100644
index 000000000..d563d4977
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.star12.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 10.96875 8.125 L 8 5.0625 L 9.15625 9.15625 L 5.0625 8 L 8.125 10.96875 L 4 12 L 8.125 13.03125 L 5.0625 16 L 9.15625 14.84375 L 8 18.9375 L 10.96875 15.875 L 11 16 L 11 14 L 11 13.5625 L 11 13 L 12 12 L 13.962891 12 L 14.595703 12 L 15 12 L 20 12 L 15.875 10.96875 L 18.9375 8 L 14.84375 9.15625 L 16 5.0625 L 13.03125 8.125 L 12 4 z M 13.294922 13 L 11.699219 13.490234 L 11.699219 14.201172 L 11.707031 14.685547 L 13.013672 14.292969 C 13.013672 14.516069 13.017578 20 13.017578 20 L 14.195312 20 C 14.195312 20 14.154459 15.2927 14.199219 13 L 13.294922 13 z M 17.822266 13 C 17.574727 13 17.302077 13.038234 17.003906 13.115234 C 16.705734 13.191934 16.372475 13.31835 16.029297 13.46875 L 16.029297 14.521484 C 16.36685 14.315784 16.733938 14.200909 17.029297 14.099609 C 17.327468 13.998609 17.558943 13.986328 17.826172 13.986328 C 18.203106 13.986328 18.432542 14.025559 18.666016 14.255859 C 18.902303 14.486159 19.007812 14.644466 19.007812 15.009766 C 19.007812 15.23
 3866 18.928064 15.42295 18.818359 15.65625 C 18.711468 15.88655 18.610746 16.018816 18.337891 16.353516 C 18.118415 16.594916 17.803916 16.992275 17.244141 17.609375 C 16.68718 18.223475 16.335207 18.648372 16.011719 19.013672 L 16 20 L 20 20 L 20 18.962891 L 17.240234 19.001953 C 17.926591 18.237553 18.244159 17.859247 18.621094 17.435547 C 18.998028 17.008847 19.220696 16.751109 19.291016 16.662109 C 19.546993 16.318209 19.722719 16.019278 19.818359 15.767578 C 19.916807 15.512778 19.966797 15.243438 19.966797 14.960938 C 19.966797 14.365238 19.772951 13.891256 19.384766 13.535156 C 18.996581 13.179056 18.474867 13 17.822266 13 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.star24.svg b/loleaflet/images/lc_starshapes.star24.svg
new file mode 100644
index 000000000..1b9082e1b
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.star24.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 11.46875 8.03125 L 9.9375 4.28125 L 10.46875 8.3125 L 8 5.0625 L 9.5625 8.8125 L 6.34375 6.34375 L 8.8125 9.5625 L 5.0625 8 L 8.3125 10.46875 L 4.28125 9.9375 L 8.03125 11.46875 L 4 12 L 8.03125 12.53125 L 4.28125 14.0625 L 8.3125 13.53125 L 5.0625 16 L 8.8125 14.4375 L 6.34375 17.65625 L 9 15.619141 L 9 13 L 10 12 L 12 12 L 15 12 L 20 12 L 15.96875 11.46875 L 19.71875 9.9375 L 15.6875 10.46875 L 18.9375 8 L 15.1875 9.5625 L 17.65625 6.34375 L 14.4375 8.8125 L 16 5.0625 L 13.53125 8.3125 L 14.0625 4.28125 L 12.53125 8.03125 L 12 4 z M 11.822266 13 C 11.574727 13 11.302077 13.038234 11.003906 13.115234 C 10.705734 13.191934 10.372475 13.31835 10.029297 13.46875 L 10.029297 14.521484 C 10.36685 14.315784 10.733938 14.200909 11.029297 14.099609 C 11.327468 13.998609 11.558943 13.986328 11.826172 13.986328 C 12.203106 13.986328 12.432542 14.025559 12.666016 14.255859 C 12.902303 14.486159 13.007812 14.644466 13.007812 15.009766 C 13.007813 15.233866 12.928064 15.42295 1
 2.818359 15.65625 C 12.711468 15.88655 12.610746 16.018816 12.337891 16.353516 C 12.118415 16.594916 11.803916 16.992275 11.244141 17.609375 C 10.68718 18.223475 10.335207 18.648372 10.011719 19.013672 L 10 20 L 14 20 L 14 18.962891 L 11.240234 19.001953 C 11.926591 18.237553 12.244159 17.859247 12.621094 17.435547 C 12.998028 17.008847 13.220696 16.751109 13.291016 16.662109 C 13.546993 16.318209 13.722719 16.019278 13.818359 15.767578 C 13.916807 15.512778 13.966797 15.243438 13.966797 14.960938 C 13.966797 14.365238 13.772951 13.891256 13.384766 13.535156 C 12.996581 13.179056 12.474867 13 11.822266 13 z M 18 13 L 15 17.238281 L 15 18 L 18 18 L 18 20 L 19 20 L 19 18 L 20 18 L 20 17 L 19 17 L 19 13 L 18 13 z M 18 14.476562 L 18 17 L 16.296875 17 L 18 14.476562 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.star4.svg b/loleaflet/images/lc_starshapes.star4.svg
new file mode 100644
index 000000000..d71c3454a
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.star4.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 9.171875 9.171875 L 4 12 L 9.171875 14.828125 L 12 20 L 14.828125 14.828125 L 20 12 L 14.828125 9.171875 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.star5.svg b/loleaflet/images/lc_starshapes.star5.svg
new file mode 100644
index 000000000..04b148848
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.star5.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 9 10 L 4 10 L 8 14 L 7 20 L 12 17 L 17 20 L 16 14 L 20 10 L 15 10 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.star6.svg b/loleaflet/images/lc_starshapes.star6.svg
new file mode 100644
index 000000000..f176d132f
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.star6.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 9 8 L 4 8 L 7 12 L 4 16 L 9 16 L 12 20 L 15 16 L 20 16 L 17 12 L 20 8 L 15 8 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.star8.svg b/loleaflet/images/lc_starshapes.star8.svg
new file mode 100644
index 000000000..51c941eb7
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.star8.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 9.65625 6.34375 L 6.34375 6.34375 L 6.34375 9.65625 L 4 12 L 6.34375 14.34375 L 6.34375 17.65625 L 9.65625 17.65625 L 12 20 L 14.34375 17.65625 L 17.65625 17.65625 L 17.65625 14.34375 L 20 12 L 17.65625 9.65625 L 17.65625 6.34375 L 14.34375 6.34375 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.svg b/loleaflet/images/lc_starshapes.svg
new file mode 100644
index 000000000..04b148848
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 9 10 L 4 10 L 8 14 L 7 20 L 12 17 L 17 20 L 16 14 L 20 10 L 15 10 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.vertical-scroll.svg b/loleaflet/images/lc_starshapes.vertical-scroll.svg
new file mode 100644
index 000000000..12c66e182
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.vertical-scroll.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 C 6.8919904 4 6 4.8919904 6 6 L 6 8 L 6 16 C 4.895431 16 4 16.8954 4 18 C 4 19.1046 4.895431 20 6 20 L 7 20 L 8 20 L 10 20 L 13 20 L 16 20 C 17.10801 20 18 19.10801 18 18 L 18 17 L 18 8 C 19.104569 8 20 7.1046 20 6 C 20 4.8954 19.104569 4 18 4 L 17 4 L 16 4 L 9 4 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index dc3598b60..a5f751807 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -379,6 +379,22 @@ var shapes = {
 
 		{img: 'arrowshapes_split-round-arrow', uno: 'ArrowShapes.split-round-arrow'},
 		{img: 'arrowshapes_s-sharped-arrow', uno: 'ArrowShapes.s-sharped-arrow'}
+	],
+
+	'Star': [
+		{img: 'starshapes_bang', uno: 'StarShapes.bang'},
+		{img: 'starshapes_star4', uno: 'StarShapes.star4'},
+		{img: 'starshapes_star5', uno: 'StarShapes.star5'},
+		{img: 'starshapes_star6', uno: 'StarShapes.star6'},
+		{img: 'starshapes_star8', uno: 'StarShapes.star8'},
+		{img: 'starshapes_star12', uno: 'StarShapes.star12'},
+
+		{img: 'starshapes_star24', uno: 'StarShapes.star24'},
+		{img: 'starshapes_concave-star6', uno: 'StarShapes.concave-star6'},
+		{img: 'starshapes_vertical-scroll', uno: 'StarShapes.vertical-scroll'},
+		{img: 'starshapes_horizontal-scroll', uno: 'StarShapes.horizontal-scroll'},
+		{img: 'starshapes_signet', uno: 'StarShapes.signet'},
+		{img: 'starshapes_doorplate', uno: 'StarShapes.doorplate'}
 	]
 };
 
commit aa29a4627076a0d246c5a4bf34b42a95d1101f40
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri May 25 15:42:27 2018 +0530

    loleaflet: Fix incorrect icon name
    
    Change-Id: Ibd9817ca3cbf56621b5156323a6b946c67e566dd

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index ec3612fdb..7560efa69 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -315,7 +315,7 @@ button.leaflet-control-search-next
 .w2ui-icon.arrowshapes_notched-right-arrow { background: url('images/lc_arrowshapes.notched-right-arrow.svg') no-repeat center !important; }
 .w2ui-icon.arrowshapes_pentagon-right { background: url('images/lc_arrowshapes.pentagon-right.svg') no-repeat center !important; }
 .w2ui-icon.arrowshapes_chevron { background: url('images/lc_arrowshapes.chevron.svg') no-repeat center !important; }
-.w2ui-icon.arrowshapes_right-arrow-callout { background: url('images/lc_arrowshapes.right-brace.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_right-arrow-callout { background: url('images/lc_arrowshapes.right-arrow-callout.svg') no-repeat center !important; }
 .w2ui-icon.arrowshapes_left-arrow-callout { background: url('images/lc_arrowshapes.left-arrow-callout.svg') no-repeat center !important; }
 .w2ui-icon.arrowshapes_up-arrow-callout { background: url('images/lc_arrowshapes.up-arrow-callout.svg') no-repeat center !important; }
 
commit 620a88267284cc04ae900e57b5e6906bb6eaef1b
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri May 25 15:30:12 2018 +0530

    loleaflet: Use breeze icons
    
    But the problem is that not all the icons in basic shapes are available
    in breeze theme. Some icons like circle, ellipse doesn't have any svg in
    breeze.
    
    Change-Id: I5d672e9f996607eabfd620f0d37ae7205f560bbc

diff --git a/loleaflet/images/lc_basicshapes.block-arc.svg b/loleaflet/images/lc_basicshapes.block-arc.svg
index 8b2fa1112..e0b17f99e 100644
--- a/loleaflet/images/lc_basicshapes.block-arc.svg
+++ b/loleaflet/images/lc_basicshapes.block-arc.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset="0"/><stop offset="1" stop-opacity="0"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="c" cx="2.25" cy="16" gradientTransform="matrix(.23703704 0 0 .0592592 4.466667 16.051852)" gradientUnits="userSpaceOnUse" r="16.875" xlink:href="#a"/><linearGradient id="d" gradientTransform="matrix(1.1711695 0 0 1.1711694 -.292731 3.71521)" gradientUnits="userSpaceOnUse" x1="9.446185" x2="13.927343" xlink:href="#b" y1="8.231112" y2="13.700933"/><radialGradient id="e" cx="2.25" cy="16" gradientTransform="matrix(.23703704 0 0 .0592592 18.466666 16.051852)" gradientUnits="userSpaceOnUse" r="16.875" xlink:href="#a"/><linearGradient id="f" gradientTransform="matrix(1.0617 0 0 .82364068 .856274 5.525346)" gradientUnits="userSpaceOnUse" x1="9.446185" x2="13.
 927343" xlink:href="#b" y1="8.231112" y2="13.700933"/><g fill-rule="evenodd" transform="translate(0 2)"><ellipse cx="5" cy="17" display="block" fill="url(#c)" opacity=".433333" rx="4" ry="1"/><ellipse cx="19" cy="17" display="block" fill="url(#e)" opacity=".433333" rx="4" ry="1"/><path d="m12 6.4997034c-5.1885241-.0001638-9.3946951 4.8117726-9.3945312 10.0002966h4.4199218c.2567675-2.554807 2.4069321-4.999832 4.9746094-5 2.566182.0022 4.714086 2.44668 4.970703 5h4.423828c.000164-5.188524-4.206007-10.0004603-9.394531-10.0002966z" fill="url(#d)" stroke="#888a85" stroke-linejoin="round" stroke-width="1.21153"/><path d="m12 7.4835784c-4.7035512-.0001152-8.2665704 4.3675216-8.2664218 8.0164216h2.5692905c.2327674-1.796702 2.6971313-5.187243 5.6971313-5.187396 3 .0021 5.648459 3.391739 5.881089 5.187396h2.510332c.000149-3.6489-3.68787-8.0165367-8.391421-8.0164216z" fill="url(#f)" stroke="#fdfdfb" stroke-linejoin="round" stroke-width=".967156"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 8 C 7.581722 8 4 11.5817 4 16 L 8 16 C 8 13.7909 9.790861 12 12 12 C 14.209139 12 16 13.7909 16 16 L 20 16 C 20 11.5817 16.418278 8 12 8 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.can.svg b/loleaflet/images/lc_basicshapes.can.svg
index 9bb667216..51a17bf58 100644
--- a/loleaflet/images/lc_basicshapes.can.svg
+++ b/loleaflet/images/lc_basicshapes.can.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.479894 0 0 .11633788 10.772975 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><linearGradient id="c" gradientTransform="matrix(.94967397 0 0 .57566701 2.032112 8.013621)" gradientUnits="userSpaceOnUse" x1="9.446185" x2="13.927343" xlink:href="#a" y1="8.231112" y2="13.700933"/><linearGradient id="d" gradientTransform="matrix(.81198146 0 0 .43797462 3.477348 -.554511)" gradientUnits="userSpaceOnUse" x1="9.446185" x2="13.927343" xlink:href="#a" y1="8.231112" y2="13.700933"/><linearGradient id="e" gradientTransform="matrix(.92471361 0 0 .55070684 2.294098 -1.726817)" gradientUnits="userSpaceOnUse" x1="9.446185" x2="13.927343
 " xlink:href="#a" y1="8.231112" y2="13.700933"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="12" x2="12" y1="2" y2="11"><stop offset="0" stop-color="#888a85"/><stop offset="1" stop-color="#888a85" stop-opacity="0"/></linearGradient><g fill-rule="evenodd" transform="translate(0 2)"><ellipse cx="11.852736" cy="17.674644" display="block" fill="url(#b)" opacity=".433333" rx="8.098211" ry="1.963204"/><g stroke-linejoin="round"><path d="m19.5 14c0 2.550211-3.292935 4.617565-7.5 4.617565s-7.5-2.067354-7.5-4.617565v-10.5h15z" fill="url(#c)" stroke="#888a85"/><ellipse cx="12" cy="4" fill="url(#e)" rx="7.417353" ry="4.417353" stroke="url(#f)" stroke-width="1.165293"/><ellipse cx="12" cy="4" fill="url(#d)" rx="6.513101" ry="3.513101" stroke="#fdfdfb" stroke-width=".973798"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 A 8 4 0 0 0 4 8 A 8 4 0 0 0 12 12 A 8 4 0 0 0 20 8 A 8 4 0 0 0 12 4 z M 4 9 L 4 16 C 4 18.209139 7.581722 20 12 20 C 16.418278 20 20 18.209139 20 16 L 20 9 C 20 11.209139 16.418278 13 12 13 C 7.581722 13 4 11.209139 4 9 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.cross.svg b/loleaflet/images/lc_basicshapes.cross.svg
index 9d6e36585..6515f6e52 100644
--- a/loleaflet/images/lc_basicshapes.cross.svg
+++ b/loleaflet/images/lc_basicshapes.cross.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.11361861 0 0 .38669439 9.334896 .088592)" gradientUnits="userSpaceOnUse" x1="23.598076" x2="37.746555" y1="23.992306" y2="39.486301"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.23703704 0 0 .0592592 11.466667 17.6897)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><g transform="translate(0 2)"><ellipse cx="12" cy="18.637848" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".711111" rx="4" ry="1"/><path d="m9.5 1.5h5v6h6v5h-5.992961l-.007 6h-5v-6h-6v-5h6z" fill="url(#a)" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round"/><path d="m10.38238 2.5h3.235286v5.8823567h5.882334v3.2352853h-5.877779l-.0046 5.882358h-3.235287v-5.88235
 8h-5.882334v-3.2352853h5.882334z" fill="none" stroke="#fdfdfb" stroke-linecap="round"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 10 4 L 10 10 L 4 10 L 4 14 L 10 14 L 10 20 L 14 20 L 14 14 L 20 14 L 20 10 L 14 10 L 14 4 L 10 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.cube.svg b/loleaflet/images/lc_basicshapes.cube.svg
index 4fa6151dc..e754b185a 100644
--- a/loleaflet/images/lc_basicshapes.cube.svg
+++ b/loleaflet/images/lc_basicshapes.cube.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.34217456 0 0 .34252098 2.973755 2.220805)" gradientUnits="userSpaceOnUse" x1="23.598076" x2="37.746555" y1="23.992306" y2="39.486301"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.53333333 0 0 .11633788 10.8 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><g transform="translate(0 2)"><path d="m6.470983.470983h15.058034v15.058034h-15.058034z" fill="none" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" stroke-width=".941966"/><ellipse cx="12" cy="17.674644" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".711111" rx="9" ry="1.963204"/><path d="m3.470983 3.470983h15.058034v15.058034h-15.058034z" fill="url(#a)" stro
 ke="#888a85" stroke-linecap="round" stroke-linejoin="round" stroke-width=".941966"/><path d="m4.464926 4.464924h13.070149v13.07015h-13.070149z" fill="none" stroke="#fdfdfb" stroke-width=".929851"/><path d="m18.513893 3.8900003 3.083358-3.08335767v14.38900137l-3.083358 3.083358z" fill="#dbdbdb" fill-rule="evenodd" stroke="#888a85" stroke-linejoin="round" stroke-width="1.027786"/><path d="m17.902822 3.4861071 3.083358-3.08335775h-14.3890017l-3.083358 3.08335775z" fill="#fafafa" fill-rule="evenodd" stroke="#888a85" stroke-linejoin="round" stroke-width="1.027786"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 6.6796875 4 L 4.6953125 6 L 17.291016 6 L 19.306641 4 L 6.6796875 4 z M 20 4.6992188 L 18 6.6875 L 18 18.306641 L 20 16.3125 L 20 4.6992188 z M 4 7 L 4 20 L 17 20 L 17 7 L 4 7 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.diamond.svg b/loleaflet/images/lc_basicshapes.diamond.svg
index 7399d5c6b..c19d42c70 100644
--- a/loleaflet/images/lc_basicshapes.diamond.svg
+++ b/loleaflet/images/lc_basicshapes.diamond.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.29940274 0 0 .29970586 -5.093429 7.359231)" gradientUnits="userSpaceOnUse" x1="35.905758" x2="19.373688" y1="13.19453" y2="29.709881"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.2091713 0 0 .04562727 11.529365 18.13785)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><g transform="translate(0 2)"><ellipse cx="12" cy="18.867887" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".5" rx="3.529766" ry=".769961"/><path d="m-4.658354 8.453136h13.175779v13.175779h-13.175779z" fill="url(#a)" stroke="#686a66" stroke-linecap="round" stroke-linejoin="round" stroke-width=".82422" transform="matrix(.70710678 -.70710678 .70710678 .70710678 0 0)"/><path 
 d="m-3.879419 9.232071h11.61791v11.61791h-11.61791z" fill="none" stroke="#fdfdfb" stroke-width=".826534" transform="matrix(.70710678 -.70710678 .70710678 .70710678 0 0)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 4 12 L 12 20 L 20 12 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.hexagon.svg b/loleaflet/images/lc_basicshapes.hexagon.svg
index 0a3da3810..617396304 100644
--- a/loleaflet/images/lc_basicshapes.hexagon.svg
+++ b/loleaflet/images/lc_basicshapes.hexagon.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.503704 0 0 .11633788 10.861863 16.175388)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><linearGradient id="c" gradientTransform="matrix(.874941 0 0 .868551 2.834335 1.349651)" gradientUnits="userSpaceOnUse" x1="10.769515" x2="15.923767" xlink:href="#a" y1="8.71965" y2="15.039417"/><linearGradient id="d" gradientTransform="matrix(1.001575 0 0 1 1.492156 .000001)" gradientUnits="userSpaceOnUse" x1="10.769515" x2="15.923767" xlink:href="#a" y1="8.71965" y2="15.039417"/><g fill-rule="evenodd" transform="translate(0 2)"><ellipse cx="11.995196" cy="18.036797" display="block" fill="url(#b)" opacity=".6" rx="8.500005" ry="1.963204"/><pat
 h d="m6.889 2.5h10.25l3.861 8.000393-3.861 8.002906h-10.25l-3.889-8.003692z" fill="url(#d)" stroke="#888a85"/><path d="m7.629 3.5h8.76l3.535 6.977518-3.535 7.024623-8.76-.0078-3.52-6.971848z" fill="url(#c)" stroke="#fdfdfb"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 L 4 12 L 8 20 L 16 20 L 20 12 L 16 4 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.isosceles-triangle.svg b/loleaflet/images/lc_basicshapes.isosceles-triangle.svg
index 52c316594..09a2de960 100644
--- a/loleaflet/images/lc_basicshapes.isosceles-triangle.svg
+++ b/loleaflet/images/lc_basicshapes.isosceles-triangle.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.38494639 0 0 .38533611 2.970474 .123405)" gradientUnits="userSpaceOnUse" x1="23.598076" x2="37.746555" y1="23.992306" y2="39.486301"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.53333333 0 0 .11633788 10.8 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><g transform="translate(0 2)"><ellipse cx="12" cy="17.674644" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".711111" rx="9" ry="1.963204"/><path d="m11.5 1.5298555 8.970145 16.9402885h-16.940289z" fill="url(#a)" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.059712"/><path d="m11.5 4 7.234328 13.468657h-13.4686562z" fill="none" stroke="#fdfdfb"
  stroke-width="1.062686"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 4 20 L 20 20 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.octagon.svg b/loleaflet/images/lc_basicshapes.octagon.svg
index 7708363ce..f8ee1ff86 100644
--- a/loleaflet/images/lc_basicshapes.octagon.svg
+++ b/loleaflet/images/lc_basicshapes.octagon.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.503704 0 0 .11633788 10.861863 16.175388)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><linearGradient id="c" gradientTransform="matrix(.874941 0 0 .868551 2.834335 1.349651)" gradientUnits="userSpaceOnUse" x1="10.769515" x2="15.923767" xlink:href="#a" y1="8.71965" y2="15.039417"/><linearGradient id="d" gradientTransform="matrix(1.001575 0 0 1 1.492156 .000001)" gradientUnits="userSpaceOnUse" x1="10.769515" x2="15.923767" xlink:href="#a" y1="8.71965" y2="15.039417"/><g fill-rule="evenodd" transform="translate(0 2)"><ellipse cx="11.995196" cy="18.036797" display="block" fill="url(#b)" opacity=".6" rx="8.500005" ry="1.963204"/><pat
 h d="m6.889 2.5h10.25l3.361 6v4l-3.361 6.003299h-10.25l-3.389-6.003299v-4.0685475z" fill="url(#d)" stroke="#888a85"/><path d="m7.5 3.5h9l3 5.3v3.4l-3 5.302141-9-.0078-3-5.294341v-3.301045z" fill="url(#c)" stroke="#fdfdfb"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8.5 4 L 4 8.5 L 4 15.5 L 8.5 20 L 15.5 20 L 20 15.5 L 20 8.5 L 15.5 4 L 8.5 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.paper.svg b/loleaflet/images/lc_basicshapes.paper.svg
index 8ae35d5b0..d71c07d4c 100644
--- a/loleaflet/images/lc_basicshapes.paper.svg
+++ b/loleaflet/images/lc_basicshapes.paper.svg
@@ -1 +1,10 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.34025939 0 0 .40884402 4.018678 1.02087)" gradientUnits="userSpaceOnUse" x1="23.598076" x2="37.746555" y1="23.992306" y2="39.486301"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.53333333 0 0 .11633788 10.620227 18.244692)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><ellipse cx="11.820227" cy="20.1061" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".711111" rx="9" ry="1.963204"/><g transform="matrix(1 0 0 -1 0 23.000001)"><path d="m4.5131235 2.5131238h11.4868765l3.486876 3.4868762v14.486877h-14.9737525z" fill="url(#a)" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.026247"/><path d="m5.5121508 3.512151
 2h9.9558112l3.019887 2.9878488v12.98785h-12.9756982z" fill="none" stroke="#fdfdfb" stroke-width="1.024302"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 5 4 L 5 20 L 6 20 L 14 20 L 15 20 L 16 19 L 18 17 L 19 16 L 19 14.59375 L 19 4 L 18 4 L 6 4 L 5 4 z "
+     />
+ <path 
+     style="fill:#b3b3b3" 
+     d="M 15 16 L 15 20 L 19 16 L 15 16 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.pentagon.svg b/loleaflet/images/lc_basicshapes.pentagon.svg
index dbd9822cd..6c1d7b972 100644
--- a/loleaflet/images/lc_basicshapes.pentagon.svg
+++ b/loleaflet/images/lc_basicshapes.pentagon.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.503704 0 0 .11633788 10.861863 16.175388)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><linearGradient id="c" gradientTransform="matrix(.874941 0 0 .868551 2.834335 1.349651)" gradientUnits="userSpaceOnUse" x1="10.769515" x2="15.923767" xlink:href="#a" y1="8.71965" y2="15.039417"/><linearGradient id="d" gradientTransform="matrix(1.001575 0 0 1 1.492156 .000001)" gradientUnits="userSpaceOnUse" x1="10.769515" x2="15.923767" xlink:href="#a" y1="8.71965" y2="15.039417"/><g fill-rule="evenodd" transform="translate(0 2)"><ellipse cx="11.995196" cy="18.036797" display="block" fill="url(#b)" opacity=".6" rx="8.500005" ry="1.963204"/><pat
 h d="m11.871559 3.623766 8.06297 5.9584575-2.795091 8.9210755h-10.2508706l-2.8239595-8.921861z" fill="url(#d)" stroke="#888a85"/><path d="m11.878997 4.6223379 7.045116 5.2458869-2.534686 7.6339162-8.7607308-.007811-2.5199123-7.5811412z" fill="url(#c)" stroke="#fdfdfb"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 11.994141 4 L 4 10.117188 L 7.0644531 20 L 16.953125 19.990234 L 20 10.101562 L 11.994141 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.right-triangle.svg b/loleaflet/images/lc_basicshapes.right-triangle.svg
index 2e6d6698a..a977e333c 100644
--- a/loleaflet/images/lc_basicshapes.right-triangle.svg
+++ b/loleaflet/images/lc_basicshapes.right-triangle.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.38494639 0 0 .38533611 2.970474 .123405)" gradientUnits="userSpaceOnUse" x1="23.598076" x2="37.746555" y1="23.992306" y2="39.486301"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.53333333 0 0 .11633788 10.8 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><g transform="translate(0 2)"><ellipse cx="12" cy="17.674644" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".711111" rx="9" ry="1.963204"/><path d="m3.529856 1.5298555 16.940289 16.9402885h-16.940289z" fill="url(#a)" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.059712"/><path d="m4.5313435 4 13.4686565 13.468657h-13.4686565z" fill="none" stro
 ke="#fdfdfb" stroke-width="1.062686"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 4 20 L 16 20 L 20 20 L 4 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.ring.svg b/loleaflet/images/lc_basicshapes.ring.svg
index 1fe2d3f1d..01aba2ebe 100644
--- a/loleaflet/images/lc_basicshapes.ring.svg
+++ b/loleaflet/images/lc_basicshapes.ring.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><radialGradient id="a" cx="2.25" cy="16" gradientTransform="matrix(.479894 0 0 .11633788 10.772975 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><linearGradient id="b" gradientTransform="matrix(1.0540526 0 0 1.0540525 .936542 1.038878)" gradientUnits="userSpaceOnUse" x1="9.446185" x2="13.927343" y1="8.231112" y2="13.700933"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><g transform="translate(0 2)"><ellipse cx="11.852736" cy="17.674644" display="block" fill="url(#a)" fill-rule="evenodd" opacity=".433333" rx="8.098211" ry="1.963204"/><path d="m12 3.5449219a8.4548111 8.4548111 0 0 0 -8.4550781 8.4550781 8.4548111 8.4548111 0 0 0 8.4550781 8.455078 8.4548111 8.4548111 0 0 0 8.455078-8.455078 8.4548111 8.4548111 0 0 0 -8.455078-8.4550781zm0 2.9550781a5.5 5.5
  0 0 1 5.5 5.5 5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5z" fill="url(#b)" fill-rule="evenodd" stroke="#888a85" stroke-linejoin="round" stroke-width="1.090377" transform="translate(0 -2)"/><ellipse cx="12" cy="10" fill="none" rx="7.44816" ry="7.448159" stroke="#fdfdfb" stroke-linejoin="round" stroke-width="1.103681"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 C 7.581722 4 4 7.5817 4 12 C 4 16.4183 7.581722 20 12 20 C 16.418278 20 20 16.4183 20 12 C 20 7.5817 16.418278 4 12 4 z M 12 8 C 14.209139 8 16 9.7909 16 12 C 16 14.2091 14.209139 16 12 16 C 9.790861 16 8 14.2091 8 12 C 8 9.7909 9.790861 8 12 8 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.round-quadrat.svg b/loleaflet/images/lc_basicshapes.round-quadrat.svg
index 06219a8e3..d60e9dd0e 100644
--- a/loleaflet/images/lc_basicshapes.round-quadrat.svg
+++ b/loleaflet/images/lc_basicshapes.round-quadrat.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.38494639 0 0 .38533611 2.970474 .123405)" gradientUnits="userSpaceOnUse" x1="23.598076" x2="37.746555" y1="23.992306" y2="39.486301"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.53333333 0 0 .11633788 10.8 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><g transform="translate(0 2)"><ellipse cx="12" cy="17.674644" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".711111" rx="9" ry="1.963204"/><rect fill="url(#a)" height="16.940289" rx="2.470145" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.059712" width="16.940289" x="3.529856" y="1.529856"/><rect fill="none" height="14.937314" rx="1.468657" st
 roke="#fdfdfb" stroke-width="1.062686" width="14.937313" x="4.531344" y="2.531343"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 6 4 C 4.8920127 4 4 4.8920127 4 6 L 4 18 C 4 19.107987 4.8920127 20 6 20 L 18 20 C 19.107987 20 20 19.107987 20 18 L 20 6 C 20 4.8920127 19.107987 4 18 4 L 6 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_basicshapes.trapezoid.svg b/loleaflet/images/lc_basicshapes.trapezoid.svg
index a9a333d9b..d12731c31 100644
--- a/loleaflet/images/lc_basicshapes.trapezoid.svg
+++ b/loleaflet/images/lc_basicshapes.trapezoid.svg
@@ -1 +1,6 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.38705024 0 0 .31920189 2.921125 3.318499)" gradientUnits="userSpaceOnUse" x1="23.598076" x2="37.746555" y1="23.992306" y2="39.486301"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.53333333 0 0 .11633788 10.8 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><g transform="translate(0 2)"><ellipse cx="12" cy="17.674644" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".711111" rx="9" ry="1.963204"/><path d="m6.5 4.4835644h11l3.016436 14.0328716h-17.0328716z" fill="url(#a)" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" stroke-width=".967129"/><path d="m7.5 5.4787621h9.021l3.000237 12.0424749h-15.0424744z" fill="none"
  stroke="#fdfdfb" stroke-width=".957525"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 8 20 L 16 20 L 20 4 L 4 4 z "
+     />
+ </svg>
commit 880cd304b69696d12713bc6876cb71187e1a5b48
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri May 25 15:13:30 2018 +0530

    loleaflet: Add arrow shapes
    
    Change-Id: Ia3eca34969a22110037e08c39e8f68771882c89f

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 9a237722d..ec3612fdb 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -298,6 +298,37 @@ button.leaflet-control-search-next
 .w2ui-icon.symbolshapes_octagon-bevel { background: url('images/lc_symbolshapes.octagon-bevel.svg') no-repeat center !important; }
 .w2ui-icon.symbolshapes_diamond-bevel { background: url('images/lc_symbolshapes.diamond-bevel.svg') no-repeat center !important; }
 
+.w2ui-icon.arrowshapes_left-arrow { background: url('images/lc_arrowshapes.left-arrow.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_right-arrow { background: url('images/lc_arrowshapes.right-arrow.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_up-arrow { background: url('images/lc_arrowshapes.up-arrow.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_down-arrow { background: url('images/lc_arrowshapes.down-arrow.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_left-right-arrow { background: url('images/lc_arrowshapes.left-right-arrow.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_up-down-arrow { background: url('images/lc_arrowshapes.up-down-arrow.svg') no-repeat center !important; }
+
+.w2ui-icon.arrowshapes_up-right-arrow { background: url('images/lc_arrowshapes.up-right-arrow.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_up-right-down-arrow { background: url('images/lc_arrowshapes.up-right-down-arrow.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_quad-arrow { background: url('images/lc_arrowshapes.quad-arrow.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_corner-right-arrow { background: url('images/lc_arrowshapes.corner-right-arrow.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_split-arrow { background: url('images/lc_arrowshapes.split-arrow.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_striped-right-arrow { background: url('images/lc_arrowshapes.striped-right-arrow.svg') no-repeat center !important; }
+
+.w2ui-icon.arrowshapes_notched-right-arrow { background: url('images/lc_arrowshapes.notched-right-arrow.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_pentagon-right { background: url('images/lc_arrowshapes.pentagon-right.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_chevron { background: url('images/lc_arrowshapes.chevron.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_right-arrow-callout { background: url('images/lc_arrowshapes.right-brace.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_left-arrow-callout { background: url('images/lc_arrowshapes.left-arrow-callout.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_up-arrow-callout { background: url('images/lc_arrowshapes.up-arrow-callout.svg') no-repeat center !important; }
+
+.w2ui-icon.arrowshapes_down-arrow-callout { background: url('images/lc_arrowshapes.down-arrow-callout.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_left-right-arrow-callout { background: url('images/lc_arrowshapes.left-right-arrow-callout.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_up-down-arrow-callout { background: url('images/lc_arrowshapes.up-down-arrow-callout.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_up-right-arrow-callout { background: url('images/lc_arrowshapes.up-right-arrow-callout.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_quad-arrow-callout { background: url('images/lc_arrowshapes.quad-arrow-callout.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_circular-arrow { background: url('images/lc_arrowshapes.circular-arrow.svg') no-repeat center !important; }
+
+.w2ui-icon.arrowshapes_split-round-arrow { background: url('images/lc_arrowshapes.split-round-arrow.svg') no-repeat center !important; }
+.w2ui-icon.arrowshapes_s-sharped-arrow { background: url('images/lc_arrowshapes.s-sharped-arrow.svg') no-repeat center !important; }
+
 .w2ui-icon.accepttrackedchanges{ background: url('images/lc_accepttrackedchanges.svg') no-repeat center !important; }
 .w2ui-icon.alignblock{ background: url('images/lc_alignblock.svg') no-repeat center !important; }
 .w2ui-icon.alignhorizontal{ background: url('images/lc_alignhorizontalcenter.svg') no-repeat center !important; }
diff --git a/loleaflet/images/lc_arrowshapes.chevron.svg b/loleaflet/images/lc_arrowshapes.chevron.svg
new file mode 100644
index 000000000..9c77fd850
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.chevron.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 8 12 L 4 20 L 16 20 L 20 12 L 16 4 L 4 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.circular-arrow.svg b/loleaflet/images/lc_arrowshapes.circular-arrow.svg
new file mode 100644
index 000000000..bd0d2dd29
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.circular-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 11 6.5 C 7.13401 6.5 4 9.634 4 13.5 L 8 13.5 C 8 11.84314 9.34314 10.5 11 10.5 C 12.65685 10.5 14 11.84314 14 13.5 L 12 13.5 L 16 17.5 L 20 13.5 L 18 13.5 C 18 9.634 14.86599 6.5 11 6.5 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.corner-right-arrow.svg b/loleaflet/images/lc_arrowshapes.corner-right-arrow.svg
new file mode 100644
index 000000000..1ab4d463e
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.corner-right-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 L 8 18 L 16 18 L 16 20 L 20 16 L 16 12 L 16 14 L 12 14 L 12 4 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.down-arrow-callout.svg b/loleaflet/images/lc_arrowshapes.down-arrow-callout.svg
new file mode 100644
index 000000000..1dae06c1b
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.down-arrow-callout.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 4 14 L 10 14 L 10 16 L 8 16 L 12 20 L 16 16 L 14 16 L 14 14 L 20 14 L 20 4 L 4 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.down-arrow.svg b/loleaflet/images/lc_arrowshapes.down-arrow.svg
new file mode 100644
index 000000000..5c37f5085
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.down-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 10 4 L 10 16 L 8 16 L 12 20 L 16 16 L 14 16 L 14 4 L 10 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.left-arrow-callout.svg b/loleaflet/images/lc_arrowshapes.left-arrow-callout.svg
new file mode 100644
index 000000000..bd28932ed
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.left-arrow-callout.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 10 4 L 10 10 L 8 10 L 8 8 L 4 12 L 8 16 L 8 14 L 10 14 L 10 20 L 20 20 L 20 4 L 10 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.left-arrow.svg b/loleaflet/images/lc_arrowshapes.left-arrow.svg
new file mode 100644
index 000000000..541b698d9
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.left-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 8 L 4 12 L 8 16 L 8 14 L 20 14 L 20 10 L 8 10 L 8 8 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.left-right-arrow-callout.svg b/loleaflet/images/lc_arrowshapes.left-right-arrow-callout.svg
new file mode 100644
index 000000000..8ec293602
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.left-right-arrow-callout.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 10 4 L 10 10 L 8 10 L 8 8 L 4 12 L 8 16 L 8 14 L 10 14 L 10 20 L 14 20 L 14 14 L 16 14 L 16 16 L 20 12 L 16 8 L 16 10 L 14 10 L 14 4 L 10 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.notched-right-arrow.svg b/loleaflet/images/lc_arrowshapes.notched-right-arrow.svg
new file mode 100644
index 000000000..422725d40
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.notched-right-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 16 8 L 16 10 L 4 10 L 6 12 L 4 14 L 16 14 L 16 16 L 20 12 L 16 8 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.pentagon-right.svg b/loleaflet/images/lc_arrowshapes.pentagon-right.svg
new file mode 100644
index 000000000..0bb512206
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.pentagon-right.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 4 20 L 16 20 L 20 12 L 16 4 L 4 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.quad-arrow-callout.svg b/loleaflet/images/lc_arrowshapes.quad-arrow-callout.svg
new file mode 100644
index 000000000..cf472a830
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.quad-arrow-callout.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 9 7 L 11 7 L 11 8 L 8 8 L 8 11 L 7 11 L 7 9 L 4 12 L 7 15 L 7 13 L 8 13 L 8 16 L 11 16 L 11 17 L 9 17 L 12 20 L 15 17 L 13 17 L 13 16 L 16 16 L 16 13 L 17 13 L 17 15 L 20 12 L 17 9 L 17 11 L 16 11 L 16 8 L 13 8 L 13 7 L 15 7 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.quad-arrow.svg b/loleaflet/images/lc_arrowshapes.quad-arrow.svg
new file mode 100644
index 000000000..080ee58e2
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.quad-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 9 7 L 11 7 L 11 11 L 7 11 L 7 9 L 4 12 L 7 15 L 7 13 L 11 13 L 11 17 L 9 17 L 12 20 L 15 17 L 13 17 L 13 13 L 17 13 L 17 15 L 20 12 L 17 9 L 17 11 L 13 11 L 13 7 L 15 7 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.right-arrow-callout.svg b/loleaflet/images/lc_arrowshapes.right-arrow-callout.svg
new file mode 100644
index 000000000..711b8731f
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.right-arrow-callout.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 4 20 L 14 20 L 14 14 L 16 14 L 16 16 L 20 12 L 16 8 L 16 10 L 14 10 L 14 4 L 4 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.right-arrow.svg b/loleaflet/images/lc_arrowshapes.right-arrow.svg
new file mode 100644
index 000000000..8f794f6c7
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.right-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 16 8 L 16 10 L 4 10 L 4 14 L 16 14 L 16 16 L 20 12 L 16 8 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.s-sharped-arrow.svg b/loleaflet/images/lc_arrowshapes.s-sharped-arrow.svg
new file mode 100644
index 000000000..7360980ca
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.s-sharped-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 16 4 L 16 6 L 15 6 C 11.134 6 8 9.13401 8 13 C 8 14.65685 6.65686 16 5 16 L 4 16 L 4 20 L 5 20 C 8.866 20 12 16.86599 12 13 C 12 11.34315 13.34314 10 15 10 L 16 10 L 16 12 L 20 8 L 16 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.split-arrow.svg b/loleaflet/images/lc_arrowshapes.split-arrow.svg
new file mode 100644
index 000000000..bc7a169ac
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.split-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 4 L 4 9.65625 L 5.40625 8.25 L 10 12.84375 L 10 20 L 14 20 L 14 12.84375 L 18.59375 8.25 L 20 9.65625 L 20 4 L 14.34375 4 L 15.75 5.40625 L 12 9.15625 L 8.25 5.40625 L 9.65625 4 L 4 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.split-round-arrow.svg b/loleaflet/images/lc_arrowshapes.split-round-arrow.svg
new file mode 100644
index 000000000..990112821
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.split-round-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 L 4 8 L 8 12 L 8 10 L 9 10 C 9.5522837 10 10 10.447715 10 11 L 10 20 L 14 20 L 14 11 C 14 10.44771 14.44772 10 15 10 L 16 10 L 16 12 L 20 8 L 16 4 L 16 6 L 15 6 C 13.862612 6 12.8401 6.3915915 12 7.03125 C 11.1599 6.391592 10.13739 6 9 6 L 8 6 L 8 5 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.striped-right-arrow.svg b/loleaflet/images/lc_arrowshapes.striped-right-arrow.svg
new file mode 100644
index 000000000..91aef835b
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.striped-right-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 16 8 L 16 10 L 8 10 L 8 14 L 16 14 L 16 16 L 20 12 L 16 8 z M 4 10 L 4 14 L 5 14 L 5 10 L 4 10 z M 6 10 L 6 14 L 7 14 L 7 10 L 6 10 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.svg b/loleaflet/images/lc_arrowshapes.svg
new file mode 100644
index 000000000..054f02bbf
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 8 L 4 12 L 8 16 L 8 14 L 16 14 L 16 16 L 20 12 L 16 8 L 16 10 L 8 10 L 8 8 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.up-arrow-callout.svg b/loleaflet/images/lc_arrowshapes.up-arrow-callout.svg
new file mode 100644
index 000000000..fbcb5ecbb
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.up-arrow-callout.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 8 8 L 10 8 L 10 10 L 4 10 L 4 20 L 20 20 L 20 10 L 14 10 L 14 8 L 16 8 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.up-arrow.svg b/loleaflet/images/lc_arrowshapes.up-arrow.svg
new file mode 100644
index 000000000..5180cb0e7
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.up-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 8 8 L 10 8 L 10 20 L 14 20 L 14 8 L 16 8 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.up-down-arrow-callout.svg b/loleaflet/images/lc_arrowshapes.up-down-arrow-callout.svg
new file mode 100644
index 000000000..a6c2a76ef
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.up-down-arrow-callout.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 8 8 L 10 8 L 10 10 L 4 10 L 4 14 L 10 14 L 10 16 L 8 16 L 12 20 L 16 16 L 14 16 L 14 14 L 20 14 L 20 10 L 14 10 L 14 8 L 16 8 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.up-down-arrow.svg b/loleaflet/images/lc_arrowshapes.up-down-arrow.svg
new file mode 100644
index 000000000..6c019af29
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.up-down-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 8 8 L 10 8 L 10 16 L 8 16 L 12 20 L 16 16 L 14 16 L 14 8 L 16 8 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.up-right-arrow-callout.svg b/loleaflet/images/lc_arrowshapes.up-right-arrow-callout.svg
new file mode 100644
index 000000000..1ea350e48
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.up-right-arrow-callout.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 L 4 8 L 6 8 L 6 11 L 6 12 L 4 12 L 4 20 L 12 20 L 12 18 L 13 18 L 16 18 L 16 20 L 20 16 L 16 12 L 16 14 L 13 14 L 12 14 L 12 12 L 10 12 L 10 11 L 10 8 L 12 8 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.up-right-arrow.svg b/loleaflet/images/lc_arrowshapes.up-right-arrow.svg
new file mode 100644
index 000000000..179bfc2c5
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.up-right-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 L 4 8 L 6 8 L 6 18 L 16 18 L 16 20 L 20 16 L 16 12 L 16 14 L 10 14 L 10 8 L 12 8 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_arrowshapes.up-right-down-arrow.svg b/loleaflet/images/lc_arrowshapes.up-right-down-arrow.svg
new file mode 100644
index 000000000..502c31aa1
--- /dev/null
+++ b/loleaflet/images/lc_arrowshapes.up-right-down-arrow.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 L 4 8 L 6 8 L 6 16 L 4 16 L 8 20 L 12 16 L 10 16 L 10 14 L 16 14 L 16 16 L 20 12 L 16 8 L 16 10 L 10 10 L 10 8 L 12 8 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 9f8f72435..dc3598b60 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -297,7 +297,7 @@ function insertTable() {
 }
 
 var shapes = {
-	'Basic Shapes': [
+	'Basic': [
 		{img: 'basicshapes_rectangle', uno: 'BasicShapes.rectangle'},
 		{img: 'basicshapes_round-rectangle', uno: 'BasicShapes.round-rectangle'},
 		{img: 'basicshapes_quadrat', uno: 'BasicShapes.quadrat'},
@@ -325,7 +325,7 @@ var shapes = {
 		{img: 'basicshapes_frame', uno: 'BasicShapes.frame'}
 	],
 
-	'Symbol Shapes':  [
+	'Symbols':  [
 		{img: 'symbolshapes', uno: 'SymbolShapes.smiley'},
 		{img: 'symbolshapes_sun', uno: 'SymbolShapes.sun'},
 		{img: 'symbolshapes_moon', uno: 'SymbolShapes.moon'},
@@ -346,6 +346,39 @@ var shapes = {
 		{img: 'symbolshapes_quad-bevel', uno: 'SymbolShapes.quad-bevel'},
 		{img: 'symbolshapes_octagon-bevel', uno: 'SymbolShapes.octagon-bevel'},
 		{img: 'symbolshapes_diamond-bevel', uno: 'SymbolShapes.diamond-bevel'}
+	],
+
+	'Arrows': [
+		{img: 'arrowshapes_left-arrow', uno: 'ArrowShapes.left-arrow'},
+		{img: 'arrowshapes_right-arrow', uno: 'ArrowShapes.right-arrow'},
+		{img: 'arrowshapes_up-arrow', uno: 'ArrowShapes.up-arrow'},
+		{img: 'arrowshapes_down-arrow', uno: 'ArrowShapes.down-arrow'},
+		{img: 'arrowshapes_left-right-arrow', uno: 'ArrowShapes.left-right-arrow'},
+		{img: 'arrowshapes_up-down-arrow', uno: 'ArrowShapes.up-down-arrow'},
+
+		{img: 'arrowshapes_up-right-arrow', uno: 'ArrowShapes.up-right-arrow'},
+		{img: 'arrowshapes_up-right-down-arrow', uno: 'ArrowShapes.up-right-down-arrow'},
+		{img: 'arrowshapes_quad-arrow', uno: 'ArrowShapes.quad-arrow'},
+		{img: 'arrowshapes_corner-right-arrow', uno: 'ArrowShapes.corner-right-arrow'},
+		{img: 'arrowshapes_split-arrow', uno: 'ArrowShapes.split-arrow'},
+		{img: 'arrowshapes_striped-right-arrow', uno: 'ArrowShapes.striped-right-arrow'},
+
+		{img: 'arrowshapes_notched-right-arrow', uno: 'ArrowShapes.notched-right-arrow'},
+		{img: 'arrowshapes_pentagon-right', uno: 'ArrowShapes.pentagon-right'},
+		{img: 'arrowshapes_chevron', uno: 'ArrowShapes.chevron'},
+		{img: 'arrowshapes_right-arrow-callout', uno: 'ArrowShapes.right-arrow-callout'},
+		{img: 'arrowshapes_left-arrow-callout', uno: 'ArrowShapes.left-arrow-callout'},
+		{img: 'arrowshapes_up-arrow-callout', uno: 'ArrowShapes.up-arrow-callout'},
+
+		{img: 'arrowshapes_down-arrow-callout', uno: 'ArrowShapes.down-arrow-callout'},
+		{img: 'arrowshapes_left-right-arrow-callout', uno: 'ArrowShapes.left-right-arrow-callout'},
+		{img: 'arrowshapes_up-down-arrow-callout', uno: 'ArrowShapes.up-down-arrow-callout'},
+		{img: 'arrowshapes_up-right-arrow-callout', uno: 'ArrowShapes.up-right-arrow-callout'},
+		{img: 'arrowshapes_quad-arrow-callout', uno: 'ArrowShapes.quad-arrow-callout'},
+		{img: 'arrowshapes_circular-arrow', uno: 'ArrowShapes.circular-arrow'},
+
+		{img: 'arrowshapes_split-round-arrow', uno: 'ArrowShapes.split-round-arrow'},
+		{img: 'arrowshapes_s-sharped-arrow', uno: 'ArrowShapes.s-sharped-arrow'}
 	]
 };
 
@@ -353,7 +386,7 @@ function insertShapes() {
 	var width = 6;
 	var $grid = $('.insertshape-grid');
 
-	if ($grid.children().size() == rows)
+	if ($grid.children().size() > 0)
 		return;
 
 	for (var s in shapes) {
commit 91bced53a96f84da12d3b2ad3e503af24b264b1a
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri May 25 14:53:47 2018 +0530

    loleaflet: Separate section for more shapes; add symbol shapes
    
    Change-Id: I4f683b50fb7debf195ead56c48ef64d7ce609b73

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 9dfa8bbb4..9a237722d 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -279,6 +279,25 @@ button.leaflet-control-search-next
 .w2ui-icon.basicshapes_paper { background: url('images/lc_basicshapes.paper.svg') no-repeat center !important; }
 .w2ui-icon.basicshapes_frame { background: url('images/lc_basicshapes.frame.svg') no-repeat center !important; }
 
+.w2ui-icon.symbolshapes { background: url('images/lc_symbolshapes.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_sun { background: url('images/lc_symbolshapes.sun.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_moon { background: url('images/lc_symbolshapes.moon.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_lightning { background: url('images/lc_symbolshapes.lightning.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_heart { background: url('images/lc_symbolshapes.heart.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_flower { background: url('images/lc_symbolshapes.flower.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_cloud { background: url('images/lc_symbolshapes.cloud.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_forbidden { background: url('images/lc_symbolshapes.forbidden.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_puzzle { background: url('images/lc_symbolshapes.puzzle.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_bracket-pair { background: url('images/lc_symbolshapes.bracket-pair.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_left-bracket { background: url('images/lc_symbolshapes.left-bracket.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_right-bracket { background: url('images/lc_symbolshapes.right-bracket.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_brace-pair { background: url('images/lc_symbolshapes.brace-pair.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_left-brace { background: url('images/lc_symbolshapes.left-brace.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_right-brace { background: url('images/lc_symbolshapes.right-brace.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_quad-bevel { background: url('images/lc_symbolshapes.right-brace.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_octagon-bevel { background: url('images/lc_symbolshapes.octagon-bevel.svg') no-repeat center !important; }
+.w2ui-icon.symbolshapes_diamond-bevel { background: url('images/lc_symbolshapes.diamond-bevel.svg') no-repeat center !important; }
+
 .w2ui-icon.accepttrackedchanges{ background: url('images/lc_accepttrackedchanges.svg') no-repeat center !important; }
 .w2ui-icon.alignblock{ background: url('images/lc_alignblock.svg') no-repeat center !important; }
 .w2ui-icon.alignhorizontal{ background: url('images/lc_alignhorizontalcenter.svg') no-repeat center !important; }
@@ -416,6 +435,13 @@ button.leaflet-control-search-next
     background: rgba(255, 255, 255, 1);
 }
 
+.insertshape-grid .row-header {
+    height: 30px;
+    text-align: center;
+    padding: 5px;
+    clear: both;
+}
+
 .insertshape-grid .col:hover {
     border: 1px solid #ccc;
 }
diff --git a/loleaflet/images/lc_symbolshapes.brace-pair.svg b/loleaflet/images/lc_symbolshapes.brace-pair.svg
new file mode 100644
index 000000000..b18aafca0
--- /dev/null
+++ b/loleaflet/images/lc_symbolshapes.brace-pair.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 11.044922 4 C 9.2680918 4 8.5234375 4.7063656 8.5234375 6.5097656 L 8.5234375 8.9511719 C 8.5234375 10.064972 8.4892425 11.355469 7.5078125 11.355469 L 7 11.355469 L 7 12.644531 L 7.5078125 12.644531 C 8.4892925 12.644531 8.5234375 13.935028 8.5234375 15.048828 L 8.5234375 17.490234 C 8.5234375 19.293634 9.2680918 20 11.044922 20 L 11.044922 18.816406 C 9.8603718 18.816406 9.84375 18.338069 9.84375 16.605469 L 9.84375 14.589844 C 9.84375 13.758944 9.639045 12.522466 8.640625 12.009766 C 9.639045 11.497066 9.84375 10.258734 9.84375 9.4277344 L 9.84375 7.3945312 C 9.84375 5.6619312 9.8603419 5.1835938 11.044922 5.1835938 L 11.044922 4 z M 12.939453 4 L 12.939453 5.1835938 C 14.124013 5.1835938 14.15625 5.6619312 14.15625 7.3945312 L 14.15625 9.4277344 C 14.15625 10.258734 14.360955 11.497066 15.359375 12.009766 C 14.360955 12.522466 14.15625 13.758944 14.15625 14.589844 L 14.15625 16.605469 C 14.15625 18.338069 14.12406 18.816406 12.939453 18.816406 L 12.939453 20 C 14.71629
 3 20 15.476562 19.293634 15.476562 17.490234 L 15.476562 15.048828 C 15.476562 13.935028 15.545202 12.644531 16.509766 12.644531 L 17 12.644531 L 17 11.355469 L 16.509766 11.355469 C 15.545196 11.355469 15.476562 10.064972 15.476562 8.9511719 L 15.476562 6.5097656 C 15.476562 4.7063656 14.716293 4 12.939453 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_symbolshapes.bracket-pair.svg b/loleaflet/images/lc_symbolshapes.bracket-pair.svg
new file mode 100644
index 000000000..457ff1a9f
--- /dev/null
+++ b/loleaflet/images/lc_symbolshapes.bracket-pair.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 9 4 C 7.895431 4 7 4.8954 7 6 L 7 8 L 7 17 L 7 18 C 7 19.1046 7.895431 20 9 20 L 11 20 L 11 19 L 10.71875 19 L 9 19 C 8.447715 19 8 18.5523 8 18 L 8 17.375 L 8 17 L 8 16.28125 L 8 7.71875 L 8 6.625 L 8 6 C 8 5.4477 8.447715 5 9 5 L 11 5 L 11 4 L 9 4 z M 13 4 L 13 5 L 15 5 C 15.552285 5 16 5.4477153 16 6 L 16 7 L 16 7.71875 L 16 9 L 16 18 C 16 18.5523 15.552285 19 15 19 L 13 19 L 13 20 L 15 20 C 16.104569 20 17 19.1046 17 18 L 17 9 L 17 7 L 17 6 C 17 4.8954305 16.104569 4 15 4 L 13 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_symbolshapes.cloud.svg b/loleaflet/images/lc_symbolshapes.cloud.svg
new file mode 100644
index 000000000..0cd9aef9b
--- /dev/null
+++ b/loleaflet/images/lc_symbolshapes.cloud.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 6 C 10.560608 6 9.3533941 7.0225542 9.0625 8.375 C 8.5939346 8.1421653 8.0587241 8 7.5 8 C 5.5670034 8 4 9.5670034 4 11.5 C 4 12.708123 4.600244 13.777275 5.53125 14.40625 C 4.6224938 14.921778 4 15.880567 4 17 C 4 18.656854 5.3431458 20 7 20 C 7.7723865 20 8.4682561 19.698244 9 19.21875 C 9.5317424 19.698243 10.227616 20 11 20 C 12.439388 20 13.646607 18.977442 13.9375 17.625 C 14.406065 17.857835 14.941276 18 15.5 18 C 17.432997 18 19 16.432997 19 14.5 C 19 13.810243 18.781984 13.166985 18.4375 12.625 C 19.365957 12.115004 20 11.1341 20 10 C 20 8.3431458 18.656854 7 17 7 C 16.12406 7 15.329713 7.3700489 14.78125 7.96875 C 14.355669 6.8296718 13.287514 6 12 6 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_symbolshapes.diamond-bevel.svg b/loleaflet/images/lc_symbolshapes.diamond-bevel.svg
new file mode 100644
index 000000000..4b33314ae
--- /dev/null
+++ b/loleaflet/images/lc_symbolshapes.diamond-bevel.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#b3b3b3" 
+     d="M 12 4 L 4 12 L 12 20 L 20 12 L 12 4 z "
+     />
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 11.5 4.5 L 4.5 11.5 L 8.5 11.5 L 11.5 8.5 L 11.5 4.5 z M 12.5 4.5 L 12.5 8.5 L 15.5 11.5 L 19.5 11.5 L 12.5 4.5 z M 4.5 12.5 L 11.5 19.5 L 11.5 15.5 L 8.5 12.5 L 4.5 12.5 z M 15.5 12.5 L 12.5 15.5 L 12.5 19.5 L 19.5 12.5 L 15.5 12.5 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_symbolshapes.flower.svg b/loleaflet/images/lc_symbolshapes.flower.svg
new file mode 100644
index 000000000..3e8cf5e92
--- /dev/null
+++ b/loleaflet/images/lc_symbolshapes.flower.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list