First switch to Noto; remove italic

fix #284 This commit also removes italic, given not all scripts have italic (arabic, chinese…), so let's deal with a consistent rendering across scripts.
hotosm · Mar 21, 2018 · 63a4932 · 63a4932
1 parent 2a29d9e
commit 63a4932
Show file tree

Hide file tree

Showing 69 changed files with 90 additions and 112 deletions.
diff --git a/base.mss b/base.mss
@@ -198,8 +198,8 @@
     line-width: 0.5;
     [zoom>=15] {
       line-width: 1;
-      text-name: "[height]";
-      text-face-name: @sans_lt;
+      text-name: '[height]';
+      text-face-name: @regular;
       text-placement: line;
       text-fill: @contour_line;
       text-halo-fill: @land;

diff --git a/fonts/NotoSans-Bold.ttf b/fonts/NotoSans-Bold.ttf
diff --git a/fonts/NotoSans-ExtraLight.ttf b/fonts/NotoSans-ExtraLight.ttf
diff --git a/fonts/NotoSans-Light.ttf b/fonts/NotoSans-Light.ttf
diff --git a/fonts/NotoSans-LightItalic.ttf b/fonts/NotoSans-LightItalic.ttf
diff --git a/fonts/NotoSans-Medium.ttf b/fonts/NotoSans-Medium.ttf
diff --git a/fonts/NotoSans-Regular.ttf b/fonts/NotoSans-Regular.ttf
diff --git a/fonts/NotoSansArabic-Bold.ttf b/fonts/NotoSansArabic-Bold.ttf
diff --git a/fonts/NotoSansArabic-ExtraLight.ttf b/fonts/NotoSansArabic-ExtraLight.ttf
diff --git a/fonts/NotoSansArabic-Light.ttf b/fonts/NotoSansArabic-Light.ttf
diff --git a/fonts/NotoSansArabic-Medium.ttf b/fonts/NotoSansArabic-Medium.ttf
diff --git a/fonts/NotoSansArabic-Regular.ttf b/fonts/NotoSansArabic-Regular.ttf
diff --git a/fonts/NotoSansArmenian-Bold.ttf b/fonts/NotoSansArmenian-Bold.ttf
diff --git a/fonts/NotoSansArmenian-ExtraLight.ttf b/fonts/NotoSansArmenian-ExtraLight.ttf
diff --git a/fonts/NotoSansArmenian-Light.ttf b/fonts/NotoSansArmenian-Light.ttf
diff --git a/fonts/NotoSansArmenian-Medium.ttf b/fonts/NotoSansArmenian-Medium.ttf
diff --git a/fonts/NotoSansArmenian-Regular.ttf b/fonts/NotoSansArmenian-Regular.ttf
diff --git a/fonts/NotoSansCJKjp-Bold.otf b/fonts/NotoSansCJKjp-Bold.otf
diff --git a/fonts/NotoSansCJKjp-Light.otf b/fonts/NotoSansCJKjp-Light.otf
diff --git a/fonts/NotoSansCJKjp-Medium.otf b/fonts/NotoSansCJKjp-Medium.otf
diff --git a/fonts/NotoSansCJKjp-Regular.otf b/fonts/NotoSansCJKjp-Regular.otf
diff --git a/fonts/NotoSansGeorgian-Bold.ttf b/fonts/NotoSansGeorgian-Bold.ttf
diff --git a/fonts/NotoSansGeorgian-ExtraLight.ttf b/fonts/NotoSansGeorgian-ExtraLight.ttf
diff --git a/fonts/NotoSansGeorgian-Light.ttf b/fonts/NotoSansGeorgian-Light.ttf
diff --git a/fonts/NotoSansGeorgian-Medium.ttf b/fonts/NotoSansGeorgian-Medium.ttf
diff --git a/fonts/NotoSansGeorgian-Regular.ttf b/fonts/NotoSansGeorgian-Regular.ttf
diff --git a/fonts/NotoSansHebrew-Bold.ttf b/fonts/NotoSansHebrew-Bold.ttf
diff --git a/fonts/NotoSansHebrew-ExtraLight.ttf b/fonts/NotoSansHebrew-ExtraLight.ttf
diff --git a/fonts/NotoSansHebrew-Light.ttf b/fonts/NotoSansHebrew-Light.ttf
diff --git a/fonts/NotoSansHebrew-Medium.ttf b/fonts/NotoSansHebrew-Medium.ttf
diff --git a/fonts/NotoSansHebrew-Regular.ttf b/fonts/NotoSansHebrew-Regular.ttf
diff --git a/fonts/NotoSansKhmer-Bold.ttf b/fonts/NotoSansKhmer-Bold.ttf
diff --git a/fonts/NotoSansKhmer-ExtraLight.ttf b/fonts/NotoSansKhmer-ExtraLight.ttf
diff --git a/fonts/NotoSansKhmer-Light.ttf b/fonts/NotoSansKhmer-Light.ttf
diff --git a/fonts/NotoSansKhmer-Medium.ttf b/fonts/NotoSansKhmer-Medium.ttf
diff --git a/fonts/NotoSansKhmer-Regular.ttf b/fonts/NotoSansKhmer-Regular.ttf
diff --git a/fonts/NotoSansLao-Bold.ttf b/fonts/NotoSansLao-Bold.ttf
diff --git a/fonts/NotoSansLao-ExtraLight.ttf b/fonts/NotoSansLao-ExtraLight.ttf
diff --git a/fonts/NotoSansLao-Light.ttf b/fonts/NotoSansLao-Light.ttf
diff --git a/fonts/NotoSansLao-Medium.ttf b/fonts/NotoSansLao-Medium.ttf
diff --git a/fonts/NotoSansLao-Regular.ttf b/fonts/NotoSansLao-Regular.ttf
diff --git a/fonts/NotoSansMyanmar-Bold.ttf b/fonts/NotoSansMyanmar-Bold.ttf
diff --git a/fonts/NotoSansMyanmar-ExtraLight.ttf b/fonts/NotoSansMyanmar-ExtraLight.ttf
diff --git a/fonts/NotoSansMyanmar-Light.ttf b/fonts/NotoSansMyanmar-Light.ttf
diff --git a/fonts/NotoSansMyanmar-Medium.ttf b/fonts/NotoSansMyanmar-Medium.ttf
diff --git a/fonts/NotoSansMyanmar-Regular.ttf b/fonts/NotoSansMyanmar-Regular.ttf
diff --git a/fonts/NotoSansTamil-Bold.ttf b/fonts/NotoSansTamil-Bold.ttf
diff --git a/fonts/NotoSansTamil-ExtraLight.ttf b/fonts/NotoSansTamil-ExtraLight.ttf
diff --git a/fonts/NotoSansTamil-Light.ttf b/fonts/NotoSansTamil-Light.ttf
diff --git a/fonts/NotoSansTamil-Medium.ttf b/fonts/NotoSansTamil-Medium.ttf
diff --git a/fonts/NotoSansTamil-Regular.ttf b/fonts/NotoSansTamil-Regular.ttf
diff --git a/fonts/NotoSansThai-Bold.ttf b/fonts/NotoSansThai-Bold.ttf
diff --git a/fonts/NotoSansThai-ExtraLight.ttf b/fonts/NotoSansThai-ExtraLight.ttf
diff --git a/fonts/NotoSansThai-Light.ttf b/fonts/NotoSansThai-Light.ttf
diff --git a/fonts/NotoSansThai-Medium.ttf b/fonts/NotoSansThai-Medium.ttf
diff --git a/fonts/NotoSansThai-Regular.ttf b/fonts/NotoSansThai-Regular.ttf
diff --git a/fonts/OpenSans-Bold.ttf b/fonts/OpenSans-Bold.ttf
diff --git a/fonts/OpenSans-BoldItalic.ttf b/fonts/OpenSans-BoldItalic.ttf
diff --git a/fonts/OpenSans-ExtraBold.ttf b/fonts/OpenSans-ExtraBold.ttf
diff --git a/fonts/OpenSans-ExtraBoldItalic.ttf b/fonts/OpenSans-ExtraBoldItalic.ttf
diff --git a/fonts/OpenSans-Italic.ttf b/fonts/OpenSans-Italic.ttf
diff --git a/fonts/OpenSans-LICENSE.txt b/fonts/OpenSans-LICENSE.txt
diff --git a/fonts/OpenSans-Light.ttf b/fonts/OpenSans-Light.ttf
diff --git a/fonts/OpenSans-LightItalic.ttf b/fonts/OpenSans-LightItalic.ttf
diff --git a/fonts/OpenSans-Regular.ttf b/fonts/OpenSans-Regular.ttf
diff --git a/fonts/OpenSans-Semibold.ttf b/fonts/OpenSans-Semibold.ttf
diff --git a/fonts/OpenSans-SemiboldItalic.ttf b/fonts/OpenSans-SemiboldItalic.ttf
diff --git a/labels.mss b/labels.mss
@@ -24,9 +24,9 @@
 
 #low_place[type='country'][zoom>=3][zoom<=7] {
   text-name:'[name]';
-  text-face-name:@sans_bold;
-  text-placement:point;
-  text-fill:@country_text;
+  text-face-name: @bold;
+  text-placement: point;
+  text-fill: @country_text;
   text-halo-fill: @country_halo;
   text-halo-radius: 1;
   [zoom=3] {
@@ -58,9 +58,9 @@
 
 #low_place[type='state'][zoom>=5][zoom<=10] {
   text-name:'[name]';
-  text-face-name:@sans_bold_italic;
-  text-placement:point;
-  text-fill:@state_text;
+  text-face-name: @bold;
+  text-placement: point;
+  text-fill: @state_text;
   text-halo-fill: @state_halo;
   text-halo-radius: 1;
   [zoom=5] {
@@ -109,7 +109,7 @@
   }
   shield-name:'[name]';
   shield-size: 9;
-  shield-face-name: @sans;
+  shield-face-name: @medium;
   shield-halo-radius: 1;
   shield-wrap-width: 50;
   shield-fill: @town_text;
@@ -126,7 +126,7 @@
     shield-size: 10;
   }
   [is_capital='country'] {
-    shield-face-name: @sans_bold;
+    shield-face-name: @bold;
     shield-fill: @capital_text;
     shield-halo-fill: @capital_halo;
     shield-size: 11;
@@ -145,7 +145,7 @@
 #place[type='town'][zoom>=11][zoom<=17] {
   text-name:'[name]';
   text-size: 11;
-  text-face-name: @sans;
+  text-face-name: @medium;
   text-halo-radius: 2;
   text-wrap-width: 50;
   text-fill: @town_text;
@@ -157,7 +157,7 @@
     text-size: 12;
   }
   [is_capital='country'] {
-    text-face-name: @sans_bold;
+    text-face-name: @bold;
     text-fill: @capital_text;
     text-halo-fill: @capital_halo;
     text-line-spacing: -2;
@@ -205,7 +205,7 @@
 #place::small[type='hamlet'][zoom>=13][zoom<=20],
 #place::small[type='neighbourhood'][zoom>=13][zoom<=20] {
   text-name:'[name]';
-  text-face-name:@sans;
+  text-face-name:@medium;
   text-placement:point;
   text-fill:@other_text;
   text-size:10;
@@ -254,7 +254,7 @@
 
 #place::small[type='locality'][zoom>=15] {
   text-name:'[name]';
-  text-face-name:@sans;
+  text-face-name:@medium;
   text-placement:point;
   text-fill:@locality_text;
   text-size:9;
@@ -284,7 +284,7 @@
 // =====================================================================
 .poi::label[zoom>=16] {
     text-name: "";
-    text-face-name: @sans;
+    text-face-name: @medium;
     text-size: 10;
     text-wrap-width: 30;
     text-fill: @poi_text;
@@ -298,15 +298,15 @@
     text-placements: "S,N,W,E";
     text-avoid-edges: true;
     text-clip: false;
-    text-character-spacing: -1;
+    text-character-spacing: -0.5;
     [zoom>=16] {
         /* Prio */
         [main='townhall'],
         [main='fire_station'],
         [main='hospital'] {
             text-name: "[name]";
             [zoom>=19] {
-                text-face-name: @sans_bold;
+                text-face-name: @bold;
             }
         }
         [main='school'],
@@ -316,7 +316,7 @@
             text-min-distance: 2;
             text-name: "[name]";
             [zoom>=19] {
-                text-face-name: @sans_bold;
+                text-face-name: @bold;
             }
         }
     }
@@ -368,7 +368,7 @@
 }
 .poi::craft[zoom>=18][craft!=null],
 .poi::shop[zoom>=19][shop!=null] {
-  text-face-name: @sans;
+  text-face-name: @medium;
   text-size: 10;
   text-wrap-width: 30;
   text-fill: @poi_text2;
@@ -379,10 +379,9 @@
   text-halo-radius: 2;
   text-label-position-tolerance: 18;
   text-placement-type: simple;
-  text-placements: "S,N,W,E";
+  text-placements: 'S,N,W,E';
   text-avoid-edges: true;
-  text-clip: false;
-  text-name: "[name]";
+  text-name: '[name]';
 }
 
 // =====================================================================
@@ -401,14 +400,14 @@
   [zoom>=19][area>=0] {
     text-name: "[name]";
     text-halo-radius: 1.5;
-    text-face-name:@sans;
+    text-face-name: @medium;
     text-size: 11;
-    text-wrap-width:30;
+    text-wrap-width: 30;
     text-fill: #888;
     text-halo-fill: #fff;
     // Specific style overrides for different types of areas:
     [type='park'][zoom>=10] {
-      text-face-name: @sans_lt_italic;
+      text-face-name: @regular;
       text-fill: @park * 0.6;
       text-halo-fill: lighten(@park, 10);
     }
@@ -469,7 +468,7 @@
 #waterway_label[type='canal'][zoom>=15],
 #waterway_label[type='stream'][zoom>=17] {
   text-name: '[name]';
-  text-face-name: @sans_italic;
+  text-face-name: @medium;
   text-fill: darken(@water,20%);
   text-halo-fill: @other_halo;
   text-halo-radius: 1;
@@ -501,48 +500,47 @@
 
 #motorway_label[type='motorway'][zoom>9],
 #motorway_label[type='trunk'][zoom>9] {
-  text-name:"[name]";
-  text-face-name: @sans_bold;
+  text-name: '[name]';
+  text-face-name: @bold;
   text-placement: line;
-  text-fill:@road_text;
+  text-fill: @road_text;
   text-halo-fill: @road_halo;
   text-halo-radius: 1;
   text-min-distance: 60;
-  text-size:10;
+  text-size: 11;
   text-avoid-edges: true;
-  text-character-spacing: -1;
-  [zoom=11] { text-min-distance:70; }
-  [zoom=12] { text-min-distance:80; }
-  [zoom=13] { text-min-distance:100; }
+  text-character-spacing: -0.1;
+  [zoom=11] { text-min-distance: 70; }
+  [zoom=12] { text-min-distance: 80; }
+  [zoom=13] { text-min-distance: 100; }
 }
 
 #mainroad_label[type='primary'][zoom>12],
 #mainroad_label[type='secondary'][zoom>13],
 #mainroad_label[type='tertiary'][zoom>13] {
-  text-name:'[name]';
-  text-face-name: @sans;
+  text-name: '[name]';
+  text-face-name: @medium;
   text-placement: line;
   text-fill: @road_text;
   text-halo-fill: @road_halo;
   text-halo-radius: 1;
-  text-min-distance:60;
-  text-size:11;
+  text-min-distance: 60;
+  text-size: 11;
   text-avoid-edges: true;
-  text-character-spacing: -1;
+  text-character-spacing: -0.1;
 }
 
 #minorroad_label[zoom>14] {
