From: Emma Marichal <64773544+emmamarichal@users.noreply.github.com>
Date: Thu, 24 Nov 2022 13:50:56 +0000 (+0100)
Subject: Marmelad: Version 1.100; ttfautohint (v1.8.4.7-5d5b) added (#5529)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=600a986f0716e83fa229dc14ed61d0305657e177;p=thirdparty%2Fgoogle%2Ffonts.git

Marmelad: Version 1.100; ttfautohint (v1.8.4.7-5d5b) added (#5529)

* [gftools-packager] Marmelad: Version 1.110; ttfautohint (v1.8.4.7-5d5b) added

* Marmelad Version 1.110; ttfautohint (v1.8.4.7-5d5b) taken from the upstream repo https://github.com/cyrealtype/Marmelad-Cyrillic at commit https://github.com/cyrealtype/Marmelad-Cyrillic/commit/9ddac1c0cbdc888e1c6adae6f34e7db08ec6c187.

* Description updated

* Marmelad: description corrected

* Marmelad: added designer

Co-authored-by: Rosalie Wagner <mail@rosaliewagner.com>
---

diff --git a/ofl/marmelad/DESCRIPTION.en_us.html b/ofl/marmelad/DESCRIPTION.en_us.html
index bedde5ff4e..31a8c52100 100644
--- a/ofl/marmelad/DESCRIPTION.en_us.html
+++ b/ofl/marmelad/DESCRIPTION.en_us.html
@@ -1 +1,5 @@
-<p>Marmelad is designed specifically for medium to large-size headlines and remains well-balanced for long text setting because of its regular proportions and medium contrast. Ascenders and descenders are elegant and details refined. The name and overall feel refers to marmalade sweets - soft and ductile.</p> <p>All vertical strokes are rounded towards the baseline, which is why technically there is no sense for overshoots in rounded letters like O. Marmelad performs well on screen because of its soft rounded features and generous x-height.<p> <p>The font supports Latin-1, Cyrillic and Turkish(Latin-5) encoding. Marmelad is designed by Manvel Shmavonyan.</p>
\ No newline at end of file
+<p>Marmelad is designed specifically for medium to large-size headlines and remains well-balanced for long text setting because of its regular proportions and medium contrast. Ascenders and descenders are elegant and details refined. The name and overall feel refers to marmalade sweets - soft and ductile.</p> 
+<p>All vertical strokes are rounded towards the baseline, which is why technically there is no sense for overshoots in rounded letters like O. Marmelad performs well on screen because of its soft rounded features and generous x-height.<p> 
+<p>The font supports Latin and Cyrillic. In 2022, the kerning is improved and the Latin language coverage expanded.</p>
+
+<p>To contribute, see <a href="https://github.com/cyrealtype/Marmelad-Cyrillic">github.com/cyrealtype/Marmelad-Cyrillic</a>.</p>
diff --git a/ofl/marmelad/METADATA.pb b/ofl/marmelad/METADATA.pb
index fcce9c1a04..19e58b9951 100644
--- a/ofl/marmelad/METADATA.pb
+++ b/ofl/marmelad/METADATA.pb
@@ -1,5 +1,5 @@
 name: "Marmelad"
-designer: "Cyreal"
+designer: "Cyreal, Manvel Shmavonyan"
 license: "OFL"
 category: "SANS_SERIF"
 date_added: "2011-12-07"
@@ -10,7 +10,7 @@ fonts {
   filename: "Marmelad-Regular.ttf"
   post_script_name: "Marmelad-Regular"
   full_name: "Marmelad Regular"
-  copyright: "Copyright 2016 The Marmelad Project Authors (manveltype@gmail.com), with Reserved Font Name \"Marmelad\"."
+  copyright: "Copyright 2016 The Marmelad Project Authors (https://github.com/cyrealtype/Marmelad-Cyrillic)"
 }
 subsets: "cyrillic"
 subsets: "cyrillic-ext"
@@ -18,3 +18,7 @@ subsets: "latin"
 subsets: "latin-ext"
 subsets: "menu"
 subsets: "vietnamese"
+source {
+  repository_url: "https://github.com/cyrealtype/Marmelad-Cyrillic"
+  commit: "9ddac1c0cbdc888e1c6adae6f34e7db08ec6c187"
+}
diff --git a/ofl/marmelad/Marmelad-Regular.ttf b/ofl/marmelad/Marmelad-Regular.ttf
index 86a1e4f038..ac1c029854 100644
Binary files a/ofl/marmelad/Marmelad-Regular.ttf and b/ofl/marmelad/Marmelad-Regular.ttf differ
diff --git a/ofl/marmelad/OFL.txt b/ofl/marmelad/OFL.txt
index d15e4c29f5..b1e2dcbea5 100644
--- a/ofl/marmelad/OFL.txt
+++ b/ofl/marmelad/OFL.txt
@@ -1,8 +1,8 @@
-Copyright 2016 The Marmelad Project Authors (manveltype@gmail.com), with Reserved Font Name "Marmelad".
+Copyright 2016 The Marmelad Project Authors (https://github.com/cyrealtype/Marmelad-Cyrillic).
 
 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://scripts.sil.org/OFL
 
 
 -----------------------------------------------------------
diff --git a/ofl/marmelad/upstream.yaml b/ofl/marmelad/upstream.yaml
new file mode 100644
index 0000000000..d93785b323
--- /dev/null
+++ b/ofl/marmelad/upstream.yaml
@@ -0,0 +1,5 @@
+branch: master
+files:
+  OFL.txt: OFL.txt
+  fonts/ttf/Marmelad-Regular.ttf: Marmelad-Regular.ttf
+archive: