Accommodate canonical CC-BY-4.0 text #488
Conversation
I'm not sure whether the accommodations I've made here are possible to support, just making them as it's easier than separately describing how https://creativecommons.org/licenses/by/4.0/legalcode.txt differs from the current XML representation.
src/CC-BY-4.0.xml
Outdated
| @@ -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> | |||
There was a problem hiding this comment.
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).
There was a problem hiding this comment.
I'm not certain, but it probably is important for matching previous texts. I would leave the alt text in.
|
Similar probably applies to other CC-*-4.0 licenses, could be applied after working out these changes. |
src/CC-BY-4.0.xml
Outdated
| <optional> | ||
| <titleText> | ||
| <p><optional>Creative Commons </optional>Attribution 4.0 International</p> | ||
| </titleText> |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
src/CC-BY-4.0.xml
Outdated
| @@ -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> | |||
There was a problem hiding this comment.
I'm not certain, but it probably is important for matching previous texts. I would leave the alt text in.
src/CC-BY-4.0.xml
Outdated
| <optional> | ||
| <titleText> | ||
| <p><optional>Creative Commons </optional>Attribution 4.0 International</p> | ||
| </titleText> |
There was a problem hiding this comment.
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.
per review comment at spdx#488 (comment)
src/CC-BY-4.0.xml
Outdated
| @@ -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> | |||
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
As suggested by @wking review.
src/CC-BY-4.0.xml
Outdated
| @@ -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<alt match=" |_"> </alt>considerations for the public<alt match=": wiki.creativecommons.org/Considerations_for_licensees|\.">: wiki.creativecommons.org/Considerations_for_licensees</alt></p> | |||
the notice is present in all 6 of the CC-BY*-4.0 licenses as published on the creativecommons.org site as spdx#455 notes
I'm not sure whether the accommodations I've made here are possible to support, just making them as it's easier than separately describing how https://creativecommons.org/licenses/by/4.0/legalcode.txt differs from the current XML representation.