From cb32b7980b38f7160c7004354d72a89677cebe95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Canouil?= <8896044+mcanouil@users.noreply.github.com> Date: Sat, 9 Sep 2023 18:10:22 +0200 Subject: [PATCH 1/4] fix: Add missing CC licences and display CC code instead of URL Fixes #6783 --- src/format/html/format-html-appendix.ts | 8 +++++--- src/resources/editor/tools/vs-code.mjs | 2 +- src/resources/editor/tools/yaml/web-worker.js | 2 +- .../tools/yaml/yaml-intelligence-resources.json | 2 +- src/resources/filters/modules/license.lua | 13 ++++++++++++- src/resources/schema/document-metadata.yml | 2 +- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/format/html/format-html-appendix.ts b/src/format/html/format-html-appendix.ts index 211bfe5adc3..9e61f8d139e 100644 --- a/src/format/html/format-html-appendix.ts +++ b/src/format/html/format-html-appendix.ts @@ -41,6 +41,8 @@ const kAppendixCreativeCommonsLic = [ "CC BY-SA", "CC BY-ND", "CC BY-NC", + "CC BY-NC-SA", + "CC BY-NC-ND", ]; const kStylePlain = "plain"; @@ -182,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 licenseUrl = creativeCommonsUrl( @@ -192,7 +194,7 @@ export async function processDocumentAppendix( ); return { url: licenseUrl, - text: licenseUrl, + text: creativeCommons.base + " " + creativeCommons.version, }; } else { return { text: license }; @@ -242,7 +244,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; diff --git a/src/resources/editor/tools/vs-code.mjs b/src/resources/editor/tools/vs-code.mjs index 000cc37ed08..120ea4c832a 100644 --- a/src/resources/editor/tools/vs-code.mjs +++ b/src/resources/editor/tools/vs-code.mjs @@ -14933,7 +14933,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" } }, { diff --git a/src/resources/editor/tools/yaml/web-worker.js b/src/resources/editor/tools/yaml/web-worker.js index f7c6f151877..c5f8074b27e 100644 --- a/src/resources/editor/tools/yaml/web-worker.js +++ b/src/resources/editor/tools/yaml/web-worker.js @@ -14934,7 +14934,7 @@ try { }, 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" } }, { diff --git a/src/resources/editor/tools/yaml/yaml-intelligence-resources.json b/src/resources/editor/tools/yaml/yaml-intelligence-resources.json index 10826992ee3..3d129f298b1 100644 --- a/src/resources/editor/tools/yaml/yaml-intelligence-resources.json +++ b/src/resources/editor/tools/yaml/yaml-intelligence-resources.json @@ -7905,7 +7905,7 @@ }, "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" } }, { diff --git a/src/resources/filters/modules/license.lua b/src/resources/filters/modules/license.lua index aac6e751035..4741e9003ec 100644 --- a/src/resources/filters/modules/license.lua +++ b/src/resources/filters/modules/license.lua @@ -45,6 +45,18 @@ local licenses = { return ccLicenseUrl("by-nc", lang, version) end }, + ["cc by-nc-sa"] = { + type = "creative-commons", + licenseUrl = function (lang, version) + return ccLicenseUrl("by-nc-sa", lang, version) + end + }, + ["cc by-nc-nd"] = { + type = "creative-commons", + licenseUrl = function (lang, version) + return ccLicenseUrl("by-nc-nd", lang, version) + end + }, } local function parseCCLicense(license) @@ -168,4 +180,3 @@ return { copyright = constants.kCopyright } } - diff --git a/src/resources/schema/document-metadata.yml b/src/resources/schema/document-metadata.yml index dfdafec565e..f3f4dd3825e 100644 --- a/src/resources/schema/document-metadata.yml +++ b/src/resources/schema/document-metadata.yml @@ -69,7 +69,7 @@ long: | The license for this document, if any. - Creative Commons licenses `CC BY`, `CC BY-SA`, `CC BY-ND`, `CC BY-NC` will automatically generate a license link + Creative 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 in the document appendix. Other license text will be placed in the appendix verbatim. - name: title-meta From 204ef8aa60af101dce888432adfefdca198e12e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Canouil?= <8896044+mcanouil@users.noreply.github.com> Date: Sat, 9 Sep 2023 18:16:43 +0200 Subject: [PATCH 2/4] fix: missing CC declaration --- src/format/html/format-html-appendix.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/format/html/format-html-appendix.ts b/src/format/html/format-html-appendix.ts index 9e61f8d139e..545555ecd2c 100644 --- a/src/format/html/format-html-appendix.ts +++ b/src/format/html/format-html-appendix.ts @@ -434,7 +434,13 @@ function creativeCommonsLicense( const version = match[2]; if (kAppendixCreativeCommonsLic.includes(base)) { return { - base: base as "CC BY" | "CC BY-SA" | "CC BY-ND" | "CC BY-NC", + base: base as + | "CC BY" + | "CC BY-SA" + | "CC BY-ND" + | "CC BY-NC" + | "CC BY-NC-ND" + | "CC BY-NC-SA", version: version || "4.0", }; } else { From c291a7bd374de338b0157bc494bfe7b462ed2baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Canouil?= <8896044+mcanouil@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:48:49 +0200 Subject: [PATCH 3/4] fix: use license text as text instead or URL --- src/format/html/format-html-appendix.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/format/html/format-html-appendix.ts b/src/format/html/format-html-appendix.ts index 69435ec3a8a..33c45a18c63 100644 --- a/src/format/html/format-html-appendix.ts +++ b/src/format/html/format-html-appendix.ts @@ -187,15 +187,12 @@ export async function processDocumentAppendix( if (typeof license === "string") { const creativeCommons = creativeCommonsLicense(license); if (creativeCommons) { - const licenseUrl = creativeCommonsUrl( + const licenseUrlInfo = creativeCommonsUrl( creativeCommons.base, format.metadata[kLang] as string | undefined, creativeCommons.version, ); - return { - url: licenseUrl, - text: creativeCommons.base + " " + creativeCommons.version, - }; + return licenseUrlInfo; } else { return { text: license }; } @@ -462,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}`, }; } } From dfd33ea1b582110d06067586f74e3ce4f1b07fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Canouil?= <8896044+mcanouil@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:49:44 +0200 Subject: [PATCH 4/4] chore: quarto build-js --- src/resources/editor/tools/vs-code.mjs | 122 +++++++++++++++++- src/resources/editor/tools/yaml/web-worker.js | 122 +++++++++++++++++- .../yaml/yaml-intelligence-resources.json | 122 +++++++++++++++++- 3 files changed, 348 insertions(+), 18 deletions(-) diff --git a/src/resources/editor/tools/vs-code.mjs b/src/resources/editor/tools/vs-code.mjs index 5a61b55e108..e822a9ef796 100644 --- a/src/resources/editor/tools/vs-code.mjs +++ b/src/resources/editor/tools/vs-code.mjs @@ -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)" @@ -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. CC BY)", - long: "The license for this document, if any.\nCreative Commons licenses CC BY, CC BY-SA,\nCC BY-ND, CC BY-NC 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 CC BY, CC BY-SA,\nCC BY-ND, CC BY-NC, CC BY-NC-SA,\nand CC BY-NC-ND 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.", @@ -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", @@ -21865,7 +21975,7 @@ var require_yaml_intelligence_resources = __commonJS({ exhaustiveCompletions: true }, theme: { - _internalId: 159044, + _internalId: 164008, type: "anyOf", anyOf: [ { diff --git a/src/resources/editor/tools/yaml/web-worker.js b/src/resources/editor/tools/yaml/web-worker.js index 0bd7a684c4a..fe1adcd95e4 100644 --- a/src/resources/editor/tools/yaml/web-worker.js +++ b/src/resources/editor/tools/yaml/web-worker.js @@ -20351,10 +20351,120 @@ try { "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)" @@ -20570,7 +20680,7 @@ try { "The text to display for the license.", { short: "The License for this document, if any. (e.g. CC BY)", - long: "The license for this document, if any.\nCreative Commons licenses CC BY, CC BY-SA,\nCC BY-ND, CC BY-NC 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 CC BY, CC BY-SA,\nCC BY-ND, CC BY-NC, CC BY-NC-SA,\nand CC BY-NC-ND 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.", @@ -21845,12 +21955,12 @@ try { 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", @@ -21866,7 +21976,7 @@ try { exhaustiveCompletions: true }, theme: { - _internalId: 159044, + _internalId: 164008, type: "anyOf", anyOf: [ { diff --git a/src/resources/editor/tools/yaml/yaml-intelligence-resources.json b/src/resources/editor/tools/yaml/yaml-intelligence-resources.json index 2ee0915df6b..35fd2b277d2 100644 --- a/src/resources/editor/tools/yaml/yaml-intelligence-resources.json +++ b/src/resources/editor/tools/yaml/yaml-intelligence-resources.json @@ -13322,10 +13322,120 @@ "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)" @@ -13541,7 +13651,7 @@ "The text to display for the license.", { "short": "The License for this document, if any. (e.g. CC BY)", - "long": "The license for this document, if any.\nCreative Commons licenses CC BY, CC BY-SA,\nCC BY-ND, CC BY-NC 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 CC BY, CC BY-SA,\nCC BY-ND, CC BY-NC, CC BY-NC-SA,\nand CC BY-NC-ND 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.", @@ -14816,12 +14926,12 @@ "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", @@ -14837,7 +14947,7 @@ "exhaustiveCompletions": true }, "theme": { - "_internalId": 159044, + "_internalId": 164008, "type": "anyOf", "anyOf": [ {