Skip to content

Commit a943db3

Browse files
goneallgoneall
authored
Merge pull request #51 from spdx/fixcommacompare
Normalize commas in license compare
2 parents 778f879 + 07f1b97 commit a943db3

File tree

4 files changed

+343
-6
lines changed

4 files changed

+343
-6
lines changed

‎TestFiles/MulanPSL-2.0-comma.txt‎

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
2+
木兰宽松许可证，第2版
3+
4+
木兰宽松许可证， 第2版
5+
6+
2020年1月 http://license.coscl.org.cn/MulanPSL2
7+
8+
您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束：
9+
10+
0. 定义
11+
12+
“软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
13+
14+
“贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
15+
16+
“贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
17+
18+
“法人实体” 是指提交贡献的机构及其“关联实体”。
19+
20+
“关联实体” 是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
21+
22+
1. 授予版权许可
23+
24+
每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。
25+
26+
2. 授予专利许可
27+
28+
每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。
29+
30+
3. 无商标许可
31+
32+
“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
33+
34+
4. 分发限制
35+
36+
您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。
37+
38+
5. 免责声明与责任限制
39+
40+
“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论，即使其曾被建议有此种损失的可能性。
41+
42+
6. 语言
43+
44+
“本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。
45+
46+
条款结束
47+
48+
如何将木兰宽松许可证，第2版，应用到您的软件
49+
50+
如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步：
51+
52+
1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
53+
54+
2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中；
55+
56+
3， 请将如下声明文本放入每个源文件的头部注释中。
57+
58+
Copyright (c) [Year] [name of copyright holder]
59+
[Software Name] is licensed under Mulan PSL v2.
60+
You can use this software according to the terms and conditions of the Mulan
61+
PSL v2.
62+
You may obtain a copy of Mulan PSL v2 at:
63+
http://license.coscl.org.cn/MulanPSL2
64+
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
65+
EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
66+
MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
67+
See the Mulan PSL v2 for more details.
68+
69+
Mulan Permissive Software License,Version 2
70+
71+
Mulan Permissive Software License,Version 2 (Mulan PSL v2)
72+
73+
January 2020 http://license.coscl.org.cn/MulanPSL2
74+
75+
Your reproduction, use, modification and distribution of the Software shall
76+
be subject to Mulan PSL v2 (this License) with the following terms and conditions:
77+
78+
0. Definition
79+
80+
Software means the program and related documents which are licensed under
81+
this License and comprise all Contribution(s).
82+
83+
Contribution means the copyrightable work licensed by a particular Contributor
84+
under this License.
85+
86+
Contributor means the Individual or Legal Entity who licenses its copyrightable
87+
work under this License.
88+
89+
Legal Entity means the entity making a Contribution and all its Affiliates.
90+
91+
Affiliates means entities that control, are controlled by, or are under common
92+
control with the acting entity under this License, ‘control’ means direct
93+
or indirect ownership of at least fifty percent (50%) of the voting power,
94+
capital or other securities of controlled or commonly controlled entity.
95+
96+
1. Grant of Copyright License
97+
98+
Subject to the terms and conditions of this License, each Contributor hereby
99+
grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
100+
copyright license to reproduce, use, modify, or distribute its Contribution,
101+
with modification or not.
102+
103+
2. Grant of Patent License
104+
105+
Subject to the terms and conditions of this License, each Contributor hereby
106+
grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
107+
(except for revocation under this Section) patent license to make, have made,
108+
use, offer for sale, sell, import or otherwise transfer its Contribution,
109+
where such patent license is only limited to the patent claims owned or controlled
110+
by such Contributor now or in future which will be necessarily infringed by
111+
its Contribution alone, or by combination of the Contribution with the Software
112+
to which the Contribution was contributed. The patent license shall not apply
113+
to any modification of the Contribution, and any other combination which includes
114+
the Contribution. If you or your Affiliates directly or indirectly institute
115+
patent litigation (including a cross claim or counterclaim in a litigation)
116+
or other patent enforcement activities against any individual or entity by
117+
alleging that the Software or any Contribution in it infringes patents, then
118+
any patent license granted to you under this License for the Software shall
119+
terminate as of the date such litigation or activity is filed or taken.
120+
121+
3. No Trademark License
122+
123+
No trademark license is granted to use the trade names, trademarks, service
124+
marks, or product names of Contributor, except as required to fulfill notice
125+
requirements in section 4.
126+
127+
4. Distribution Restriction
128+
129+
You may distribute the Software in any medium with or without modification,
130+
whether in source or executable forms, provided that you provide recipients
131+
with a copy of this License and retain copyright, patent, trademark and disclaimer
132+
statements in the Software.
133+
134+
5. Disclaimer of Warranty and Limitation of Liability
135+
136+
THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY
137+
KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT
138+
HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY
139+
DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE
140+
OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW
141+
IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY
142+
OF SUCH DAMAGES.
143+
144+
6. Language
145+
146+
THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION
147+
AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE
148+
BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL.
149+
150+
END OF THE TERMS AND CONDITIONS
151+
152+
How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2)
153+
to Your Software
154+
155+
To apply the Mulan PSL v2 to your work, for easy identification by recipients,
156+
you are suggested to complete following three steps:
157+
158+
i. Fill in the blanks in following statement, including insert your software
159+
name, the year of the first publication of your software, and your name identified
160+
as the copyright owner;
161+
ii. Create a file named "LICENSE" which contains the whole context of this
162+
License in the first directory of your software package;
163+
iii. Attach the statement to the appropriate annotated syntax at the beginning
164+
of each source file.
165+
166+
Copyright (c) [Year] [name of copyright holder]
167+
[Software Name] is licensed under Mulan PSL v2.
168+
You can use this software according to the terms and conditions of the Mulan
169+
PSL v2.
170+
You may obtain a copy of Mulan PSL v2 at:
171+
http://license.coscl.org.cn/MulanPSL2
172+
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
173+
EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
174+
MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
175+
See the Mulan PSL v2 for more details.

