Improve imagemagick rules with required phrases

pombredanne · pombredanne · commit 543d47c6b739 · 2024-10-09T11:22:16.000+02:00
Signed-off-by: Philippe Ombredanne &lt;pombredanne@nexb.com&gt;
diff --git a/src/licensedcode/data/rules/imagemagick_11.RULE b/src/licensedcode/data/rules/imagemagick_11.RULE
@@ -2,8 +2,9 @@
 license_expression: imagemagick
 is_license_notice: yes
 minimum_coverage: 100
+skip_for_required_phrase_generation: yes
 ---
 
-ImageMagick is free software delivered as a ready-to-run binary distribution or
+{{ImageMagick is free software delivered}} as a ready-to-run binary distribution or
 as source code that you may use, copy, modify, and distribute in both open and
-proprietary applications. It is distributed under the Apache 2.0
+proprietary applications. It is {{distributed under the Apache 2.0}}
diff --git a/src/licensedcode/data/rules/imagemagick_12.RULE b/src/licensedcode/data/rules/imagemagick_12.RULE
@@ -8,10 +8,10 @@ ignorable_urls:
 # You may not use this file except in compliance with the License.
 # obtain a copy of the License at
 #
-#   http://www.imagemagick.org/script/license.php
+# {{  http://www.imagemagick.org/script/license.php }}
 #
 # 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.
+# limitations under the License.
diff --git a/src/licensedcode/data/rules/imagemagick_13.RULE b/src/licensedcode/data/rules/imagemagick_13.RULE
@@ -8,10 +8,10 @@ ignorable_urls:
 You may not use this file except in compliance with the License.  You may 
 obtain a copy of the License at                                           
                                                                           
