Merriweather: Version 2.100 added

Taken from the upstream repo https://github.com/EbenSorkin/Merriweather4 at commit https://github.com/EbenSorkin/Merriweather4/commit/e586023aa0fe1dba9a7d4ec80fa8b9e546cb7ecf.

diff --git a/ofl/merriweather/METADATA.pb b/ofl/merriweather/METADATA.pb
index 1a6f7962aa425a5d781d1e9e7dd71f0944c81990..dbc3750ff7596af282cc62a55dd12ceab44f0e57 100644 (file)
--- a/ofl/merriweather/METADATA.pb
+++ b/ofl/merriweather/METADATA.pb
@@ -6,74 +6,20 @@ date_added: "2011-05-11"
 fonts {
   name: "Merriweather"
   style: "normal"
-  weight: 300
-  filename: "Merriweather-Light.ttf"
+  weight: 400
+  filename: "Merriweather[opsz,wdth,wght].ttf"
   post_script_name: "Merriweather-Light"
   full_name: "Merriweather Light"
-  copyright: "Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name \"Merriweather\"."
+  copyright: "Copyright 2024 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather4) with Reserved Font Name \"Merriweather\"."
 }
 fonts {
   name: "Merriweather"
   style: "italic"
-  weight: 300
-  filename: "Merriweather-LightItalic.ttf"
+  weight: 400
+  filename: "Merriweather-Italic[opsz,wdth,wght].ttf"
   post_script_name: "Merriweather-LightItalic"
   full_name: "Merriweather Light Italic"
-  copyright: "Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), 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 (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name \"Merriweather\"."
-}
-fonts {
-  name: "Merriweather"
-  style: "italic"
-  weight: 400
-  filename: "Merriweather-Italic.ttf"
-  post_script_name: "Merriweather-Italic"
-  full_name: "Merriweather Italic"
-  copyright: "Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name \"Merriweather\"."
-}
-fonts {
-  name: "Merriweather"
-  style: "normal"
-  weight: 700
-  filename: "Merriweather-Bold.ttf"
-  post_script_name: "Merriweather-Bold"
-  full_name: "Merriweather Bold"
-  copyright: "Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name \"Merriweather\"."
-}
-fonts {
-  name: "Merriweather"
-  style: "italic"
-  weight: 700
-  filename: "Merriweather-BoldItalic.ttf"
-  post_script_name: "Merriweather-BoldItalic"
-  full_name: "Merriweather Bold Italic"
-  copyright: "Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name \"Merriweather\"."
-}
-fonts {
-  name: "Merriweather"
-  style: "normal"
-  weight: 900
-  filename: "Merriweather-Black.ttf"
-  post_script_name: "Merriweather-Black"
-  full_name: "Merriweather Black"
-  copyright: "Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name \"Merriweather\"."
-}
-fonts {
-  name: "Merriweather"
-  style: "italic"
-  weight: 900
-  filename: "Merriweather-BlackItalic.ttf"
-  post_script_name: "Merriweather-BlackItalic"
-  full_name: "Merriweather Black Italic"
-  copyright: "Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name \"Merriweather\"."
+  copyright: "Copyright 2024 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather4) with Reserved Font Name \"Merriweather\"."
 }
 subsets: "cyrillic"
 subsets: "cyrillic-ext"
@@ -81,8 +27,42 @@ subsets: "latin"
 subsets: "latin-ext"
 subsets: "menu"
 subsets: "vietnamese"
