From 8f78b74ef0a890c9bda09332f02f540f05963115 Mon Sep 17 00:00:00 2001 From: Thomas Rose Date: Mon, 4 May 2026 18:42:23 -0400 Subject: [PATCH 1/4] revise pigment metadata --- docs/changelog.md | 7 +++++++ docs/metadata_pigment.md | 25 +++++++++++++++++-------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 34fc9c2..5a0bc9b 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,3 +1,10 @@ +## Version 0.35 + +* Change field type of `AS 3.1 assemblage_investigation_unit_type` to free text +* Change scope of `OP4.2 material_pigment_composition_compound` to all chemical formulas (or names) and its field type to free text +* Addition of new `OP4.3 material_pigment_composition_chromophore` +* Renumber `OP4.3 material_pigment_composition_mineral` to `OP4.4 material_pigment_composition_mineral` including its subproperties + ## Version 0.3 * Addition of `OP5.3 material_pigment_production_details` diff --git a/docs/metadata_pigment.md b/docs/metadata_pigment.md index a352dfd..5aaaa2a 100644 --- a/docs/metadata_pigment.md +++ b/docs/metadata_pigment.md @@ -64,26 +64,35 @@ end="" %} -### Organic compounds +### Chemical compound **ID and name:** OP4.2 material_pigment_composition_compound **Provided by:** data provider **Obligation:** recommended **Occurrences:** 0–n -**Definition:** The (main) organic compounds in the pigment. -**Allowed values and other constraints:** free text -**Example:** Lycopene +**Definition:** The (chemical) formula or name of the main compounds in the pigment. If it is a mineral pigment, record the name in [`OP4.4.1 Mineral name`](metadata_pigment.md#441-mineral-name) +**Allowed values and other constraints:** free text +**Example:** Dracorubin, Mg2Co(AsO4)2 + +### Chromophore +**ID and name:** OP4.3 material_pigment_composition_chromophore +**Provided by:** data provider +**Obligation:** recommended +**Occurrences:** 0–n +**Definition:** The part of the pigment's compound creating its colour. +**Allowed values and other constraints:** free text +**Example:** Organic-based, Co-based ### Mineralogical composition -**ID and name:** OP4.3 material_pigment_composition_mineral +**ID and name:** OP4.4 material_pigment_composition_mineral **Provided by:** data provider **Obligation:** recommended **Occurrences:** 0–n -**Definition:** If it is mineral pigment, which minerals are present? +**Definition:** If it is a mineral pigment, which minerals are present? *with the two subproperties:* #### Mineral name -**ID and name:** OP4.3.1 material_pigment_composition_mineral_name +**ID and name:** OP4.4.1 material_pigment_composition_mineral_name **Provided by:** data provider **Obligation:** mandatory **Occurrences:** 1 @@ -91,7 +100,7 @@ **Allowed values and other constraints:** controlled vocabulary ([IMA list of minerals](https://rruff.info/ima/)), retrieved from the Mindat API #### Mineral ID -**ID and name:** OP4.3.2 material_pigment_composition_mineral_id +**ID and name:** OP4.4.2 material_pigment_composition_mineral_id **Provided by:** Mindat API **Obligation:** mandatory **Occurrences:** 1 From 0a645ba42235c8b8cf9dacdfbf16f58e76d0d773 Mon Sep 17 00:00:00 2001 From: Thomas Rose <55918349+archaeothommy@users.noreply.github.com> Date: Mon, 4 May 2026 18:47:33 -0400 Subject: [PATCH 2/4] Update metadata_pigment.md --- docs/metadata_pigment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/metadata_pigment.md b/docs/metadata_pigment.md index 5aaaa2a..4d36b1b 100644 --- a/docs/metadata_pigment.md +++ b/docs/metadata_pigment.md @@ -49,7 +49,7 @@ **Occurrences:** 1 **Definition:** The chemical and/or mineralogical composition of the pigment. At least one of its subproperties must be provided. -*with the three subproperties:* +*with the four subproperties:* ### Chemical composition **ID and name:** OP4.1 material_pigment_composition_chemistry From 49df22f68f02f15e8266ddd19e34b60ce641b0d6 Mon Sep 17 00:00:00 2001 From: Thomas Rose <55918349+archaeothommy@users.noreply.github.com> Date: Mon, 4 May 2026 18:50:21 -0400 Subject: [PATCH 3/4] Update metadata_pigment.md --- docs/metadata_pigment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/metadata_pigment.md b/docs/metadata_pigment.md index 4d36b1b..5d32233 100644 --- a/docs/metadata_pigment.md +++ b/docs/metadata_pigment.md @@ -69,7 +69,7 @@ **Provided by:** data provider **Obligation:** recommended **Occurrences:** 0–n -**Definition:** The (chemical) formula or name of the main compounds in the pigment. If it is a mineral pigment, record the name in [`OP4.4.1 Mineral name`](metadata_pigment.md#441-mineral-name) +**Definition:** The (chemical) formula or name of the main compounds in the pigment. If it is a mineral pigment, record the name in [`OP4.4.1 Mineral name`](metadata_pigment.md#441-mineral-name). **Allowed values and other constraints:** free text **Example:** Dracorubin, Mg2Co(AsO4)2 From fbce83f39248f23d15a96b01bb0158075dcb65cf Mon Sep 17 00:00:00 2001 From: Thomas Rose Date: Wed, 6 May 2026 14:50:13 -0400 Subject: [PATCH 4/4] move metadatum Chromophore to pigment type --- docs/changelog.md | 5 ++--- docs/metadata_pigment.md | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 5a0bc9b..5788bed 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,9 +1,8 @@ -## Version 0.35 +## Version 0.3.1 +* Addition of new `OP3.3 material_pigment_composition_chromophore` * Change field type of `AS 3.1 assemblage_investigation_unit_type` to free text * Change scope of `OP4.2 material_pigment_composition_compound` to all chemical formulas (or names) and its field type to free text -* Addition of new `OP4.3 material_pigment_composition_chromophore` -* Renumber `OP4.3 material_pigment_composition_mineral` to `OP4.4 material_pigment_composition_mineral` including its subproperties ## Version 0.3 diff --git a/docs/metadata_pigment.md b/docs/metadata_pigment.md index 5d32233..d528139 100644 --- a/docs/metadata_pigment.md +++ b/docs/metadata_pigment.md @@ -24,7 +24,7 @@ **Occurrences:** 1–n **Definition:** Information about the pigment type. -*with the two subproperties:* +*with the three subproperties:* ### Type **ID and name:** OP3.1 material_pigment_type_chemistry @@ -42,6 +42,15 @@ **Definition:** Is it a natural or synthetic pigment? **Allowed values and other constraints:** controlled vocabulary +### Chromophore +**ID and name:** OP3.3 material_pigment_composition_chromophore +**Provided by:** data provider +**Obligation:** recommended +**Occurrences:** 0–n +**Definition:** The part of the pigment's compound creating its colour. +**Allowed values and other constraints:** free text +**Example:** Organic-based, Co-based + ## Pigment composition **ID and name:** OP4 material_pigment_composition **Provided by:** data provider @@ -49,7 +58,7 @@ **Occurrences:** 1 **Definition:** The chemical and/or mineralogical composition of the pigment. At least one of its subproperties must be provided. -*with the four subproperties:* +*with the three subproperties:* ### Chemical composition **ID and name:** OP4.1 material_pigment_composition_chemistry @@ -73,17 +82,8 @@ **Allowed values and other constraints:** free text **Example:** Dracorubin, Mg2Co(AsO4)2 -### Chromophore -**ID and name:** OP4.3 material_pigment_composition_chromophore -**Provided by:** data provider -**Obligation:** recommended -**Occurrences:** 0–n -**Definition:** The part of the pigment's compound creating its colour. -**Allowed values and other constraints:** free text -**Example:** Organic-based, Co-based - ### Mineralogical composition -**ID and name:** OP4.4 material_pigment_composition_mineral +**ID and name:** OP4.3 material_pigment_composition_mineral **Provided by:** data provider **Obligation:** recommended **Occurrences:** 0–n @@ -92,7 +92,7 @@ *with the two subproperties:* #### Mineral name -**ID and name:** OP4.4.1 material_pigment_composition_mineral_name +**ID and name:** OP4.3.1 material_pigment_composition_mineral_name **Provided by:** data provider **Obligation:** mandatory **Occurrences:** 1 @@ -100,7 +100,7 @@ **Allowed values and other constraints:** controlled vocabulary ([IMA list of minerals](https://rruff.info/ima/)), retrieved from the Mindat API #### Mineral ID -**ID and name:** OP4.4.2 material_pigment_composition_mineral_id +**ID and name:** OP4.3.2 material_pigment_composition_mineral_id **Provided by:** Mindat API **Obligation:** mandatory **Occurrences:** 1