extras/source/truetype/symbol/OpenSymbol2.sfd | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit efad5d95cd1952d09354650699b5c2daf07aa573
Author: dante <dante19031...@gmail.com>
AuthorDate: Fri Nov 20 19:01:08 2020 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jul 27 08:47:50 2021 +0200
Copyright notice updated:
- Font name: OpenSymbol Math
- Font version restarts on 0.1
- Copyright notice added
- Licensed under OLF
I can't correct the merge error because the file is too big.
I need the previous patch merged first.
Change-Id: Ia97d8c8ef99c9fbb49e2f268fd6cb52d5db257e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106289
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/extras/source/truetype/symbol/OpenSymbol2.sfd
b/extras/source/truetype/symbol/OpenSymbol2.sfd
index 667a79f1f081..a4856903ae29 100644
--- a/extras/source/truetype/symbol/OpenSymbol2.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol2.sfd
@@ -1,10 +1,10 @@
SplineFontDB: 3.2
-FontName: OpenSymbol2
-FullName: OpenSymbol2
-FamilyName: OpenSymbol2
+FontName: OpenSymbolMath
+FullName: OpenSymbol Math
+FamilyName: OpenSymbol Math
Weight: Book
-Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <->
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven,
eight, nine, question, underscore, copyright, registered, uni2215, angle,
therefore, lozenge (c) 2010 Google Corporation\nuni20D1 (c) 2019 Takeshi Abe
-Version: 102.11
+Copyright: Copyright (c) 2009 Sun Microsystems Inc.\nCopyright (c) 2011 Julien
Nabet\nCopyright (c) 2011 Olivier Hallot\nCopyright (c) 2013 Mathias
Hasselmann\nCopyright (c) 2015 Khaled Hosny\nCopyright (c) 2016 Mike
Kaganski\nCopyright (c) 2010 Google Corporation\nCopyright (c) 2019 Takeshi
Abe\nCopyright (c) 2012-2020 The Libertinus Project Authors,\nwith Reserved
Font Name "Linux Libertine", "Biolinum", "STIX Fonts".\n\nThis Font Software is
licensed under the SIL Open Font License, Version 1.1.\nThis license is copied
below, and is also available with a FAQ at:\nhttp://scripts.sil.org/OFL
+Version: 0.1
ItalicAngle: 0
UnderlinePosition: -143
UnderlineWidth: 20
@@ -773,7 +773,7 @@ ShortTable: maxp 16
0
0
EndShort
-LangName: 1033 "" "" "Regular" "OpenSymbol2"
+LangName: 1033 "" "" "Regular" "OpenSymbolMath" "" "" "" "" "" "" "" "" ""
"Copyright (c) 2009 Sun Microsystems Inc.+AAoA-Copyright (c) 2011 Julien
Nabet+AAoA-Copyright (c) 2011 Olivier Hallot+AAoA-Copyright (c) 2013 Mathias
Hasselmann+AAoA-Copyright (c) 2015 Khaled Hosny+AAoA-Copyright (c) 2016 Mike
Kaganski+AAoA-Copyright (c) 2010 Google Corporation+AAoA-Copyright (c) 2019
Takeshi Abe+AAoA-Copyright (c) 2012-2020 The Libertinus Project
Authors,+AAoA-with Reserved Font Name +ACIA-Linux Libertine+ACIA,
+ACIA-Biolinum+ACIA, +ACIA-STIX Fonts+ACIA.+AAoACgAA-This Font Software is
licensed under the SIL Open Font License, Version 1.1.+AAoA-This license is
copied below, and is also available with a FAQ
at:+AAoA-http://scripts.sil.org/OFL+AAoACgAK------------------------------------------------------------+AAoA-SIL
OPEN FONT LICENSE Version 1.1 - 26 February
2007+AAoA------------------------------------------------------------+AAoACgAA-PREAMBLE+AAoA-The
goals of the Open Font License (OFL)
are to stimulate worldwide+AAoA-development of collaborative font projects,
to support the font creation+AAoA-efforts of academic and linguistic
communities, and to provide a free and+AAoA-open framework in which fonts may
be shared and improved in partnership+AAoA-with others.+AAoACgAA-The OFL allows
the licensed fonts to be used, studied, modified and+AAoA-redistributed freely
as long as they are not sold by themselves. The+AAoA-fonts, including any
derivative works, can be bundled, embedded, +AAoA-redistributed and/or sold
with any software provided that any reserved+AAoA-names are not used by
derivative works. The fonts and derivatives,+AAoA-however, cannot be released
under any other type of license. The+AAoA-requirement for fonts to remain under
this license does not apply+AAoA-to any document created using the fonts or
their derivatives.+AAoACgAA-DEFINITIONS+AAoAIgAA-Font Software+ACIA refers to
the set of files released by the Copyright+AAoA-Holder(s) under this license and
clearly marked as such. This may+AAoA-include source files, build scripts and
documentation.+AAoACgAi-Reserved Font Name+ACIA refers to any names specified
as such after the+AAoA-copyright statement(s).+AAoACgAi-Original Version+ACIA
refers to the collection of Font Software components as+AAoA-distributed by the
Copyright Holder(s).+AAoACgAi-Modified Version+ACIA refers to any derivative
made by adding to, deleting,+AAoA-or substituting -- in part or in whole -- any
of the components of the+AAoA-Original Version, by changing formats or by
porting the Font Software to a+AAoA-new environment.+AAoACgAi-Author+ACIA
refers to any designer, engineer, programmer, technical+AAoA-writer or other
person who contributed to the Font Software.+AAoACgAA-PERMISSION &
CONDITIONS+AAoA-Permission is hereby granted, free of charge, to any person
obtaining+AAoA-a copy of the Font Software, to use, study, copy, merge, embed,
modify,+AAoA-redistribute, and sell modified and unmodified copies of the Font
+AAoA-Software, subject to the following conditions:+AAoACgAA-1) Neither the
Font Software nor any of its individual components,+AAoA-in Original or
Modified Versions, may be sold by itself.+AAoACgAA-2) Original or Modified
Versions of the Font Software may be bundled,+AAoA-redistributed and/or sold
with any software, provided that each copy+AAoA-contains the above copyright
notice and this license. These can be+AAoA-included either as stand-alone text
files, human-readable headers or+AAoA-in the appropriate machine-readable
metadata fields within text or+AAoA-binary files as long as those fields can be
easily viewed by the user.+AAoACgAA-3) No Modified Version of the Font Software
may use the Reserved Font+AAoA-Name(s) unless explicit written permission is
granted by the corresponding+AAoA-Copyright Holder. This restriction only
applies to the primary font name as+AAoA-presented to the users.+AAoACgAA-4)
The name(s) of the Copyright Holder(s) or the Author(s) of the Font+AAoA-Softw
are shall not be used to promote, endorse or advertise any+AAoA-Modified
Version, except to acknowledge the contribution(s) of the+AAoA-Copyright
Holder(s) and the Author(s) or with their explicit
written+AAoA-permission.+AAoACgAA-5) The Font Software, modified or unmodified,
in part or in whole,+AAoA-must be distributed entirely under this license, and
must not be+AAoA-distributed under any other license. The requirement for fonts
to+AAoA-remain under this license does not apply to any document
created+AAoA-using the Font Software.+AAoACgAA-TERMINATION+AAoA-This license
becomes null and void if any of the above conditions are+AAoA-not
met.+AAoACgAA-DISCLAIMER+AAoA-THE FONT SOFTWARE IS PROVIDED +ACIA-AS IS+ACIA,
WITHOUT WARRANTY OF ANY KIND,+AAoA-EXPRESS OR IMPLIED, INCLUDING BUT NOT
LIMITED TO ANY WARRANTIES OF+AAoA-MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND NONINFRINGEMENT+AAoA-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER
RIGHT. IN NO EVENT SHALL THE+AAoA-COPYRIGHT HOLDER
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,+AAoA-INCLUDING ANY
GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL+AAoA-DAMAGES, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING+AAoA-FROM, OUT OF THE USE
OR INABILITY TO USE THE FONT SOFTWARE OR FROM+AAoA-OTHER DEALINGS IN THE FONT
SOFTWARE." "http://scripts.sil.org/OFL";
GaspTable: 1 65535 2 0
Encoding: UnicodeFull
UnicodeInterp: none
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
