diff --git a/src/ESA-PL-weak-copyleft-2.4.xml b/src/ESA-PL-weak-copyleft-2.4.xml
index 66d281903..390c77fa0 100644
--- a/src/ESA-PL-weak-copyleft-2.4.xml
+++ b/src/ESA-PL-weak-copyleft-2.4.xml
@@ -137,13 +137,16 @@
subject to the terms and conditions of this License, to:
- use the Software; reproduce the Software by any or all
- means and in any or all form; Modify the Software and create
- works based on the Software; communicate to the public,
- including making available, display or perform the Software
- or copies thereof to the public; Distribute, sublicense,
- lend and rent the Software. The license grant is perpetual
- and irrevocable, unless terminated pursuant to Sec. 8.
+ - use the Software;
+ - reproduce the Software by any or all
+ means and in any or all form;
+ - Modify the Software and create works based on the Software;
+ - communicate to the public, including making available,
+ display or perform the Software or copies thereof to the
+ public;
+ - Distribute, sublicense, lend and rent the Software. The
+ license grant is perpetual and irrevocable, unless terminated
+ pursuant to Sec. 8.
-
@@ -634,12 +637,10 @@
Czech Republic, Denmark, Estonia, Finland, France,
Germany, Greece, Hungary, Ireland, Italy, Luxembourg,
The Netherlands, Norway, Poland, Portugal, Romania,
- Spain, Sweden, Switzerland and the United Kingdom.
+ Slovenia, Spain, Sweden, Switzerland and the United Kingdom.
-
-
diff --git a/test/simpleTestForGenerator/ESA-PL-weak-copyleft-2.4.txt b/test/simpleTestForGenerator/ESA-PL-weak-copyleft-2.4.txt
index 8951ab977..d0e6ef4e4 100644
--- a/test/simpleTestForGenerator/ESA-PL-weak-copyleft-2.4.txt
+++ b/test/simpleTestForGenerator/ESA-PL-weak-copyleft-2.4.txt
@@ -1,10 +1,10 @@
European Space Agency Public License (ESA-PL) Weak Copyleft (Type 2) – v2.4
-
+
1 Definitions
-
+
1.1 “Contributor” means (a) the individual or legal entity that originally creates or later modifies the Software and (b) each subsequent individual or legal entity that creates or contributes to the creation of Modifications.
@@ -22,7 +22,7 @@ European Space Agency Public License (ESA-PL) Weak Copyleft (Type 2) – v2.4
1.8 “Object Code” means any non-Source Code form of the Software and/or Modifications.
-1.9 “Patent Claims” (of a Contributor) means any patent claim(s), owned at the time of the Distribution or subsequently acquired, including without limitation, method, process and apparatus claims, in any patent licensable by a Contributor which would be infringed by making use of the rights granted under Sec. 2.1, including but not limited to make, have made, use, sell, offer for sale or import of the Contributor Version and/or such Contributor’s Modifications (if any), either alone or in combination with the Contributor Version. “Licensable” means having the right to grant, whether at the time of the Distribution or subsequently acquired, the rights conveyed herein.
+1.9 “Patent Claims” (of a Contributor) means any patent claim(s), owned at the time of the Distribution or subsequently acquired, including without limitation, method, process and apparatus claims, in any patent licensable by a Contributor which would be infringed by making use of the rights granted under Sec. 2.1, including but not limited to make, have made, use, sell, offer for sale or import of the Contributor Version and/or such Contributor’s Modifications (if any), either alone or in combination with the Contributor Version. “Licensable” means having the right to grant, whether at the time of the Distribution or subsequently acquired, the rights conveyed herein.
1.10 “Software” means the software Distributed under this License by the Licensor, in Source Code and/or Object Code form.
@@ -30,24 +30,24 @@ European Space Agency Public License (ESA-PL) Weak Copyleft (Type 2) – v2.4
1.12 “You” means an individual or legal entity exercising rights under this License (the licensee).
-
+
2 Grant of Rights
-
+
2.1 Copyright
The Licensor, and each Contributor in respect of such Contributor’s Modifications, hereby grants You a world-wide, royalty-free, non-exclusive license under Copyright, subject to the terms and conditions of this License, to:
-use the Software;
-reproduce the Software by any or all means and in any or all form;
-Modify the Software and create works based on the Software;
-communicate to the public, including making available, display or perform the Software or copies thereof to the public;
-Distribute, sublicense, lend and rent the Software.
-The license grant is perpetual and irrevocable, unless terminated pursuant to Sec. 8.
+- use the Software;
+- reproduce the Software by any or all means and in any or all form;
+- Modify the Software and create works based on the Software;
+- communicate to the public, including making available, display or perform the Software or copies thereof to the public;
+- Distribute, sublicense, lend and rent the Software.
+- The license grant is perpetual and irrevocable, unless terminated pursuant to Sec. 8.
+
-
2.2 Patents
@@ -55,20 +55,20 @@ Each Contributor in respect of such Contributor’s Modifications, hereby grants
No patent license is granted for claims that are infringed:
-only as a consequence of further modification of the Patent Licensed Version; or
-by the combination of the Patent Licensed Version with other software or other devices or hardware, unless such combination was an intended use case of the Patent Licensed Version (e.g. a general purpose library is intended to be used with other software, a satellite navigation software is intended to be used with appropriate hardware); or
-by a Modification under Patent Claims in the absence of the Contributor’s Modifications or by a combination of the Contributor’s Modifications with software other than the Patent Licensed Version or Modifications thereof.
-
+- only as a consequence of further modification of the Patent Licensed Version; or
+- by the combination of the Patent Licensed Version with other software or other devices or hardware, unless such combination was an intended use case of the Patent Licensed Version (e.g. a general purpose library is intended to be used with other software, a satellite navigation software is intended to be used with appropriate hardware); or
+- by a Modification under Patent Claims in the absence of the Contributor’s Modifications or by a combination of the Contributor’s Modifications with software other than the Patent Licensed Version or Modifications thereof.
+
2.3 Trademark
This License does not grant permission to use trade names, trademarks, services marks, logos or names of the Licensor, except as required for reasonable and customary use in describing the origin of the Software and as reasonable necessary to comply with the obligations of this License (e.g. by reproducing the content of the notices). For the avoidance of doubt, upon Distribution of Modifications You must not use the Licensor’s or ESA’s trademarks, names or logos in any way that states or implies, or can be interpreted as stating or implying, that the final product is endorsed or created by the Licensor or ESA.
-
+
3 Distribution
-
+
3.1 Copyleft Clause
@@ -90,8 +90,8 @@ provided that:
the Covered Code will be governed by this License and the different license terms effectively do not restrict the rights granted by this License; and
the External Code and its license terms are clearly identified and notice is given of the use of Covered Code and the applicability of this License; and
the External Code’s Source Code is clearly separated from the Covered Code’s Source Code (usually contained in different files); and
-You communicate the Covered Code’s Source Code in accordance with Sec. 3.3.
-
+You communicate the Covered Code’s Source Code in accordance with Sec. 3.3.
+
3.3 Communication of the Source Code
@@ -99,13 +99,13 @@ If You Distribute the Software and/or Modifications as Object Code, You must:
provide in addition a copy of the Source Code of the Software and/or Modifications to each recipient; or
make the Source Code of the Software and/or Modifications freely accessible by reasonable means for anyone who possesses the Object Code or received the Software and/or Modifications from You, and inform recipients how to obtain a copy of the Source Code. Such information needs to be included at a minimum in the “NOTICE” file pursuant to Sec. 4.4 You are obliged to make the Source Code accessible in accordance with this Section for as long as You continue to Distribute the Software and/or Modifications and at a minimum for a three year period following Your last Distribution of the Software and/or Modifications.
-
+
3.4 Dual Licensing
This License gives no permission to license the Software or Modifications in any other way, but it does not invalidate such permission if You have separately received it.
-
+
4 Notices
@@ -117,13 +117,13 @@ The following obligations apply in the event of any Distribution of the Software
4.3 Each Contributor must cause its Modification carrying prominent notices stating that the Software has been modified and the date of modification and identify itself as the originator of its Modifications in a manner that reasonably allows identification and contact with the Contributor. The aforementioned notices must at a minimum be in a text file included with the Distribution titled “CHANGELOG”.
-4.4 The Software may include a "NOTICE" text file containing general notices. Any Contributor can create such a NOTICE file or add notices to it, alongside or as an addendum to the original text, provided that such notices cannot be construed as modifying the License.
+4.4 The Software may include a "NOTICE" text file containing general notices. Any Contributor can create such a NOTICE file or add notices to it, alongside or as an addendum to the original text, provided that such notices cannot be construed as modifying the License.
4.5 Each Contributor must identify all of its Patent Claims by providing at a minimum the patent number and identification and contact information in a text file included with the Distribution titled "LEGAL".
-
-5 Warranty and Liability
+
+5 Warranty and Liability
5.1 Each Contributor warrants and represents that it has sufficient rights to grant the rights to its Modifications conveyed by this License.
@@ -131,19 +131,19 @@ The following obligations apply in the event of any Distribution of the Software
5.3 Except as expressly set forth in this License, neither Licensor nor any Contributor shall be liable, including, without limitation, for direct, indirect, incidental, or consequential damages (including without limitation loss of profit), however caused and on any theory of liability, arising in any way out of the use or Distribution of the Software or the exercise of any rights under this License, even if You have been advised of the possibility of such damages. Mandatory statutory liability claims, e.g. in the event of wilful misconduct, wilful deception or fraudulent misrepresentation, shall remain unaffected.
-
+
6 Additional Agreements
While Distributing the Software or Modifications, You may choose to conclude additional agreements, for free or for charge, regarding for example support, warranty, indemnity, liability or liability obligations and/or rights, provided such additional agreements are consistent with this License and do not effectively restrict the recipient’s rights under this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor or Licensor, and only if You agree to indemnify, defend, and hold each Contributor or Licensor harmless for any liability incurred by, or claims asserted against, such Contributor or Licensor by reason of your accepting any such warranty or additional liability.
-
+
7 Infringements
7.1 You acknowledge that continuing to use the Software knowing that such use infringes third party rights (e.g. after receiving a third party notification of infringement) would expose you to the risk of being considered as intentionally infringing third party rights. In such event You should acquire the respective rights or modify the Software so that the Modification is non-infringing.
-
+
8 Termination
@@ -153,7 +153,7 @@ While Distributing the Software or Modifications, You may choose to conclude add
8.3 Any licenses validly granted by You under the License prior to termination shall continue and survive termination.
-
+
9 Applicable Law, Arbitration and Compliance
@@ -167,7 +167,7 @@ While Distributing the Software or Modifications, You may choose to conclude add
comply with the terms of this License to the maximum extent possible; and
describe the limitations and the Object Code and/or Source Code they affect. Such description must be included in the LEGAL notice described in Section 4. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for an average recipient to be able to understand it.
-
+
10 Miscellaneous
@@ -177,17 +177,17 @@ describe the limitations and the Object Code and/or Source Code they affect. Suc
10.3 If any provision of this License is held invalid or unenforceable, the remaining provisions of this License shall not be affected. The invalid or unenforceable provision shall be construed and/or reformed to the extent necessary to make it enforceable and valid.
-
+
Appendix A – List of compatible licenses
-
+
Compatible licenses are:
GNU General Public License (GPL) version 2 and any subsequent version
CeCILL version 2 and any subsequent version
-
-
-[1] As of January 2020 the Member States are Austria, Belgium, Czech Republic, Denmark, Estonia, Finland, France, Germany, Greece, Hungary, Ireland, Italy, Luxembourg, The Netherlands, Norway, Poland, Portugal, Romania, Spain, Sweden, Switzerland and the United Kingdom.
\ No newline at end of file
+
+
+[1] As of January 2020 the Member States are Austria, Belgium, Czech Republic, Denmark, Estonia, Finland, France, Germany, Greece, Hungary, Ireland, Italy, Luxembourg, The Netherlands, Norway, Poland, Portugal, Romania, Slovenia, Spain, Sweden, Switzerland and the United Kingdom.