Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merriweather: Version 2.100 added #7886

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 41 additions & 61 deletions ofl/merriweather/METADATA.pb
Original file line number Diff line number Diff line change
Expand Up @@ -6,83 +6,63 @@ 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"
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: "10d36940db1d7fd894a8bbb8c61b5bcb66695f4a"
archive_url: "https://github.com/EbenSorkin/Merriweather4/releases/download/4.007/Merriweather4-4.007.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 {
Expand Down
Binary file removed ofl/merriweather/Merriweather-Black.ttf
Binary file not shown.
Binary file removed ofl/merriweather/Merriweather-BlackItalic.ttf
Binary file not shown.
Binary file removed ofl/merriweather/Merriweather-Bold.ttf
Binary file not shown.
Binary file removed ofl/merriweather/Merriweather-BoldItalic.ttf
Binary file not shown.
Binary file removed ofl/merriweather/Merriweather-Italic.ttf
Binary file not shown.
Binary file not shown.
Binary file removed ofl/merriweather/Merriweather-Light.ttf
Binary file not shown.
Binary file removed ofl/merriweather/Merriweather-LightItalic.ttf
Binary file not shown.
Binary file removed ofl/merriweather/Merriweather-Regular.ttf
Binary file not shown.
Binary file added ofl/merriweather/Merriweather[opsz,wdth,wght].ttf
Binary file not shown.
4 changes: 2 additions & 2 deletions ofl/merriweather/OFL.txt
Original file line number Diff line number Diff line change
@@ -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


-----------------------------------------------------------
Expand Down
Loading