Skip to content

Commit b731f6e

Browse files
swinslowswinslow
authored
Merge pull request #965 from swinslow/ofl-rfn
Add separate -RFN and -no-RFN identifiers for OFL licenses
2 parents ebad7c9 + e986189 commit b731f6e

File tree

11 files changed

+587
-3
lines changed

11 files changed

+587
-3
lines changed

‎expected-warnings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
"Duplicates licenses: GPL-3.0-only, GPL-3.0-or-later","Duplicates licenses: AGPL-1.0-only, AGPL-1.0-or-later","Duplicates licenses: LGPL-3.0-only, LGPL-3.0-or-later","Duplicates licenses: GFDL-1.1-or-later, GFDL-1.1-only","Duplicates licenses: LGPL-2.0-or-later, LGPL-2.0-only","Duplicates licenses: MPL-2.0, MPL-2.0-no-copyleft-exception","Duplicates licenses: GFDL-1.3-only, GFDL-1.3-or-later","Duplicates licenses: GFDL-1.2-only, GFDL-1.2-or-later","Duplicates licenses: GFDL-1.3-only, GFDL-1.3-or-later","Duplicates licenses: AGPL-3.0-only, AGPL-3.0-or-later","Duplicates licenses: GPL-1.0-or-later, GPL-1.0-only","Duplicates licenses: AGPL-1.0-or-later, AGPL-1.0-only","Duplicates licenses: AGPL-3.0-or-later, AGPL-3.0-only","Duplicates licenses: GFDL-1.2-or-later, GFDL-1.2-only","Duplicates licenses: GFDL-1.3-or-later, GFDL-1.3-only","Duplicates licenses: GPL-3.0-or-later, GPL-3.0-only","Duplicates licenses: LGPL-3.0-or-later, LGPL-3.0-only","Duplicates licenses: GPL-3.0-or-later, GPL-3.0-only","Duplicates licenses: AGPL-1.0-or-later, AGPL-1.0-only","Duplicates licenses: LGPL-3.0-or-later, LGPL-3.0-only","Duplicates licenses: GFDL-1.1-only, GFDL-1.1-or-later","Duplicates licenses: LGPL-2.0-only, LGPL-2.0-or-later","Duplicates licenses: LGPL-2.1, LGPL-2.1-only","Duplicates licenses: LGPL-2.1-only, LGPL-2.1","Duplicates licenses: MPL-2.0-no-copyleft-exception, MPL-2.0","Duplicates licenses: GFDL-1.3-or-later, GFDL-1.3-only","Duplicates licenses: GFDL-1.2-or-later, GFDL-1.2-only","Duplicates licenses: GFDL-1.3-or-later, GFDL-1.3-only","Duplicates licenses: AGPL-3.0-or-later, AGPL-3.0-only","Duplicates licenses: GPL-1.0-only, GPL-1.0-or-later","Duplicates licenses: AGPL-1.0-only, AGPL-1.0-or-later","Duplicates licenses: AGPL-3.0-only, AGPL-3.0-or-later","Duplicates licenses: GFDL-1.2-only, GFDL-1.2-or-later","Duplicates licenses: GFDL-1.3-only, GFDL-1.3-or-later","Duplicates licenses: GPL-3.0-only, GPL-3.0-or-later","Duplicates licenses: LGPL-3.0-only, LGPL-3.0-or-later"
1+
"Duplicates licenses: GPL-3.0-only, GPL-3.0-or-later","Duplicates licenses: AGPL-1.0-only, AGPL-1.0-or-later","Duplicates licenses: LGPL-3.0-only, LGPL-3.0-or-later","Duplicates licenses: GFDL-1.1-or-later, GFDL-1.1-only","Duplicates licenses: LGPL-2.0-or-later, LGPL-2.0-only","Duplicates licenses: MPL-2.0, MPL-2.0-no-copyleft-exception","Duplicates licenses: GFDL-1.3-only, GFDL-1.3-or-later","Duplicates licenses: GFDL-1.2-only, GFDL-1.2-or-later","Duplicates licenses: GFDL-1.3-only, GFDL-1.3-or-later","Duplicates licenses: AGPL-3.0-only, AGPL-3.0-or-later","Duplicates licenses: GPL-1.0-or-later, GPL-1.0-only","Duplicates licenses: AGPL-1.0-or-later, AGPL-1.0-only","Duplicates licenses: AGPL-3.0-or-later, AGPL-3.0-only","Duplicates licenses: GFDL-1.2-or-later, GFDL-1.2-only","Duplicates licenses: GFDL-1.3-or-later, GFDL-1.3-only","Duplicates licenses: GPL-3.0-or-later, GPL-3.0-only","Duplicates licenses: LGPL-3.0-or-later, LGPL-3.0-only","Duplicates licenses: GPL-3.0-or-later, GPL-3.0-only","Duplicates licenses: AGPL-1.0-or-later, AGPL-1.0-only","Duplicates licenses: LGPL-3.0-or-later, LGPL-3.0-only","Duplicates licenses: GFDL-1.1-only, GFDL-1.1-or-later","Duplicates licenses: LGPL-2.0-only, LGPL-2.0-or-later","Duplicates licenses: LGPL-2.1, LGPL-2.1-only","Duplicates licenses: LGPL-2.1-only, LGPL-2.1","Duplicates licenses: MPL-2.0-no-copyleft-exception, MPL-2.0","Duplicates licenses: GFDL-1.3-or-later, GFDL-1.3-only","Duplicates licenses: GFDL-1.2-or-later, GFDL-1.2-only","Duplicates licenses: GFDL-1.3-or-later, GFDL-1.3-only","Duplicates licenses: AGPL-3.0-or-later, AGPL-3.0-only","Duplicates licenses: GPL-1.0-only, GPL-1.0-or-later","Duplicates licenses: AGPL-1.0-only, AGPL-1.0-or-later","Duplicates licenses: AGPL-3.0-only, AGPL-3.0-or-later","Duplicates licenses: GFDL-1.2-only, GFDL-1.2-or-later","Duplicates licenses: GFDL-1.3-only, GFDL-1.3-or-later","Duplicates licenses: GPL-3.0-only, GPL-3.0-or-later","Duplicates licenses: LGPL-3.0-only, LGPL-3.0-or-later","Duplicates licenses: OFL-1.1-RFN, OFL-1.1","Duplicates licenses: OFL-1.1, OFL-1.1-RFN","Duplicates licenses: OFL-1.0, OFL-1.0-no-RFN","Duplicates licenses: OFL-1.0-no-RFN, OFL-1.0","Duplicates licenses: OFL-1.0-RFN, OFL-1.0-no-RFN","Duplicates licenses: OFL-1.0-no-RFN, OFL-1.0-RFN","Duplicates licenses: OFL-1.0-RFN, OFL-1.0","Duplicates licenses: OFL-1.0, OFL-1.0-RFN"
22

‎src/OFL-1.0-RFN.xml

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
3+
<license isOsiApproved="false" licenseId="OFL-1.0-RFN" name="SIL Open Font License 1.0 with Reserved Font Name" listVersionAdded="3.8">
4+
<crossRefs>
5+
<crossRef>http://scripts.sil.org/cms/scripts/page.php?item_id=OFL10_web</crossRef>
6+
</crossRefs>
7+
<notes>This license has been superseded. This license was released in November 2005. The identifier
8+
OFL-1.0-RFN should only be used when a Reserved Font Name applies. See OFL-1.0 and OFL-1.0-no-RFN
9+
for alternatives.</notes>
10+
<text>
11+
<titleText>
12+
<p>SIL OPEN FONT LICENSE</p>
13+
<p>Version 1.0 - 22 November 2005</p>
14+
</titleText>
15+
<p>PREAMBLE</p>
16+
<p>The goals of the Open Font License (OFL) are to stimulate worldwide development of cooperative font
17+
projects, to support the font creation efforts of academic and linguistic communities, and to provide
18+
an open framework in which fonts may be shared and improved in partnership with others.</p>
19+
<p>The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they
20+
are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded,
21+
redistributed and sold with any software provided that the font names of derivative works are changed.
22+
The fonts and derivatives, however, cannot be released under any other type of license.</p>
23+
24+
<p>DEFINITIONS</p>
25+
<p>"Font Software" refers to any and all of the following:</p>
26+
<list>
27+
<item>
28+
<bullet>-</bullet>
29+
font files
30+
</item>
31+
<item>
32+
<bullet>-</bullet>
33+
data files
34+
</item>
35+
<item>
36+
<bullet>-</bullet>
37+
source code
38+
</item>
39+
<item>
40+
<bullet>-</bullet>
41+
build scripts
42+
</item>
43+
<item>
44+
<bullet>-</bullet>
45+
documentation
46+
</item>
47+
</list>
48+
<p>"Reserved Font Name" refers to the Font Software name as seen by users and any other names as
49+
specified after the copyright statement.</p>
50+
<p>"Standard Version" refers to the collection of Font Software components as distributed by the
51+
Copyright Holder.</p>
52+
<p>"Modified Version" refers to any derivative font software made by adding to, deleting, or
53+
substituting — in part or in whole -- any of the components of the Standard Version, by
54+
changing formats or by porting the Font Software to a new environment.</p>
55+
<p>"Author" refers to any designer, engineer, programmer, technical writer or other person who
56+
contributed to the Font Software.</p>
57+
<p>PERMISSION &amp; CONDITIONS</p>
58+
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of the Font
59+
Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and
60+
unmodified copies of the Font Software, subject to the following conditions:</p>
61+
<list>
62+
<item>
63+
<bullet>1)</bullet>
64+
Neither the Font Software nor any of its individual components, in Standard or Modified Versions,
65+
may be sold by itself.
66+
</item>
67+
<item>
68+
<bullet>2)</bullet>
69+
Standard or Modified Versions of the Font Software may be bundled, redistributed and sold with
70+
any software, provided that each copy contains the above copyright notice and this license.
71+
These can be included either as stand-alone text files, human-readable headers or in the
72+
appropriate machine-readable metadata fields within text or binary files as long as those
73+
fields can be easily viewed by the user.
74+
</item>
75+
<item>
76+
<bullet>3)</bullet>
77+
No Modified Version of the Font Software may use the Reserved Font Name(s), in part or in whole,
78+
unless explicit written permission is granted by the Copyright Holder. This restriction
79+
applies to all references stored in the Font Software, such as the font menu name and other
80+
font description fields, which are used to differentiate the font from others.
81+
</item>
82+
<item>
83+
<bullet>4)</bullet>
84+
The name(s) of the Copyright Holder or the Author(s) of the Font Software shall not be used to
85+
promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s)
86+
of the Copyright Holder and the Author(s) or with their explicit written permission.
87+
</item>
88+
<item>
89+
<bullet>5)</bullet>
90+
The Font Software, modified or unmodified, in part or in whole, must be distributed using this
91+
license, and may not be distributed under any other license.
92+
</item>
93+
</list>
94+
<p>TERMINATION</p>
95+
<p>This license becomes null and void if any of the above conditions are not met.</p>
96+
<p>DISCLAIMER</p>
97+
<p>THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
98+
NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
99+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR
100+
ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR
101+
CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE
102+
USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.</p>
103+
</text>
104+
</license>
105+
</SPDXLicenseCollection>

