Skip to content

OFL-1.1 optionally templated #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 19, 2017
Merged

OFL-1.1 optionally templated #491

merged 2 commits into from
Dec 19, 2017

Conversation

mlinksva
Copy link
Contributor

@mlinksva mlinksva commented Nov 25, 2017

Copy link
Contributor

@wking wking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm in favor of these additions (after a few minor tweaks mentioned in inline comments). But:

  • Upstream has multiple “Copyright (c) …” paragraphs, as they try and show how the copyright paragraphs will apply to a renamed font with multiple authors. We could maybe cover that generically with a complicated <alt> regexp, but we still have to pick what to use as the canonical text. I think the SPDX policy is to use the upstream text verbatim, even if that doesn't apply cleanly to folks creating a new OFL-1.1 project (who will only need a single “Copyright (c) …” paragraph. But I'm not a maintainer ;).

  • OFL-1.1 standard license header #451 is about us not declaring a standardLicenseHeader for the OFL-1.1. This PR doesn't address that. I'm fine punting it to future work, but I don't think we want “Fixes OFL-1.1 standard license header #451” in the original post.

src/OFL-1.1.xml Outdated
@@ -6,6 +6,11 @@
<crossRef>http://www.opensource.org/licenses/OFL-1.1</crossRef>
</crossRefs>
<notes>This license was released: 26 February 2007.</notes>
<optional>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copyrightText is already optional (guideline 10.1.1). I'm in favor of explicit <optional> tags for optional copyright text, but that's not where this repo is now. I think we should shift this line after <copyrightText> for this PR and move it back to here it if/when the whole repository moves to use explicit <optional> tags for <copyrightText>.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, agreed on all points.

src/OFL-1.1.xml Outdated
<optional>
<copyrightText><p>Copyright (c) &lt;dates&gt;, &lt;Copyright Holder&gt; (&lt;URL|email&gt;),
<br/>with Reserved Font Name &lt;Reserved Font Name&gt;.</p></copyrightText>
<p>This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL</p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The “This license is copied below…” bit is a separate paragraph upstream.

@mlinksva
Copy link
Contributor Author

OK, I removed 'fixes'.

@jlovejoy jlovejoy merged commit be618ef into spdx:master Dec 19, 2017
@mlinksva mlinksva deleted the patch-7 branch December 19, 2017 23:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants