Update DancingScript to 2.001 am: f6410ea231 am: 1de05c38dd am: b75f0509ee am: a34e4d9f8b
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/dancing-script/+/2483764
Change-Id: Idf990f3ea5201a50c671973c7b5b5dcffa91a3f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index a93470f..a4847b2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,12 +53,7 @@
src: "DancingScript-Regular.ttf",
}
-prebuilt_font {
- name: "DancingScript-Bold.ttf",
- src: "DancingScript-Bold.ttf",
-}
-
filegroup {
name: "GoogleFontDancingScript",
srcs: [ "*.ttf" ],
-}
\ No newline at end of file
+}
diff --git a/DancingScript-Bold.ttf b/DancingScript-Bold.ttf
deleted file mode 100644
index d502ef8..0000000
--- a/DancingScript-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/DancingScript-Regular.ttf b/DancingScript-Regular.ttf
index 3fa27af..9f521e7 100644
--- a/DancingScript-Regular.ttf
+++ b/DancingScript-Regular.ttf
Binary files differ
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..69f05a7
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,111 @@
+Copyright (c) 2010, Pablo Impallari (www.impallari.com|impallari@gmail.com),
+Copyright (c) 2010, Igino Marini. (www.ikern.com|mail@iginomarini.com),
+with Reserved Font Name Dancing Script.
+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 (C) 2014 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
diff --git a/METADATA b/METADATA
index 5331b9a..23e530c 100644
--- a/METADATA
+++ b/METADATA
@@ -1,7 +1,20 @@
# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE
# CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
# DEPENDING ON IT IN YOUR PROJECT. ***
+name: "dancingscript"
+description: "Dancing Script is a lively casual script where the letters bounce and change size slightly. Caps are big, and goes below the baseline."
+
third_party {
- license_note: "would be NOTICE save for OFL 1.1 in NOTICE file"
+ url {
+ type: HOMEPAGE
+ value: "https://github.com/google/fonts/tree/main/ofl/dancingscript"
+ }
+ url {
+ type: GIT
+ value: "https://github.com/google/fonts"
+ }
+ version: "2.001"
+ last_upgrade_date { year: 2023 month: 3 day: 13 }
+ license_note: "contains OFL fonts"
license_type: BY_EXCEPTION_ONLY
}
diff --git a/fonts.mk b/fonts.mk
index a9cf501..d45970d 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -17,5 +17,4 @@
# get installed too.
PRODUCT_PACKAGES := \
- DancingScript-Regular.ttf \
- DancingScript-Bold.ttf
+ DancingScript-Regular.ttf