‎TestFiles/MulanPSL-2.0.template.txt‎

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
<<beginOptional>> 木兰宽松许可证, 第2版<<endOptional>><<beginOptional>> 木兰宽松许可证， 第2版
2+
3+
2020年1月 http://license.coscl.org.cn/MulanPSL2<<endOptional>>
4+
5+
您对"软件"的复制、使用、修改及分发受木兰宽松许可证，第2版（"本许可证"）的如下条款的约束：
6+
7+
<<var;name="bullet";original="0.";match=".{0,20}">> 定义
8+
9+
"软件" 是指由"贡献"构成的许可在"本许可证"下的程序和相关文档的集合。
10+
11+
"贡献" 是指由任一"贡献者"许可在"本许可证"下的受版权法保护的作品。
12+
13+
"贡献者" 是指将受版权法保护的作品许可在"本许可证"下的自然人或"法人实体"。
14+
15+
"法人实体" 是指提交贡献的机构及其"关联实体"。
16+
17+
"关联实体" 是指，对"本许可证"下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
18+
19+
<<var;name="bullet";original="1.";match=".{0,20}">> 授予版权许可
20+
21+
每个"贡献者"根据"本许可证"授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其"贡献"，不论修改与否。
22+
23+
<<var;name="bullet";original="2.";match=".{0,20}">> 授予专利许可
24+
25+
每个"贡献者"根据"本许可证"授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其"贡献"或以其他方式转移其"贡献"。前述专利许可仅限于"贡献者"现在或将来拥有或控制的其"贡献"本身或其"贡献"与许可"贡献"时的"软件"结合而将必然会侵犯的专利权利要求，不包括对"贡献"的修改或包含"贡献"的其他结合。如果您或您的"关联实体"直接或间接地，就"软件"或其中的"贡献"对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则"本许可证"授予您对"软件"的专利许可自您提起诉讼或发起维权行动之日终止。
26+
27+
<<var;name="bullet";original="3.";match=".{0,20}">> 无商标许可
28+
29+
"本许可证"不提供对"贡献者"的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
30+
31+
<<var;name="bullet";original="4.";match=".{0,20}">> 分发限制
32+
33+
您可以在任何媒介中将"软件"以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供"本许可证"的副本，并保留"软件"中的版权、商标、专利及免责声明。
34+
35+
<<var;name="bullet";original="5.";match=".{0,20}">> 免责声明与责任限制
36+
37+
"软件"及其中的"贡献"在提供时不带任何明示或默示的担保。在任何情况下，"贡献者"或版权所有者不对任何人因使用"软件"或其中的"贡献"而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论，即使其曾被建议有此种损失的可能性。
38+
39+
<<var;name="bullet";original="6.";match=".{0,20}">> 语言
40+
41+
"本许可证"以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。
42+
43+
条款结束
44+
45+
如何将木兰宽松许可证，第2版，应用到您的软件
46+
47+
如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步：
48+
49+
<<var;name="bullet";original="1，";match=".{0,20}">> 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
50+
51+
<<var;name="bullet";original="2，";match=".{0,20}">> 请您在软件包的一级目录下创建以"LICENSE"为名的文件，将整个许可证文本放入该文件中；
52+
53+
<<var;name="bullet";original="3，";match=".{0,20}">> 请将如下声明文本放入每个源文件的头部注释中。
54+
55+
Copyright (c) [Year] [name of copyright holder]
56+
57+
[Software Name] is licensed under Mulan PSL v2.
58+
59+
You can use this software according to the terms and conditions of the Mulan PSL v2.
60+
61+
You may obtain a copy of Mulan PSL v2 at:
62+
63+
http://license.coscl.org.cn/MulanPSL2
64+
65+
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
66+
67+
EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
68+
69+
MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
70+
71+
See the Mulan PSL v2 for more details.<<beginOptional>> Mulan Permissive Software License，Version 2<<endOptional>><<beginOptional>> Mulan Permissive Software License，Version 2 (Mulan PSL v2)
72+
73+
January 2020 http://license.coscl.org.cn/MulanPSL2<<endOptional>>
74+
75+
Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions:
76+
77+
<<var;name="bullet";original="0.";match=".{0,20}">> Definition
78+
79+
Software means the program and related documents which are licensed under this License and comprise all Contribution(s).
80+
81+
Contribution means the copyrightable work licensed by a particular Contributor under this License.
82+
83+
Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License.
84+
85+
Legal Entity means the entity making a Contribution and all its Affiliates.
86+
87+
Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, 'control' means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity.
88+
89+
<<var;name="bullet";original="1.";match=".{0,20}">> Grant of Copyright License
90+
91+
Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not.
92+
93+
<<var;name="bullet";original="2.";match=".{0,20}">> Grant of Patent License
94+
95+
Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken.
96+
97+
<<var;name="bullet";original="3.";match=".{0,20}">> No Trademark License
98+
99+
No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4.
100+
101+
<<var;name="bullet";original="4.";match=".{0,20}">> Distribution Restriction
102+
103+
You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software.
104+
105+
<<var;name="bullet";original="5.";match=".{0,20}">> Disclaimer of Warranty and Limitation of Liability
106+
107+
THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT'S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
108+
109+
<<var;name="bullet";original="6.";match=".{0,20}">> Language
110+
111+
THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL.
112+
113+
END OF THE TERMS AND CONDITIONS
114+
115+
How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software
116+
117+
To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps:
118+
119+
<<var;name="bullet";original="i.";match=".{0,20}">> Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner;
120+
121+
<<var;name="bullet";original="ii.";match=".{0,20}">> Create a file named "LICENSE" which contains the whole context of this License in the first directory of your software package;
122+
123+
<<var;name="bullet";original="iii.";match=".{0,20}">> Attach the statement to the appropriate annotated syntax at the beginning of each source file.
124+
125+
Copyright (c) [Year] [name of copyright holder]
126+
127+
[Software Name] is licensed under Mulan PSL v2.
128+
129+
You can use this software according to the terms and conditions of the Mulan PSL v2.
130+
131+
You may obtain a copy of Mulan PSL v2 at:
132+
133+
http://license.coscl.org.cn/MulanPSL2
134+
135+
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
136+
137+
EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
138+
139+
MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
140+
141+
See the Mulan PSL v2 for more details.

0 commit comments

Comments
 (0)