Regenerated styles.

1 files changed, 61 insertions, 238 deletions

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 6aaa044377..87cbe7d06c 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -10362,17 +10362,9 @@ cont {
 cont {
   name: "craft-photographer"
   element {
-    scale: 17
-    symbol {
-      name: "photo-shop-l"
-      priority: 16000
-      min_distance: 24
-    }
-  }
-  element {
     scale: 18
     symbol {
-      name: "photo-shop-l"
+      name: "hand-l"
       priority: 16625
     }
     caption {
@@ -10387,7 +10379,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "photo-shop-l"
+      name: "hand-l"
       priority: 16625
     }
     caption {
@@ -30534,7 +30526,7 @@ cont {
     scale: 15
     symbol {
       name: "monument-m"
-      priority: 16854
+      priority: 16750
       min_distance: 24
     }
     caption {
@@ -30543,14 +30535,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15854
+      priority: 15750
     }
   }
   element {
     scale: 16
     symbol {
       name: "monument-m"
-      priority: 16854
+      priority: 16750
       min_distance: 12
     }
     caption {
@@ -30559,14 +30551,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15854
+      priority: 15750
     }
   }
   element {
     scale: 17
     symbol {
       name: "monument-l"
-      priority: 16854
+      priority: 16750
     }
     caption {
       primary {
@@ -30574,14 +30566,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15854
+      priority: 15750
     }
   }
   element {
     scale: 18
     symbol {
       name: "monument-l"
-      priority: 16854
+      priority: 16750
     }
     caption {
       primary {
@@ -30589,14 +30581,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15854
+      priority: 15750
     }
   }
   element {
     scale: 19
     symbol {
       name: "monument-l"
-      priority: 16854
+      priority: 16750
     }
     caption {
       primary {
@@ -30604,7 +30596,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15854
+      priority: 15750
     }
   }
 }
@@ -30614,7 +30606,7 @@ cont {
     scale: 13
     symbol {
       name: "monument-s"
-      priority: 16854
+      priority: 16750
       min_distance: 12
     }
     caption {
@@ -30623,14 +30615,14 @@ cont {
         color: 4473924
         offset_y: 6
       }
-      priority: 15854
+      priority: 15750
     }
   }
   element {
     scale: 14
     symbol {
       name: "monument-s"
-      priority: 16854
+      priority: 16750
       min_distance: 12
     }
     caption {
@@ -30639,14 +30631,14 @@ cont {
         color: 4473924
         offset_y: 6
       }
-      priority: 15854
+      priority: 15750
     }
   }
   element {
     scale: 15
     symbol {
       name: "monument-m"
-      priority: 16854
+      priority: 16750
       min_distance: 24
     }
     caption {
@@ -30655,14 +30647,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15854
+      priority: 15750
     }
   }
   element {
     scale: 16
     symbol {
       name: "monument-m"
-      priority: 16854
+      priority: 16750
       min_distance: 12
     }
     caption {
@@ -30671,14 +30663,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15854
+      priority: 15750
     }
   }
   element {
     scale: 17
     symbol {
       name: "monument-l"
-      priority: 16854
+      priority: 16750
     }
     caption {
       primary {
@@ -30686,14 +30678,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15854
+      priority: 15750
     }
   }
   element {
     scale: 18
     symbol {
       name: "monument-l"
-      priority: 16854
+      priority: 16750
     }
     caption {
       primary {
@@ -30701,14 +30693,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15854
+      priority: 15750
     }
   }
   element {
     scale: 19
     symbol {
       name: "monument-l"
-      priority: 16854
+      priority: 16750
     }
     caption {
       primary {
@@ -30716,7 +30708,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15854
+      priority: 15750
     }
   }
 }
@@ -47085,12 +47077,6 @@ cont {
         height: 10
         color: 8355711
       }
-      secondary {
-        height: 9
-        color: 8355711
-        offset_y: 20
-        text: "int_name"
-      }
       priority: 15000
     }
   }
@@ -48510,6 +48496,22 @@ cont {
 cont {
   name: "railway-level_crossing"
   element {
+    scale: 15
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16677
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16677
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "railway-crossing"
@@ -59479,38 +59481,6 @@ cont {
 cont {
   name: "shop-mall"
   element {
-    scale: 12
-    symbol {
-      name: "shop-s"
-      priority: 16927
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15927
-    }
-  }
-  element {
-    scale: 13
-    symbol {
-      name: "shop-s"
-      priority: 16927
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15927
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "shop-s"
@@ -63855,104 +63825,62 @@ cont {
   name: "waterway-canal-tunnel"
   element {
     scale: 13
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15600
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 16961
+      priority: 16921
     }
   }
   element {
     scale: 14
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15600
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 16961
+      priority: 16921
     }
   }
   element {
     scale: 15
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15600
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 16961
+      priority: 16921
     }
   }
   element {
     scale: 16
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15600
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 16961
+      priority: 16921
     }
   }
   element {
     scale: 17
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15600
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 16961
+      priority: 16921
     }
   }
   element {
     scale: 18
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15600
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 16961
+      priority: 16921
     }
   }
 }
@@ -64100,7 +64028,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1961
+      priority: 1921
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64114,7 +64042,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1961
+      priority: 1921
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64319,7 +64247,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1961
+      priority: 1921
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64333,7 +64261,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1961
+      priority: 1921
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64590,7 +64518,7 @@ cont {
     lines {
       width: 1.0
       color: 3584191
-      priority: -15600
+      priority: 1921
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -64600,7 +64528,7 @@ cont {
     lines {
       width: 1.0
       color: 3584191
-      priority: -15600
+      priority: 1921
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -64610,7 +64538,7 @@ cont {
     lines {
       width: 1.0
       color: 3584191
-      priority: -15600
+      priority: 1921
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -64620,7 +64548,7 @@ cont {
     lines {
       width: 1.0
       color: 3584191
-      priority: -15600
+      priority: 1921
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -64630,7 +64558,7 @@ cont {
     lines {
       width: 1.0
       color: 3584191
-      priority: -15600
+      priority: 1921
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -64640,7 +64568,7 @@ cont {
     lines {
       width: 1.0
       color: 3584191
-      priority: -15600
+      priority: 1921
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -64650,7 +64578,7 @@ cont {
     lines {
       width: 1.0
       color: 3584191
-      priority: -15600
+      priority: 1921
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -64660,7 +64588,7 @@ cont {
     lines {
       width: 1.0
       color: 3584191
-      priority: -15600
+      priority: 1921
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -64670,7 +64598,7 @@ cont {
     lines {
       width: 1.0
       color: 3584191
-      priority: -15600
+      priority: 1921
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -65347,111 +65275,6 @@ cont {
   }
 }
 cont {
-  name: "waterway-stream-tunnel"
-  element {
-    scale: 13
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15600
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 16961
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15600
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 16961
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15600
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 16961
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15600
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 16961
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15600
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 16961
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15600
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 16961
-    }
-  }
-}
-cont {
   name: "waterway-waterfall"
   element {
     scale: 11