‎src/OFL-1.0-no-RFN.xml

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
3+
<license isOsiApproved="false" licenseId="OFL-1.0-no-RFN" name="SIL Open Font License 1.0 with no Reserved Font Name" listVersionAdded="3.8">
4+
<crossRefs>
5+
<crossRef>http://scripts.sil.org/cms/scripts/page.php?item_id=OFL10_web</crossRef>
6+
</crossRefs>
7+
<notes>This license has been superseded. This license was released in November 2005. The identifier
8+
OFL-1.0-no-RFN should only be used when there is no Reserved Font Name. See OFL-1.0 and OFL-1.0-RFN
9+
for alternatives.</notes>
10+
<text>
11+
<titleText>
12+
<p>SIL OPEN FONT LICENSE</p>
13+
<p>Version 1.0 - 22 November 2005</p>
14+
</titleText>
15+
<p>PREAMBLE</p>
16+
<p>The goals of the Open Font License (OFL) are to stimulate worldwide development of cooperative font
17+
projects, to support the font creation efforts of academic and linguistic communities, and to provide
18+
an open framework in which fonts may be shared and improved in partnership with others.</p>
19+
<p>The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they
20+
are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded,
21+
redistributed and sold with any software provided that the font names of derivative works are changed.
22+
The fonts and derivatives, however, cannot be released under any other type of license.</p>
23+
24+
<p>DEFINITIONS</p>
25+
<p>"Font Software" refers to any and all of the following:</p>
26+
<list>
27+
<item>
28+
<bullet>-</bullet>
29+
font files
30+
</item>
31+
<item>
32+
<bullet>-</bullet>
33+
data files
34+
</item>
35+
<item>
36+
<bullet>-</bullet>
37+
source code
38+
</item>
39+
<item>
40+
<bullet>-</bullet>
41+
build scripts
42+
</item>
43+
<item>
44+
<bullet>-</bullet>
45+
documentation
46+
</item>
47+
</list>
48+
<p>"Reserved Font Name" refers to the Font Software name as seen by users and any other names as
49+
specified after the copyright statement.</p>
50+
<p>"Standard Version" refers to the collection of Font Software components as distributed by the
51+
Copyright Holder.</p>
52+
<p>"Modified Version" refers to any derivative font software made by adding to, deleting, or
53+
substituting — in part or in whole -- any of the components of the Standard Version, by
54+
changing formats or by porting the Font Software to a new environment.</p>
55+
<p>"Author" refers to any designer, engineer, programmer, technical writer or other person who
56+
contributed to the Font Software.</p>
57+
<p>PERMISSION &amp; CONDITIONS</p>
58+
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of the Font
59+
Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and
60+
unmodified copies of the Font Software, subject to the following conditions:</p>
61+
<list>
62+
<item>
63+
<bullet>1)</bullet>
64+
Neither the Font Software nor any of its individual components, in Standard or Modified Versions,
65+
may be sold by itself.
66+
</item>
67+
<item>
68+
<bullet>2)</bullet>
69+
Standard or Modified Versions of the Font Software may be bundled, redistributed and sold with
70+
any software, provided that each copy contains the above copyright notice and this license.
71+
These can be included either as stand-alone text files, human-readable headers or in the
72+
appropriate machine-readable metadata fields within text or binary files as long as those
73+
fields can be easily viewed by the user.
74+
</item>
75+
<item>
76+
<bullet>3)</bullet>
77+
No Modified Version of the Font Software may use the Reserved Font Name(s), in part or in whole,
78+
unless explicit written permission is granted by the Copyright Holder. This restriction
79+
applies to all references stored in the Font Software, such as the font menu name and other
80+
font description fields, which are used to differentiate the font from others.
81+
</item>
82+
<item>
83+
<bullet>4)</bullet>
84+
The name(s) of the Copyright Holder or the Author(s) of the Font Software shall not be used to
85+
promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s)
86+
of the Copyright Holder and the Author(s) or with their explicit written permission.
87+
</item>
88+
<item>
89+
<bullet>5)</bullet>
90+
The Font Software, modified or unmodified, in part or in whole, must be distributed using this
91+
license, and may not be distributed under any other license.
92+
</item>
93+
</list>
94+
<p>TERMINATION</p>
95+
<p>This license becomes null and void if any of the above conditions are not met.</p>
96+
<p>DISCLAIMER</p>
97+
<p>THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
98+
NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
99+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR
100+
ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR
101+
CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE
102+
USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.</p>
103+
</text>
104+
</license>
105+
</SPDXLicenseCollection>

‎src/OFL-1.0.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
<crossRefs>
55
<crossRef>http://scripts.sil.org/cms/scripts/page.php?item_id=OFL10_web</crossRef>
66
</crossRefs>
7-
<notes>This license has been superseded. This license was released in November 2005.</notes>
7+
<notes>This license has been superseded. This license was released in November 2005. The identifier
8+
OFL-1.0 can be used to indicate that version 1.0 of the SIL Open Font License applies, without
9+
asserting whether or not a Reserved Font Name is used. See OFL-1.0-RFN and OFL-1.0-no-RFN for
10+
alternative identifiers that can be used to express explicitly that a Reserved Font Name is
11+
used or is not used, respectively.</notes>
812
<text>
913
<titleText>
1014
<p>SIL OPEN FONT LICENSE</p>

0 commit comments

Comments
 (0)