Skip to content

Accommodate canonical CC-BY-4.0 text #488

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.

Sign up for GitHub

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 12 commits into from
Dec 21, 2017
Merged

Accommodate canonical CC-BY-4.0 text #488

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
82dd645
Accommodate canonical CC-BY-4.0 text
mlinksva Nov 24, 2017
ccaf5b5
rm mistakenly introduced double space
mlinksva Nov 24, 2017
52ba77b
move first title text back out of optional section
mlinksva Nov 25, 2017
bed477d
handle spurious underscore in canonical text
mlinksva Nov 26, 2017
d177251
apply to the other 5 CC 4.0 licenses
mlinksva Nov 27, 2017
fc78654
add name attributes to alt per https://github.com/spdx/license-list-X…
mlinksva Nov 27, 2017
ad82590
consistent formatting of ...may be contacted... closing line
mlinksva Dec 21, 2017
c86fa96
Merge branch 'patch-3' of github.com:mlinksva/license-list-XML into p…
mlinksva Dec 21, 2017
59d2420
Merge branch 'master' into patch-3
mlinksva Dec 21, 2017
3a8a88e
Merge branch 'master' into patch-3
mlinksva Dec 21, 2017
8107e70
add optional CC0 notice to 5 licenses not addressed in https://github…
mlinksva Dec 21, 2017
7bf5366
fix conflict merge mistake
mlinksva Dec 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/CC-BY-4.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<crossRefs>
<crossRef>http://creativecommons.org/licenses/by/4.0/legalcode</crossRef>
</crossRefs>
<titleText>
<p>Creative Commons Attribution 4.0 International</p>
</titleText>
<optional>
<titleText>
<p><optional>Creative Commons </optional>Attribution 4.0 International</p>
</titleText>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I moved this inside the optional block because it doesn't make sense to have

title
optional
title
body

meaning that

title
title
body

is a reasonable rendering.

And note that "Creative Commons " is not included in the version provided by CC, thus made optional.

Copy link
Member

Choose a reason for hiding this comment

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

I'm actually treating all titleText as optional when creating the license matching templates - so we don't really need to wrap the titleText with optional.

<p>Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services
or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or
other relationship. Creative Commons makes its licenses and related information available on an
Expand All @@ -26,7 +26,7 @@
license they choose before applying it. Licensors should also secure all rights necessary before
applying our licenses so that the public can reuse the material as expected. Licensors should clearly
mark any material not subject to the license. This includes other CC-licensed material, or material
used under an exception or limitation to copyright. More considerations for licensors.</p>
used under an exception or limitation to copyright. More considerations for licensors<alt match=": wiki.creativecommons.org/Considerations_for_licensors|\.">: wiki.creativecommons.org/Considerations_for_licensors</alt></p>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note the the current text doesn't make much sense; the sentence only works with the link. It was probably copied from the CC HTML version and the link lost. I think it would be fine to drop the current text entirely and thus avoid alt match, that is unless it is important to match texts previously published by SPDX (I imagine it might be).

Copy link
Member

Choose a reason for hiding this comment

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

I'm not certain, but it probably is important for matching previous texts. I would leave the alt text in.

<p>Considerations for the public: By using one of our public licenses, a licensor grants the public
permission to use the licensed material under specified terms and conditions. If the licensor’s
permission is not necessary for any reason–for example, because of any applicable exception or
Expand All @@ -35,7 +35,7 @@
the licensed material may still be restricted for other reasons, including because others have
copyright or other rights in the material. A licensor may make special requests, such as asking that
all changes be marked or described. Although not required by our licenses, you are encouraged to
respect those requests where reasonable. More considerations for the public.</p>
respect those requests where reasonable. More considerations for the public<alt match=": wiki.creativecommons.org/Considerations_for_licensees|\.">: wiki.creativecommons.org/Considerations_for_licensees</alt></p>
Copy link
Contributor

Choose a reason for hiding this comment

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

Upstream has an unfortunate typo underscore here (since 2014-01-10), so I think we want something like:

… More<alt match=" |_"> </alt>considerations…

as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Pointed this out to them at creativecommons/creativecommons.org#714 ... maybe they'll fix going forward.

I'll go ahead and add your suggestion in any case.

</optional>

<titleText>
Expand Down Expand Up @@ -439,4 +439,4 @@
<br/>Creative Commons may be contacted at creativecommons.org. </p>

</license>
</SPDXLicenseCollection>
</SPDXLicenseCollection>