From 23373b235af8d322b64bb3f21f4c7d0008ea41f0 Mon Sep 17 00:00:00 2001 From: "James.Hester" Date: Thu, 19 Feb 2026 15:31:51 +1100 Subject: [PATCH 1/5] Add _dictionary.licence attribute --- ddl.dic | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/ddl.dic b/ddl.dic index 82c0138..2442256 100644 --- a/ddl.dic +++ b/ddl.dic @@ -11,10 +11,11 @@ data_DDL_DIC _dictionary.title DDL_DIC _dictionary.class Reference _dictionary.version 4.2.0 - _dictionary.date 2026-01-20 + _dictionary.date 2026-02-19 _dictionary.uri https://raw.githubusercontent.com/COMCIFS/cif_core/master/ddl.dic _dictionary.ddl_conformance 4.2.0 + _dictionary.licence 'SPDX-License-Identifier: CC-BY-4.0' _dictionary.namespace DDLm _description.text ; @@ -615,6 +616,40 @@ save_dictionary.formalism save_ +save_dictionary.licence + + _definition.id '_dictionary.licence' + _definition.class Attribute + _definition.update 2026-02-19 + _description.text +; + The licence or licences under which this dictionary is distributed. They + should be specified using an SPDX-License-Identifier: expression + (https://spdx.dev/learn/handling-license-info/). If the licence is not + listed in the curated SPDX list (https://spdx.org/licenses/) then this + field may contain the full text of the licence. However, registration with + the SPDX project and use of an SPDX-License-Identifier: string is strongly + encouraged. + + Ref: International Organization for Standardization (2021). ISO/IEC + 5962:2021. Information technology — SPDX® Specification V2.2.1. Geneva: + International Organization for Standardization. +; + + _name.category_id dictionary + _name.object_id licence + _type.purpose Audit + _type.source Assigned + _type.container Single + _type.contents Text + + loop_ + _description_example.case + 'SPDX-License-Identifier: CC-BY-4.0' + 'SPDX-License-Identifier: CC-BY-4.0 OR CC0-1.0+' + +save_ + save_dictionary.namespace _definition.id '_dictionary.namespace' @@ -2552,7 +2587,8 @@ save_ '_dictionary_audit.version' '_dictionary_audit.date' '_dictionary_audit.revision' - '_dictionary.doi'] + '_dictionary.doi' + '_dictionary.licence'] Dictionary Prohibited [ALIAS CATEGORY_KEY DEFINITION DESCRIPTION_EXAMPLE ENUMERATION IMPORT METHOD NAME TYPE UNITS] @@ -3069,7 +3105,7 @@ save_ by explicitly specifying that it adheres to the formal grammar provided in SemVer version 2.0.0. ; - 4.2.0 2026-01-20 + 4.2.0 2026-02-19 ; # Please update the date above and describe the change below until # ready for the next release @@ -3123,4 +3159,6 @@ save_ the lower bound are not allowed. Changed _dictionary.namespace attribute from 'DdlDic' to 'DDLm'. + + Added "_dictionary.licence" attribute. ; From 32befe7cd9279620080d98a86bf9054b38015677 Mon Sep 17 00:00:00 2001 From: "jxh@ansto.gov.au" Date: Tue, 24 Feb 2026 18:09:35 +1100 Subject: [PATCH 2/5] Modified based on feedback Use separate spdx identifier and licensing_details attributes to allow both machine readability and for non-registered licences to be handled. --- ddl.dic | 50 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/ddl.dic b/ddl.dic index 2442256..e3badcd 100644 --- a/ddl.dic +++ b/ddl.dic @@ -11,11 +11,11 @@ data_DDL_DIC _dictionary.title DDL_DIC _dictionary.class Reference _dictionary.version 4.2.0 - _dictionary.date 2026-02-19 + _dictionary.date 2026-02-24 _dictionary.uri https://raw.githubusercontent.com/COMCIFS/cif_core/master/ddl.dic _dictionary.ddl_conformance 4.2.0 - _dictionary.licence 'SPDX-License-Identifier: CC-BY-4.0' + _dictionary.licensing_SPDX CC-BY-4.0 _dictionary.namespace DDLm _description.text ; @@ -616,18 +616,40 @@ save_dictionary.formalism save_ -save_dictionary.licence +save_dictionary.licensing_details - _definition.id '_dictionary.licence' + _definition.id '_dictionary.licensing_details' _definition.class Attribute - _definition.update 2026-02-19 + _definition.update 2026-02-24 _description.text ; - The licence or licences under which this dictionary is distributed. They - should be specified using an SPDX-License-Identifier: expression + Details about the licence or licences under which this dictionary + is distributed. _dictionary.licensing_SPDX should be used where + the licence is included in the SPDX list. +; + + _name.category_id dictionary + _name.object_id licensing_details + _type.purpose Audit + _type.source Assigned + _type.container Single + _type.contents Text + +save_ + +save_dictionary.licensing_spdx + + _definition.id '_dictionary.licensing_SPDX' + _definition.class Attribute + _definition.update 2026-02-24 + _description.text +; + The licence or licences under which this dictionary is distributed, + specified using an SPDX-License-Identifier: expression (https://spdx.dev/learn/handling-license-info/). If the licence is not - listed in the curated SPDX list (https://spdx.org/licenses/) then this - field may contain the full text of the licence. However, registration with + listed in the curated SPDX list (https://spdx.org/licenses/) then the + full text of the licence should be included in + _dictionary.licensing_details. Registration with the SPDX project and use of an SPDX-License-Identifier: string is strongly encouraged. @@ -637,7 +659,7 @@ save_dictionary.licence ; _name.category_id dictionary - _name.object_id licence + _name.object_id licensing_spdx _type.purpose Audit _type.source Assigned _type.container Single @@ -645,8 +667,8 @@ save_dictionary.licence loop_ _description_example.case - 'SPDX-License-Identifier: CC-BY-4.0' - 'SPDX-License-Identifier: CC-BY-4.0 OR CC0-1.0+' + 'CC-BY-4.0' + 'CC-BY-4.0 OR CC0-1.0+' save_ @@ -3105,7 +3127,7 @@ save_ by explicitly specifying that it adheres to the formal grammar provided in SemVer version 2.0.0. ; - 4.2.0 2026-02-19 + 4.2.0 2026-02-24 ; # Please update the date above and describe the change below until # ready for the next release @@ -3160,5 +3182,5 @@ save_ Changed _dictionary.namespace attribute from 'DdlDic' to 'DDLm'. - Added "_dictionary.licence" attribute. + Added dictionary licensing attributes. ; From b3d2ac54a4b8e6e22fe5fb9d4e59ca1b439bb67f Mon Sep 17 00:00:00 2001 From: James Hester Date: Tue, 24 Feb 2026 19:26:59 +1100 Subject: [PATCH 3/5] Update ddl.dic Co-authored-by: Antanas Vaitkus --- ddl.dic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ddl.dic b/ddl.dic index e3badcd..b2053ae 100644 --- a/ddl.dic +++ b/ddl.dic @@ -2610,7 +2610,7 @@ save_ '_dictionary_audit.date' '_dictionary_audit.revision' '_dictionary.doi' - '_dictionary.licence'] + '_dictionary.licensing_spdx'] Dictionary Prohibited [ALIAS CATEGORY_KEY DEFINITION DESCRIPTION_EXAMPLE ENUMERATION IMPORT METHOD NAME TYPE UNITS] From 04817c2fc54011f3984487c8be6e425d797af1ce Mon Sep 17 00:00:00 2001 From: James Hester Date: Tue, 24 Feb 2026 19:27:29 +1100 Subject: [PATCH 4/5] Update ddl.dic Co-authored-by: Antanas Vaitkus --- ddl.dic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ddl.dic b/ddl.dic index b2053ae..8c0309b 100644 --- a/ddl.dic +++ b/ddl.dic @@ -645,7 +645,7 @@ save_dictionary.licensing_spdx _description.text ; The licence or licences under which this dictionary is distributed, - specified using an SPDX-License-Identifier: expression + specified using an SPDX license expression (https://spdx.dev/learn/handling-license-info/). If the licence is not listed in the curated SPDX list (https://spdx.org/licenses/) then the full text of the licence should be included in From 9f740aecf6547fdf0f7068580a587d8a27523534 Mon Sep 17 00:00:00 2001 From: Antanas Vaitkus Date: Tue, 24 Feb 2026 11:36:04 +0200 Subject: [PATCH 5/5] Avoid referencing "SPDX-License-Identifier" --- ddl.dic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ddl.dic b/ddl.dic index bf2ead8..b85b9c8 100644 --- a/ddl.dic +++ b/ddl.dic @@ -696,7 +696,7 @@ save_dictionary.licensing_spdx listed in the curated SPDX list (https://spdx.org/licenses/) then the full text of the licence should be included in _dictionary.licensing_details. Registration with - the SPDX project and use of an SPDX-License-Identifier: string is strongly + the SPDX project and use of an SPDX license expression is strongly encouraged. Ref: International Organization for Standardization (2021). ISO/IEC