Merge pull request #484 from github/same-license--mod

same-license--variations

README.md

@@ -91,6 +91,8 @@ The license properties (rules) are stored as a bulleted list within the licenses
 * `disclose-source` - Source code must be made available when distributing the software.
 * `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code.
 * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used.
+* `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used.
+* `same-license--library` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library.
 
 #### Limitations
 

_data/rules.yml

@@ -31,6 +31,12 @@ conditions:
 - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used.
   label: Same License
   tag: same-license
+- description: Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used.
+  label: Same License (File)
+  tag: same-license--file
+- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library.
+  label: Same License (Library)
+  tag: same-license--library
 
 limitations:
 - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights.

_licenses/lgpl-2.1.txt

@@ -22,7 +22,7 @@ conditions:
   - include-copyright
   - disclose-source
   - document-changes
-  - same-license
+  - same-license--library
 
 limitations:
   - liability

_licenses/lgpl-3.0.txt

@@ -23,7 +23,7 @@ conditions:
   - include-copyright
   - disclose-source
   - document-changes
-  - same-license
+  - same-license--library
 
 limitations:
   - liability

_licenses/mpl-2.0.txt

@@ -26,7 +26,7 @@ permissions:
 conditions:
   - disclose-source
   - include-copyright
-  - same-license
+  - same-license--file
 
 limitations:
   - liability

_licenses/ms-rl.txt

@@ -17,7 +17,7 @@ permissions:
 conditions:
   - disclose-source
   - include-copyright
-  - same-license
+  - same-license--file
 
 limitations:
   - warranty

appendix.md

@@ -17,7 +17,7 @@ If you're here to choose a license, **[start from the home page](/)** to see a f
   {% for type in types %}
     {% assign rules = site.data.rules[type] | sort: "label" %}
     {% for rule_obj in rules %}
-      {% if seen_tags contains rule_obj.tag %}
+      {% if seen_tags contains rule_obj.tag or rule_obj.tag contains '--' %}
         {% continue %}
       {% endif %}
       {% capture seen_tags %}{{ seen_tags | append:rule_obj.tag }}{% endcapture %}
@@ -33,21 +33,23 @@ If you're here to choose a license, **[start from the home page](/)** to see a f
     {% assign rules = site.data.rules[type] | sort: "label" %}
     {% for rule_obj in rules %}
       {% assign req = rule_obj.tag %}
-      {% if seen_tags contains req %}
+      {% if seen_tags contains req  or rule_obj.tag contains '--' %}
         {% continue %}
       {% endif %}
       {% capture seen_tags %}{{ seen_tags | append:req }}{% endcapture %}
       {% assign seen_req = false %}
       {% for t in types %}
-        {% if license[t] contains req %}
+        {% for r in license[t] %}
+          {% if r contains req %}
             <td class="license-{{ t }}" style="text-align:center">
-            <span class="{{ req }}">
-              <span class="license-sprite {{ req }}"></span>
+              <span class="{{ r }}">
+                <span class="license-sprite {{ r }}"></span>
               </span>
             </td>
             {% assign seen_req = true %}
           {% endif %}
         {% endfor %}
+      {% endfor %}
       {% unless seen_req %}
         <td></td>
       {% endunless %}