From 72129f98d42bc4449c4649e69e8b1304aabdb7a7 Mon Sep 17 00:00:00 2001
From: Constantin Shalnev <c.shalnev@corp.mail.ru>
Date: Thu, 29 Oct 2015 16:58:02 +0300
Subject: [PATCH 1/2] Fixed rivers labeling

---
 data/styles/clear/include/labels.mapcss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss
index 18059a2a6d..741d3a3493 100644
--- a/data/styles/clear/include/labels.mapcss
+++ b/data/styles/clear/include/labels.mapcss
@@ -970,6 +970,11 @@ node|z16-[natural=bay]
 
 /* water LABELS */
 
+line[waterway]
+{
+  text-position: line;
+}
+
 area|z10-[natural=lake][bbox_area>=4000000],
 area|z10-[landuse=reservoir][bbox_area>=4000000],
 area|z10-[natural=water][bbox_area>=4000000]

From c4fe61ea10aef39e4d8923108c33e8033b3ddd4e Mon Sep 17 00:00:00 2001
From: Constantin Shalnev <c.shalnev@corp.mail.ru>
Date: Thu, 29 Oct 2015 16:59:59 +0300
Subject: [PATCH 2/2] Styles were rebuilt

---
 data/drules_proto_clear.bin | Bin 123480 -> 123485 bytes
 data/drules_proto_clear.txt | 240 ++++++++++++++++++------------------
 data/drules_proto_dark.bin  | Bin 121539 -> 121544 bytes
 data/drules_proto_dark.txt  | 240 ++++++++++++++++++------------------
 4 files changed, 240 insertions(+), 240 deletions(-)

diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 8fc406588a3aa25b854e835670bea5366a28841c..3c2e9c80bd449b17b5e516176d0eda743cfabfef 100644
GIT binary patch
delta 1314
zcmca{g#GRj_J%Et+?R!(GIH^hCzhlZl_yr}rX=PHX-=2D%qS&n#mmLc!6k5{V<MBp
z?M6l+O%8$S@|PJU1TiG07h+d01Xhp5AYrfsKbk??-(F_Cz{F?81Gabf=1EKv>*}WG
z-DXrn7yEyWQ59Xx{wAZU5UO4wLk|Aw=dUv=Vu}lZ#nH{kyMt-&LM&p2H!#(u++a+@
zFmH&sz3>*}`=RP~_PdM*5Vvy+z|u_OLq-{NvHZJ?(vWljS0|(nOwtb@GK!<CJ&0AU
z5LUJNj~J!V_1oNIv_cmfXg5{gXADI5zYPc9^ab}Bb<o9)fcYli0izPSAABCb@*+G8
cr#Aq_F!c+8^<#<)V>MUiA)`6ET>~6m01<I@@c;k-

delta 1346
zcmcb6g#E@5_J%Et+?PcjFmmyfCzhlZl_yr}rX=PHX>jmQUvQaGLP(2;i=Bf@;7G?r
zCW+6LKyd*a;(}mt0d)1#=Urx$!Zbw~teOv1_4ZGf880xw1b1(q#3XU7Z2E<3jB4m&
zf;SmeVTMB02^n(mO<#DIQGB}mbw(~sN&e{zuQMv58{}|@Q59Y6!gWkBfm_%t6vk?1
z<_*R)3^RwCC(3Ryz8~_Q;JM3a07(hl0<dJF0Zb+i4;dvOo`Z`|pYV`T8eMGeT}Eki
z{puWo;ADob_B~d$z!U;ZlIUt3?=f1Tn>!fX)o`CN5Z$f!?=u>pi^)EKWl2Q%1p>v;
h{bU3TE5!$lN|@q8IK+j);^_7%K4dgUH)9Zl7XT0#d@cY0

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 81b53857ce..9ae8408ed2 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -40269,12 +40269,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15603
+      priority: 16603
     }
   }
   element {
@@ -40286,12 +40286,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15603
+      priority: 16603
     }
   }
   element {
@@ -40303,12 +40303,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15603
+      priority: 16603
     }
   }
   element {
@@ -40320,12 +40320,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15603
+      priority: 16603
     }
   }
   element {
@@ -40337,12 +40337,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15603
+      priority: 16603
     }
   }
 }