-  text-name:'[name]';
-  text-face-name:@sans;
-  text-placement:line;
-  text-size:10;
-  text-fill:@road_text;
-  text-halo-fill:@road_halo;
-  text-halo-radius:1;
-  text-min-distance:60;
-  text-size:11;
+  text-name: '[name]';
+  text-face-name: @medium;
+  text-placement: line;
+  text-fill: @road_text;
+  text-halo-fill: @road_halo;
+  text-halo-radius: 1;
+  text-min-distance: 60;
+  text-size: 11;
   text-avoid-edges: true;
-  text-character-spacing: -1;
+  // text-character-spacing: -0.5;
 }
 
 /* ================================================================== */
@@ -575,7 +573,7 @@
   text-size: 10;
   text-placement: line;
   text-dy: -7;
-  text-face-name: @sans_lt_italic;
+  text-face-name: @regular;
   text-halo-radius: 2;
   text-halo-fill: @place_halo;
   text-min-padding: 50;
@@ -593,7 +591,7 @@
 #housenumber[zoom>=17]{
   text-name: "[housenumber]";
   text-placement: interior;
-  text-face-name: @sans;
+  text-face-name: @medium;
   text-fill: @housenumber_text;
   text-halo-fill: @road_halo;
   text-halo-radius: 1;
