Skip to content

Conversation

@mlinksva
Copy link
Contributor

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.

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.
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.

@mlinksva
Copy link
Contributor Author

Similar probably applies to other CC-*-4.0 licenses, could be applied after working out these changes.

<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.

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
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.

<optional>
<titleText>
<p><optional>Creative Commons </optional>Attribution 4.0 International</p>
</titleText>
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.

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.

@wking wking mentioned this pull request Nov 28, 2017
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>
Copy link
Contributor

Choose a reason for hiding this comment

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

This and other <alt> elements in this PR will need a name attribute to comply with 0d0e50c (#519) (see also #518, which has downstream tooling complaining about a missing name).

@jlovejoy jlovejoy merged commit 9f4ca64 into spdx:master Dec 21, 2017
@mlinksva mlinksva deleted the patch-3 branch December 21, 2017 21:50
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