From: Emma Marichal <64773544+emmamarichal@users.noreply.github.com>
Date: Fri, 4 Nov 2022 10:26:37 +0000 (+0100)
Subject: Calistoga: Version 1.008; ttfautohint (v1.8.4.7-5d5b) added (#5502)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5befa280bc0339eb303b09063c58d36d63bd8ed6;p=thirdparty%2Fgoogle%2Ffonts.git

Calistoga: Version 1.008; ttfautohint (v1.8.4.7-5d5b) added (#5502)

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

* Calistoga Version 1.008; ttfautohint (v1.8.4.7-5d5b) taken from the upstream repo https://github.com/SorkinType/Calistoga at commit https://github.com/SorkinType/Calistoga/commit/29e91526013f0d5b53862fee3c5ce6c108394812.

* Description updated

* Calistoga: corrected description

* Calistoga: credited Sorkin Type in metadata

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

diff --git a/ofl/calistoga/Calistoga-Regular.ttf b/ofl/calistoga/Calistoga-Regular.ttf
index 6ba77fb376..f0fa4ad3c4 100644
Binary files a/ofl/calistoga/Calistoga-Regular.ttf and b/ofl/calistoga/Calistoga-Regular.ttf differ
diff --git a/ofl/calistoga/DESCRIPTION.en_us.html b/ofl/calistoga/DESCRIPTION.en_us.html
index ea383b2331..511d7d255a 100644
--- a/ofl/calistoga/DESCRIPTION.en_us.html
+++ b/ofl/calistoga/DESCRIPTION.en_us.html
@@ -2,7 +2,6 @@
 
 <p>Calistoga includes proportional, tabular, old style and lining figures. It also offers fractions, superiors, inferiors, a broad range of symbols, and it includes case sensitive forms.</p>
 
-<p>Calistoga is an original typeface designed by Yvonne Schuttler. Eben Sorkin expanded the language support and refined the design in 2018.</p>
+<p>Calistoga is an original typeface designed by Yvonne Schuttler. Eben Sorkin expanded the language support and refined the design in 2018 and 2022.</p>
 
-<p>Calistoga is published by <a href="http://www.sorkintype.com/" target="blank">Sorkin Type</a>.</p>
-<p>To contribute, see <a href="https://github.com/SorkinType/Calistoga" target="blank">Calistoga GitHub</a></p>
+<p>To contribute, see <a href="https://github.com/SorkinType/Calistoga" target="blank">github.com/SorkinType/Calistoga</a></p>
diff --git a/ofl/calistoga/METADATA.pb b/ofl/calistoga/METADATA.pb
index ca421b8609..8160bebf4b 100644
--- a/ofl/calistoga/METADATA.pb
+++ b/ofl/calistoga/METADATA.pb
@@ -1,5 +1,5 @@
 name: "Calistoga"
-designer: "Yvonne Schüttler, Eben Sorkin"
+designer: "Yvonne Schüttler, Sorkin Type, Eben Sorkin"
 license: "OFL"
 category: "DISPLAY"
 date_added: "2019-11-04"
@@ -16,3 +16,7 @@ subsets: "latin"
 subsets: "latin-ext"
 subsets: "menu"
 subsets: "vietnamese"
+source {
+  repository_url: "https://github.com/SorkinType/Calistoga"
+  commit: "29e91526013f0d5b53862fee3c5ce6c108394812"
+}
diff --git a/ofl/calistoga/OFL.txt b/ofl/calistoga/OFL.txt
index 757b325207..15e23f87f0 100644
--- a/ofl/calistoga/OFL.txt
+++ b/ofl/calistoga/OFL.txt
@@ -2,7 +2,7 @@ Copyright 2019 The Calistoga Project Authors (https://github.com/SorkinType/Cali
 
 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/calistoga/upstream.yaml b/ofl/calistoga/upstream.yaml
new file mode 100644
index 0000000000..a11af677e9
--- /dev/null
+++ b/ofl/calistoga/upstream.yaml
@@ -0,0 +1,5 @@
+branch: main
+files:
+  OFL.txt: OFL.txt
+  fonts/ttf/Calistoga-Regular.ttf: Calistoga-Regular.ttf
+archive: