merriweather v1.585 added.

Fixes google#588
m4rc1e · Apr 24, 2017 · 7d507b1 · 7d507b1
1 parent 89c68b7
commit 7d507b1
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 14 deletions.
diff --git a/ofl/merriweather/DESCRIPTION.en_us.html b/ofl/merriweather/DESCRIPTION.en_us.html
@@ -5,7 +5,3 @@
 <p>
 There is also <a href="https://fonts.google.com/specimen/Merriweather+Sans">Merriweather Sans</a>, a sans-serif version which closely harmonizes with the weights and styles of this serif family. 
 </p>
-<p>
-<b>Updated January 2017:</b>
-Many more languages are now supported, with Vietnamese and extended Cyrillic glyphs added. 
-</p>
diff --git a/ofl/merriweather/FONTLOG.txt b/ofl/merriweather/FONTLOG.txt
@@ -47,6 +47,9 @@ To contribute to the project contact Eben Sorkin at sorkineben@gmail.com
 
 ChangeLog
 
+24 April 2017 (Marc Foley) Merriweather v1.585
+v2.001 had to be reverted back to v1.544, due to regression issues. This hotfix fixes https://github.com/google/fonts/issues/588.
+
 2 Feb 2017 (Marc Foley) Merriweather v2.001
 * Fixed interpolation issues in Italic
 

diff --git a/ofl/merriweather/METADATA.pb b/ofl/merriweather/METADATA.pb
@@ -10,7 +10,7 @@ fonts {
   filename: "Merriweather-Light.ttf"
   post_script_name: "Merriweather-Light"
   full_name: "Merriweather Light"
-  copyright: "Copyright 2016 The Merriweather Project Authors (sorkintype@gmail.com), with Reserved Font Name \"Merriweather\"."
+  copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
 }
 fonts {
   name: "Merriweather"
@@ -19,16 +19,16 @@ fonts {
   filename: "Merriweather-LightItalic.ttf"
   post_script_name: "Merriweather-LightItalic"
   full_name: "Merriweather Light Italic"
-  copyright: "Copyright 2016 The Merriweather Project Authors (sorkintype@gmail.com), with Reserved Font Name \"Merriweather\"."
+  copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
 }
 fonts {
   name: "Merriweather"
   style: "normal"
   weight: 400
   filename: "Merriweather-Regular.ttf"
   post_script_name: "Merriweather-Regular"
-  full_name: "Merriweather Regular"
-  copyright: "Copyright 2016 The Merriweather Project Authors (sorkintype@gmail.com), with Reserved Font Name \"Merriweather\"."
+  full_name: "Merriweather"
+  copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
 }
 fonts {
   name: "Merriweather"
@@ -37,7 +37,7 @@ fonts {
   filename: "Merriweather-Italic.ttf"
   post_script_name: "Merriweather-Italic"
   full_name: "Merriweather Italic"
-  copyright: "Copyright 2016 The Merriweather Project Authors (sorkintype@gmail.com), with Reserved Font Name \"Merriweather\"."
+  copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
 }
 fonts {
   name: "Merriweather"
@@ -46,7 +46,7 @@ fonts {
   filename: "Merriweather-Bold.ttf"
   post_script_name: "Merriweather-Bold"
   full_name: "Merriweather Bold"
-  copyright: "Copyright 2016 The Merriweather Project Authors (sorkintype@gmail.com), with Reserved Font Name \"Merriweather\"."
+  copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
 }
 fonts {
   name: "Merriweather"
@@ -55,7 +55,7 @@ fonts {
   filename: "Merriweather-BoldItalic.ttf"
   post_script_name: "Merriweather-BoldItalic"
   full_name: "Merriweather Bold Italic"
-  copyright: "Copyright 2016 The Merriweather Project Authors (sorkintype@gmail.com), with Reserved Font Name \"Merriweather\"."
+  copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
 }
 fonts {
   name: "Merriweather"
@@ -64,7 +64,7 @@ fonts {
   filename: "Merriweather-Black.ttf"
   post_script_name: "Merriweather-Black"
   full_name: "Merriweather Black"
-  copyright: "Copyright 2016 The Merriweather Project Authors (sorkintype@gmail.com), with Reserved Font Name \"Merriweather\"."
+  copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
 }
 fonts {
   name: "Merriweather"
@@ -73,11 +73,10 @@ fonts {
   filename: "Merriweather-BlackItalic.ttf"
   post_script_name: "Merriweather-BlackItalic"
   full_name: "Merriweather Black Italic"
-  copyright: "Copyright 2016 The Merriweather Project Authors (sorkintype@gmail.com), with Reserved Font Name \"Merriweather\"."
+  copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
 }
 subsets: "cyrillic"
 subsets: "cyrillic-ext"
 subsets: "latin"
 subsets: "latin-ext"
 subsets: "menu"
-subsets: "vietnamese"
diff --git a/ofl/merriweather/Merriweather-Black.ttf b/ofl/merriweather/Merriweather-Black.ttf
diff --git a/ofl/merriweather/Merriweather-BlackItalic.ttf b/ofl/merriweather/Merriweather-BlackItalic.ttf
diff --git a/ofl/merriweather/Merriweather-Bold.ttf b/ofl/merriweather/Merriweather-Bold.ttf
diff --git a/ofl/merriweather/Merriweather-BoldItalic.ttf b/ofl/merriweather/Merriweather-BoldItalic.ttf
diff --git a/ofl/merriweather/Merriweather-Italic.ttf b/ofl/merriweather/Merriweather-Italic.ttf
diff --git a/ofl/merriweather/Merriweather-Light.ttf b/ofl/merriweather/Merriweather-Light.ttf
diff --git a/ofl/merriweather/Merriweather-LightItalic.ttf b/ofl/merriweather/Merriweather-LightItalic.ttf
diff --git a/ofl/merriweather/Merriweather-Regular.ttf b/ofl/merriweather/Merriweather-Regular.ttf