@@ -612,7 +610,7 @@
 
 #natural_point_label[type='bay'][zoom>=10] {
   text-name: '[name]';
-  text-face-name: @sans_italic;
+  text-face-name: @medium;
   text-fill: darken(@water,30%);
   text-halo-fill: lighten(@water,10%);
   text-halo-radius: 1;
@@ -623,7 +621,7 @@
 #natural_point_label[type='peak'][zoom>=13] {
   shield-file: url('icons/natural/peak-6.png');
   shield-name: '[name]';
-  shield-face-name: @sans_lt_italic;
+  shield-face-name: @regular;
   shield-fill: @peak;
   shield-size: 10;
   shield-min-distance: 50;

diff --git a/palette.mss b/palette.mss
@@ -21,12 +21,45 @@
 Map { font-directory: url(./fonts); }
 
 /* set up font sets for various weights and styles */
-@sans_lt:           "Open Sans Regular", "DejaVu Sans Book", "Unifont Medium", "unifont Medium";
-@sans_lt_italic:    "Open Sans Italic", "DejaVu Sans Italic", "Open Sans Regular", "DejaVu Sans Book", "Unifont Medium", "unifont Medium";
-@sans:              "Open Sans Semibold", "Open Sans Regular", "DejaVu Sans Book", "Unifont Medium", "unifont Medium";
-@sans_italic:       "Open Sans Semibold Italic", "DejaVu Sans Italic", "Open Sans Regular", "DejaVu Sans Book", "Unifont Medium", "unifont Medium";
-@sans_bold:         "Open Sans Bold", "DejaVu Sans Bold", "Open Sans Regular", "DejaVu Sans Book", "Unifont Medium", "unifont Medium";
-@sans_bold_italic:  "Open Sans Bold Italic", "DejaVu Sans Bold Italic", "Open Sans Regular", "DejaVu Sans Book", "Unifont Medium", "unifont Medium";
+@regular:           'Noto Sans Regular',
+                    'Noto Sans Arabic Regular',
+                    'Noto Sans Armenian Regular',
+                    'Noto Sans CJK JP Regular',
+                    'Noto Sans Georgian Regular',
+                    'Noto Sans Hebrew Regular',
+                    'Noto Sans Khmer Regular',
+                    'Noto Sans Lao Regular',
+                    'Noto Sans Myanmar Regular',
+                    'Noto Sans Tamil Regular',
+                    'Noto Sans Thai Regular',
+                    'Unifont Medium',
+                    'unifont Medium';
+@medium:            'Noto Sans Medium',
+                    'Noto Sans Arabic Medium',
+                    'Noto Sans Armenian Medium',
+                    'Noto Sans CJK JP Medium',
+                    'Noto Sans Georgian Medium',
+                    'Noto Sans Hebrew Medium',
+                    'Noto Sans Khmer Medium',
+                    'Noto Sans Lao Medium',
+                    'Noto Sans Myanmar Medium',
+                    'Noto Sans Tamil Medium',
+                    'Noto Sans Thai Medium',
+                    'Unifont Medium',
+                    'unifont Medium';
+@bold:              'Noto Sans Bold',
+                    'Noto Sans Arabic Bold',
+                    'Noto Sans Armenian Bold',
+                    'Noto Sans CJK JP Bold',
+                    'Noto Sans Georgian Bold',
+                    'Noto Sans Hebrew Bold',
+                    'Noto Sans Khmer Bold',
+                    'Noto Sans Lao Bold',
+                    'Noto Sans Myanmar Bold',
+                    'Noto Sans Tamil Bold',
+                    'Noto Sans Thai Bold',
+                    'Unifont Medium',
+                    'unifont Medium';
 
 /* Some fonts are larger or smaller than others. Use this variable to
    globally increase or decrease the font sizes. */