+axes {
+  tag: "opsz"
+  min_value: 18.0
+  max_value: 144.0
+}
+axes {
+  tag: "wdth"
+  min_value: 87.0
+  max_value: 112.0
+}
+axes {
+  tag: "wght"
+  min_value: 300.0
+  max_value: 900.0
+}
+registry_default_overrides {
+  key: "opsz"
+  value: 18.0
+}
 source {
-  repository_url: "https://github.com/EbenSorkin/Merriweather"
+  repository_url: "https://github.com/EbenSorkin/Merriweather4"
+  commit: "e586023aa0fe1dba9a7d4ec80fa8b9e546cb7ecf"
+  archive_url: "https://github.com/EbenSorkin/Merriweather4/releases/download/4.008/Merriweather4-4.008.zip"
+  files {
+    source_file: "fonts/variable/Merriweather[opsz,wdth,wght].ttf"
+    dest_file: "Merriweather[opsz,wdth,wght].ttf"
+  }
+  files {
+    source_file: "fonts/variable/Merriweather-Italic[opsz,wdth,wght].ttf"
+    dest_file: "Merriweather-Italic[opsz,wdth,wght].ttf"
+  }
+  files {
+    source_file: "OFL.txt"
+    dest_file: "OFL.txt"
+  }
+  branch: "main"
 }
 fallbacks {
   axis_target {

diff --git a/ofl/merriweather/Merriweather-Black.ttf b/ofl/merriweather/Merriweather-Black.ttf
deleted file mode 100644 (file)
index ccbaf7f..0000000
Binary files a/ofl/merriweather/Merriweather-Black.ttf and /dev/null differ

diff --git a/ofl/merriweather/Merriweather-BlackItalic.ttf b/ofl/merriweather/Merriweather-BlackItalic.ttf
deleted file mode 100644 (file)
index 04cc484..0000000
Binary files a/ofl/merriweather/Merriweather-BlackItalic.ttf and /dev/null differ

diff --git a/ofl/merriweather/Merriweather-Bold.ttf b/ofl/merriweather/Merriweather-Bold.ttf
deleted file mode 100644 (file)
index 62df073..0000000
Binary files a/ofl/merriweather/Merriweather-Bold.ttf and /dev/null differ

diff --git a/ofl/merriweather/Merriweather-BoldItalic.ttf b/ofl/merriweather/Merriweather-BoldItalic.ttf
deleted file mode 100644 (file)
index e937f84..0000000
Binary files a/ofl/merriweather/Merriweather-BoldItalic.ttf and /dev/null differ

diff --git a/ofl/merriweather/Merriweather-Italic.ttf b/ofl/merriweather/Merriweather-Italic.ttf
deleted file mode 100644 (file)
index f9f8fab..0000000
Binary files a/ofl/merriweather/Merriweather-Italic.ttf and /dev/null differ

diff --git a/ofl/merriweather/Merriweather-Italic[opsz,wdth,wght].ttf b/ofl/merriweather/Merriweather-Italic[opsz,wdth,wght].ttf
new file mode 100644 (file)
index 0000000..f161207
Binary files /dev/null and b/ofl/merriweather/Merriweather-Italic[opsz,wdth,wght].ttf differ

diff --git a/ofl/merriweather/Merriweather-Light.ttf b/ofl/merriweather/Merriweather-Light.ttf
deleted file mode 100644 (file)
index 3b17a2d..0000000
Binary files a/ofl/merriweather/Merriweather-Light.ttf and /dev/null differ

diff --git a/ofl/merriweather/Merriweather-LightItalic.ttf b/ofl/merriweather/Merriweather-LightItalic.ttf
deleted file mode 100644 (file)
index 3eec62a..0000000
Binary files a/ofl/merriweather/Merriweather-LightItalic.ttf and /dev/null differ

diff --git a/ofl/merriweather/Merriweather-Regular.ttf b/ofl/merriweather/Merriweather-Regular.ttf
deleted file mode 100644 (file)
index 2ee9a69..0000000
Binary files a/ofl/merriweather/Merriweather-Regular.ttf and /dev/null differ

diff --git a/ofl/merriweather/Merriweather[opsz,wdth,wght].ttf b/ofl/merriweather/Merriweather[opsz,wdth,wght].ttf
new file mode 100644 (file)
index 0000000..cb775b8
Binary files /dev/null and b/ofl/merriweather/Merriweather[opsz,wdth,wght].ttf differ

diff --git a/ofl/merriweather/OFL.txt b/ofl/merriweather/OFL.txt
index 042a4c436f80cc00f4a40fb9f459cf04dbe2e665..17d2c5151b6a31ca53721fc253708caf5cf0329a 100644 (file)
--- a/ofl/merriweather/OFL.txt
+++ b/ofl/merriweather/OFL.txt
@@ -1,8 +1,8 @@
-Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name "Merriweather".
+Copyright 2020 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather4) with Reserved Font Name "Merriweather".
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
+https://openfontlicense.org
 
 
 -----------------------------------------------------------