@@ -40608,12 +40608,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40629,12 +40629,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40650,12 +40650,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40671,12 +40671,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40692,12 +40692,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40713,12 +40713,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40734,12 +40734,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40755,12 +40755,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40776,12 +40776,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
@@ -40814,12 +40814,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40835,12 +40835,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40856,12 +40856,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40877,12 +40877,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40898,12 +40898,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40919,12 +40919,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40940,12 +40940,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40961,12 +40961,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40982,12 +40982,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
@@ -41090,12 +41090,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41111,12 +41111,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41132,12 +41132,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41153,12 +41153,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41174,12 +41174,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41195,12 +41195,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41216,12 +41216,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41237,12 +41237,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41258,12 +41258,12 @@ cont {
       color: 8965341
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
@@ -41278,12 +41278,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41295,12 +41295,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41312,12 +41312,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41329,12 +41329,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41346,12 +41346,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41363,12 +41363,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41380,12 +41380,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
@@ -41400,12 +41400,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41417,12 +41417,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41434,12 +41434,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41451,12 +41451,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41468,12 +41468,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41485,12 +41485,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41502,12 +41502,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
@@ -41526,12 +41526,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41547,12 +41547,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41567,12 +41567,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41587,12 +41587,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41607,12 +41607,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41627,12 +41627,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41647,12 +41647,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
@@ -41667,12 +41667,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41684,12 +41684,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41701,12 +41701,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41718,12 +41718,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41735,12 +41735,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41752,12 +41752,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41769,12 +41769,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 807f7c24b8e90fab770631ebd11084db2030abdd..fe943935926089adf9e6e4e02ba9008152b5ad8e 100644
GIT binary patch
delta 1253
zcmX@SmHot4_J%Et&1XcOGIH^hCzhlZl_yr}rX=PHX>#ySKX`^wLePqri=Bf@;OeTY
zOcJ*n8HF^b??1yRC5$1=AqZBFMM4OdgfLiwAI+%ksb?8yF!5S(bFl&Keb&J!v950V
zn~RJpXhO1=7!?IkR0-*D@J&~|#3+lV^1>BHMKqy*m_j;NF;ppD#1JyPj3HEekueF)
z_`&Sl_{)sfhmdo(U1c<YIF}oi7!<EF%0OZsCM2W+Os>F~7e!N9aGg;SO(^gdhEU%%
zMoA3wgt3`->l&jKnt21~7>*l^foRUQ24(==8;m+=!ur6_$-c>`fFUe^U04viun<@n
Y&Hw2)VL1~P8PjLnWHd)pHDI9x0G=#Qr2qf`

delta 1228
zcmX@HmHqHm_J%Et&1Xa&FmmyfCzhlZl_yr}rX=PHX>jmQe|v^eLO_d$i=Bf@;OeTY
zOcI|fg*2ugIKwD~Df${HDuk|<LkNc%j%OLA_)t}E&pOLEgNav*n~M!--LnoxiDPBc
zKVD>1K@)Pgz^I5O6mSVcs17J3h+>wI4u`<>iB}nA(KH)g#n2p&Db$N8)O3+C3C*m*
z?A(;gjMs;db9Y~5G=Mml8<rRz-ei<P6H>g!D2XOya0^2y7gN>2>x`0+^Z_$oNQFaq
zdf_!jQ8e@JUt_dF6B-zY@ZMkyL~}^?4MqbrU+4q#ZNW`O1q@*U?81WBg@wSvXx8Q2
Ugylw9piQ59lhGVa)qsQ!00KBty8r+H

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index c3238de1a8..229a2e8ffd 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -40269,12 +40269,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15603
+      priority: 16603
     }
   }
   element {
@@ -40286,12 +40286,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15603
+      priority: 16603
     }
   }
   element {
@@ -40303,12 +40303,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15603
+      priority: 16603
     }
   }
   element {
@@ -40320,12 +40320,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15603
+      priority: 16603
     }
   }
   element {
@@ -40337,12 +40337,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15603
+      priority: 16603
     }
   }
 }
@@ -40608,12 +40608,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40629,12 +40629,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40650,12 +40650,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40671,12 +40671,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40692,12 +40692,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40713,12 +40713,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40734,12 +40734,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40755,12 +40755,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40776,12 +40776,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
@@ -40814,12 +40814,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40835,12 +40835,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40856,12 +40856,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40877,12 +40877,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40898,12 +40898,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40919,12 +40919,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40940,12 +40940,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40961,12 +40961,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -40982,12 +40982,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
@@ -41090,12 +41090,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41111,12 +41111,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41132,12 +41132,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41153,12 +41153,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41174,12 +41174,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41195,12 +41195,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41216,12 +41216,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41237,12 +41237,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41258,12 +41258,12 @@ cont {
       color: 8738
       priority: 1175
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
@@ -41278,12 +41278,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41295,12 +41295,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41312,12 +41312,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41329,12 +41329,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41346,12 +41346,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41363,12 +41363,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41380,12 +41380,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
@@ -41400,12 +41400,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41417,12 +41417,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41434,12 +41434,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41451,12 +41451,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41468,12 +41468,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41485,12 +41485,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41502,12 +41502,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
@@ -41526,12 +41526,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41547,12 +41547,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41567,12 +41567,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41587,12 +41587,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41607,12 +41607,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41627,12 +41627,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41647,12 +41647,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }
@@ -41667,12 +41667,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41684,12 +41684,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41701,12 +41701,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41718,12 +41718,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41735,12 +41735,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41752,12 +41752,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
   element {
@@ -41769,12 +41769,12 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15174
+      priority: 16174
     }
   }
 }