Merienda: Version 2.001 added (#5291)

* [gftools-packager] Merienda: Version 2.001 added

* Merienda Version 2.001 taken from the upstream repo https://github.com/etunni/merienda at commit https://github.com/etunni/merienda/commit/15f2f36d29595fa3dd6cf068323ef44bc0713b56.

* Description updated

diff --git a/ofl/merienda/DESCRIPTION.en_us.html b/ofl/merienda/DESCRIPTION.en_us.html
index 7736bbcd0cff944cb5b3ce3e17f871b9534b27fb..7592dab3e40b18072bd9fad0a850b26ac87d7976 100644 (file)
--- a/ofl/merienda/DESCRIPTION.en_us.html
+++ b/ofl/merienda/DESCRIPTION.en_us.html
@@ -1,11 +1,10 @@
 <p>'Merienda' is a Spanish term for "afternoon snack", and this pleasant time
 of the day was worth its own typography.</p>
 
-<p>Merienda has soft shapes, is slightly condensed, and has a rhythm which is
-an invitation to read short pieces of text. It is ideal for headlines which
-call for height, as its strokes resemble those of a brush and deliver
-freshness and a dynamic touch in the development of words.</p>
-
-<p><a href="http://www.google.com/fonts/specimen/Merienda+One">Merienda
-One</a> is the initial publication of this typeface family in a single bold
-style.</p>
\ No newline at end of file
+<p>Merienda has soft shapes, is slightly condensed, and has a rhythm which is an invitation to read short pieces of text. It is ideal for headlines which call for height, as its strokes resemble those of a brush and deliver freshness and a dynamic touch in the development of words.</p>
+
+<p><a href="http://www.google.com/fonts/specimen/Merienda+One">Merienda One</a> is the initial publication of this typeface family in a single boldstyle.</p>
+
+<p>In september 2022, the font is updated as a variable and now offers 7 styles, ranging from light to black. The glyphset has also been extended, offering a larger number of supported languages.</p>
+
+<p>To contribute, see <a href="https://github.com/etunni/merienda">github.com/etunni/merienda</a>.</p>

diff --git a/ofl/merienda/METADATA.pb b/ofl/merienda/METADATA.pb
index 0ebcc0e2e7eb9cbd755b9ff3bb786496a3807155..22792194e85048678d68ef7f362b2ddd7f468fcd 100644 (file)
--- a/ofl/merienda/METADATA.pb
+++ b/ofl/merienda/METADATA.pb
@@ -7,20 +7,21 @@ fonts {
   name: "Merienda"
   style: "normal"
   weight: 400
-  filename: "Merienda-Regular.ttf"
-  post_script_name: "Merienda-Regular_0_wt"
-  full_name: "Merienda"
-  copyright: "Copyright (c) 2011-2012, Eduardo Tunni (http://www.tipo.net.ar edu@tipo.net.ar), with Reserved Font Name \'Merienda\'"
+  filename: "Merienda[wght].ttf"
+  post_script_name: "Merienda-Regular"
+  full_name: "Merienda Regular"
+  copyright: "Copyright 2017 The Merienda Project Authors (https://github.com/etunni/merienda)"
 }
-fonts {
-  name: "Merienda"
-  style: "normal"
-  weight: 700
-  filename: "Merienda-Bold.ttf"
-  post_script_name: "Merienda-Bold"
-  full_name: "Merienda Bold"
-  copyright: "Copyright (c) 2011-2012, Eduardo Tunni (http://www.tipo.net.ar edu@tipo.net.ar), with Reserved Font Name \'Merienda\'"
-}
-subsets: "menu"
 subsets: "latin"
 subsets: "latin-ext"
+subsets: "menu"
+subsets: "vietnamese"
+axes {
+  tag: "wght"
+  min_value: 300.0
+  max_value: 900.0
+}
+source {
+  repository_url: "https://github.com/etunni/merienda"
+  commit: "15f2f36d29595fa3dd6cf068323ef44bc0713b56"
+}

diff --git a/ofl/merienda/Merienda-Bold.ttf b/ofl/merienda/Merienda-Bold.ttf
deleted file mode 100644 (file)
index 02762ca..0000000
Binary files a/ofl/merienda/Merienda-Bold.ttf and /dev/null differ

diff --git a/ofl/merienda/Merienda-Regular.ttf b/ofl/merienda/Merienda-Regular.ttf
deleted file mode 100644 (file)
index 055eaea..0000000
Binary files a/ofl/merienda/Merienda-Regular.ttf and /dev/null differ

diff --git a/ofl/merienda/Merienda[wght].ttf b/ofl/merienda/Merienda[wght].ttf
new file mode 100644 (file)
index 0000000..230b625
Binary files /dev/null and b/ofl/merienda/Merienda[wght].ttf differ

diff --git a/ofl/merienda/OFL.txt b/ofl/merienda/OFL.txt
index f05fe13d446c05b9bbe1882b4f51e1a821713eab..5a861ca450a6b0fcd86f5aa9ebf8012759c81795 100644 (file)
--- a/ofl/merienda/OFL.txt
+++ b/ofl/merienda/OFL.txt
@@ -1,93 +1,94 @@
-Copyright (c) 2012, Eduardo Tunni (http://www.tipo.net.ar), with Reserved Font Name 'Merienda'
-
-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
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright 2017 The Merienda Project Authors (https://github.com/etunni/merienda)\r
+with Reserved Font Name "Merienda"\r
+\r
+This Font Software is licensed under the SIL Open Font License, Version 1.1.\r
+This license is copied below, and is also available with a FAQ at:\r
+https://scripts.sil.org/OFL\r
+\r
+\r
+-----------------------------------------------------------\r
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007\r
+-----------------------------------------------------------\r
+\r
+PREAMBLE\r
+The goals of the Open Font License (OFL) are to stimulate worldwide\r
+development of collaborative font projects, to support the font creation\r
+efforts of academic and linguistic communities, and to provide a free and\r
+open framework in which fonts may be shared and improved in partnership\r
+with others.\r
+\r
+The OFL allows the licensed fonts to be used, studied, modified and\r
+redistributed freely as long as they are not sold by themselves. The\r
+fonts, including any derivative works, can be bundled, embedded, \r
+redistributed and/or sold with any software provided that any reserved\r
+names are not used by derivative works. The fonts and derivatives,\r
+however, cannot be released under any other type of license. The\r
+requirement for fonts to remain under this license does not apply\r
+to any document created using the fonts or their derivatives.\r
+\r
+DEFINITIONS\r
+"Font Software" refers to the set of files released by the Copyright\r
+Holder(s) under this license and clearly marked as such. This may\r
+include source files, build scripts and documentation.\r
+\r
+"Reserved Font Name" refers to any names specified as such after the\r
+copyright statement(s).\r
+\r
+"Original Version" refers to the collection of Font Software components as\r
+distributed by the Copyright Holder(s).\r
+\r
+"Modified Version" refers to any derivative made by adding to, deleting,\r
+or substituting -- in part or in whole -- any of the components of the\r
+Original Version, by changing formats or by porting the Font Software to a\r
+new environment.\r
+\r
+"Author" refers to any designer, engineer, programmer, technical\r
+writer or other person who contributed to the Font Software.\r
+\r
+PERMISSION & CONDITIONS\r
+Permission is hereby granted, free of charge, to any person obtaining\r
+a copy of the Font Software, to use, study, copy, merge, embed, modify,\r
+redistribute, and sell modified and unmodified copies of the Font\r
+Software, subject to the following conditions:\r
+\r
+1) Neither the Font Software nor any of its individual components,\r
+in Original or Modified Versions, may be sold by itself.\r
+\r
+2) Original or Modified Versions of the Font Software may be bundled,\r
+redistributed and/or sold with any software, provided that each copy\r
+contains the above copyright notice and this license. These can be\r
+included either as stand-alone text files, human-readable headers or\r
+in the appropriate machine-readable metadata fields within text or\r
+binary files as long as those fields can be easily viewed by the user.\r
+\r
+3) No Modified Version of the Font Software may use the Reserved Font\r
+Name(s) unless explicit written permission is granted by the corresponding\r
+Copyright Holder. This restriction only applies to the primary font name as\r
+presented to the users.\r
+\r
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\r
+Software shall not be used to promote, endorse or advertise any\r
+Modified Version, except to acknowledge the contribution(s) of the\r
+Copyright Holder(s) and the Author(s) or with their explicit written\r
+permission.\r
+\r
+5) The Font Software, modified or unmodified, in part or in whole,\r
+must be distributed entirely under this license, and must not be\r
+distributed under any other license. The requirement for fonts to\r
+remain under this license does not apply to any document created\r
+using the Font Software.\r
+\r
+TERMINATION\r
+This license becomes null and void if any of the above conditions are\r
+not met.\r
+\r
+DISCLAIMER\r
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\r
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\r
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\r
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\r
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL\r
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\r
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\r
+OTHER DEALINGS IN THE FONT SOFTWARE.\r

diff --git a/ofl/merienda/upstream.yaml b/ofl/merienda/upstream.yaml
new file mode 100644 (file)
index 0000000..d633f50
--- /dev/null
+++ b/ofl/merienda/upstream.yaml
@@ -0,0 +1,5 @@
+branch: master
+files:
+  OFL.txt: OFL.txt
+  fonts/variable/Merienda[wght].ttf: Merienda[wght].ttf
+archive: