diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index f0f9bc87f0..3083a5469e 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 5b675c29ad..d7021daacd 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -30833,12 +30833,6 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 20
- }
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 12
@@ -30846,21 +30840,14 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 12
- }
caption {
primary {
height: 10
color: 3832097
stroke_color: 872415231
- offset_y: 1
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 13
@@ -30882,7 +30869,6 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 14
@@ -30891,13 +30877,13 @@ cont {
priority: -15940
}
symbol {
- name: "park-s"
+ name: "nparkf-s"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 10
+ height: 11
color: 3832097
stroke_color: 872415231
offset_y: 1
@@ -30913,14 +30899,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 14
- area {
- color: 11453035
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 14
area {
@@ -30940,7 +30918,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 15
@@ -30949,15 +30927,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-m"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -30971,14 +30949,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 15
- area {
- color: 11584112
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 15
area {
@@ -30998,7 +30968,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 16
@@ -31007,15 +30977,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31029,14 +30999,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 16
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 16
area {
@@ -31044,7 +31006,7 @@ cont {
priority: -15940
}
symbol {
- name: "nparkf-m"
+ name: "nparkf-l"
priority: 16060
}
caption {
@@ -31056,7 +31018,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 17
@@ -31065,7 +31027,7 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
@@ -31073,7 +31035,7 @@ cont {
primary {
height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31087,14 +31049,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 17
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 17
area {
@@ -31114,7 +31068,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 18
@@ -31123,15 +31077,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31145,18 +31099,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 18
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 18
area {
@@ -31176,7 +31118,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 19
@@ -31185,15 +31127,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31207,18 +31149,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 19
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 19
area {
@@ -31238,7 +31168,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
}
cont {
@@ -31256,12 +31186,6 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 20
- }
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 12
@@ -31269,21 +31193,14 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 12
- }
caption {
primary {
height: 10
color: 3832097
stroke_color: 872415231
- offset_y: 1
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 13
@@ -31305,7 +31222,6 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 14
@@ -31314,13 +31230,13 @@ cont {
priority: -15940
}
symbol {
- name: "park-s"
+ name: "nparkf-s"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 10
+ height: 11
color: 3832097
stroke_color: 872415231
offset_y: 1
@@ -31336,14 +31252,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 14
- area {
- color: 11453035
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 14
area {
@@ -31363,7 +31271,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 15
@@ -31372,15 +31280,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-m"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31394,14 +31302,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 15
- area {
- color: 11584112
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 15
area {
@@ -31421,7 +31321,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 16
@@ -31430,15 +31330,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31452,14 +31352,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 16
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 16
area {
@@ -31467,7 +31359,7 @@ cont {
priority: -15940
}
symbol {
- name: "nparkf-m"
+ name: "nparkf-l"
priority: 16060
}
caption {
@@ -31479,7 +31371,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 17
@@ -31488,7 +31380,7 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
@@ -31496,7 +31388,7 @@ cont {
primary {
height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31510,14 +31402,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 17
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 17
area {
@@ -31537,7 +31421,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 18
@@ -31546,15 +31430,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31568,18 +31452,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 18
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 18
area {
@@ -31599,7 +31471,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 19
@@ -31608,15 +31480,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31630,18 +31502,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 19
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 19
area {
@@ -31661,7 +31521,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
}
cont {
@@ -31679,12 +31539,6 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 20
- }
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 12
@@ -31692,21 +31546,14 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 12
- }
caption {
primary {
height: 10
color: 3832097
stroke_color: 872415231
- offset_y: 1
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 13
@@ -31728,7 +31575,6 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 14
@@ -31737,13 +31583,13 @@ cont {
priority: -15940
}
symbol {
- name: "park-s"
+ name: "nparkf-s"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 10
+ height: 11
color: 3832097
stroke_color: 872415231
offset_y: 1
@@ -31759,14 +31605,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 14
- area {
- color: 11453035
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 14
area {
@@ -31786,7 +31624,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 15
@@ -31795,15 +31633,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-m"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31817,14 +31655,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 15
- area {
- color: 11584112
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 15
area {
@@ -31844,7 +31674,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 16
@@ -31853,15 +31683,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31875,14 +31705,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 16
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 16
area {
@@ -31890,7 +31712,7 @@ cont {
priority: -15940
}
symbol {
- name: "nparkf-m"
+ name: "nparkf-l"
priority: 16060
}
caption {
@@ -31902,7 +31724,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 17
@@ -31911,7 +31733,7 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
@@ -31919,7 +31741,7 @@ cont {
primary {
height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31933,14 +31755,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 17
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 17
area {
@@ -31960,7 +31774,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 18
@@ -31969,15 +31783,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31991,18 +31805,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 18
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 18
area {
@@ -32022,7 +31824,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 19
@@ -32031,15 +31833,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -32053,18 +31855,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 19
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 19
area {
@@ -32084,7 +31874,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
}
cont {
@@ -32102,12 +31892,6 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 20
- }
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 12
@@ -32115,21 +31899,14 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 12
- }
caption {
primary {
height: 10
color: 3832097
stroke_color: 872415231
- offset_y: 1
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 13
@@ -32151,7 +31928,6 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 14
@@ -32160,13 +31936,13 @@ cont {
priority: -15940
}
symbol {
- name: "park-s"
+ name: "nparkf-s"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 10
+ height: 11
color: 3832097
stroke_color: 872415231
offset_y: 1
@@ -32182,14 +31958,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 14
- area {
- color: 11453035
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 14
area {
@@ -32209,7 +31977,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 15
@@ -32218,15 +31986,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-m"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -32240,14 +32008,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 15
- area {
- color: 11584112
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 15
area {
@@ -32267,7 +32027,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 16
@@ -32276,15 +32036,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -32298,14 +32058,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 16
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 16
area {
@@ -32313,7 +32065,7 @@ cont {
priority: -15940
}
symbol {
- name: "nparkf-m"
+ name: "nparkf-l"
priority: 16060
}
caption {
@@ -32325,7 +32077,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 17
@@ -32334,7 +32086,7 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
@@ -32342,7 +32094,7 @@ cont {
primary {
height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -32356,14 +32108,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 17
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 17
area {
@@ -32383,7 +32127,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 18
@@ -32392,15 +32136,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -32414,18 +32158,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 18
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 18
area {
@@ -32445,7 +32177,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 19
@@ -32454,15 +32186,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -32476,18 +32208,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 19
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 19
area {
@@ -32507,7 +32227,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
}
cont {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index e2aca9f387..82c40bef59 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 9c6f987c66..72935846d4 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -30531,12 +30531,6 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 20
- }
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 12
@@ -30544,21 +30538,14 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 12
- }
caption {
primary {
height: 10
color: 3832097
stroke_color: 872415231
- offset_y: 1
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 13
@@ -30580,7 +30567,6 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 14
@@ -30589,13 +30575,13 @@ cont {
priority: -15940
}
symbol {
- name: "park-s"
+ name: "nparkf-s"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 10
+ height: 11
color: 3832097
stroke_color: 872415231
offset_y: 1
@@ -30611,14 +30597,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 14
- area {
- color: 11453035
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 14
area {
@@ -30638,7 +30616,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 15
@@ -30647,15 +30625,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-m"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -30669,14 +30647,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 15
- area {
- color: 11584112
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 15
area {
@@ -30696,7 +30666,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 16
@@ -30705,15 +30675,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -30727,14 +30697,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 16
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 16
area {
@@ -30742,7 +30704,7 @@ cont {
priority: -15940
}
symbol {
- name: "nparkf-m"
+ name: "nparkf-l"
priority: 16060
}
caption {
@@ -30754,7 +30716,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 17
@@ -30763,7 +30725,7 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
@@ -30771,7 +30733,7 @@ cont {
primary {
height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -30785,14 +30747,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 17
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 17
area {
@@ -30812,7 +30766,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 18
@@ -30821,15 +30775,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -30843,18 +30797,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 18
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 18
area {
@@ -30874,7 +30816,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 19
@@ -30883,15 +30825,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -30905,18 +30847,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 19
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 19
area {
@@ -30936,7 +30866,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
}
cont {
@@ -30954,12 +30884,6 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 20
- }
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 12
@@ -30967,21 +30891,14 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 12
- }
caption {
primary {
height: 10
color: 3832097
stroke_color: 872415231
- offset_y: 1
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 13
@@ -31003,7 +30920,6 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 14
@@ -31012,13 +30928,13 @@ cont {
priority: -15940
}
symbol {
- name: "park-s"
+ name: "nparkf-s"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 10
+ height: 11
color: 3832097
stroke_color: 872415231
offset_y: 1
@@ -31034,14 +30950,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 14
- area {
- color: 11453035
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 14
area {
@@ -31061,7 +30969,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 15
@@ -31070,15 +30978,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-m"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31092,14 +31000,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 15
- area {
- color: 11584112
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 15
area {
@@ -31119,7 +31019,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 16
@@ -31128,15 +31028,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31150,14 +31050,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 16
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 16
area {
@@ -31165,7 +31057,7 @@ cont {
priority: -15940
}
symbol {
- name: "nparkf-m"
+ name: "nparkf-l"
priority: 16060
}
caption {
@@ -31177,7 +31069,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 17
@@ -31186,7 +31078,7 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
@@ -31194,7 +31086,7 @@ cont {
primary {
height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31208,14 +31100,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 17
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 17
area {
@@ -31235,7 +31119,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 18
@@ -31244,15 +31128,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31266,18 +31150,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 18
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 18
area {
@@ -31297,7 +31169,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 19
@@ -31306,15 +31178,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31328,18 +31200,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 19
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 19
area {
@@ -31359,7 +31219,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
}
cont {
@@ -31377,12 +31237,6 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 20
- }
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 12
@@ -31390,21 +31244,14 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 12
- }
caption {
primary {
height: 10
color: 3832097
stroke_color: 872415231
- offset_y: 1
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 13
@@ -31426,7 +31273,6 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 14
@@ -31435,13 +31281,13 @@ cont {
priority: -15940
}
symbol {
- name: "park-s"
+ name: "nparkf-s"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 10
+ height: 11
color: 3832097
stroke_color: 872415231
offset_y: 1
@@ -31457,14 +31303,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 14
- area {
- color: 11453035
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 14
area {
@@ -31484,7 +31322,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 15
@@ -31493,15 +31331,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-m"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31515,14 +31353,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 15
- area {
- color: 11584112
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 15
area {
@@ -31542,7 +31372,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 16
@@ -31551,15 +31381,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31573,14 +31403,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 16
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 16
area {
@@ -31588,7 +31410,7 @@ cont {
priority: -15940
}
symbol {
- name: "nparkf-m"
+ name: "nparkf-l"
priority: 16060
}
caption {
@@ -31600,7 +31422,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 17
@@ -31609,7 +31431,7 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
@@ -31617,7 +31439,7 @@ cont {
primary {
height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31631,14 +31453,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 17
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 17
area {
@@ -31658,7 +31472,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 18
@@ -31667,15 +31481,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31689,18 +31503,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 18
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 18
area {
@@ -31720,7 +31522,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 19
@@ -31729,15 +31531,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31751,18 +31553,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 19
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 19
area {
@@ -31782,7 +31572,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
}
cont {
@@ -31800,12 +31590,6 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 20
- }
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 12
@@ -31813,21 +31597,14 @@ cont {
color: 12372094
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 12
- }
caption {
primary {
height: 10
color: 3832097
stroke_color: 872415231
- offset_y: 1
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 13
@@ -31849,7 +31626,6 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 14
@@ -31858,13 +31634,13 @@ cont {
priority: -15940
}
symbol {
- name: "park-s"
+ name: "nparkf-s"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 10
+ height: 11
color: 3832097
stroke_color: 872415231
offset_y: 1
@@ -31880,14 +31656,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 14
- area {
- color: 11453035
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 14
area {
@@ -31907,7 +31675,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 15
@@ -31916,15 +31684,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-m"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31938,14 +31706,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 15
- area {
- color: 11584112
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 15
area {
@@ -31965,7 +31725,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 16
@@ -31974,15 +31734,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -31996,14 +31756,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 16
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 16
area {
@@ -32011,7 +31763,7 @@ cont {
priority: -15940
}
symbol {
- name: "nparkf-m"
+ name: "nparkf-l"
priority: 16060
}
caption {
@@ -32023,7 +31775,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 17
@@ -32032,7 +31784,7 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
@@ -32040,7 +31792,7 @@ cont {
primary {
height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -32054,14 +31806,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 17
- area {
- color: 11190117
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 17
area {
@@ -32081,7 +31825,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 18
@@ -32090,15 +31834,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -32112,18 +31856,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 18
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 18
area {
@@ -32143,7 +31875,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 19
@@ -32152,15 +31884,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 3832097
- stroke_color: 872415231
+ stroke_color: 452984831
offset_y: 1
}
secondary {
@@ -32174,18 +31906,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 19
- area {
- color: 11190117
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 19
area {
@@ -32205,7 +31925,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
}
cont {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 519c0380e5..b566489772 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 5898b596c3..78b75d8be7 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -30687,12 +30687,6 @@ cont {
color: 1317888
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 20
- }
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 12
@@ -30700,21 +30694,14 @@ cont {
color: 1317888
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 12
- }
caption {
primary {
height: 10
color: 2836760
stroke_color: 856756480
- offset_y: 1
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 13
@@ -30736,7 +30723,6 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 14
@@ -30745,15 +30731,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-s"
+ name: "nparkf-s"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 10
+ height: 11
color: 2836760
- stroke_color: 856756497
+ stroke_color: 856756480
offset_y: 1
}
secondary {
@@ -30767,14 +30753,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 14
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 14
area {
@@ -30794,7 +30772,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 15
@@ -30803,15 +30781,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-m"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -30825,14 +30803,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 15
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 15
area {
@@ -30852,7 +30822,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 16
@@ -30861,15 +30831,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -30883,14 +30853,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 16
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 16
area {
@@ -30898,7 +30860,7 @@ cont {
priority: -15940
}
symbol {
- name: "nparkf-m"
+ name: "nparkf-l"
priority: 16060
}
caption {
@@ -30910,7 +30872,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 17
@@ -30919,7 +30881,7 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
@@ -30927,7 +30889,7 @@ cont {
primary {
height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -30941,14 +30903,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 17
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 17
area {
@@ -30968,7 +30922,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 18
@@ -30977,15 +30931,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -30999,18 +30953,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 18
- area {
- color: 1317888
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 18
area {
@@ -31030,7 +30972,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 19
@@ -31039,15 +30981,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -31061,18 +31003,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 19
- area {
- color: 1317888
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 19
area {
@@ -31092,7 +31022,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
}
cont {
@@ -31110,12 +31040,6 @@ cont {
color: 1317888
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 20
- }
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 12
@@ -31123,21 +31047,14 @@ cont {
color: 1317888
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 12
- }
caption {
primary {
height: 10
color: 2836760
stroke_color: 856756480
- offset_y: 1
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 13
@@ -31159,7 +31076,6 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 14
@@ -31168,15 +31084,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-s"
+ name: "nparkf-s"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 10
+ height: 11
color: 2836760
- stroke_color: 856756497
+ stroke_color: 856756480
offset_y: 1
}
secondary {
@@ -31190,14 +31106,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 14
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 14
area {
@@ -31217,7 +31125,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 15
@@ -31226,15 +31134,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-m"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -31248,14 +31156,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 15
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 15
area {
@@ -31275,7 +31175,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 16
@@ -31284,15 +31184,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -31306,14 +31206,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 16
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 16
area {
@@ -31321,7 +31213,7 @@ cont {
priority: -15940
}
symbol {
- name: "nparkf-m"
+ name: "nparkf-l"
priority: 16060
}
caption {
@@ -31333,7 +31225,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 17
@@ -31342,7 +31234,7 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
@@ -31350,7 +31242,7 @@ cont {
primary {
height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -31364,14 +31256,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 17
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 17
area {
@@ -31391,7 +31275,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 18
@@ -31400,15 +31284,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -31422,18 +31306,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 18
- area {
- color: 1317888
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 18
area {
@@ -31453,7 +31325,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 19
@@ -31462,15 +31334,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -31484,18 +31356,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 19
- area {
- color: 1317888
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 19
area {
@@ -31515,7 +31375,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
}
cont {
@@ -31533,12 +31393,6 @@ cont {
color: 1317888
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 20
- }
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 12
@@ -31546,21 +31400,14 @@ cont {
color: 1317888
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 12
- }
caption {
primary {
height: 10
color: 2836760
stroke_color: 856756480
- offset_y: 1
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 13
@@ -31582,7 +31429,6 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 14
@@ -31591,15 +31437,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-s"
+ name: "nparkf-s"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 10
+ height: 11
color: 2836760
- stroke_color: 856756497
+ stroke_color: 856756480
offset_y: 1
}
secondary {
@@ -31613,14 +31459,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 14
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 14
area {
@@ -31640,7 +31478,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 15
@@ -31649,15 +31487,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-m"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -31671,14 +31509,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 15
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 15
area {
@@ -31698,7 +31528,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 16
@@ -31707,15 +31537,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -31729,14 +31559,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 16
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 16
area {
@@ -31744,7 +31566,7 @@ cont {
priority: -15940
}
symbol {
- name: "nparkf-m"
+ name: "nparkf-l"
priority: 16060
}
caption {
@@ -31756,7 +31578,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 17
@@ -31765,7 +31587,7 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
@@ -31773,7 +31595,7 @@ cont {
primary {
height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -31787,14 +31609,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 17
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 17
area {
@@ -31814,7 +31628,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 18
@@ -31823,15 +31637,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -31845,18 +31659,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 18
- area {
- color: 1317888
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 18
area {
@@ -31876,7 +31678,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 19
@@ -31885,15 +31687,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -31907,18 +31709,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 19
- area {
- color: 1317888
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 19
area {
@@ -31938,7 +31728,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
}
cont {
@@ -31956,12 +31746,6 @@ cont {
color: 1317888
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 20
- }
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 12
@@ -31969,21 +31753,14 @@ cont {
color: 1317888
priority: -15940
}
- symbol {
- name: "nparkf-s"
- priority: 16060
- min_distance: 12
- }
caption {
primary {
height: 10
color: 2836760
stroke_color: 856756480
- offset_y: 1
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 13
@@ -32005,7 +31782,6 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
}
element {
scale: 14
@@ -32014,15 +31790,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-s"
+ name: "nparkf-s"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 10
+ height: 11
color: 2836760
- stroke_color: 856756497
+ stroke_color: 856756480
offset_y: 1
}
secondary {
@@ -32036,14 +31812,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 14
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 14
area {
@@ -32063,7 +31831,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 15
@@ -32072,15 +31840,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-m"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -32094,14 +31862,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 15
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 15
area {
@@ -32121,7 +31881,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 16
@@ -32130,15 +31890,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-m"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 11
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -32152,14 +31912,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 16
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 16
area {
@@ -32167,7 +31919,7 @@ cont {
priority: -15940
}
symbol {
- name: "nparkf-m"
+ name: "nparkf-l"
priority: 16060
}
caption {
@@ -32179,7 +31931,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 17
@@ -32188,7 +31940,7 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
@@ -32196,7 +31948,7 @@ cont {
primary {
height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -32210,14 +31962,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 17
- area {
- color: 1317888
- priority: -15940
- }
- apply_if: "!name"
- }
element {
scale: 17
area {
@@ -32237,7 +31981,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 18
@@ -32246,15 +31990,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -32268,18 +32012,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 18
- area {
- color: 1317888
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 18
area {
@@ -32299,7 +32031,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
element {
scale: 19
@@ -32308,15 +32040,15 @@ cont {
priority: -15940
}
symbol {
- name: "park-l"
+ name: "nparkf-l"
priority: 16060
min_distance: 10
}
caption {
primary {
- height: 13
+ height: 12
color: 2836760
- stroke_color: 856756497
+ stroke_color: 437326080
offset_y: 1
}
secondary {
@@ -32330,18 +32062,6 @@ cont {
}
apply_if: "name"
}
- element {
- scale: 19
- area {
- color: 1317888
- priority: -15940
- }
- symbol {
- name: "park-l"
- priority: 16060
- }
- apply_if: "!name"
- }
element {
scale: 19
area {
@@ -32361,7 +32081,7 @@ cont {
}
priority: 15060
}
- apply_if: "extra_tag=boundary=national_park"
+ apply_if: "!name"
}
}
cont {
diff --git a/data/local_ads_symbols.txt b/data/local_ads_symbols.txt
index 3bcf66fe84..7b71023328 100644
--- a/data/local_ads_symbols.txt
+++ b/data/local_ads_symbols.txt
@@ -100,6 +100,7 @@
09018_gym-l
09019_equestrian-l
09020_theme_park-l
+0_burger-king
10001_kindergarten-l
10002_school-l
10003_college-l
diff --git a/data/resources-6plus_clear/symbols-ad.sdf b/data/resources-6plus_clear/symbols-ad.sdf
index c6afb5d443..607ce9eb66 100644
--- a/data/resources-6plus_clear/symbols-ad.sdf
+++ b/data/resources-6plus_clear/symbols-ad.sdf
@@ -1,134 +1,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf
index 24f5e05655..57319b1bb6 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -1,1050 +1,1050 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_dark/symbols-ad.sdf b/data/resources-6plus_dark/symbols-ad.sdf
index c6afb5d443..607ce9eb66 100644
--- a/data/resources-6plus_dark/symbols-ad.sdf
+++ b/data/resources-6plus_dark/symbols-ad.sdf
@@ -1,134 +1,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf
index ea0b92503f..e738ebd805 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -1,1051 +1,1051 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_clear/symbols-ad.sdf b/data/resources-hdpi_clear/symbols-ad.sdf
index caa613de6f..a69541f185 100644
--- a/data/resources-hdpi_clear/symbols-ad.sdf
+++ b/data/resources-hdpi_clear/symbols-ad.sdf
@@ -1,134 +1,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf
index 82ae230ed9..78a94888d5 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -1,1050 +1,1050 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols-ad.sdf b/data/resources-hdpi_dark/symbols-ad.sdf
index caa613de6f..a69541f185 100644
--- a/data/resources-hdpi_dark/symbols-ad.sdf
+++ b/data/resources-hdpi_dark/symbols-ad.sdf
@@ -1,134 +1,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf
index 7999f74597..4923bbfcbc 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -1,1051 +1,1051 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_clear/symbols-ad.sdf b/data/resources-mdpi_clear/symbols-ad.sdf
index 432b434095..3494fe2b8f 100644
--- a/data/resources-mdpi_clear/symbols-ad.sdf
+++ b/data/resources-mdpi_clear/symbols-ad.sdf
@@ -1,134 +1,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf
index 47839644c0..2f5bb6be0a 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -1,1050 +1,1050 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols-ad.sdf b/data/resources-mdpi_dark/symbols-ad.sdf
index 432b434095..3494fe2b8f 100644
--- a/data/resources-mdpi_dark/symbols-ad.sdf
+++ b/data/resources-mdpi_dark/symbols-ad.sdf
@@ -1,134 +1,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf
index e34f8c30b4..44dab80bd1 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -1,1051 +1,1051 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_clear/symbols-ad.sdf b/data/resources-xhdpi_clear/symbols-ad.sdf
index 924c40b831..d0819474f4 100644
--- a/data/resources-xhdpi_clear/symbols-ad.sdf
+++ b/data/resources-xhdpi_clear/symbols-ad.sdf
@@ -1,134 +1,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf
index 30962e4c66..0e0c7e6b80 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -1,1050 +1,1050 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols-ad.sdf b/data/resources-xhdpi_dark/symbols-ad.sdf
index 924c40b831..d0819474f4 100644
--- a/data/resources-xhdpi_dark/symbols-ad.sdf
+++ b/data/resources-xhdpi_dark/symbols-ad.sdf
@@ -1,134 +1,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf
index 94d5bc3fec..9eedae7e6d 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -1,1051 +1,1051 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_clear/symbols-ad.sdf b/data/resources-xxhdpi_clear/symbols-ad.sdf
index c6afb5d443..607ce9eb66 100644
--- a/data/resources-xxhdpi_clear/symbols-ad.sdf
+++ b/data/resources-xxhdpi_clear/symbols-ad.sdf
@@ -1,134 +1,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf
index 8df3b4bab3..df9a025b75 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -1,1050 +1,1050 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols-ad.sdf b/data/resources-xxhdpi_dark/symbols-ad.sdf
index c6afb5d443..607ce9eb66 100644
--- a/data/resources-xxhdpi_dark/symbols-ad.sdf
+++ b/data/resources-xxhdpi_dark/symbols-ad.sdf
@@ -1,134 +1,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf
index 8d103e1257..07b9e65399 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -1,1051 +1,1051 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+