diff --git a/ofl/merriweather/DESCRIPTION.en_us.html b/ofl/merriweather/DESCRIPTION.en_us.html index c2227de4e..9ac02bce4 100644 --- a/ofl/merriweather/DESCRIPTION.en_us.html +++ b/ofl/merriweather/DESCRIPTION.en_us.html @@ -5,7 +5,3 @@ It features a very large x height, slightly condensed letterforms, a mild diagon

There is also Merriweather Sans, a sans-serif version which closely harmonizes with the weights and styles of this serif family.

-

-Updated January 2017: -Many more languages are now supported, with Vietnamese and extended Cyrillic glyphs added. -

diff --git a/ofl/merriweather/FONTLOG.txt b/ofl/merriweather/FONTLOG.txt index 2a827084e..0dbbcf5d6 100644 --- 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 index 96ab52cd7..b5a5dc0a2 100644 --- 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,7 +19,7 @@ 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" @@ -27,8 +27,8 @@ fonts { 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 index 43a901062..1b5f3e4d9 100644 Binary files a/ofl/merriweather/Merriweather-Black.ttf and b/ofl/merriweather/Merriweather-Black.ttf differ diff --git a/ofl/merriweather/Merriweather-BlackItalic.ttf b/ofl/merriweather/Merriweather-BlackItalic.ttf index 0dba7c625..8cd9d3042 100644 Binary files a/ofl/merriweather/Merriweather-BlackItalic.ttf and b/ofl/merriweather/Merriweather-BlackItalic.ttf differ diff --git a/ofl/merriweather/Merriweather-Bold.ttf b/ofl/merriweather/Merriweather-Bold.ttf index a3015cd6d..9c710da28 100644 Binary files a/ofl/merriweather/Merriweather-Bold.ttf and b/ofl/merriweather/Merriweather-Bold.ttf differ diff --git a/ofl/merriweather/Merriweather-BoldItalic.ttf b/ofl/merriweather/Merriweather-BoldItalic.ttf index f02698066..0f542a244 100644 Binary files a/ofl/merriweather/Merriweather-BoldItalic.ttf and b/ofl/merriweather/Merriweather-BoldItalic.ttf differ diff --git a/ofl/merriweather/Merriweather-Italic.ttf b/ofl/merriweather/Merriweather-Italic.ttf index 3afedd5cf..d0af21d2f 100644 Binary files a/ofl/merriweather/Merriweather-Italic.ttf and b/ofl/merriweather/Merriweather-Italic.ttf differ diff --git a/ofl/merriweather/Merriweather-Light.ttf b/ofl/merriweather/Merriweather-Light.ttf index dae4b0ead..069f8dffc 100644 Binary files a/ofl/merriweather/Merriweather-Light.ttf and b/ofl/merriweather/Merriweather-Light.ttf differ diff --git a/ofl/merriweather/Merriweather-LightItalic.ttf b/ofl/merriweather/Merriweather-LightItalic.ttf index 8ee54c671..cca6deff8 100644 Binary files a/ofl/merriweather/Merriweather-LightItalic.ttf and b/ofl/merriweather/Merriweather-LightItalic.ttf differ diff --git a/ofl/merriweather/Merriweather-Regular.ttf b/ofl/merriweather/Merriweather-Regular.ttf index b1747e52a..21e959cbf 100644 Binary files a/ofl/merriweather/Merriweather-Regular.ttf and b/ofl/merriweather/Merriweather-Regular.ttf differ