diff --git a/wagtail/wagtailadmin/forms.py b/wagtail/wagtailadmin/forms.py
index 93060bc4b2..1c89218f75 100644
--- a/wagtail/wagtailadmin/forms.py
+++ b/wagtail/wagtailadmin/forms.py
@@ -55,19 +55,11 @@ class SearchForm(forms.Form):
class ExternalLinkChooserForm(forms.Form):
url = URLOrAbsolutePathField(required=True, label=ugettext_lazy("URL"))
-
-
-class ExternalLinkChooserWithLinkTextForm(forms.Form):
- url = URLOrAbsolutePathField(required=True, label=ugettext_lazy("URL"))
- link_text = forms.CharField(required=True)
+ link_text = forms.CharField(required=False)
class EmailLinkChooserForm(forms.Form):
email_address = forms.EmailField(required=True)
-
-
-class EmailLinkChooserWithLinkTextForm(forms.Form):
- email_address = forms.EmailField(required=True)
link_text = forms.CharField(required=False)
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail-icomoon.json b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail-icomoon.json
index 456cca8e64..5359e68e71 100755
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail-icomoon.json
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail-icomoon.json
@@ -29,13 +29,14 @@
}
],
"properties": {
- "order": 1,
+ "order": 131,
"id": 0,
"prevSize": 16,
"code": 8220,
"name": "quotes-left"
},
"setIdx": 0,
+ "setId": 1,
"iconIdx": 0
},
{
@@ -85,14 +86,15 @@
}
],
"properties": {
- "order": 2,
+ "order": 132,
"id": 1,
"prevSize": 16,
"code": 58881,
"name": "embed"
},
- "setIdx": 1,
- "iconIdx": 0
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 1
},
{
"icon": {
@@ -122,14 +124,15 @@
}
],
"properties": {
- "order": 3,
+ "order": 133,
"id": 0,
"prevSize": 16,
"code": 58880,
"name": "pilcrow"
},
- "setIdx": 1,
- "iconIdx": 1
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 2
},
{
"icon": {
@@ -160,14 +163,15 @@
}
],
"properties": {
- "order": 4,
+ "order": 134,
"id": 0,
"prevSize": 16,
"code": 123,
"name": "marquee"
},
- "setIdx": 1,
- "iconIdx": 2
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 3
},
{
"icon": {
@@ -179,18 +183,21 @@
"user"
],
"defaultCode": 61447,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 7,
- "order": 8,
+ "order": 135,
"prevSize": 16,
"code": 121,
"name": "user",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 3
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 4
},
{
"icon": {
@@ -201,18 +208,21 @@
"eye"
],
"defaultCode": 61550,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 104,
- "order": 70,
+ "order": 136,
"prevSize": 16,
"code": 52,
"name": "eye",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 4
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 5
},
{
"icon": {
@@ -223,18 +233,21 @@
"eye-slash"
],
"defaultCode": 61552,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 105,
- "order": 71,
+ "order": 137,
"prevSize": 16,
"code": 94,
"name": "eye-slash",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 5
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 6
},
{
"icon": {
@@ -246,18 +259,21 @@
],
"defaultCode": 61612,
"grid": 16,
- "width": 1024
+ "width": 1024,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 162,
- "order": 11,
+ "order": 138,
"prevSize": 16,
"code": 64,
"name": "globe",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 6
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 7
},
{
"icon": {
@@ -269,18 +285,21 @@
"time",
"schedule"
],
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 72,
- "order": 16,
+ "order": 139,
"prevSize": 16,
"code": 56,
"name": "clock",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 7
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 8
},
{
"icon": {
@@ -291,18 +310,21 @@
"tags": [
"lock39 copy"
],
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
- "order": 7,
+ "order": 140,
"id": 67,
"prevSize": 16,
"code": 109,
"name": "lock",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 8
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 9
},
{
"icon": {
@@ -313,18 +335,21 @@
"tags": [
"lock39-open"
],
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
- "order": 12,
+ "order": 141,
"id": 66,
"prevSize": 16,
"code": 112,
"name": "lock-open",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 9
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 10
},
{
"icon": {
@@ -334,18 +359,21 @@
"tags": [
"form"
],
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
- "order": 5,
+ "order": 142,
"id": 63,
"prevSize": 16,
"code": 36,
"name": "form",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 10
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 11
},
{
"icon": {
@@ -353,18 +381,21 @@
"M478 512c0-38-14-70-40-96-26-28-58-40-96-40-38 0-70 12-98 40-26 26-40 58-40 96 0 38 14 70 40 96 28 28 60 40 98 40 38 0 70-12 96-40 26-26 40-58 40-96zM888 786c0-20-8-36-20-48-14-14-30-22-48-22-20 0-36 8-48 22-14 12-22 28-22 48 0 18 8 34 20 48 14 12 30 20 50 20 18 0 34-8 48-20 12-14 20-30 20-48zM888 238c0-18-8-34-20-48-14-12-30-20-48-20-20 0-36 8-48 20-14 14-22 30-22 48 0 20 8 36 20 50 14 12 30 20 50 20 18 0 34-8 48-20 12-14 20-30 20-50zM682 464v98c0 4 0 8-4 10-2 4-4 6-8 6l-82 12c-4 14-10 26-18 42 12 16 28 36 48 60 4 4 4 8 4 12 0 4 0 8-4 10-8 10-22 26-44 48-20 20-34 32-42 32-4 0-6-2-10-4l-62-48c-12 6-26 12-40 16-4 38-8 66-14 82-2 10-6 14-16 14h-98c-4 0-8-2-10-4-4-4-6-6-6-10l-12-82c-12-4-26-8-40-16l-64 48c-2 2-6 4-10 4s-8-2-12-6c-50-46-76-74-76-84 0-4 2-8 4-10 4-6 10-16 22-28 10-14 18-26 24-34-8-16-14-30-18-44l-82-12c-2 0-6-2-8-6-2-2-4-6-4-10v-98c0-4 2-8 4-10 2-4 6-6 8-6l82-12c4-14 10-26 18-42-12-16-28-36-48-60-2-4-4-8-4-12 0-4 2-8 4-10 8-10 22-26 44-48 22-20 36-32 42-32 4 0 8 2 12 4l60 48c12-6 26-12 42-16 4-38 8-66 12-82 2-10 8-14 16-14h98c4 0 8 2 12 4 2 4 4 6 4 10l14 82c12 4 24 8 40 16l62-48c2-2 6-4 10-4s8 2 12 6c52 46 76 74 76 84 0 4 0 8-2 10-6 6-12 16-24 30-10 12-18 24-24 32 8 16 14 32 18 44l82 12c4 0 6 2 8 6 4 2 4 6 4 10zM1024 748v74c0 6-26 12-80 16-4 10-10 20-16 28 18 40 28 66 28 74 0 2 0 2-2 4-44 26-66 38-66 38-4 0-12-8-26-26-12-16-22-28-26-36-8 2-14 2-16 2-4 0-10 0-16-2-6 8-16 20-28 36-14 18-22 26-26 26 0 0-22-12-66-38 0-2-2-2-2-4 0-8 10-34 28-74-6-8-12-18-16-28-54-4-80-10-80-16v-74c0-6 26-12 80-16 4-12 10-20 16-28-18-40-28-66-28-74 0-2 2-2 2-4 2 0 8-4 20-10 10-6 20-12 30-18 10-6 16-10 16-10 4 0 12 10 26 26 12 16 22 28 28 36 6-2 12-2 16-2 2 0 8 0 16 2 18-26 34-46 48-60l4-2c0 0 22 14 66 38 2 2 2 2 2 4 0 8-10 34-28 74 6 8 12 16 16 28 54 4 80 10 80 16zM1024 202v74c0 6-26 12-80 16-4 10-10 20-16 28 18 40 28 66 28 74 0 2 0 2-2 4-44 26-66 38-66 38-4 0-12-8-26-26-12-16-22-28-26-36-8 2-14 2-16 2-4 0-10 0-16-2-6 8-16 20-28 36-14 18-22 26-26 26 0 0-22-12-66-38 0-2-2-2-2-4 0-8 10-34 28-74-6-8-12-18-16-28-54-4-80-10-80-16v-74c0-6 26-12 80-16 4-12 10-20 16-28-18-40-28-66-28-74 0-2 2-2 2-4 2 0 8-4 20-10 10-8 20-14 30-18 10-6 16-10 16-10 4 0 12 8 26 26 12 16 22 28 28 36 6-2 12-2 16-2 2 0 8 0 16 2 18-26 34-46 48-60l4-2c0 0 22 14 66 38 2 2 2 2 2 4 0 8-10 34-28 74 6 8 12 16 16 28 54 4 80 10 80 16z"
],
"defaultCode": 97,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 0,
- "order": 6,
+ "order": 143,
"prevSize": 16,
"code": 97,
"name": "uni61",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 11
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 12
},
{
"icon": {
@@ -372,18 +403,21 @@
"M902.4 433.067v488.533c0 17.067-6.4 29.867-17.067 40.533-10.667 12.8-25.6 17.067-42.667 17.067h-661.333c-17.067 0-32-4.267-42.667-17.067-10.667-10.667-17.067-23.467-17.067-40.533v-819.2c0-17.067 6.4-29.867 17.067-40.533 10.667-12.8 25.6-17.067 42.667-17.067h330.667v330.667c0 17.067 6.4 29.867 17.067 40.533 10.667 12.8 25.6 17.067 40.533 17.067zM900.267 356.267h-309.333v-311.467c32 6.4 59.733 19.2 78.933 40.533l189.867 189.867c21.333 21.333 34.133 46.933 40.533 81.067z"
],
"defaultCode": 98,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 1,
- "order": 9,
+ "order": 183,
"prevSize": 16,
"code": 98,
"name": "uni62",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 12
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 13
},
{
"icon": {
@@ -391,18 +425,21 @@
"M200.533 902.4h622.933v-469.333h-253.867c-14.933 0-29.867-4.267-40.533-17.067-10.667-10.667-17.067-23.467-17.067-40.533v-253.867h-311.467zM590.933 356.267h228.267c-4.267-12.8-8.533-21.333-12.8-25.6l-192-189.867c-4.267-6.4-12.8-10.667-23.467-14.933zM902.4 375.467v546.133c0 17.067-6.4 29.867-17.067 40.533-10.667 12.8-25.6 17.067-42.667 17.067h-661.333c-17.067 0-32-4.267-42.667-17.067-10.667-10.667-17.067-23.467-17.067-40.533v-819.2c0-17.067 6.4-29.867 17.067-40.533 10.667-12.8 25.6-17.067 42.667-17.067h388.267c17.067 0 34.133 2.133 55.467 10.667 19.2 8.533 34.133 19.2 44.8 29.867l189.867 189.867c12.8 10.667 21.333 27.733 29.867 46.933s12.8 36.267 12.8 53.333z"
],
"defaultCode": 99,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 2,
- "order": 10,
+ "order": 184,
"prevSize": 16,
"code": 99,
"name": "uni63",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 13
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 14
},
{
"icon": {
@@ -410,18 +447,21 @@
"M312 878l52-52-134-134-52 52v60h74v74zM612 348c0-8-4-14-14-14-2 0-6 2-8 4l-310 310c-4 4-4 6-4 10 0 8 4 12 12 12 4 0 8 0 10-4l310-308c2-4 4-6 4-10zM580 238l238 238-476 474h-236v-236zM970 292c0 20-6 38-20 52l-96 94-236-236 94-96c14-14 30-20 52-20 20 0 36 6 52 20l134 134c14 16 20 32 20 52z"
],
"defaultCode": 100,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 3,
- "order": 13,
+ "order": 185,
"prevSize": 16,
"code": 100,
"name": "uni64",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 14
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 15
},
{
"icon": {
@@ -429,18 +469,21 @@
"M798 644c0 6-2 10-6 14l-30 28c-2 4-8 6-12 6-6 0-10-2-14-6l-224-224-224 224c-4 4-8 6-14 6-4 0-10-2-12-6l-30-28c-4-4-6-8-6-14 0-4 2-8 6-12l266-266c4-4 10-6 14-6s10 2 14 6l266 266c4 4 6 8 6 12z"
],
"defaultCode": 101,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 4,
- "order": 14,
+ "order": 186,
"prevSize": 16,
"code": 101,
"name": "uni65",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 15
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 16
},
{
"icon": {
@@ -448,18 +491,21 @@
"M682.625 446.25c0-67.5-22.5-123.75-69.375-170.625s-103.125-69.375-170.625-69.375c-65.625 0-121.875 22.5-168.75 69.375s-71.25 103.125-71.25 170.625c0 65.625 24.375 121.875 71.25 168.75s103.125 71.25 168.75 71.25c67.5 0 123.75-24.375 170.625-71.25s69.375-103.125 69.375-168.75zM958.25 890.625c0 18.75-7.5 35.625-20.625 48.75s-30 20.625-48.75 20.625c-18.75 0-35.625-7.5-48.75-20.625l-183.75-183.75c-63.75 45-135 67.5-213.75 67.5-50.625 0-99.375-9.375-146.25-30s-86.25-46.875-120-80.625c-33.75-33.75-60-73.125-80.625-120-18.75-46.875-30-95.625-30-146.25 0-52.5 11.25-101.25 30-146.25 20.625-46.875 46.875-88.125 80.625-121.875s73.125-60 120-80.625c46.875-18.75 95.625-28.125 146.25-28.125 52.5 0 101.25 9.375 148.125 28.125 45 20.625 86.25 46.875 120 80.625s60 75 80.625 121.875c18.75 45 30 93.75 30 146.25 0 78.75-22.5 150-67.5 213.75l183.75 183.75c13.125 13.125 20.625 28.125 20.625 46.875z"
],
"defaultCode": 102,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 5,
- "order": 15,
+ "order": 187,
"prevSize": 16,
"code": 102,
"name": "uni66",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 16
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 17
},
{
"icon": {
@@ -467,18 +513,21 @@
"M852 724c0 14-6 28-16 38l-78 78c-10 10-24 16-40 16-14 0-28-6-38-16l-168-168-168 168c-10 10-24 16-38 16-16 0-30-6-40-16l-78-78c-10-10-16-24-16-38 0-16 6-28 16-40l168-168-168-168c-10-10-16-24-16-38 0-16 6-28 16-40l78-76c10-12 24-16 40-16 14 0 28 4 38 16l168 168 168-168c10-12 24-16 38-16 16 0 30 4 40 16l78 76c10 12 16 24 16 40 0 14-6 28-16 38l-168 168 168 168c10 12 16 24 16 40z"
],
"defaultCode": 103,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 6,
- "order": 17,
+ "order": 188,
"prevSize": 16,
"code": 103,
"name": "uni67",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 17
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 18
},
{
"icon": {
@@ -486,18 +535,21 @@
"M896.961 559.82c0-10.547-8.789-15.82-24.609-15.82h-509.766c-12.305 0-26.367 3.516-40.43 10.547s-26.367 14.063-33.398 24.609l-138.867 170.508c-5.273 7.031-7.031 12.305-7.031 17.578 0 10.547 7.031 17.578 24.609 17.578h509.766c12.305 0 26.367-3.516 40.43-10.547s24.609-15.82 33.398-24.609l137.109-170.508c5.273-7.031 8.789-14.063 8.789-19.336zM362.586 484.234h358.594v-75.586c0-12.305-3.516-22.852-12.305-31.641s-19.336-12.305-31.641-12.305h-270.703c-12.305 0-22.852-5.273-31.641-14.063s-12.305-19.336-12.305-31.641v-29.883c0-12.305-5.273-22.852-14.063-31.641s-19.336-14.063-31.641-14.063h-149.414c-12.305 0-22.852 5.273-31.641 14.063s-14.063 19.336-14.063 31.641v399.023l119.531-147.656c14.063-15.82 33.398-29.883 54.492-40.43 22.852-10.547 45.703-15.82 66.797-15.82zM956.727 559.82c0 19.336-7.031 38.672-21.094 56.25l-138.867 170.508c-14.063 17.578-31.641 29.883-54.492 40.43-22.852 12.305-43.945 17.578-65.039 17.578h-509.766c-29.883 0-54.492-10.547-73.828-31.641-21.094-21.094-31.641-45.703-31.641-73.828v-450c0-28.125 10.547-52.734 31.641-73.828 19.336-21.094 43.945-31.641 73.828-31.641h149.414c28.125 0 52.734 10.547 73.828 31.641s31.641 45.703 31.641 73.828v14.063h254.883c28.125 0 52.734 10.547 73.828 31.641s31.641 45.703 31.641 73.828v75.586h89.648c15.82 0 31.641 3.516 45.703 10.547 14.063 8.789 24.609 19.336 31.641 33.398 5.273 10.547 7.031 21.094 7.031 31.641z"
],
"defaultCode": 105,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 7,
- "order": 18,
+ "order": 189,
"prevSize": 16,
"code": 105,
"name": "uni69",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 18
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 19
},
{
"icon": {
@@ -505,18 +557,21 @@
"M958.25 390.25v376.875c0 31.875-13.125 60-35.625 84.375-24.375 24.375-52.5 35.625-84.375 35.625h-652.5c-31.875 0-60-11.25-84.375-35.625-22.5-24.375-35.625-52.5-35.625-84.375v-513.75c0-33.75 13.125-61.875 35.625-86.25 24.375-22.5 52.5-33.75 84.375-33.75h172.5c31.875 0 60 11.25 84.375 33.75 22.5 24.375 35.625 52.5 35.625 86.25v16.875h360c31.875 0 60 11.25 84.375 35.625 22.5 22.5 35.625 50.625 35.625 84.375z"
],
"defaultCode": 106,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 8,
- "order": 19,
+ "order": 144,
"prevSize": 16,
"code": 106,
"name": "uni6A",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 19
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 20
},
{
"icon": {
@@ -524,18 +579,21 @@
"M962 386.836v399.023c0 21.094-7.031 40.43-22.852 56.25s-35.156 22.852-58.008 22.852h-738.281c-22.852 0-42.188-7.031-58.008-22.852s-22.852-35.156-22.852-56.25v-399.023c14.063 15.82 31.641 29.883 50.977 43.945 121.289 82.617 203.906 138.867 249.609 172.266 19.336 14.063 35.156 26.367 45.703 33.398 12.305 7.031 28.125 15.82 47.461 24.609 21.094 7.031 38.672 12.305 56.25 12.305v0c17.578 0 35.156-5.273 56.25-12.305 19.336-8.789 35.156-17.578 47.461-24.609 10.547-7.031 26.367-19.336 45.703-33.398 58.008-40.43 140.625-98.438 249.609-172.266 19.336-14.063 36.914-28.125 50.977-43.945zM962 239.18c0 26.367-8.789 50.977-24.609 75.586s-36.914 43.945-61.523 61.523c-124.805 87.891-203.906 142.383-235.547 163.477-1.758 1.758-10.547 7.031-21.094 15.82-10.547 7.031-19.336 14.063-26.367 19.336-7.031 3.516-15.82 8.789-26.367 15.82-10.547 5.273-19.336 10.547-28.125 14.063-10.547 1.758-17.578 3.516-26.367 3.516v0c-8.789 0-15.82-1.758-26.367-3.516-8.789-3.516-17.578-8.789-28.125-14.063-10.547-7.031-19.336-12.305-26.367-15.82-7.031-5.273-15.82-12.305-26.367-19.336-10.547-8.789-19.336-14.063-21.094-15.82-31.641-21.094-75.586-52.734-131.836-91.406-58.008-40.43-91.406-63.281-103.711-72.070-21.094-14.063-40.43-33.398-58.008-58.008-19.336-24.609-28.125-47.461-28.125-68.555 0-26.367 7.031-47.461 21.094-65.039s33.398-26.367 59.766-26.367h738.281c22.852 0 40.43 8.789 56.25 24.609s24.609 33.398 24.609 56.25z"
],
"defaultCode": 107,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 9,
- "order": 20,
+ "order": 145,
"prevSize": 16,
"code": 107,
"name": "uni6B",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 20
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 21
},
{
"icon": {
@@ -543,18 +601,21 @@
"M671.961 221.961c0 8.789-1.758 17.578-8.789 22.852-7.031 7.031-14.063 10.547-22.852 10.547h-63.281v513.281h63.281c8.789 0 15.82 3.516 22.852 10.547 7.031 5.273 8.789 14.063 8.789 22.852s-1.758 15.82-8.789 21.094l-128.32 130.078c-7.031 5.273-14.063 8.789-22.852 8.789s-15.82-3.516-22.852-8.789l-128.32-130.078c-7.031-5.273-8.789-12.305-8.789-21.094s1.758-17.578 8.789-22.852c7.031-7.031 14.063-10.547 22.852-10.547h63.281v-513.281h-63.281c-8.789 0-15.82-3.516-22.852-10.547-7.031-5.273-8.789-14.063-8.789-22.852s1.758-15.82 8.789-21.094l128.32-130.078c7.031-5.273 14.063-8.789 22.852-8.789s15.82 3.516 22.852 8.789l128.32 130.078c7.031 5.273 8.789 12.305 8.789 21.094z"
],
"defaultCode": 108,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 10,
- "order": 21,
+ "order": 146,
"prevSize": 16,
"code": 108,
"name": "uni6C",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 21
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 22
},
{
"icon": {
@@ -562,18 +623,21 @@
"M670 516c0 6-2 10-6 14l-266 266c-4 4-10 6-14 6s-10-2-14-6l-28-28c-4-4-6-8-6-14 0-4 2-10 6-12l224-226-224-224c-4-4-6-8-6-14 0-4 2-8 6-12l28-28c4-4 10-6 14-6s10 2 14 6l266 266c4 4 6 8 6 12z"
],
"defaultCode": 110,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 12,
- "order": 22,
+ "order": 147,
"prevSize": 16,
"code": 110,
"name": "uni6E",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 22
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 23
},
{
"icon": {
@@ -581,18 +645,21 @@
"M732 676v38c0 4-2 8-6 12s-8 6-12 6h-404c-4 0-8-2-12-6s-6-8-6-12v-38c0-4 2-10 6-12 4-4 8-6 12-6h404c4 0 8 2 12 6 4 2 6 8 6 12zM732 530v36c0 6-2 10-6 14s-8 6-12 6h-404c-4 0-8-2-12-6s-6-8-6-14v-36c0-6 2-10 6-12 4-4 8-6 12-6h404c4 0 8 2 12 6 4 2 6 6 6 12zM220 878h584v-440h-238c-14 0-28-4-38-16-10-10-16-22-16-38v-238h-292zM586 366h214c-4-12-8-20-12-24l-180-178c-4-6-12-10-22-14zM878 384v512c0 16-6 28-16 38-10 12-24 16-40 16h-620c-16 0-30-4-40-16-10-10-16-22-16-38v-768c0-16 6-28 16-38 10-12 24-16 40-16h364c16 0 32 2 52 10 18 8 32 18 42 28l178 178c12 10 20 26 28 44s12 34 12 50z"
],
"defaultCode": 104,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 13,
- "order": 23,
+ "order": 148,
"prevSize": 16,
"code": 104,
"name": "uni68",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 23
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 24
},
{
"icon": {
@@ -600,18 +667,21 @@
"M362.586 362.586c0 24.609-8.789 45.703-26.367 63.281s-38.672 26.367-65.039 26.367c-24.609 0-45.703-8.789-63.281-26.367s-26.367-38.672-26.367-63.281c0-26.367 8.789-47.461 26.367-65.039s38.672-26.367 63.281-26.367c26.367 0 47.461 8.789 65.039 26.367s26.367 38.672 26.367 65.039zM842.469 541.883v210.938h-660.938v-91.406l151.172-149.414 73.828 75.586 240.82-240.82zM886.414 211.414h-748.828c-5.273 0-8.789 1.758-10.547 5.273-3.516 3.516-5.273 7.031-5.273 10.547v569.531c0 3.516 1.758 7.031 5.273 10.547 1.758 3.516 5.273 5.273 10.547 5.273h748.828c5.273 0 8.789-1.758 10.547-5.273 3.516-3.516 5.273-7.031 5.273-10.547v-569.531c0-3.516-1.758-7.031-5.273-10.547-1.758-3.516-5.273-5.273-10.547-5.273zM962 227.234v569.531c0 21.094-7.031 38.672-22.852 52.734-14.063 15.82-31.641 22.852-52.734 22.852h-748.828c-21.094 0-38.672-7.031-52.734-22.852-15.82-14.063-22.852-31.641-22.852-52.734v-569.531c0-21.094 7.031-38.672 22.852-52.734 14.063-15.82 31.641-22.852 52.734-22.852h748.828c21.094 0 38.672 7.031 52.734 22.852 15.82 14.063 22.852 31.641 22.852 52.734z"
],
"defaultCode": 111,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 14,
- "order": 24,
+ "order": 149,
"prevSize": 16,
"code": 111,
"name": "uni6F",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 24
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 25
},
{
"icon": {
@@ -619,18 +689,21 @@
"M798 420c0 6-2 10-6 14l-266 266c-4 4-10 6-14 6s-10-2-14-6l-266-266c-4-4-6-8-6-14 0-4 2-8 6-12l30-30c2-2 8-4 12-4 6 0 10 2 14 4l224 226 224-226c4-2 8-4 14-4 4 0 10 2 12 4l30 30c4 4 6 8 6 12z"
],
"defaultCode": 113,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 16,
- "order": 25,
+ "order": 150,
"prevSize": 16,
"code": 113,
"name": "uni71",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 25
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 26
},
{
"icon": {
@@ -638,18 +711,21 @@
"M732 786v-36c0-6-2-10-6-14-4-2-8-4-12-4h-404c-4 0-8 2-12 4-4 4-6 8-6 14v36c0 6 2 10 6 14 4 2 8 4 12 4h404c4 0 8-2 12-4 4-4 6-8 6-14zM732 640v-36c0-6-2-10-6-14s-8-4-12-4h-404c-4 0-8 0-12 4s-6 8-6 14v36c0 6 2 10 6 14 4 2 8 4 12 4h404c4 0 8-2 12-4 4-4 6-8 6-14zM878 438v458c0 16-6 28-16 38-10 12-24 16-40 16h-620c-16 0-30-4-40-16-10-10-16-22-16-38v-768c0-16 6-28 16-38 10-12 24-16 40-16h310v310c0 16 6 28 16 38 10 12 24 16 38 16zM876 366h-290v-292c30 6 56 18 74 38l178 178c20 20 32 44 38 76z"
],
"defaultCode": 114,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 17,
- "order": 26,
+ "order": 151,
"prevSize": 16,
"code": 114,
"name": "uni72",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 26
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 27
},
{
"icon": {
@@ -657,18 +733,21 @@
"M888.875 767.125v-376.875c0-15-5.625-26.25-15-37.5-9.375-9.375-22.5-15-35.625-15h-376.875c-15 0-28.125-3.75-37.5-15-9.375-9.375-15-22.5-15-35.625v-33.75c0-15-5.625-28.125-15-37.5s-22.5-15-35.625-15h-172.5c-13.125 0-26.25 5.625-35.625 15s-15 22.5-15 37.5v513.75c0 13.125 5.625 26.25 15 35.625 9.375 11.25 22.5 15 35.625 15h652.5c13.125 0 26.25-3.75 35.625-15 9.375-9.375 15-22.5 15-35.625zM958.25 390.25v376.875c0 31.875-13.125 60-35.625 84.375-24.375 24.375-52.5 35.625-84.375 35.625h-652.5c-31.875 0-60-11.25-84.375-35.625-22.5-24.375-35.625-52.5-35.625-84.375v-513.75c0-33.75 13.125-61.875 35.625-86.25 24.375-22.5 52.5-33.75 84.375-33.75h172.5c31.875 0 60 11.25 84.375 33.75 22.5 24.375 35.625 52.5 35.625 86.25v16.875h360c31.875 0 60 11.25 84.375 35.625 22.5 22.5 35.625 50.625 35.625 84.375z"
],
"defaultCode": 115,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 18,
- "order": 27,
+ "order": 152,
"prevSize": 16,
"code": 115,
"name": "uni73",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 27
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 28
},
{
"icon": {
@@ -676,18 +755,21 @@
"M888.875 425.75v103.125c0 15-5.625 26.25-15 37.5-9.375 9.375-22.5 15-35.625 15h-223.125v221.25c0 15-5.625 28.125-15 37.5s-22.5 15-37.5 15h-101.25c-15 0-28.125-5.625-37.5-15s-15-22.5-15-37.5v-221.25h-223.125c-13.125 0-26.25-5.625-35.625-15-9.375-11.25-15-22.5-15-37.5v-103.125c0-13.125 5.625-26.25 15-35.625s22.5-15 35.625-15h223.125v-223.125c0-15 5.625-26.25 15-35.625 9.375-11.25 22.5-15 37.5-15h101.25c15 0 28.125 3.75 37.5 15 9.375 9.375 15 20.625 15 35.625v223.125h223.125c13.125 0 26.25 5.625 35.625 15s15 22.5 15 35.625z"
],
"defaultCode": 116,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 19,
- "order": 28,
+ "order": 153,
"prevSize": 16,
"code": 116,
"name": "uni74",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 28
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 29
},
{
"icon": {
@@ -695,18 +777,21 @@
"M330 256c0-20-8-38-22-52s-32-22-52-22c-20 0-38 8-52 22-14 14-22 32-22 52 0 20 8 38 22 52 14 14 32 22 52 22 20 0 38-8 52-22 14-14 22-32 22-52zM938 586c0 20-6 36-20 50l-280 282c-16 14-34 20-52 20-22 0-38-6-52-20l-408-410c-16-14-28-32-38-58-10-24-14-46-14-66v-238c0-20 6-36 20-52 16-14 32-20 52-20h238c20 0 42 4 66 14 26 10 44 22 60 38l408 408c14 14 20 32 20 52z"
],
"defaultCode": 117,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 20,
- "order": 29,
+ "order": 154,
"prevSize": 16,
"code": 117,
"name": "uni75",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 29
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 30
},
{
"icon": {
@@ -714,18 +799,21 @@
"M942.664 570.367c0 8.789-5.273 19.336-14.063 31.641l-158.203 184.57c-12.305 15.82-31.641 29.883-56.25 40.43-24.609 12.305-45.703 17.578-66.797 17.578h-509.766c-10.547 0-21.094-1.758-28.125-7.031-8.789-3.516-14.063-10.547-14.063-19.336 0-10.547 5.273-21.094 15.82-31.641l156.445-184.57c14.063-17.578 33.398-29.883 56.25-42.188 24.609-10.547 47.461-15.82 68.555-15.82h509.766c10.547 0 19.336 1.758 28.125 5.273 8.789 5.273 12.305 12.305 12.305 21.094zM782.703 408.648v75.586h-390.234c-29.883 0-59.766 7.031-93.164 22.852-31.641 14.063-58.008 33.398-77.344 54.492l-156.445 186.328-3.516 3.516c0-1.758 0-3.516 0-7.031 0-1.758 0-3.516 0-5.273v-450c0-28.125 10.547-52.734 31.641-73.828 19.336-21.094 43.945-31.641 73.828-31.641h149.414c28.125 0 52.734 10.547 73.828 31.641s31.641 45.703 31.641 73.828v14.063h254.883c28.125 0 52.734 10.547 73.828 31.641s31.641 45.703 31.641 73.828z"
],
"defaultCode": 118,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 21,
- "order": 30,
+ "order": 155,
"prevSize": 16,
"code": 118,
"name": "uni76",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 30
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 31
},
{
"icon": {
@@ -733,18 +821,21 @@
"M658 512c0-40-14-74-42-104-30-28-64-42-104-42-40 0-74 14-104 42-28 30-42 64-42 104 0 40 14 74 42 104 30 28 64 42 104 42 40 0 74-14 104-42 28-30 42-64 42-104zM950 450v126c0 6 0 10-4 14-2 4-6 6-12 8l-104 16c-8 20-16 38-24 52 14 18 34 44 62 78 4 4 6 10 6 14 0 6-2 10-6 14-10 14-28 34-56 62-28 26-46 40-54 40-4 0-10-2-14-6l-80-62c-16 10-34 16-52 22-6 52-12 88-16 106-2 12-10 16-20 16h-128c-4 0-10 0-14-4s-6-8-6-12l-16-106c-18-6-36-12-52-20l-80 60c-4 4-8 6-14 6s-10-2-14-6c-48-44-80-76-94-96-4-4-4-8-4-14 0-4 0-8 4-12 6-8 16-22 28-38 14-18 24-32 32-42-10-18-18-38-24-56l-104-16c-6 0-10-2-12-6-4-4-4-8-4-14v-126c0-6 0-10 4-14 2-4 6-6 10-8l106-16c6-16 14-34 24-52-16-22-36-48-62-78-4-6-6-10-6-14 0-4 2-8 6-14 10-14 28-34 56-60 28-28 46-42 54-42 4 0 10 2 14 6l80 62c16-10 34-16 52-22 6-52 12-88 16-106 2-12 10-16 20-16h128c4 0 10 0 14 4s6 8 6 12l16 106c18 6 36 12 52 20l80-60c4-4 8-6 14-6s10 2 14 6c50 46 82 78 94 98 4 2 4 6 4 12 0 4 0 8-4 12-6 8-16 22-28 38-14 18-24 32-32 42 10 18 18 36 24 56l104 16c6 0 10 2 12 6 4 4 4 8 4 14z"
],
"defaultCode": 119,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 22,
- "order": 31,
+ "order": 156,
"prevSize": 16,
"code": 119,
"name": "uni77",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 31
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 32
},
{
"icon": {
@@ -752,18 +843,21 @@
"M954 292c0 14-4 28-16 38l-490 492c-12 10-24 16-40 16-14 0-28-6-38-16l-284-284c-12-12-16-24-16-40 0-14 4-28 16-38l76-78c12-10 24-16 40-16 14 0 28 6 38 16l168 168 376-376c10-10 24-16 38-16 16 0 28 6 40 16l76 78c12 12 16 24 16 40z"
],
"defaultCode": 120,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 23,
- "order": 32,
+ "order": 190,
"prevSize": 16,
"code": 120,
"name": "uni78",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 32
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 33
},
{
"icon": {
@@ -771,18 +865,21 @@
"M688 278c0 6-2 10-6 14l-224 224 224 226c4 2 6 8 6 12 0 6-2 10-6 14l-28 28c-4 4-10 6-14 6s-10-2-14-6l-266-266c-4-4-6-8-6-14 0-4 2-8 6-12l266-266c4-4 10-6 14-6s10 2 14 6l28 28c4 4 6 8 6 12z"
],
"defaultCode": 122,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 24,
- "order": 33,
+ "order": 191,
"prevSize": 16,
"code": 122,
"name": "uni7A",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 33
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 34
},
{
"icon": {
@@ -790,18 +887,21 @@
"M464 742l352-350c6-8 10-16 10-26s-4-18-10-26l-58-58c-8-8-16-12-26-12s-20 4-26 12l-268 266-120-120c-6-8-16-10-26-10s-18 2-26 10l-58 58c-6 8-10 16-10 26s4 18 10 26l206 204c6 8 14 12 24 12s20-4 26-12zM950 238v548c0 46-16 84-48 116s-70 48-116 48h-548c-46 0-84-16-116-48s-48-70-48-116v-548c0-46 16-84 48-116s70-48 116-48h548c46 0 84 16 116 48s48 70 48 116z"
],
"defaultCode": 65,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 25,
- "order": 34,
+ "order": 192,
"prevSize": 16,
"code": 65,
"name": "uni41",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 34
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 35
},
{
"icon": {
@@ -809,18 +909,21 @@
"M768 548v-72c0-10-4-20-10-26-8-8-16-12-26-12h-146v-146c0-10-4-18-12-26-6-6-16-10-26-10h-72c-10 0-20 4-26 10-8 8-12 16-12 26v146h-146c-10 0-18 4-26 12-6 6-10 16-10 26v72c0 10 4 20 10 26 8 8 16 12 26 12h146v146c0 10 4 18 12 26 6 6 16 10 26 10h72c10 0 20-4 26-10 8-8 12-16 12-26v-146h146c10 0 18-4 26-12 6-6 10-16 10-26zM950 512c0 80-18 154-58 220-40 68-92 120-160 160-66 40-140 58-220 58-80 0-154-18-220-58-68-40-120-92-160-160-40-66-58-140-58-220 0-80 18-154 58-220 40-68 92-120 160-160 66-40 140-58 220-58 80 0 154 18 220 58 68 40 120 92 160 160 40 66 58 140 58 220z"
],
"defaultCode": 66,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 26,
- "order": 35,
+ "order": 193,
"prevSize": 16,
"code": 66,
"name": "uni42",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 35
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 36
},
{
"icon": {
@@ -828,18 +931,21 @@
"M374.935 845.58c-132.111-37.981-510.278-204.772-80.918-756.335 231.193 156.882 320.369 295.598 336.881 409.543-110.643 39.633-186.607 117.249-176.698 257.617-61.102-143.671-108.992-343.488-128.808-467.342-9.908 145.322 11.559 402.938 49.541 556.517zM521.908 880.259c-31.377-87.523-97.433-376.516 397.984-361.654 14.863 454.132-226.239 437.617-333.58 406.24 44.587-87.523 102.385-166.791 175.047-232.846-89.176 49.541-170.093 112.294-239.452 188.258z"
],
"defaultCode": 68,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 27,
- "order": 36,
+ "order": 194,
"prevSize": 16,
"code": 68,
"name": "uni44",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 36
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 37
},
{
"icon": {
@@ -847,18 +953,21 @@
"M431.375 847.625c28.125 11.25 52.5 16.875 75 16.875 46.875 0 86.25-7.5 116.25-22.5s52.5-35.625 65.625-60c13.125-26.25 20.625-58.125 20.625-97.5 0-41.25-7.5-73.125-22.5-95.625-20.625-33.75-45-56.25-75-67.5-28.125-13.125-73.125-18.75-133.125-18.75-26.25 0-43.125 1.875-54.375 5.625v170.625l1.875 144.375c0 5.625 1.875 13.125 5.625 24.375zM423.875 446.375c16.875 3.75 35.625 3.75 60 3.75 61.875 0 108.75-11.25 140.625-33.75 31.875-24.375 46.875-63.75 46.875-120 0-39.375-15-73.125-45-101.25-30-26.25-75-39.375-136.875-39.375-18.75 0-41.25 1.875-69.375 7.5 0 15 0 28.125 1.875 41.25 1.875 43.125 3.75 93.75 1.875 148.125v52.5c0 16.875 0 30 0 41.25zM135.125 922.625v-48.75c16.875-3.75 28.125-5.625 37.5-7.5 28.125-3.75 48.75-9.375 65.625-16.875 5.625-9.375 9.375-18.75 11.25-26.25 3.75-24.375 5.625-58.125 5.625-105l-1.875-266.25c-1.875-90-3.75-163.125-5.625-215.625 0-31.875-1.875-50.625-5.625-58.125 0-1.875-1.875-3.75-5.625-7.5-7.5-3.75-18.75-5.625-37.5-7.5-11.25 0-30-3.75-60-7.5l-3.75-43.125 140.625-3.75 202.5-7.5h24.375c1.875 0 3.75 0 7.5 0s5.625 0 7.5 0c0 0 3.75 0 11.25 0s15 0 22.5 0h39.375c31.875 0 65.625 3.75 103.125 15 15 3.75 31.875 11.25 50.625 20.625 20.625 9.375 39.375 22.5 54.375 39.375 16.875 16.875 28.125 35.625 35.625 56.25s11.25 43.125 11.25 65.625c0 24.375-5.625 48.75-16.875 69.375-13.125 20.625-30 39.375-52.5 56.25-9.375 5.625-35.625 20.625-78.75 41.25 61.875 13.125 110.625 39.375 142.5 76.875s48.75 80.625 48.75 127.5c0 26.25-5.625 56.25-15 86.25-7.5 22.5-20.625 43.125-37.5 61.875-24.375 26.25-48.75 45-75 58.125s-63.75 24.375-108.75 31.875c-30 5.625-65.625 7.5-106.875 5.625l-105-1.875c-30 0-84.375 1.875-159.375 5.625-13.125 1.875-61.875 3.75-146.25 5.625z"
],
"defaultCode": 67,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 28,
- "order": 37,
+ "order": 195,
"prevSize": 16,
"code": 67,
"name": "uni43",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 37
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 38
},
{
"icon": {
@@ -866,18 +975,21 @@
"M238.25 922.625l9.375-45c0-1.875 15-5.625 41.25-11.25 26.25-7.5 46.875-13.125 61.875-20.625 9.375-13.125 16.875-31.875 20.625-54.375l15-75 37.5-178.125c1.875-15 5.625-30 7.5-45 3.75-15 7.5-26.25 9.375-35.625s5.625-16.875 7.5-24.375c1.875-7.5 1.875-13.125 3.75-16.875s1.875-5.625 1.875-5.625l15-84.375 9.375-33.75 11.25-73.125 5.625-26.25v-20.625c-15-7.5-41.25-13.125-78.75-15-9.375 0-16.875-1.875-18.75-1.875l9.375-54.375 170.625 7.5c13.125 0 26.25 0 37.5 0 24.375 0 61.875-1.875 116.25-3.75 11.25-1.875 22.5-1.875 35.625-3.75 13.125 0 18.75 0 18.75 0 0 5.625-1.875 13.125-1.875 18.75-3.75 11.25-5.625 20.625-7.5 28.125-20.625 7.5-39.375 13.125-58.125 16.875-22.5 5.625-41.25 11.25-54.375 16.875-3.75 11.25-9.375 26.25-13.125 46.875-3.75 15-5.625 30-7.5 43.125-15 71.25-26.25 125.625-35.625 165l-31.875 166.875-20.625 84.375-22.5 125.625-7.5 24.375c0 1.875 0 7.5 1.875 13.125 22.5 5.625 43.125 9.375 63.75 11.25 13.125 1.875 24.375 3.75 35.625 5.625-1.875 11.25-1.875 20.625-3.75 31.875-3.75 11.25-5.625 18.75-5.625 22.5-5.625 0-11.25 0-13.125 0-7.5 0-15 0-22.5 0-1.875 0-7.5 0-15 0-5.625-1.875-31.875-5.625-76.875-9.375l-106.875-1.875c-13.125 0-45 1.875-91.875 5.625-26.25 3.75-45 3.75-52.5 5.625z"
],
"defaultCode": 69,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 29,
- "order": 38,
+ "order": 196,
"prevSize": 16,
"code": 69,
"name": "uni45",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 38
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 39
},
{
"icon": {
@@ -885,18 +997,21 @@
"M271.399 752.601c0 26.367-9.888 46.143-26.367 64.27-18.127 18.128-39.551 26.367-64.27 26.367s-46.143-8.24-64.27-26.367c-18.128-18.128-26.367-37.903-26.367-64.27 0-24.719 8.24-46.143 26.367-64.27 18.127-16.479 39.551-26.367 64.27-26.367s46.143 9.888 64.27 26.367c16.479 18.128 26.367 39.551 26.367 64.27zM271.399 512c0 24.719-9.888 46.143-26.367 64.27-18.127 18.128-39.551 26.367-64.27 26.367s-46.143-8.24-64.27-26.367c-18.128-18.128-26.367-39.551-26.367-64.27s8.24-46.143 26.367-64.27c18.127-18.127 39.551-26.367 64.27-26.367s46.143 8.24 64.27 26.367c16.479 18.127 26.367 39.551 26.367 64.27zM933.875 708.106v90.637c0 3.296-1.648 6.592-4.943 9.888s-6.592 4.943-9.888 4.943h-573.487c-3.296 0-6.592-1.648-9.888-4.943s-4.943-6.592-4.943-9.888v-90.638c0-4.943 1.648-8.24 4.943-11.536 3.296-1.648 6.592-3.296 9.888-3.296h573.487c3.296 0 6.592 1.648 9.888 3.296 3.296 3.296 4.943 6.592 4.943 11.536zM271.399 271.399c0 24.719-9.888 46.143-26.367 64.27-18.127 16.479-39.551 26.367-64.27 26.367s-46.143-9.888-64.27-26.367c-18.128-18.127-26.367-39.551-26.367-64.27 0-26.367 8.24-46.143 26.367-64.27s39.551-26.367 64.27-26.367c24.719 0 46.143 8.24 64.27 26.367 16.479 18.127 26.367 37.903 26.367 64.27zM933.875 467.505v88.989c0 4.943-1.648 8.24-4.943 11.536s-6.592 4.943-9.888 4.943h-573.487c-3.296 0-6.592-1.648-9.888-4.943s-4.943-6.592-4.943-11.536v-88.989c0-4.943 1.648-8.24 4.943-11.536s6.592-4.943 9.888-4.943h573.487c3.296 0 6.592 1.648 9.888 4.943s4.943 6.592 4.943 11.536zM933.875 225.257v90.638c0 4.943-1.648 8.24-4.943 11.536-3.296 1.648-6.592 3.296-9.888 3.296h-573.487c-3.296 0-6.592-1.648-9.888-3.296-3.296-3.296-4.943-6.592-4.943-11.536v-90.637c0-3.296 1.648-6.592 4.943-9.888s6.592-4.943 9.888-4.943h573.487c3.296 0 6.592 1.648 9.888 4.943s4.943 6.592 4.943 9.888z"
],
"defaultCode": 70,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 30,
- "order": 39,
+ "order": 157,
"prevSize": 16,
"code": 70,
"name": "uni46",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 39
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 40
},
{
"icon": {
@@ -904,18 +1019,21 @@
"M284.893 831.805c0 23.174-7.725 41.714-24.719 55.618-15.449 13.904-35.534 20.085-58.708 20.085-32.444 0-57.163-9.27-77.248-29.354l26.264-38.623c13.904 13.904 29.354 20.085 46.348 20.085 9.27 0 15.449-3.090 21.629-6.18 7.725-4.634 10.815-10.815 10.815-18.54 0-20.085-15.449-27.809-46.348-24.719l-12.36-24.719c3.090-3.090 7.725-9.27 13.904-20.085 7.725-9.27 13.904-16.994 20.085-23.174 4.634-6.18 10.815-12.36 15.449-16.995v-1.545c-4.634 0-12.36 1.545-21.629 1.545s-16.994 0-21.629 0v23.174h-46.348v-66.433h146.77v38.623l-41.714 50.984c15.449 3.090 27.809 10.815 35.534 21.629 9.27 10.815 13.904 23.174 13.904 38.623zM284.893 555.259v69.523h-159.13c-1.545-10.815-3.090-18.54-3.090-23.174 0-15.449 4.634-29.354 10.815-41.714s15.449-21.629 24.719-29.354c9.27-7.725 20.085-15.449 29.354-21.629s18.54-12.36 24.719-18.54c7.725-6.18 10.815-13.904 10.815-20.085 0-7.725-3.090-13.904-6.18-16.994-4.634-4.634-10.815-6.18-18.54-6.18-12.36 0-24.719 9.27-35.534 26.264l-37.079-26.264c7.725-15.449 16.994-27.809 30.899-35.534s30.899-12.36 47.893-12.36c20.085 0 38.623 6.18 54.073 18.54 13.904 12.36 21.629 27.809 21.629 49.438 0 13.904-4.634 27.809-15.449 40.169-9.27 12.36-20.085 21.629-32.444 27.809-12.36 7.725-23.174 15.449-33.989 23.174-9.27 7.725-15.449 15.449-15.449 23.174h55.618v-26.264zM907.508 695.849v84.972c0 3.090-1.545 6.18-4.634 9.27s-6.18 4.634-9.27 4.634h-537.644c-3.090 0-6.18-1.545-9.27-4.634s-4.634-6.18-4.634-9.27v-84.973c0-4.634 1.545-7.725 4.634-10.815 3.090-1.545 6.18-3.090 9.27-3.090h537.644c3.090 0 6.18 1.545 9.27 3.090 3.090 3.090 4.634 6.18 4.634 10.815zM286.437 298.797v43.259h-148.315v-43.259h47.893c0-12.36 0-29.354 0-54.073 0-23.174 0-41.714 0-52.529v-6.18h-1.545c-1.545 4.634-9.27 13.904-21.629 24.719l-30.899-33.989 60.253-55.618h46.348v177.669zM907.508 470.286v83.427c0 4.634-1.545 7.725-4.634 10.815s-6.18 4.634-9.27 4.634h-537.644c-3.090 0-6.18-1.545-9.27-4.634s-4.634-6.18-4.634-10.815v-83.427c0-4.634 1.545-7.725 4.634-10.815s6.18-4.634 9.27-4.634h537.644c3.090 0 6.18 1.545 9.27 4.634s4.634 6.18 4.634 10.815zM907.508 243.178v84.973c0 4.634-1.545 7.725-4.634 10.815-3.090 1.545-6.18 3.090-9.27 3.090h-537.644c-3.090 0-6.18-1.545-9.27-3.090-3.090-3.090-4.634-6.18-4.634-10.815v-84.972c0-3.090 1.545-6.18 4.634-9.27s6.18-4.634 9.27-4.634h537.644c3.090 0 6.18 1.545 9.27 4.634s4.634 6.18 4.634 9.27z"
],
"defaultCode": 71,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 31,
- "order": 40,
+ "order": 158,
"prevSize": 16,
"code": 71,
"name": "uni47",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 40
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 41
},
{
"icon": {
@@ -923,18 +1041,21 @@
"M922.625 512c0 56.25-9.375 108.75-31.875 159.375s-50.625 95.625-88.125 131.25c-35.625 37.5-80.625 65.625-131.25 88.125s-103.125 31.875-159.375 31.875c-61.875 0-120-11.25-174.375-37.5-56.25-26.25-103.125-63.75-142.5-110.625-1.875-3.75-3.75-7.5-3.75-11.25 0-5.625 1.875-7.5 5.625-11.25l73.125-73.125c3.75-3.75 7.5-5.625 13.125-5.625s9.375 3.75 13.125 5.625c24.375 35.625 58.125 61.875 95.625 78.75 37.5 18.75 76.875 28.125 120 28.125 37.5 0 73.125-7.5 106.875-20.625 33.75-15 61.875-33.75 86.25-60 26.25-24.375 45-52.5 60-86.25 13.125-33.75 20.625-69.375 20.625-106.875s-7.5-73.125-20.625-106.875c-15-33.75-33.75-61.875-60-86.25-24.375-26.25-52.5-45-86.25-60-33.75-13.125-69.375-20.625-106.875-20.625-35.625 0-69.375 5.625-101.25 18.75s-60 30-84.375 54.375l73.125 73.125c11.25 11.25 13.125 24.375 7.5 37.5-7.5 15-16.875 20.625-31.875 20.625h-240c-9.375 0-16.875-1.875-24.375-9.375s-9.375-15-9.375-24.375v-240c0-15 5.625-24.375 20.625-31.875 13.125-5.625 26.25-3.75 37.5 7.5l69.375 69.375c37.5-35.625 82.5-63.75 131.25-84.375 48.75-18.75 99.375-28.125 151.875-28.125 56.25 0 108.75 9.375 159.375 31.875s95.625 50.625 131.25 88.125c37.5 35.625 65.625 80.625 88.125 131.25s31.875 103.125 31.875 159.375z"
],
"defaultCode": 72,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 32,
- "order": 41,
+ "order": 159,
"prevSize": 16,
"code": 72,
"name": "uni48",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 41
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 42
},
{
"icon": {
@@ -942,18 +1063,21 @@
"M922.625 168.875v240c0 9.375-1.875 16.875-9.375 24.375s-15 9.375-24.375 9.375h-240c-15 0-24.375-5.625-31.875-20.625-5.625-13.125-3.75-26.25 7.5-37.5l75-73.125c-52.5-48.75-116.25-73.125-187.5-73.125-37.5 0-73.125 7.5-106.875 20.625-33.75 15-61.875 33.75-86.25 60-26.25 24.375-45 52.5-60 86.25-13.125 33.75-20.625 69.375-20.625 106.875s7.5 73.125 20.625 106.875c15 33.75 33.75 61.875 60 86.25 24.375 26.25 52.5 45 86.25 60 33.75 13.125 69.375 20.625 106.875 20.625 43.125 0 82.5-9.375 120-28.125 37.5-16.875 71.25-43.125 95.625-78.75 3.75-1.875 7.5-5.625 13.125-5.625s9.375 1.875 13.125 5.625l73.125 73.125c3.75 3.75 5.625 5.625 5.625 11.25 0 3.75-1.875 7.5-3.75 11.25-39.375 46.875-86.25 84.375-142.5 110.625-54.375 26.25-112.5 37.5-174.375 37.5-56.25 0-108.75-9.375-159.375-31.875s-95.625-50.625-131.25-88.125c-37.5-35.625-65.625-80.625-88.125-131.25s-31.875-103.125-31.875-159.375c0-56.25 9.375-108.75 31.875-159.375s50.625-95.625 88.125-131.25c35.625-37.5 80.625-65.625 131.25-88.125s103.125-31.875 159.375-31.875c52.5 0 103.125 9.375 151.875 28.125 48.75 20.625 93.75 48.75 131.25 84.375l69.375-69.375c11.25-11.25 22.5-13.125 37.5-7.5 15 7.5 20.625 16.875 20.625 31.875z"
],
"defaultCode": 73,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 33,
- "order": 42,
+ "order": 160,
"prevSize": 16,
"code": 73,
"name": "uni49",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 42
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 43
},
{
"icon": {
@@ -961,18 +1085,21 @@
"M824.891 703.961c0-12.305-3.516-24.609-14.063-33.398l-103.711-103.711c-8.789-10.547-21.094-14.063-35.156-14.063s-24.609 5.273-35.156 15.82c0 0 3.516 3.516 8.789 8.789s8.789 8.789 10.547 10.547c1.758 1.758 5.273 5.273 8.789 10.547 3.516 3.516 5.273 7.031 5.273 12.305 1.758 3.516 1.758 8.789 1.758 14.063 0 12.305-3.516 24.609-14.063 33.398-8.789 8.789-19.336 14.063-33.398 14.063-5.273 0-8.789 0-14.063-1.758-3.516-1.758-8.789-3.516-12.305-7.031-5.273-1.758-7.031-5.273-10.547-7.031-1.758-1.758-5.273-5.273-10.547-10.547s-7.031-8.789-8.789-8.789c-10.547 8.789-15.82 21.094-15.82 35.156s3.516 26.367 14.063 35.156l101.953 103.711c10.547 8.789 21.094 14.063 35.156 14.063 12.305 0 24.609-5.273 33.398-14.063l73.828-72.070c10.547-10.547 14.063-21.094 14.063-35.156zM471.57 350.641c0-14.063-3.516-24.609-14.063-33.398l-101.953-105.469c-10.547-8.789-21.094-14.063-35.156-14.063-12.305 0-24.609 5.273-33.398 14.063l-73.828 73.828c-10.547 8.789-14.063 21.094-14.063 33.398 0 14.063 3.516 24.609 14.063 33.398l103.711 105.469c8.789 8.789 21.094 14.063 35.156 14.063s24.609-5.273 35.156-15.82c0-1.758-3.516-5.273-8.789-10.547s-8.789-8.789-10.547-10.547c-1.758-1.758-5.273-5.273-8.789-8.789-3.516-5.273-5.273-8.789-5.273-12.305-1.758-5.273-1.758-8.789-1.758-14.063 0-14.063 3.516-24.609 14.063-35.156 8.789-8.789 19.336-14.063 33.398-14.063 5.273 0 8.789 1.758 14.063 1.758 3.516 1.758 8.789 3.516 12.305 7.031 5.273 3.516 7.031 5.273 10.547 7.031 1.758 1.758 5.273 5.273 10.547 10.547s7.031 8.789 8.789 10.547c10.547-10.547 15.82-22.852 15.82-36.914zM921.57 703.961c0 40.43-14.063 75.586-42.188 101.953l-73.828 73.828c-28.125 28.125-61.523 42.188-101.953 42.188s-75.586-14.063-101.953-42.188l-103.711-105.469c-28.125-26.367-42.188-61.523-42.188-101.953s14.063-75.586 43.945-103.711l-43.945-43.945c-28.125 28.125-63.281 43.945-103.711 43.945s-75.586-14.063-103.711-42.188l-103.711-105.469c-28.125-28.125-42.188-61.523-42.188-101.953s14.063-73.828 42.188-101.953l73.828-73.828c28.125-28.125 61.523-40.43 101.953-40.43s75.586 14.063 101.953 42.188l103.711 103.711c28.125 28.125 42.188 61.523 42.188 101.953s-14.063 75.586-43.945 105.469l43.945 43.945c28.125-29.883 63.281-43.945 103.711-43.945s75.586 14.063 103.711 42.188l103.711 103.711c28.125 28.125 42.188 63.281 42.188 101.953z"
],
"defaultCode": 74,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 34,
- "order": 43,
+ "order": 161,
"prevSize": 16,
"code": 74,
"name": "uni4A",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 43
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 44
},
{
"icon": {
@@ -980,18 +1107,21 @@
"M950 512c0 80-18 154-58 220-40 68-92 120-160 160-66 40-140 58-220 58-80 0-154-18-220-58-68-40-120-92-160-160-40-66-58-140-58-220 0-80 18-154 58-220 40-68 92-120 160-160 66-40 140-58 220-58 80 0 154 18 220 58 68 40 120 92 160 160 40 66 58 140 58 220z"
],
"defaultCode": 75,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 35,
- "order": 44,
+ "order": 162,
"prevSize": 16,
"code": 75,
"name": "uni4B",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 44
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 45
},
{
"icon": {
@@ -999,18 +1129,21 @@
"M512 202c-56 0-108 14-156 40-48 28-86 66-114 114-26 48-40 100-40 156 0 56 14 108 40 156 28 48 66 86 114 114 48 26 100 40 156 40 56 0 108-14 156-40 48-28 86-66 114-114 26-48 40-100 40-156 0-56-14-108-40-156-28-48-66-86-114-114-48-26-100-40-156-40zM950 512c0 80-18 154-58 220-40 68-92 120-160 160-66 40-140 58-220 58-80 0-154-18-220-58-68-40-120-92-160-160-40-66-58-140-58-220 0-80 18-154 58-220 40-68 92-120 160-160 66-40 140-58 220-58 80 0 154 18 220 58 68 40 120 92 160 160 40 66 58 140 58 220z"
],
"defaultCode": 76,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 36,
- "order": 45,
+ "order": 163,
"prevSize": 16,
"code": 76,
"name": "uni4C",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 45
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 46
},
{
"icon": {
@@ -1018,18 +1151,21 @@
"M958 694c0 22-8 38-22 52l-42 44c-16 14-32 20-52 20-22 0-38-6-52-20l-278-278-278 278c-14 14-30 20-52 20-20 0-36-6-50-20l-44-44c-14-14-22-30-22-52 0-20 8-36 22-52l372-372c14-14 32-20 52-20s38 6 52 20l372 372c14 16 22 32 22 52z"
],
"defaultCode": 77,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 37,
- "order": 46,
+ "order": 164,
"prevSize": 16,
"code": 77,
"name": "uni4D",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 46
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 47
},
{
"icon": {
@@ -1037,18 +1173,21 @@
"M958 402c0 20-8 38-22 52l-372 372c-14 14-32 22-52 22s-38-8-52-22l-372-372c-14-14-22-32-22-52s8-38 22-52l42-42c16-14 34-22 52-22 22 0 38 8 52 22l278 278 278-278c14-14 30-22 52-22 18 0 36 8 52 22l42 42c14 16 22 32 22 52z"
],
"defaultCode": 78,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 38,
- "order": 47,
+ "order": 165,
"prevSize": 16,
"code": 78,
"name": "uni4E",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 47
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 48
},
{
"icon": {
@@ -1056,18 +1195,21 @@
"M350.501 512c-47.791 1.648-85.693 19.776-117.005 56.031h-57.678c-24.719 0-44.495-4.943-60.974-18.128-16.479-11.536-24.719-28.015-24.719-51.086 0-103.821 18.127-154.907 54.382-154.907 1.648 0 8.24 1.648 19.776 8.24 9.888 6.592 24.719 13.184 42.847 19.776 16.479 4.943 34.607 8.24 51.086 8.24 19.776 0 39.551-3.296 59.326-9.888-1.648 11.536-1.648 21.424-1.648 29.663 0 39.551 11.536 77.453 34.607 112.060zM821.815 792.151c0 34.607-11.536 62.622-32.959 82.398-21.424 21.424-49.438 31.311-84.045 31.311h-385.62c-34.607 0-62.622-9.888-84.045-31.311-21.424-19.776-32.959-47.791-32.959-82.398 0-16.479 1.648-31.311 1.648-46.143 1.648-14.831 3.296-29.663 6.592-47.791 3.296-16.479 6.592-32.959 11.536-47.791s11.536-28.015 18.128-42.847c8.24-13.184 18.127-24.719 28.015-34.607s23.071-18.127 37.903-24.719c14.831-4.943 31.311-8.24 49.438-8.24 1.648 0 8.24 3.296 18.128 9.888s19.776 13.184 31.311 21.424c13.184 6.592 28.015 14.831 47.791 19.776 19.776 6.592 39.551 9.888 59.326 9.888s39.551-3.296 59.326-9.888c19.776-4.943 34.607-13.184 47.791-19.776 11.536-8.24 21.424-14.831 31.311-21.424s16.479-9.888 18.127-9.888c18.128 0 34.607 3.296 49.438 8.24 14.831 6.592 28.015 14.831 37.903 24.719s19.776 21.424 28.015 34.607c6.592 14.831 13.184 28.015 18.127 42.847s8.24 31.311 11.536 47.791c3.296 18.128 4.943 32.959 6.592 47.791 0 14.831 1.648 29.663 1.648 46.143zM371.924 230.201c0 31.311-11.536 57.678-32.959 80.75-23.071 21.424-49.438 32.959-80.75 32.959-29.663 0-57.678-11.536-79.102-32.959-21.424-23.071-32.959-49.438-32.959-80.75s11.536-57.678 32.959-79.102c21.424-21.424 49.438-32.959 79.102-32.959 31.311 0 57.678 11.536 80.75 32.959 21.424 21.424 32.959 47.791 32.959 79.102zM680.091 399.94c0 46.143-16.479 85.693-49.438 118.653s-72.51 49.438-118.653 49.438c-46.143 0-85.693-16.479-118.653-49.438s-49.438-72.51-49.438-118.653c0-47.791 16.479-87.341 49.438-120.3s72.51-49.438 118.653-49.438c46.143 0 85.693 16.479 118.653 49.438s49.438 72.51 49.438 120.3zM933.875 498.817c0 23.071-8.24 39.551-24.719 51.086-16.479 13.184-36.255 18.128-60.974 18.128h-57.678c-31.311-36.255-69.214-54.383-117.005-56.031 23.071-34.607 34.607-72.51 34.607-112.060 0-8.24 0-18.127-1.648-29.663 19.776 6.592 39.551 9.888 59.326 9.888 16.479 0 34.607-3.296 51.086-8.24 18.128-6.592 32.959-13.184 42.847-19.776 11.536-6.592 18.128-8.24 19.776-8.24 36.255 0 54.383 51.086 54.383 154.907zM877.844 230.201c0 31.311-11.536 57.678-32.959 80.75-21.424 21.424-49.438 32.959-79.102 32.959-31.311 0-57.678-11.536-80.75-32.959-21.424-23.071-32.959-49.438-32.959-80.75s11.536-57.678 32.959-79.102c23.071-21.424 49.438-32.959 80.75-32.959 29.663 0 57.678 11.536 79.102 32.959s32.959 47.791 32.959 79.102z"
],
"defaultCode": 79,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 39,
- "order": 48,
+ "order": 166,
"prevSize": 16,
"code": 79,
"name": "uni4F",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 48
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 49
},
{
"icon": {
@@ -1075,18 +1217,21 @@
"M750 512c0 14-6 24-18 32l-312 182c-6 4-12 6-18 6s-12-2-18-6-18-18-18-32v-364c0-14 6-26 18-32 12-8 24-8 36 0l312 182c12 8 18 18 18 32zM822 512c0-56-14-108-40-156-28-48-66-86-114-114-48-26-100-40-156-40-56 0-108 14-156 40-48 28-86 66-114 114-26 48-40 100-40 156 0 56 14 108 40 156 28 48 66 86 114 114 48 26 100 40 156 40 56 0 108-14 156-40 48-28 86-66 114-114 26-48 40-100 40-156zM950 512c0 80-18 154-58 220-40 68-92 120-160 160-66 40-140 58-220 58-80 0-154-18-220-58-68-40-120-92-160-160-40-66-58-140-58-220 0-80 18-154 58-220 40-68 92-120 160-160 66-40 140-58 220-58 80 0 154 18 220 58 68 40 120 92 160 160 40 66 58 140 58 220z"
],
"defaultCode": 80,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 40,
- "order": 49,
+ "order": 167,
"prevSize": 16,
"code": 80,
"name": "uni50",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 49
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 50
},
{
"icon": {
@@ -1094,18 +1239,21 @@
"M512.359 318.641c0-26.367-10.547-49.219-28.125-68.555-19.336-17.578-42.188-28.125-68.555-28.125s-49.219 10.547-68.555 28.125c-19.336 19.336-28.125 42.188-28.125 68.555 0 14.063 3.516 28.125 8.789 42.188-12.305-7.031-26.367-8.789-40.43-8.789-28.125 0-49.219 8.789-68.555 28.125-19.336 17.578-28.125 40.43-28.125 66.797 0 28.125 8.789 50.977 28.125 68.555 19.336 19.336 40.43 28.125 68.555 28.125 26.367 0 49.219-8.789 68.555-28.125 17.578-17.578 28.125-40.43 28.125-68.555 0-14.063-3.516-26.367-10.547-40.43 14.063 5.273 28.125 8.789 42.188 8.789 26.367 0 49.219-8.789 68.555-28.125 17.578-19.336 28.125-40.43 28.125-68.555zM939.508 671.961c0 7.031-8.789 17.578-24.609 33.398-15.82 17.578-28.125 24.609-33.398 24.609-3.516 0-7.031-1.758-14.063-7.031s-12.305-10.547-19.336-17.578c-5.273-5.273-10.547-12.305-19.336-19.336-7.031-8.789-10.547-12.305-12.305-14.063l-47.461 49.219 110.742 110.742c8.789 8.789 14.063 21.094 14.063 33.398 0 14.063-7.031 28.125-19.336 40.43-14.063 14.063-26.367 19.336-40.43 19.336s-26.367-3.516-35.156-14.063l-337.5-335.742c-58.008 43.945-119.531 65.039-182.813 65.039-54.492 0-98.438-17.578-133.594-50.977-33.398-35.156-50.977-79.102-50.977-133.594 0-52.734 15.82-105.469 47.461-156.445 31.641-52.734 73.828-93.164 124.805-124.805s103.711-47.461 156.445-47.461c54.492 0 100.195 15.82 133.594 50.977 35.156 33.398 52.734 79.102 52.734 133.594 0 63.281-22.852 123.047-66.797 182.813l179.297 177.539 47.461-47.461c-1.758-1.758-5.273-5.273-12.305-12.305-8.789-7.031-15.82-14.063-21.094-19.336s-10.547-12.305-15.82-17.578c-5.273-7.031-8.789-12.305-8.789-15.82 0-5.273 8.789-15.82 24.609-31.641 15.82-17.578 28.125-24.609 33.398-24.609 3.516 0 8.789 1.758 12.305 3.516 1.758 3.516 8.789 10.547 22.852 22.852 12.305 12.305 26.367 26.367 40.43 40.43s28.125 28.125 43.945 42.188c14.063 15.82 26.367 28.125 36.914 40.43 8.789 10.547 14.063 17.578 14.063 19.336z"
],
"defaultCode": 81,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 41,
- "order": 50,
+ "order": 168,
"prevSize": 16,
"code": 81,
"name": "uni51",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 50
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 51
},
{
"icon": {
@@ -1113,18 +1261,21 @@
"M880 246h-376c-20-24-40-50-46-56-4-12-16-20-28-20h-150c-10 0-18 6-26 12l-50 64h-60c-32 0-56 26-56 56v496c0 30 24 56 56 56h736c32 0 56-26 56-56v-496c0-30-24-56-56-56z"
],
"defaultCode": 82,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 43,
- "order": 51,
+ "order": 169,
"prevSize": 16,
"code": 82,
"name": "uni52",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 51
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 52
},
{
"icon": {
@@ -1132,18 +1283,21 @@
"M766.918 695.849c0-18.54-6.18-35.534-18.54-50.984-13.904-15.449-29.354-23.174-46.348-23.174-15.449 0-27.809 4.634-37.079 15.449-7.725 10.815-12.36 24.719-12.36 41.714s4.634 30.899 15.449 41.714c10.815 12.36 26.264 16.995 46.348 16.995 13.904 0 26.264-3.090 37.079-10.815 10.815-9.27 15.449-18.54 15.449-30.899zM498.096 751.467c0 4.634-1.545 7.725-4.634 10.815l-140.59 140.59c-3.090 3.090-6.18 4.634-10.815 4.634-3.090 0-6.18-1.545-9.27-4.634l-142.136-140.59c-4.634-4.634-4.634-9.27-3.090-15.449 3.090-6.18 7.725-9.27 13.904-9.27h84.972v-607.166c0-4.634 1.545-7.725 3.090-9.27 3.090-3.090 6.18-4.634 10.815-4.634h84.973c3.090 0 7.725 1.545 9.27 4.634 3.090 1.545 4.634 4.634 4.634 9.27v607.166h84.973c3.090 0 7.725 1.545 9.27 4.634 3.090 3.090 4.634 6.18 4.634 9.27zM828.716 722.114c0 18.54-1.545 35.534-6.18 52.529-3.090 18.54-9.27 35.534-16.994 50.984-9.27 15.449-18.54 29.354-30.899 41.714-10.815 12.36-26.264 21.629-43.259 29.354s-35.534 10.815-55.618 10.815c-18.54 0-33.989-3.090-47.893-7.725-7.725-1.545-13.904-4.634-18.54-6.18l16.995-49.438c4.634 1.545 9.27 3.090 13.904 4.634 10.815 3.090 21.629 6.18 32.444 6.18 24.719 0 44.804-9.27 60.253-26.264 13.904-16.994 24.719-38.623 29.354-64.888h-1.545c-6.18 7.725-15.449 12.36-26.264 16.995-12.36 4.634-24.719 6.18-38.623 6.18-30.899 0-55.618-10.815-75.703-30.899-20.085-21.629-29.354-46.348-29.354-77.248s10.815-57.163 30.899-78.792c21.629-20.085 47.893-30.899 80.337-30.899 37.079 0 66.433 13.904 91.152 41.714 23.174 27.809 35.534 64.888 35.534 111.237zM816.356 405.399v49.438h-207.023v-49.438h72.612v-191.574c0-1.545 0-4.634 0-7.725 1.545-3.090 1.545-6.18 1.545-7.725v-6.18h-1.545l-3.090 4.634c-3.090 3.090-6.18 7.725-10.815 13.904l-27.809 24.719-37.079-37.079 84.973-81.882h54.073v288.907z"
],
"defaultCode": 84,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 44,
- "order": 52,
+ "order": 197,
"prevSize": 16,
"code": 84,
"name": "uni54",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 52
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 53
},
{
"icon": {
@@ -1151,18 +1305,21 @@
"M821.375 562.625v258.75c0 9.375-3.75 16.875-11.25 22.5-5.625 7.5-15 11.25-24.375 11.25h-204.375v-206.25h-138.75v206.25h-204.375c-9.375 0-18.75-3.75-24.375-11.25-7.5-5.625-11.25-13.125-11.25-22.5v-258.75c0 0 0 0 1.875 0 0-1.875 0-1.875 0-1.875l307.5-255 307.5 255c0 0 1.875 1.875 1.875 1.875zM939.5 527l-31.875 39.375c-3.75 3.75-7.5 5.625-11.25 5.625h-1.875c-5.625 0-9.375-1.875-11.25-3.75l-371.25-309.375-371.25 309.375c-3.75 3.75-7.5 3.75-13.125 3.75-3.75 0-7.5-1.875-11.25-5.625l-31.875-39.375c-3.75-3.75-3.75-7.5-3.75-13.125s1.875-9.375 5.625-11.25l384.375-320.625c11.25-9.375 26.25-15 41.25-15s30 5.625 41.25 15l129.375 108.75v-105c0-3.75 1.875-9.375 5.625-11.25 3.75-3.75 7.5-5.625 13.125-5.625h101.25c5.625 0 9.375 1.875 13.125 5.625 3.75 1.875 5.625 7.5 5.625 11.25v219.375l116.25 97.5c3.75 1.875 5.625 5.625 5.625 11.25s0 9.375-3.75 13.125z"
],
"defaultCode": 87,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 45,
- "order": 53,
+ "order": 198,
"prevSize": 16,
"code": 87,
"name": "uni57",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 53
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 54
},
{
"icon": {
@@ -1170,18 +1327,21 @@
"M703.602 714.148c1.758 7.031 1.758 12.305-3.516 17.578l-175.781 193.359c-1.758 3.516-7.031 5.273-10.547 5.273-5.273 0-8.789-1.758-12.305-5.273l-177.539-193.359c-5.273-5.273-5.273-10.547-3.516-17.578 3.516-5.273 8.789-8.789 14.063-8.789h112.5v-627.539c0-5.273 1.758-8.789 5.273-10.547 3.516-3.516 7.031-5.273 12.305-5.273h94.922c5.273 0 8.789 1.758 12.305 5.273 3.516 1.758 5.273 5.273 5.273 10.547v627.539h112.5c7.031 0 10.547 3.516 14.063 8.789z"
],
"defaultCode": 88,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 46,
- "order": 54,
+ "order": 199,
"prevSize": 16,
"code": 88,
"name": "uni58",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 54
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 55
},
{
"icon": {
@@ -1189,18 +1349,21 @@
"M703.602 309.852c-3.516 5.273-8.789 8.789-14.063 8.789h-112.5v627.539c0 5.273-1.758 8.789-5.273 10.547-3.516 3.516-7.031 5.273-12.305 5.273h-94.922c-5.273 0-8.789-1.758-12.305-5.273-3.516-1.758-5.273-5.273-5.273-10.547v-627.539h-112.5c-7.031 0-10.547-3.516-14.063-8.789-1.758-7.031-1.758-12.305 3.516-17.578l175.781-193.359c1.758-3.516 7.031-5.273 10.547-5.273 5.273 0 8.789 1.758 12.305 5.273l177.539 193.359c5.273 5.273 5.273 10.547 3.516 17.578z"
],
"defaultCode": 89,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 47,
- "order": 55,
+ "order": 200,
"prevSize": 16,
"code": 89,
"name": "uni59",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 55
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 56
},
{
"icon": {
@@ -1208,18 +1371,21 @@
"M402 420v330c0 6-2 10-4 12-4 4-8 6-14 6h-36c-6 0-10-2-14-6-4-2-4-6-4-12v-330c0-4 0-10 4-12 4-4 8-6 14-6h36c6 0 10 2 14 6 2 2 4 8 4 12zM548 420v330c0 6-2 10-4 12-4 4-8 6-14 6h-36c-6 0-10-2-14-6-2-2-4-6-4-12v-330c0-4 2-10 4-12 4-4 8-6 14-6h36c6 0 10 2 14 6 2 2 4 8 4 12zM694 420v330c0 6 0 10-4 12-4 4-8 6-14 6h-36c-6 0-10-2-14-6-2-2-4-6-4-12v-330c0-4 2-10 4-12 4-4 8-6 14-6h36c6 0 10 2 14 6 4 2 4 8 4 12zM768 834v-542h-512v542c0 8 2 16 4 24 2 6 6 12 8 14 4 4 6 6 6 6h476c0 0 2-2 6-6 2-2 6-8 8-14 2-8 4-16 4-24zM384 220h256l-28-68c-2-2-6-4-10-6h-180c-4 2-8 4-10 6zM914 238v36c0 6-2 10-4 14-4 2-8 4-14 4h-54v542c0 32-10 60-28 82-18 24-40 34-64 34h-476c-24 0-46-10-64-32s-28-50-28-82v-544h-54c-6 0-10-2-14-4-2-4-4-8-4-14v-36c0-6 2-10 4-14 4-2 8-4 14-4h176l40-96c6-14 16-26 32-36 14-10 30-14 44-14h184c14 0 30 4 44 14 16 10 26 22 32 36l40 96h176c6 0 10 2 14 4 2 4 4 8 4 14z"
],
"defaultCode": 90,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 48,
- "order": 56,
+ "order": 201,
"prevSize": 16,
"code": 90,
"name": "uni5A",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 56
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 57
},
{
"icon": {
@@ -1227,18 +1393,21 @@
"M788.707 162.475c0 9.709-7.282 19.419-19.419 19.419-9.709 0-19.419-9.709-19.419-19.419 0-12.137 9.709-19.419 19.419-19.419 12.137 0 19.419 7.282 19.419 19.419zM795.989 346.946c0 0-26.7-121.363-186.899-89.808-14.563-55.827-12.137-97.090 21.845-133.499 48.545-50.973 126.218-24.272 126.218-24.272v-41.264c-26.7-12.137-53.399-14.563-80.099-14.563-104.372 0-162.626 77.673-186.899 131.072l-288.844 531.57 82.527-14.563-150.491 288.844 104.372-19.419 80.099-225.735c225.735 0 517.006-82.527 478.171-388.362zM893.079 245.002l-63.109-63.109-50.973 63.109zM354.228 669.772c0 0 9.709-2.427 21.845-4.854 12.137-4.854 31.554-7.282 53.399-14.563 12.137-2.427 24.272-7.282 36.409-9.709 12.137-4.854 26.7-9.709 38.836-14.563 14.563-7.282 26.7-12.137 38.836-19.419 14.563-7.282 26.7-16.991 38.836-24.272 2.427-2.427 7.282-4.854 9.709-7.282l7.282-7.282c7.282-7.282 12.137-12.137 16.991-16.991s9.709-12.137 14.563-16.991c2.427-2.427 4.854-4.854 7.282-9.709l2.427-4.854 2.427-2.427c2.427-4.854 4.854-7.282 4.854-9.709 2.427-2.427 4.854-7.282 4.854-9.709 2.427-2.427 2.427-2.427 2.427-4.854 2.427 0 2.427-2.427 2.427-4.854 2.427-2.427 2.427-4.854 4.854-7.282 2.427-7.282 4.854-12.137 7.282-19.419 0-4.854 2.427-9.709 4.854-16.991 0-4.854 2.427-9.709 2.427-14.563s2.427-9.709 2.427-14.563c0-4.854 2.427-9.709 2.427-14.563 0-2.427 0-7.282 0-9.709 0-12.137 2.427-21.845 2.427-21.845l12.137 2.427c0 0-2.427 7.282-2.427 19.419 0 4.854-2.427 7.282-2.427 12.137s0 9.709-2.427 12.137c0 4.854 0 9.709-2.427 16.991 0 4.854-2.427 9.709-2.427 14.563-2.427 7.282-4.854 12.137-7.282 19.419-2.427 4.854-4.854 12.137-7.282 16.991 0 2.427-2.427 7.282-4.854 9.709 0 2.427 0 2.427-2.427 4.854 0 2.427 0 2.427-2.427 4.854 0 2.427-2.427 4.854-4.854 9.709-2.427 2.427-2.427 4.854-4.854 7.282s-2.427 4.854-2.427 4.854l-4.854 4.854c-2.427 2.427-4.854 7.282-7.282 9.709-4.854 4.854-9.709 12.137-14.563 16.991s-9.709 9.709-16.991 16.991l-7.282 7.282c-4.854 2.427-7.282 2.427-9.709 4.854-14.563 9.709-26.7 19.419-41.264 26.7-12.137 4.854-26.7 12.137-38.836 16.991-14.563 4.854-26.7 9.709-41.264 14.563-12.137 2.427-24.272 7.282-36.409 9.709-21.845 4.854-41.264 9.709-53.399 12.137s-21.845 4.854-21.845 4.854z"
],
"defaultCode": 86,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 49,
- "order": 57,
+ "order": 202,
"prevSize": 16,
"code": 86,
"name": "uni56",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 57
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 58
},
{
"icon": {
@@ -1246,18 +1415,21 @@
"M213.721 810.279c-79.102-79.102-123.596-186.218-123.596-298.279 0-232.361 189.514-421.875 421.875-421.875l52.734 52.734-52.734 52.734c-174.683 0-316.406 141.724-316.406 316.406 0 84.045 32.959 164.795 92.286 224.122l-64.27 8.24zM512 933.875l-52.734-52.734 52.734-52.734c174.683 0 316.406-141.724 316.406-316.406 0-84.045-32.959-164.795-92.286-224.122l64.27-8.24 9.888-65.918c79.102 79.102 123.596 186.218 123.596 298.279 0 232.361-189.514 421.875-421.875 421.875z"
],
"defaultCode": 49,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 50,
- "order": 58,
+ "order": 203,
"prevSize": 16,
"code": 49,
"name": "uni31",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 58
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 59
},
{
"icon": {
@@ -1265,18 +1437,21 @@
"M449.378 830.054c0 57.678-47.791 103.821-105.469 103.821s-105.469-46.143-105.469-103.821c0-59.326 47.791-105.469 105.469-105.469s105.469 46.143 105.469 105.469zM449.378 512c0 57.678-47.791 105.469-105.469 105.469s-105.469-47.791-105.469-105.469c0-57.678 47.791-105.469 105.469-105.469s105.469 47.791 105.469 105.469zM449.378 193.946c0 59.326-47.791 105.469-105.469 105.469s-105.469-46.143-105.469-105.469c0-57.678 47.791-103.821 105.469-103.821s105.469 46.143 105.469 103.821zM785.56 830.054c0 57.678-47.791 103.821-105.469 103.821s-105.469-46.143-105.469-103.821c0-59.326 47.791-105.469 105.469-105.469s105.469 46.143 105.469 105.469zM785.56 512c0 57.678-47.791 105.469-105.469 105.469s-105.469-47.791-105.469-105.469c0-57.678 47.791-105.469 105.469-105.469s105.469 47.791 105.469 105.469zM785.56 193.946c0 59.326-47.791 105.469-105.469 105.469s-105.469-46.143-105.469-105.469c0-57.678 47.791-103.821 105.469-103.821s105.469 46.143 105.469 103.821z"
],
"defaultCode": 85,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 51,
- "order": 59,
+ "order": 170,
"prevSize": 16,
"code": 85,
"name": "uni55",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 59
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 60
},
{
"icon": {
@@ -1284,18 +1459,21 @@
"M654.5 193.25v176.25h91.875v183.75h-360v-103.125l-285 191.25 285 189.375v-101.25h536.25v-536.25z"
],
"defaultCode": 51,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 52,
- "order": 60,
+ "order": 171,
"prevSize": 16,
"code": 51,
"name": "uni33",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 60
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 61
},
{
"icon": {
@@ -1303,18 +1481,21 @@
"M406.531 406.531h-316.406l245.544 179.627-88.989 294.983 252.136-176.331 276.856 176.331-113.708-294.983 271.912-179.627h-316.406l-118.653-303.223z"
],
"defaultCode": 50,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 53,
- "order": 61,
+ "order": 172,
"prevSize": 16,
"code": 50,
"name": "uni32",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 61
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 62
},
{
"icon": {
@@ -1322,18 +1503,21 @@
"M270 112h482v46h-482zM810 466l-254 248v-444h-90v440l-250-244-66 64 362 362 362-362z"
],
"defaultCode": 53,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 54,
- "order": 62,
+ "order": 173,
"prevSize": 16,
"code": 53,
"name": "uni35",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 62
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 63
},
{
"icon": {
@@ -1341,18 +1525,21 @@
"M272 112h482v46h-482zM216 716l252-248v444h90v-440l252 244 64-64-362-362-362 362z"
],
"defaultCode": 54,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 55,
- "order": 63,
+ "order": 174,
"prevSize": 16,
"code": 54,
"name": "uni36",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 63
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 64
},
{
"icon": {
@@ -1360,18 +1547,21 @@
"M680.75 390.125c0 3.75 0 7.5 0 11.25s-1.875 7.5-1.875 13.125c0 3.75-1.875 9.375-1.875 13.125-1.875 5.625-3.75 11.25-3.75 16.875-1.875 5.625-3.75 11.25-5.625 16.875s-3.75 11.25-5.625 18.75c-1.875 1.875-3.75 5.625-3.75 7.5-1.875 1.875-1.875 3.75-1.875 5.625-1.875 1.875-1.875 1.875-3.75 3.75-1.875 3.75-1.875 5.625-3.75 9.375s-3.75 5.625-5.625 9.375l-3.75 3.75-1.875 5.625c-1.875 1.875-3.75 5.625-7.5 7.5-3.75 5.625-7.5 13.125-13.125 16.875-5.625 5.625-11.25 11.25-16.875 16.875l-7.5 7.5c-3.75 1.875-5.625 3.75-9.375 7.5-11.25 9.375-24.375 16.875-37.5 24.375s-26.25 13.125-39.375 18.75c-13.125 5.625-26.25 11.25-39.375 15-11.25 3.75-22.5 7.5-33.75 11.25-22.5 5.625-41.25 9.375-54.375 13.125s-20.625 3.75-20.625 3.75c0 0 7.5 0 20.625-3.75 13.125-1.875 31.875-5.625 54.375-11.25 11.25-3.75 22.5-5.625 35.625-9.375s26.25-9.375 39.375-15c13.125-5.625 26.25-11.25 39.375-18.75 13.125-5.625 26.25-15 39.375-24.375 3.75-1.875 5.625-3.75 9.375-5.625l9.375-7.5c5.625-5.625 11.25-11.25 15-16.875 5.625-5.625 11.25-11.25 15-16.875 3.75-3.75 5.625-5.625 7.5-9.375l3.75-3.75c0-1.875 1.875-3.75 1.875-5.625 1.875-1.875 3.75-5.625 7.5-9.375 0-1.875 1.875-5.625 3.75-9.375 1.875 0 1.875-1.875 3.75-3.75 0-1.875 0-3.75 1.875-5.625s1.875-5.625 3.75-9.375c3.75-5.625 5.625-11.25 7.5-16.875 1.875-7.5 3.75-13.125 5.625-18.75s1.875-11.25 3.75-15c1.875-5.625 1.875-11.25 3.75-15 0-5.625 0-9.375 1.875-13.125 0-5.625 0-9.375 0-11.25 1.875-15 1.875-22.5 1.875-22.5h-11.25c0 0 0 7.5-1.875 20.625zM890.75 240.125l-63.75-61.875c-1.875-61.875-41.25-103.125-60-114.375-18.75-16.875-61.875-30-110.625-24.375-46.875 7.5-114.375 31.875-161.25 120-91.875 172.5-288.75 541.875-290.625 545.625-1.875 0-1.875 1.875 0 1.875 0 1.875 1.875 1.875 1.875 1.875l75-13.125-146.25 283.125c0 1.875 0 1.875 1.875 3.75 0 0 0 0 1.875 0 0 0 0 0 0 0l105-18.75c0 0 1.875 0 1.875-1.875l76.875-225c196.875-1.875 333.75-48.75 408.75-144.375 78.75-101.25 67.5-228.75 54.375-288.75l-9.375-58.125h112.5c0 0 1.875 0 1.875-1.875 1.875 0 0-1.875 0-3.75zM787.625 161.375c0 9.375-9.375 18.75-18.75 18.75-11.25 0-18.75-9.375-18.75-18.75 0-11.25 7.5-20.625 18.75-20.625 9.375 0 18.75 9.375 18.75 20.625zM725.75 588.875c-75 93.75-210 140.625-405 140.625-1.875 0-1.875 1.875-1.875 3.75l-78.75 225-95.625 16.875 146.25-283.125c0-1.875 0-1.875 0-3.75-1.875 0-1.875-1.875-3.75-1.875l-75 15c26.25-48.75 204.375-378.75 288.75-538.125 46.875-86.25 110.625-110.625 155.625-116.25 46.875-5.625 86.25 5.625 105 18.75v41.25c-3.75 0-30-9.375-54.375-9.375s-52.5 9.375-69.375 28.125c-30 33.75-37.5 67.5-22.5 123.75 101.25-18.75 146.25 24.375 163.125 50.625 13.125 56.25 28.125 185.625-52.5 288.75zM780.125 240.125l43.125-56.25 56.25 56.25z"
],
"defaultCode": 48,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 56,
- "order": 64,
+ "order": 175,
"prevSize": 16,
"code": 48,
"name": "uni30",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 64
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 65
},
{
"icon": {
@@ -1379,18 +1569,21 @@
"M506.375 69.5c121.875 0 225 41.25 313.125 125.625 86.25 84.375 131.25 187.5 135 309.375 0 121.875-41.25 226.875-127.5 313.125-84.375 88.125-187.5 133.125-309.375 136.875-121.875 0-226.875-41.25-313.125-127.5-88.125-84.375-133.125-187.5-135-309.375s39.375-226.875 125.625-313.125c86.25-88.125 189.375-133.125 311.25-135zM504.5 780.125c18.75 0 35.625-5.625 46.875-16.875 11.25-13.125 18.75-28.125 18.75-45 0-20.625-3.75-35.625-16.875-48.75-11.25-11.25-28.125-16.875-46.875-16.875 0 0-1.875 0-1.875 0-18.75 0-33.75 5.625-45 16.875-13.125 11.25-18.75 26.25-20.625 45 0 18.75 5.625 33.75 18.75 46.875 11.25 11.25 26.25 18.75 45 18.75 0 0 1.875 0 1.875 0zM663.875 465.125c16.875-20.625 24.375-45 24.375-75 0-48.75-16.875-86.25-50.625-110.625s-76.875-35.625-129.375-35.625c-41.25 0-75 7.5-99.375 24.375-45 26.25-67.5 73.125-69.375 140.625 0 0 0 3.75 0 3.75s105 0 105 0c0 0 0-3.75 0-3.75 0-16.875 5.625-33.75 15-52.5 11.25-15 28.125-22.5 52.5-22.5 26.25 0 43.125 5.625 50.625 18.75 9.375 13.125 15 26.25 15 43.125 0 11.25-5.625 24.375-15 37.5-5.625 7.5-13.125 15-20.625 18.75 0 0-5.625 3.75-5.625 3.75-3.75 3.75-7.5 7.5-15 11.25-5.625 3.75-13.125 9.375-18.75 15-7.5 3.75-13.125 9.375-20.625 15s-13.125 11.25-16.875 16.875c-7.5 13.125-13.125 37.5-16.875 75 0 0 0 7.5 0 7.5s105 0 105 0c0 0 0-3.75 0-3.75 0-7.5 0-16.875 3.75-26.25 3.75-13.125 11.25-24.375 26.25-35.625 0 0 26.25-16.875 26.25-16.875 30-22.5 46.875-37.5 54.375-48.75z"
],
"defaultCode": 63,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 57,
- "order": 65,
+ "order": 176,
"prevSize": 16,
"code": 63,
"name": "uni3F",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 65
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 66
},
{
"icon": {
@@ -1398,18 +1591,21 @@
"M939.148 847.742c7.031 10.547 7.031 21.094 0 31.641-5.273 8.789-14.063 14.063-26.367 14.063 0 0-803.32 0-803.32 0-10.547 0-19.336-5.273-24.609-14.063-7.031-10.547-7.031-21.094-1.758-31.641 0 0 400.781-703.125 400.781-703.125 5.273-10.547 14.063-15.82 28.125-15.82 12.305 0 21.094 5.273 26.367 15.82 0 0 400.781 703.125 400.781 703.125zM561.219 803.797c0 0 0-89.648 0-89.648s-98.438 0-98.438 0c0 0 0 89.648 0 89.648s98.438 0 98.438 0zM561.219 647.352c0 0 0-270.703 0-270.703s-98.438 0-98.438 0c0 0 0 270.703 0 270.703s98.438 0 98.438 0z"
],
"defaultCode": 33,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 58,
- "order": 66,
+ "order": 177,
"prevSize": 16,
"code": 33,
"name": "uni21",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 66
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 67
},
{
"icon": {
@@ -1417,18 +1613,21 @@
"M512 62c-247.852 0-450 202.148-450 450s202.148 450 450 450c247.852 0 450-202.148 450-450s-202.148-450-450-450zM441.688 719.422l-205.664-207.422 79.102-79.102 126.563 128.32 270.703-270.703 79.102 79.102z"
],
"defaultCode": 57,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 59,
- "order": 67,
+ "order": 178,
"prevSize": 16,
"code": 57,
"name": "uni39",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 67
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 68
},
{
"icon": {
@@ -1436,18 +1635,21 @@
"M806.983 627.357v192.81h-589.966v-192.81h-112.060v248.841c0 31.311 24.719 57.678 56.031 57.678h702.026c31.311 0 56.031-26.367 56.031-57.678v-248.841zM502.112 607.581l-163.147-194.458c0 0-24.719-24.719 3.296-24.719 26.367 0 90.637 0 90.637 0s0-14.831 0-39.551c0-67.566 0-194.458 0-245.544 0 0-3.296-13.184 18.128-13.184 19.776 0 112.060 0 128.54 0 14.831 0 13.184 11.536 13.184 11.536 0 49.438 0 179.627 0 245.544 0 21.424 0 36.255 0 36.255s52.734 0 85.693 0c31.311 0 8.24 24.719 8.24 24.719s-138.428 182.922-158.203 201.050c-13.184 14.831-26.367-1.648-26.367-1.648z"
],
"defaultCode": 83,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 60,
- "order": 68,
+ "order": 179,
"prevSize": 16,
"code": 83,
"name": "uni53",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 68
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 69
},
{
"icon": {
@@ -1455,18 +1657,21 @@
"M775.672 933.875h-527.344c-87.341 0-158.203-70.862-158.203-158.203v-527.344c0-69.214 44.495-126.892 105.469-148.315v69.214c0 44.495 36.255 79.102 79.102 79.102s79.102-34.607 79.102-79.102v-79.102h316.406v79.102c0 44.495 36.255 79.102 79.102 79.102s79.102-34.607 79.102-79.102v-69.214c60.974 21.424 105.469 79.102 105.469 148.315v527.344c0 87.341-70.862 158.203-158.203 158.203zM828.406 353.797h-632.813v421.875c0 29.663 23.071 52.734 52.734 52.734h527.344c29.663 0 52.734-23.071 52.734-52.734zM617.469 617.469h105.469v105.469h-105.469zM617.469 459.266h105.469v105.469h-105.469zM459.266 617.469h105.469v105.469h-105.469zM459.266 459.266h105.469v105.469h-105.469zM301.063 617.469h105.469v105.469h-105.469zM301.063 459.266h105.469v105.469h-105.469zM749.305 195.594c-14.831 0-26.367-11.536-26.367-26.367v-79.102h52.734v79.102c0 14.831-11.536 26.367-26.367 26.367zM274.695 195.594c-14.831 0-26.367-11.536-26.367-26.367v-79.102h52.734v79.102c0 14.831-11.536 26.367-26.367 26.367z"
],
"defaultCode": 55,
- "grid": 16
+ "grid": 16,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 62,
- "order": 69,
+ "order": 180,
"prevSize": 16,
"code": 55,
"name": "uni37",
"ligatures": ""
},
- "setIdx": 1,
- "iconIdx": 69
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 70
},
{
"icon": {
@@ -1477,17 +1682,46 @@
"text-height"
],
"defaultCode": 61492,
- "grid": 14
+ "grid": 14,
+ "attrs": []
},
+ "attrs": [],
"properties": {
"id": 49,
- "order": 72,
+ "order": 181,
"prevSize": 16,
"code": 61492,
"name": "text-height"
},
- "setIdx": 1,
- "iconIdx": 70
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 71
+ },
+ {
+ "icon": {
+ "paths": [
+ "M250.857 726.286l-146.286 146.286q-5.714 5.143-13.143 5.143-6.857 0-13.143-5.143-5.143-5.714-5.143-13.143t5.143-13.143l146.286-146.286q5.714-5.143 13.143-5.143t13.143 5.143q5.143 5.714 5.143 13.143t-5.143 13.143zM347.429 749.714v182.857q0 8-5.143 13.143t-13.143 5.143-13.143-5.143-5.143-13.143v-182.857q0-8 5.143-13.143t13.143-5.143 13.143 5.143 5.143 13.143zM219.429 621.714q0 8-5.143 13.143t-13.143 5.143h-182.857q-8 0-13.143-5.143t-5.143-13.143 5.143-13.143 13.143-5.143h182.857q8 0 13.143 5.143t5.143 13.143zM941.714 694.857q0 68.571-48.571 116l-84 83.429q-47.429 47.429-116 47.429-69.143 0-116.571-48.571l-190.857-191.429q-12-12-24-32l136.571-10.286 156 156.571q15.429 15.429 38.857 15.714t38.857-15.143l84-83.429q16-16 16-38.286 0-22.857-16-38.857l-156.571-157.143 10.286-136.571q20 12 32 24l192 192q48 49.143 48 116.571zM589.143 281.143l-136.571 10.286-156-156.571q-16-16-38.857-16-22.286 0-38.857 15.429l-84 83.429q-16 16-16 38.286 0 22.857 16 38.857l156.571 156.571-10.286 137.143q-20-12-32-24l-192-192q-48-49.143-48-116.571 0-68.571 48.571-116l84-83.429q47.429-47.429 116-47.429 69.143 0 116.571 48.571l190.857 191.429q12 12 24 32zM950.857 329.143q0 8-5.143 13.143t-13.143 5.143h-182.857q-8 0-13.143-5.143t-5.143-13.143 5.143-13.143 13.143-5.143h182.857q8 0 13.143 5.143t5.143 13.143zM640 18.286v182.857q0 8-5.143 13.143t-13.143 5.143-13.143-5.143-5.143-13.143v-182.857q0-8 5.143-13.143t13.143-5.143 13.143 5.143 5.143 13.143zM872.571 104.571l-146.286 146.286q-6.286 5.143-13.143 5.143t-13.143-5.143q-5.143-5.714-5.143-13.143t5.143-13.143l146.286-146.286q5.714-5.143 13.143-5.143t13.143 5.143q5.143 5.714 5.143 13.143t-5.143 13.143z"
+ ],
+ "attrs": [],
+ "isMulticolor": false,
+ "width": 951,
+ "tags": [
+ "chain-broken",
+ "unlink"
+ ],
+ "grid": 14
+ },
+ "attrs": [],
+ "properties": {
+ "order": 182,
+ "id": 163,
+ "prevSize": 16,
+ "code": 59648,
+ "name": "chain-broken"
+ },
+ "setIdx": 0,
+ "setId": 1,
+ "iconIdx": 72
}
],
"height": 1024,
@@ -1513,7 +1747,9 @@
"showMetadata": false,
"showVersion": false,
"includeMetadata": false,
- "resetPoint": 58880
+ "resetPoint": 58880,
+ "embed": false,
+ "showSelector": false
},
"imagePref": {},
"historySize": 100,
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.eot b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.eot
index c62083ac50..028676ac39 100755
Binary files a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.eot and b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.eot differ
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.svg
index 64723fcf8c..3363bfd94c 100755
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.svg
@@ -6,77 +6,78 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.ttf b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.ttf
index d0b7edcd3f..089d7774bf 100755
Binary files a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.ttf and b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.ttf differ
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.woff b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.woff
index 48d2dbd0db..117e5e43da 100755
Binary files a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.woff and b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.woff differ
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js
index 74cb248e81..3d7717da91 100644
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js
@@ -7,7 +7,7 @@
editable: null
},
populateToolbar: function(toolbar) {
- var button, getEnclosingLink, widget;
+ var buttonSet, addButton, cancelButton, getEnclosingLink, widget;
widget = this;
getEnclosingLink = function() {
@@ -17,61 +17,135 @@
return $(node).parents('a').get(0);
};
- button = $('');
- button.hallobutton({
- uuid: this.options.uuid,
- editable: this.options.editable,
- label: 'Links',
+ buttonSet = $('');
+
+ addButton = $('');
+ addButton = addButton.hallobutton({
+ uuid: widget.options.uuid,
+ editable: widget.options.editable,
+ label: 'Add/Edit Link',
icon: 'icon-link',
command: null,
queryState: function(event) {
- return button.hallobutton('checked', !!getEnclosingLink());
+ return addButton.hallobutton('checked', !!getEnclosingLink());
}
});
+ addButton.on('click', function() {
+ var enclosingLink, lastSelection, url, urlParams, href, pageId;
- toolbar.append(button);
- return button.on('click', function(event) {
- var enclosingLink, lastSelection, url;
+ // Defaults.
+ url = window.chooserUrls.pageChooser;
+ urlParams = {
+ 'allow_external_link': true,
+ 'allow_email_link': true
+ };
+
+ enclosingLink = getEnclosingLink();
+ lastSelection = widget.options.editable.getSelection();
+
+ if (enclosingLink) {
+ href = enclosingLink.getAttribute('href');
+ pageId = enclosingLink.getAttribute('data-id');
+
+ urlParams['link_text'] = enclosingLink.innerText;
+
+ if (pageId) {
+ // TODO: Actually show the parent not the page itself.
+ url = window.chooserUrls.pageChooser + pageId.toString() + '/';
+ } else if (href.startsWith('mailto:')) {
+ url = window.chooserUrls.emailLinkChooser;
+ href = href.replace('mailto:', '');
+ urlParams['link_url'] = href;
+ } else {
+ url = window.chooserUrls.externalLinkChooser;
+ urlParams['link_url'] = href;
+ }
+ } else if (!lastSelection.collapsed) {
+ urlParams['link_text'] = lastSelection.toString();
+ }
+
+ return ModalWorkflow({
+ url: url,
+ urlParams: urlParams,
+ responses: {
+ pageChosen: function(pageData) {
+ var a, text;
+
+ // Create link
+ a = document.createElement('a');
+ a.setAttribute('href', pageData.url);
+ if (pageData.id) {
+ a.setAttribute('data-id', pageData.id);
+ a.setAttribute('data-linktype', 'page');
+ }
+
+ if (pageData.id) {
+ // If it's a link to an internal page, `pageData.title` will not use the link_text
+ // like external and email responses do, overwriting selection text :(
+ if (!lastSelection.collapsed) {
+ text = lastSelection.toString();
+ } else if (enclosingLink) {
+ text = enclosingLink.innerHTML;
+ }
+ else {
+ text = pageData.title;
+ }
+ } else {
+ text = pageData.title;
+ }
+ a.appendChild(document.createTextNode(text));
+
+ // Remove existing nodes
+ if (enclosingLink && enclosingLink.parentNode) {
+ enclosingLink.parentNode.removeChild(enclosingLink);
+ }
+ lastSelection.deleteContents();
+
+ // Add new node
+ lastSelection.insertNode(a);
+
+ return widget.options.editable.element.trigger('change');
+ }
+ }
+ });
+ });
+ buttonSet.append(addButton);
+
+ cancelButton = $('');
+ cancelButton = cancelButton.hallobutton({
+ uuid: widget.options.uuid,
+ editable: widget.options.editable,
+ label: 'Remove Link',
+ icon: 'icon-chain-broken',
+ command: null,
+ queryState: function(event) {
+ if (!!getEnclosingLink()) {
+ return cancelButton.hallobutton('enable');
+ } else {
+ return cancelButton.hallobutton('disable');
+ }
+ }
+ });
+ cancelButton.on('click', function() {
+ var enclosingLink, sel, range;
enclosingLink = getEnclosingLink();
if (enclosingLink) {
- $(enclosingLink).replaceWith(enclosingLink.innerHTML);
- button.hallobutton('checked', false);
- return widget.options.editable.element.trigger('change');
- } else {
- lastSelection = widget.options.editable.getSelection();
- if (lastSelection.collapsed) {
- url = window.chooserUrls.pageChooser + '?allow_external_link=true&allow_email_link=true&prompt_for_link_text=true';
- } else {
- url = window.chooserUrls.pageChooser + '?allow_external_link=true&allow_email_link=true';
- }
+ sel = rangy.getSelection();
+ range = sel.getRangeAt(0);
- return ModalWorkflow({
- url: url,
- responses: {
- pageChosen: function(pageData) {
- var a;
+ range.setStartBefore(sel.anchorNode.parentNode);
+ range.setEndAfter(sel.anchorNode.parentNode);
- a = document.createElement('a');
- a.setAttribute('href', pageData.url);
- if (pageData.id) {
- a.setAttribute('data-id', pageData.id);
- a.setAttribute('data-linktype', 'page');
- }
+ sel.setSingleRange(range, false);
- if ((!lastSelection.collapsed) && lastSelection.canSurroundContents()) {
- lastSelection.surroundContents(a);
- } else {
- a.appendChild(document.createTextNode(pageData.title));
- lastSelection.insertNode(a);
- }
-
- return widget.options.editable.element.trigger('change');
- }
- }
- });
+ document.execCommand('unlink');
}
});
+ buttonSet.append(cancelButton);
+
+ buttonSet.hallobuttonset();
+ toolbar.append(buttonSet);
}
});
})(jQuery);
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/_variables-icons.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/_variables-icons.scss
index 1ba23ffe00..15c421c494 100644
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/_variables-icons.scss
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/_variables-icons.scss
@@ -72,7 +72,8 @@ $icons: (
'title': '\f034',
'code': '\e601',
'openquote': '“',
- 'horizontalrule': '\2014'
+ 'horizontalrule': '\2014',
+ 'chain-broken': '\e900'
);
$icons-after: (
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index cd92a14b7b..64b3e85e4f 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -6,7 +6,9 @@
diff --git a/wagtail/wagtailadmin/tests/test_page_chooser.py b/wagtail/wagtailadmin/tests/test_page_chooser.py
index b1a53b1016..e23fc75259 100644
--- a/wagtail/wagtailadmin/tests/test_page_chooser.py
+++ b/wagtail/wagtailadmin/tests/test_page_chooser.py
@@ -313,27 +313,34 @@ class TestChooserExternalLink(TestCase, WagtailTestUtils):
self.assertTemplateUsed(response, 'wagtailadmin/chooser/external_link.html')
def test_get_with_param(self):
- self.assertEqual(self.get({'prompt_for_link_text': 'foo'}).status_code, 200)
+ self.assertEqual(self.get({'link_text': 'foo'}).status_code, 200)
def test_create_link(self):
+ response = self.post({'url': 'http://www.example.com/', 'link_text': 'example'})
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, "'onload'") # indicates success / post back to calling page
+ self.assertContains(response, "'url': 'http://www.example.com/'")
+ self.assertContains(response, "'title': 'example'") # When link text is given, it is used
+
+ def test_create_link_without_text(self):
response = self.post({'url': 'http://www.example.com/'})
self.assertEqual(response.status_code, 200)
self.assertContains(response, "'onload'") # indicates success / post back to calling page
- self.assertContains(response, "'url': 'http://www.example.com/',")
- self.assertContains(response, "'title': 'http://www.example.com/'")
+ self.assertContains(response, "'url': 'http://www.example.com/'")
+ self.assertContains(response, "'title': 'http://www.example.com/'") # When no text is given, it uses the url
def test_invalid_url(self):
- response = self.post({'url': 'ntp://www.example.com'})
+ response = self.post({'url': 'ntp://www.example.com', 'link_text': 'example'})
self.assertEqual(response.status_code, 200)
self.assertContains(response, "'html'") # indicates failure / show error message
self.assertContains(response, "Enter a valid URL.")
def test_allow_local_url(self):
- response = self.post({'url': '/admin/'})
+ response = self.post({'url': '/admin/', 'link_text': 'admin'})
self.assertEqual(response.status_code, 200)
self.assertContains(response, "'onload'") # indicates success / post back to calling page
self.assertContains(response, "'url': '/admin/',")
- self.assertContains(response, "'title': '/admin/'")
+ self.assertContains(response, "'title': 'admin'")
class TestChooserEmailLink(TestCase, WagtailTestUtils):
@@ -352,9 +359,14 @@ class TestChooserEmailLink(TestCase, WagtailTestUtils):
self.assertTemplateUsed(response, 'wagtailadmin/chooser/email_link.html')
def test_get_with_param(self):
- self.assertEqual(self.get({'prompt_for_link_text': 'foo'}).status_code, 200)
+ self.assertEqual(self.get({'link_text': 'foo'}).status_code, 200)
def test_create_link(self):
+ request = self.post({'email_address': 'example@example.com', 'link_text': 'contact'})
+ self.assertContains(request, "'url': 'mailto:example@example.com',")
+ self.assertContains(request, "'title': 'contact'") # When link text is given, it is used
+
+ def test_create_link_without_text(self):
request = self.post({'email_address': 'example@example.com'})
self.assertContains(request, "'url': 'mailto:example@example.com',")
- self.assertContains(request, "'title': 'example@example.com'")
+ self.assertContains(request, "'title': 'example@example.com'") # When no link text is given, it uses the email
diff --git a/wagtail/wagtailadmin/views/chooser.py b/wagtail/wagtailadmin/views/chooser.py
index e2d4e6051e..22525347a6 100644
--- a/wagtail/wagtailadmin/views/chooser.py
+++ b/wagtail/wagtailadmin/views/chooser.py
@@ -4,9 +4,7 @@ from django.http import Http404
from django.shortcuts import get_object_or_404, render
from wagtail.utils.pagination import paginate
-from wagtail.wagtailadmin.forms import (
- EmailLinkChooserForm, EmailLinkChooserWithLinkTextForm, ExternalLinkChooserForm,
- ExternalLinkChooserWithLinkTextForm, SearchForm)
+from wagtail.wagtailadmin.forms import EmailLinkChooserForm, ExternalLinkChooserForm, SearchForm
from wagtail.wagtailadmin.modal_workflow import render_modal_workflow
from wagtail.wagtailcore.models import Page
from wagtail.wagtailcore.utils import resolve_model_string
@@ -144,26 +142,23 @@ def search(request, parent_page_id=None):
def external_link(request):
- prompt_for_link_text = bool(request.GET.get('prompt_for_link_text'))
-
- if prompt_for_link_text:
- form_class = ExternalLinkChooserWithLinkTextForm
- else:
- form_class = ExternalLinkChooserForm
+ link_text = request.GET.get('link_text', '')
+ link_url = request.GET.get('link_url', '')
if request.method == 'POST':
- form = form_class(request.POST)
+ form = ExternalLinkChooserForm(request.POST)
+
if form.is_valid():
return render_modal_workflow(
request,
None, 'wagtailadmin/chooser/external_link_chosen.js',
{
'url': form.cleaned_data['url'],
- 'link_text': form.cleaned_data['link_text'] if prompt_for_link_text else form.cleaned_data['url']
+ 'link_text': form.cleaned_data['link_text'].strip() or form.cleaned_data['url']
}
)
else:
- form = form_class()
+ form = ExternalLinkChooserForm(initial={'url': link_url, 'link_text': link_text})
return render_modal_workflow(
request,
@@ -175,28 +170,23 @@ def external_link(request):
def email_link(request):
- prompt_for_link_text = bool(request.GET.get('prompt_for_link_text'))
-
- if prompt_for_link_text:
- form_class = EmailLinkChooserWithLinkTextForm
- else:
- form_class = EmailLinkChooserForm
+ link_text = request.GET.get('link_text', '')
+ link_url = request.GET.get('link_url', '')
if request.method == 'POST':
- form = form_class(request.POST)
+ form = EmailLinkChooserForm(request.POST)
+
if form.is_valid():
return render_modal_workflow(
request,
None, 'wagtailadmin/chooser/external_link_chosen.js',
{
'url': 'mailto:' + form.cleaned_data['email_address'],
- 'link_text': form.cleaned_data['link_text'] if (
- prompt_for_link_text and form.cleaned_data['link_text']
- ) else form.cleaned_data['email_address']
+ 'link_text': form.cleaned_data['link_text'].strip() or form.cleaned_data['email_address']
}
)
else:
- form = form_class()
+ form = EmailLinkChooserForm(initial={'email_address': link_url, 'link_text': link_text})
return render_modal_workflow(
request,