Skip to content

fix: Add missing CC licences and display CC code instead of URL #6784

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
dragonstyle merged 5 commits into from
Sep 11, 2023
Merged

fix: Add missing CC licences and display CC code instead of URL #6784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cb32b79
fix: Add missing CC licences and display CC code instead of URL
mcanouil Sep 9, 2023
204ef8a
fix: missing CC declaration
mcanouil Sep 9, 2023
5f6a831
Merge branch 'main' into fix/issue6783
mcanouil Sep 11, 2023
c291a7b
fix: use license text as text instead or URL
mcanouil Sep 11, 2023
dfd33ea
chore: quarto build-js
mcanouil Sep 11, 2023
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
10 changes: 4 additions & 6 deletions src/format/html/format-html-appendix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export async function processDocumentAppendix(
//
// this will allow us to not include the following code.
const normalizedLicense = (license: unknown) => {
if (typeof (license) === "string") {
if (typeof license === "string") {
const creativeCommons = creativeCommonsLicense(license);
if (creativeCommons) {
const licenseUrlInfo = creativeCommonsUrl(
Expand Down Expand Up @@ -241,7 +241,7 @@ export async function processDocumentAppendix(
//
// this will allow us to not include the following code.
const normalizedCopyright = (copyright: unknown) => {
if (typeof (copyright) === "string") {
if (typeof copyright === "string") {
return copyright;
} else if (copyright) {
return (copyright as { statement?: string }).statement;
Expand Down Expand Up @@ -459,15 +459,13 @@ function creativeCommonsUrl(license: string, lang?: string, version?: string) {
`https://creativecommons.org/licenses/${licenseType.toLowerCase()}/${version}/deed.${
lang.toLowerCase().replace("-", "_")
}`,
text:
`https://creativecommons.org/licenses/${licenseType.toLowerCase()}/${version}/`,
text: `CC ${licenseType} ${version}`,
};
} else {
return {
url:
`https://creativecommons.org/licenses/${licenseType.toLowerCase()}/${version}/`,
text:
`https://creativecommons.org/licenses/${licenseType.toLowerCase()}/${version}/`,
text: `CC ${licenseType} ${version}`,
};
}
}
Expand Down
124 changes: 117 additions & 7 deletions src/resources/editor/tools/vs-code.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14951,7 +14951,7 @@ var require_yaml_intelligence_resources = __commonJS({
},
description: {
short: "The License for this document, if any. (e.g. `CC BY`)",
long: "The license for this document, if any. \n\nCreative Commons licenses `CC BY`, `CC BY-SA`, `CC BY-ND`, `CC BY-NC` will automatically generate a license link\nin the document appendix. Other license text will be placed in the appendix verbatim.\n"
long: "The license for this document, if any. \n\nCreative Commons licenses `CC BY`, `CC BY-SA`, `CC BY-ND`, `CC BY-NC`, `CC BY-NC-SA`, and `CC BY-NC-ND` will automatically generate a license link\nin the document appendix. Other license text will be placed in the appendix verbatim.\n"
}
},
{
Expand Down Expand Up @@ -20350,10 +20350,120 @@ var require_yaml_intelligence_resources = __commonJS({
"Information about the funding of the research reported in the article\n(for example, grants, contracts, sponsors) and any open access fees for\nthe article itself",
"Displayable prose statement that describes the funding for the\nresearch on which a work was based.",
"Open access provisions that apply to a work or the funding\ninformation that provided the open access provisions.",
"Information about awards associated with this funding.",
"Unique identifier assigned to an award, contract, or grant.",
"The name of this award",
"The description for this award.",
"Agency or organization that funded the research on which a work was\nbased.",
"The text describing the source of the funding.",
{
short: "Abbreviation for country where source of grant is located.",
long: "Abbreviation for country where source of grant is located. Whenever\npossible, ISO 3166-1 2-letter alphabetic codes should be used."
},
"The text describing the source of the funding.",
{
short: "Abbreviation for country where source of grant is located.",
long: "Abbreviation for country where source of grant is located. Whenever\npossible, ISO 3166-1 2-letter alphabetic codes should be used."
},
"Individual(s) or institution(s) to whom the award was given (for\nexample, the principal grant holder or the sponsored individual).",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was the recipient of the funding.",
"The institution that was the recipient of the funding.",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was the recipient of the funding.",
"The institution that was the recipient of the funding.",
"Individual(s) responsible for the intellectual content of the work\nreported in the document.",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was responsible for the intellectual\ncontent of the work reported in the document.",
"The institution that was responsible for the intellectual content of\nthe work reported in the document.",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was responsible for the intellectual\ncontent of the work reported in the document.",
"The institution that was responsible for the intellectual content of\nthe work reported in the document.",
"Unique identifier assigned to an award, contract, or grant.",
"The name of this award",
"The description for this award.",
"Agency or organization that funded the research on which a work was\nbased.",
"The text describing the source of the funding.",
{
short: "Abbreviation for country where source of grant is located.",
long: "Abbreviation for country where source of grant is located. Whenever\npossible, ISO 3166-1 2-letter alphabetic codes should be used."
},
"The text describing the source of the funding.",
{
short: "Abbreviation for country where source of grant is located.",
long: "Abbreviation for country where source of grant is located. Whenever\npossible, ISO 3166-1 2-letter alphabetic codes should be used."
},
"Individual(s) or institution(s) to whom the award was given (for\nexample, the principal grant holder or the sponsored individual).",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was the recipient of the funding.",
"The institution that was the recipient of the funding.",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was the recipient of the funding.",
"The institution that was the recipient of the funding.",
"Individual(s) responsible for the intellectual content of the work\nreported in the document.",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was responsible for the intellectual\ncontent of the work reported in the document.",
"The institution that was responsible for the intellectual content of\nthe work reported in the document.",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was responsible for the intellectual\ncontent of the work reported in the document.",
"The institution that was responsible for the intellectual content of\nthe work reported in the document.",
"Displayable prose statement that describes the funding for the\nresearch on which a work was based.",
"Open access provisions that apply to a work or the funding\ninformation that provided the open access provisions.",
"Information about awards associated with this funding.",
"Unique identifier assigned to an award, contract, or grant.",
"The name of this award",
"The description for this award.",
"Agency or organization that funded the research on which a work was\nbased.",
"The text describing the source of the funding.",
{
short: "Abbreviation for country where source of grant is located.",
long: "Abbreviation for country where source of grant is located. Whenever\npossible, ISO 3166-1 2-letter alphabetic codes should be used."
},
"The text describing the source of the funding.",
{
short: "Abbreviation for country where source of grant is located.",
long: "Abbreviation for country where source of grant is located. Whenever\npossible, ISO 3166-1 2-letter alphabetic codes should be used."
},
"Individual(s) or institution(s) to whom the award was given (for\nexample, the principal grant holder or the sponsored individual).",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was the recipient of the funding.",
"The institution that was the recipient of the funding.",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was the recipient of the funding.",
"The institution that was the recipient of the funding.",
"Individual(s) responsible for the intellectual content of the work\nreported in the document.",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was responsible for the intellectual\ncontent of the work reported in the document.",
"The institution that was responsible for the intellectual content of\nthe work reported in the document.",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was responsible for the intellectual\ncontent of the work reported in the document.",
"The institution that was responsible for the intellectual content of\nthe work reported in the document.",
"Unique identifier assigned to an award, contract, or grant.",
"The name of this award",
"The description for this award.",
"Agency or organization that funded the research on which a work was\nbased.",
"The text describing the source of the funding.",
{
short: "Abbreviation for country where source of grant is located.",
long: "Abbreviation for country where source of grant is located. Whenever\npossible, ISO 3166-1 2-letter alphabetic codes should be used."
},
"The text describing the source of the funding.",
{
short: "Abbreviation for country where source of grant is located.",
long: "Abbreviation for country where source of grant is located. Whenever\npossible, ISO 3166-1 2-letter alphabetic codes should be used."
},
"Individual(s) or institution(s) to whom the award was given (for\nexample, the principal grant holder or the sponsored individual).",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was the recipient of the funding.",
"The institution that was the recipient of the funding.",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was the recipient of the funding.",
"The institution that was the recipient of the funding.",
"Individual(s) responsible for the intellectual content of the work\nreported in the document.",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was responsible for the intellectual\ncontent of the work reported in the document.",
"The institution that was responsible for the intellectual content of\nthe work reported in the document.",
"The id of an author or affiliation in the document metadata.",
"The name of an individual that was responsible for the intellectual\ncontent of the work reported in the document.",
"The institution that was responsible for the intellectual content of\nthe work reported in the document.",
{
short: "Format to write to (e.g. html)",
long: "Format to write to. Extensions can be individually enabled or\ndisabled by appending +EXTENSION or -EXTENSION to the format name\n(e.g. gfm+footnotes)"
Expand Down Expand Up @@ -20569,7 +20679,7 @@ var require_yaml_intelligence_resources = __commonJS({
"The text to display for the license.",
{
short: "The License for this document, if any. (e.g.&nbsp;<code>CC BY</code>)",
long: "The license for this document, if any.\nCreative Commons licenses <code>CC BY</code>, <code>CC BY-SA</code>,\n<code>CC BY-ND</code>, <code>CC BY-NC</code> will automatically generate\na license link in the document appendix. Other license text will be\nplaced in the appendix verbatim."
long: "The license for this document, if any.\nCreative Commons licenses <code>CC BY</code>, <code>CC BY-SA</code>,\n<code>CC BY-ND</code>, <code>CC BY-NC</code>, <code>CC BY-NC-SA</code>,\nand <code>CC BY-NC-ND</code> will automatically generate a license link\nin the document appendix. Other license text will be placed in the\nappendix verbatim."
},
"The type of the license.",
"A URL to the license.",
Expand Down Expand Up @@ -21844,12 +21954,12 @@ var require_yaml_intelligence_resources = __commonJS({
mermaid: "%%"
},
"handlers/mermaid/schema.yml": {
_internalId: 159045,
_internalId: 164009,
type: "object",
description: "be an object",
properties: {
"mermaid-format": {
_internalId: 159037,
_internalId: 164001,
type: "enum",
enum: [
"png",
Expand All @@ -21865,7 +21975,7 @@ var require_yaml_intelligence_resources = __commonJS({
exhaustiveCompletions: true
},
theme: {
_internalId: 159044,
_internalId: 164008,
type: "anyOf",
anyOf: [
{
Expand Down
Loading