-  http://www.imagemagick.org/MagicksToolkit/script/license.php            
+{{  http://www.imagemagick.org/MagicksToolkit/script/license.php     }}
                                                                           
 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.
+limitations under the License.
diff --git a/src/licensedcode/data/rules/imagemagick_14.RULE b/src/licensedcode/data/rules/imagemagick_14.RULE
@@ -3,8 +3,8 @@ license_expression: imagemagick
 is_license_notice: yes
 ---
 
-ImageMagick is freely available without charge; 
+{{ImageMagick is freely available without charge; }} 
    you may include ImageMagick on any digital media as long as you comply with the terms of the license; 
-   you can give modified code away for free or sell it under the terms of the ImageMagick license or distribute the result under a different license, but you  need to acknowledge the use of the ImageMagick software; 
+   you can give modified code away for free or sell it under the terms of the {{ImageMagick license}} or distribute the result under a different license, but you  need to acknowledge the use of the ImageMagick software; 
    the license is compatible with the GPL V3. 
-   when exporting the ImageMagick software, review its export classification
+   when exporting the ImageMagick software, review its export classification
diff --git a/src/licensedcode/data/rules/imagemagick_15.RULE b/src/licensedcode/data/rules/imagemagick_15.RULE
@@ -6,6 +6,6 @@ ignorable_urls:
     - http://imagemagick.org/script/license.php
 ---
 
-ImageMagick
-is licensed with a derived Apache license 2.0. See
-http://imagemagick.org/script/license.php for more details.
+{{ ImageMagick
+is licensed with a derived Apache license 2.0. }} See
+{{ http://imagemagick.org/script/license.php }} for more details.
diff --git a/src/licensedcode/data/rules/imagemagick_16.RULE b/src/licensedcode/data/rules/imagemagick_16.RULE
@@ -4,6 +4,6 @@ is_license_reference: yes
 minimum_coverage: 80
 ---
 
-ImageMagick is free software delivered as a ready-to-run binary distribution or
+{{ImageMagick is free software}} delivered as a ready-to-run binary distribution or
 as source code that you may use, copy, modify, and distribute in both open and
-proprietary applications. It is distributed under a dervived Apache 2.0 license.
+proprietary applications. {{It is distributed under a dervived Apache 2.0 license.}}
diff --git a/src/licensedcode/data/rules/imagemagick_17.RULE b/src/licensedcode/data/rules/imagemagick_17.RULE
@@ -8,10 +8,10 @@ ignorable_urls:
 #  You may not use this file except in compliance with the License.  You may
 #  obtain a copy of the License at
 #
-#    https://imagemagick.org/script/license.php
+# {{   https://imagemagick.org/script/license.php }}
 #
 #  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.
+#  limitations under the License.
diff --git a/src/licensedcode/data/rules/imagemagick_18.RULE b/src/licensedcode/data/rules/imagemagick_18.RULE
@@ -4,6 +4,6 @@ is_license_notice: yes
 minimum_coverage: 80
 ---
 
-ImageMagick is free software delivered as a ready-to-run binary distribution or
+{{ImageMagick is free software}} delivered as a ready-to-run binary distribution or
 as source code that you may use, copy, modify, and distribute in both open and
-proprietary applications. It is distributed under a derived Apache 2.0 license.
+proprietary applications. It is {{distributed under a derived Apache 2.0 license.}}
diff --git a/src/licensedcode/data/rules/imagemagick_2.RULE b/src/licensedcode/data/rules/imagemagick_2.RULE
@@ -9,10 +9,10 @@ ignorable_urls:
 You may not use this file except in compliance with the License.  You may
  obtain a copy of the License at
 
-   https://www.imagemagick.org/script/license.php
+ {{  https://www.imagemagick.org/script/license.php }}
 
  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.
+ limitations under the License.
diff --git a/src/licensedcode/data/rules/imagemagick_20.RULE b/src/licensedcode/data/rules/imagemagick_20.RULE
@@ -1,10 +1,10 @@
 ---
 license_expression: imagemagick
 is_license_reference: yes
-is_continuous: yes
+is_required_phrase: yes
 relevance: 100
 minimum_coverage: 100
 notes: Rule based on an SPDX license identifier and name
 ---
 
-ImageMagick License
+ImageMagick License
diff --git a/src/licensedcode/data/rules/imagemagick_21.RULE b/src/licensedcode/data/rules/imagemagick_21.RULE
@@ -1,10 +1,10 @@
 ---
 license_expression: imagemagick
-is_license_reference: yes
+is_license_tag: yes
 is_continuous: yes
 relevance: 100
 minimum_coverage: 100
 notes: Rule based on an SPDX license identifier and name
 ---
 
-name: ImageMagick License
+name: {{ ImageMagick License }}
diff --git a/src/licensedcode/data/rules/imagemagick_22.RULE b/src/licensedcode/data/rules/imagemagick_22.RULE
@@ -7,4 +7,4 @@ minimum_coverage: 100
 notes: Rule based on an SPDX license identifier and name
 ---
 
-ImageMagick ImageMagick License
+ImageMagick {{ ImageMagick License }}
diff --git a/src/licensedcode/data/rules/imagemagick_23.RULE b/src/licensedcode/data/rules/imagemagick_23.RULE
@@ -7,4 +7,4 @@ minimum_coverage: 100
 notes: Rule based on an SPDX license identifier and name
 ---
 
-ImageMagick License ImageMagick
+{{ImageMagick License }} ImageMagick
diff --git a/src/licensedcode/data/rules/imagemagick_24.RULE b/src/licensedcode/data/rules/imagemagick_24.RULE
@@ -7,4 +7,4 @@ minimum_coverage: 100
 notes: Rule based on an SPDX license identifier and name
 ---
 
-license: ImageMagick
+{{ license: ImageMagick }}
diff --git a/src/licensedcode/data/rules/imagemagick_25.RULE b/src/licensedcode/data/rules/imagemagick_25.RULE
@@ -7,4 +7,4 @@ minimum_coverage: 100
 notes: Rule based on an SPDX license identifier and name
 ---
 
-license: ImageMagick License
+license: {{ ImageMagick License }}
diff --git a/src/licensedcode/data/rules/imagemagick_26.RULE b/src/licensedcode/data/rules/imagemagick_26.RULE
@@ -7,4 +7,4 @@ minimum_coverage: 100
 notes: Rule based on an SPDX license identifier and name
 ---
 
-licenseId: ImageMagick
+{{licenseId: ImageMagick }}
diff --git a/src/licensedcode/data/rules/imagemagick_29.RULE b/src/licensedcode/data/rules/imagemagick_29.RULE
@@ -5,11 +5,11 @@ ignorable_urls:
     - http://www.imagemagick.org/www/license.html
 ---
 
-Licensed under the ImageMagick License (the "License"); you may not use
+{{Licensed under the ImageMagick License}} (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.imagemagick.org/www/license.html
+of the License at {{ http://www.imagemagick.org/www/license.html }}
 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.
+under the License.
diff --git a/src/licensedcode/data/rules/imagemagick_3.RULE b/src/licensedcode/data/rules/imagemagick_3.RULE
@@ -9,10 +9,10 @@ ignorable_urls:
 You may not use this file except in compliance with the License.
  obtain a copy of the License at
  
-   https://www.imagemagick.org/script/license.php
+ {{  https://www.imagemagick.org/script/license.php }}
  
  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.
+ limitations under the License.
diff --git a/src/licensedcode/data/rules/imagemagick_31.RULE b/src/licensedcode/data/rules/imagemagick_31.RULE
@@ -4,4 +4,4 @@ is_license_reference: yes
 relevance: 100
 ---
 
-licenses.nuget.org/ImageMagick
+{{ licenses.nuget.org/ImageMagick }}
diff --git a/src/licensedcode/data/rules/imagemagick_32.RULE b/src/licensedcode/data/rules/imagemagick_32.RULE
@@ -6,4 +6,4 @@ ignorable_urls:
     - https://spdx.org/licenses/ImageMagick
 ---
 
-LICENSE {{ImageMagick}} https://spdx.org/licenses/ImageMagick
+{{ LICENSE ImageMagick }} https://spdx.org/licenses/ImageMagick
diff --git a/src/licensedcode/data/rules/imagemagick_33.RULE b/src/licensedcode/data/rules/imagemagick_33.RULE
@@ -6,4 +6,4 @@ ignorable_urls:
     - https://spdx.org/licenses/ImageMagick
 ---
 
-{{ImageMagick}} https://spdx.org/licenses/ImageMagick
+ImageMagick {{ https://spdx.org/licenses/ImageMagick }}
diff --git a/src/licensedcode/data/rules/imagemagick_4.RULE b/src/licensedcode/data/rules/imagemagick_4.RULE
@@ -4,6 +4,6 @@ is_license_notice: yes
 minimum_coverage: 100
 ---
 
-ImageMagick is free software delivered as a ready-to-run binary distribution or
+{{ImageMagick is free software }} delivered as a ready-to-run binary distribution or
 as source code that you may use, copy, modify, and distribute in both open and
-proprietary applications. It is distributed under the Apache 2.0 [license]
+proprietary applications. It is {{distributed under the Apache 2.0 [license] }}
diff --git a/src/licensedcode/data/rules/imagemagick_5.RULE b/src/licensedcode/data/rules/imagemagick_5.RULE
@@ -9,10 +9,10 @@ ignorable_urls:
 You may not use this file except in compliance with the License.  You may
 obtain a copy of the License at
 
-  http://www.imagemagick.org/script/license.php
+{{  http://www.imagemagick.org/script/license.php }}
 
 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.
+limitations under the License.
diff --git a/src/licensedcode/data/rules/imagemagick_6.RULE b/src/licensedcode/data/rules/imagemagick_6.RULE
@@ -3,4 +3,4 @@ license_expression: imagemagick
 is_license_notice: yes
 ---
 
-ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you can freely use, copy, modify, and distribute. Its license is compatible with the GPL. It runs on all major operating systems.
+{{ImageMagick is free software delivered }} as a ready-to-run binary distribution or as source code that {{you can freely use, copy, modify, and distribute}}. Its license is compatible with the GPL. It runs on all major operating systems.
diff --git a/src/licensedcode/data/rules/imagemagick_8.RULE b/src/licensedcode/data/rules/imagemagick_8.RULE
@@ -9,10 +9,10 @@ ignorable_urls:
 You may not use this file except in compliance with the License.
 obtain a copy of the License at
 
-  http://www.imagemagick.org/MagicksToolkit/script/license.php
+{{  http://www.imagemagick.org/MagicksToolkit/script/license.php }}
 
 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.
+limitations under the License.
diff --git a/src/licensedcode/data/rules/imagemagick_9.RULE b/src/licensedcode/data/rules/imagemagick_9.RULE
@@ -5,6 +5,5 @@ ignorable_urls:
     - http://www.imagemagick.org/script/license.php
 ---
 
-ImageMagick
-is licensed with the Apache license 2.0. See
-http://www.imagemagick.org/script/license.php for more details
+ImageMagick is licensed with the Apache license 2.0. See
+{{ http://www.imagemagick.org/script/license.php }} for more details
diff --git a/src/licensedcode/data/rules/imagemagick_url_1.RULE b/src/licensedcode/data/rules/imagemagick_url_1.RULE
@@ -1,9 +1,10 @@
 ---
 license_expression: imagemagick
 is_license_reference: yes
+is_required_phrase: yes
 relevance: 95
 ignorable_urls:
     - https://spdx.org/licenses/imagemagick
 ---
 
-https://spdx.org/licenses/imagemagick
+https://spdx.org/licenses/imagemagick
diff --git a/src/licensedcode/data/rules/imagemagick_url_2.RULE b/src/licensedcode/data/rules/imagemagick_url_2.RULE
@@ -1,9 +1,10 @@
 ---
 license_expression: imagemagick
 is_license_reference: yes
+is_required_phrase: yes
 relevance: 95
 ignorable_urls:
     - https://spdx.org/licenses/imagemagick.html
 ---
 
-https://spdx.org/licenses/imagemagick.html
+https://spdx.org/licenses/imagemagick.html

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@ ignorable_urls:`
`8`	`8`	`# You may not use this file except in compliance with the License.`
`9`	`9`	`# obtain a copy of the License at`
`10`	`10`	`#`
`11`		`-# http://www.imagemagick.org/script/license.php`
	`11`	`+# {{ http://www.imagemagick.org/script/license.php }}`
`12`	`12`	`#`
`13`	`13`	`# Unless required by applicable law or agreed to in writing, software`
`14`	`14`	`# distributed under the License is distributed on an "AS IS" BASIS,`
`15`	`15`	`# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.`
`16`	`16`	`# See the License for the specific language governing permissions and`
`17`		`-# limitations under the License.`
	`17`	`+# limitations under the License.`