Merge pull request #38 from vaitkus/fix-dictionary-layout

Fix dictionary layout

Author: jamesrhester

multi_block_core.dic

@@ -10,9 +10,12 @@ data_MULTIBLOCK_DIC
     _dictionary.title             MULTIBLOCK_DIC
     _dictionary.class             Instance
     _dictionary.version           1.1.0
-    _dictionary.date              2025-07-07
+    _dictionary.date              2025-11-28
     _dictionary.uri
-        https://raw.githubusercontent.com/COMCIFS/MultiBlock_Dictionary/main/multi_block_core.dic
+;\
+https://raw.githubusercontent.com/COMCIFS/MultiBlock_Dictionary/main/\
+multi_block_core.dic
+;
     _dictionary.ddl_conformance   4.2.0
     _dictionary.namespace         CifCore
     _description.text
@@ -280,6 +283,162 @@ save_diffrn.id
 
 save_
 
+save_CELL
+
+    _definition.id                CELL
+    _definition.scope             Category
+    _definition.class             Set
+    _definition.update            2023-03-02
+    _description.text
+;
+    The CATEGORY of data items used to describe the parameters of
+    the crystal unit cell.
+;
+    _name.category_id             DIFFRN
+    _name.object_id               CELL
+    _category_key.name            '_cell.structure_id'
+
+save_
+
+save_cell.structure_id
+
+    _definition.id                '_cell.structure_id'
+    _definition.update            2024-02-05
+    _description.text
+;
+    A code identifying the crystallographic structure associated with this cell
+    description.
+;
+    _name.category_id             cell
+    _name.object_id               structure_id
+    _name.linked_item_id          '_structure.id'
+    _type.purpose                 Link
+    _type.source                  Assigned
+    _type.container               Single
+    _type.contents                Word
+
+save_
+
+save_CELL_MEASUREMENT
+
+    _definition.id                CELL_MEASUREMENT
+    _definition.scope             Category
+    _definition.class             Set
+    _definition.update            2022-05-25
+    _description.text
+;
+    The CATEGORY of data items used to describe the measurement of
+    the cell parameters.
+;
+    _name.category_id             CELL
+    _name.object_id               CELL_MEASUREMENT
+    _category_key.name            '_cell_measurement.structure_id'
+
+save_
+
+save_cell_measurement.condition_id
+
+    _definition.id                '_cell_measurement.condition_id'
+    _definition.update            2023-02-01
+    _description.text
+;
+    A pointer to the diffraction conditions used for cell measurement,
+    where different to the diffraction conditions used for data
+    collection.
+;
+    _name.category_id             cell_measurement
+    _name.object_id               condition_id
+    _name.linked_item_id          '_diffrn.id'
+    _type.purpose                 Link
+    _type.source                  Related
+    _type.container               Single
+    _type.contents                Word
+    _method.purpose               Definition
+    _method.expression
+;
+    _enumeration.default = _cell_measurement.diffrn_id
+;
+
+save_
+
+save_cell_measurement.diffrn_id
+
+    _definition.id                '_cell_measurement.diffrn_id'
+    _definition.update            2023-10-26
+    _description.text
+;
+    A pointer to the diffraction experiment to which the measured cell
+    has been applied.
+;
+    _name.category_id             cell_measurement
+    _name.object_id               diffrn_id
+    _name.linked_item_id          '_diffrn.id'
+    _type.purpose                 Link
+    _type.source                  Related
+    _type.container               Single
+    _type.contents                Word
+
+save_
+
+save_cell_measurement.structure_id
+
+    _definition.id                '_cell_measurement.structure_id'
+    _definition.update            2024-02-05
+    _description.text
+;
+    A code identifying the structure to which the cell being measured belongs.
+;
+    _name.category_id             cell_measurement
+    _name.object_id               structure_id
+    _name.linked_item_id          '_structure.id'
+    _type.purpose                 Link
+    _type.source                  Assigned
+    _type.container               Single
+    _type.contents                Word
+
+save_
+
+save_CELL_MEASUREMENT_REFLN
+
+    _definition.id                CELL_MEASUREMENT_REFLN
+    _definition.scope             Category
+    _definition.class             Loop
+    _definition.update            2023-10-16
+    _description.text
+;
+    The CATEGORY of data items used to describe the reflection data
+    used in the measurement of the crystal unit cell.
+;
+    _name.category_id             CELL_MEASUREMENT
+    _name.object_id               CELL_MEASUREMENT_REFLN
+
+    loop_
+      _category_key.name
+         '_cell_measurement_refln.index_h'
+         '_cell_measurement_refln.index_k'
+         '_cell_measurement_refln.index_l'
+         '_cell_measurement_refln.structure_id'
+
+save_
+
+save_cell_measurement_refln.structure_id
+
+    _definition.id                '_cell_measurement_refln.structure_id'
+    _definition.update            2023-10-16
+    _description.text
+;
+    A code identifying the structure for which the reflections were measured.
+;
+    _name.category_id             cell_measurement_refln
+    _name.object_id               structure_id
+    _name.linked_item_id          '_structure.id'
+    _type.purpose                 Link
+    _type.source                  Assigned
+    _type.container               Single
+    _type.contents                Word
+
+save_
+
 save_DIFFRN_DETECTOR
 
     _definition.id                DIFFRN_DETECTOR
@@ -360,7 +519,7 @@ save_
 
 save_diffrn_radiation.diffrn_id
 
-    _definition.id                'diffrn_radiation.diffrn_id'
+    _definition.id                '_diffrn_radiation.diffrn_id'
     _definition.update            2025-06-30
     _description.text
 ;
@@ -473,162 +632,6 @@ save_diffrn_source.radiation_id
 
 save_
 
-save_CELL
-
-    _definition.id                CELL
-    _definition.scope             Category
-    _definition.class             Set
-    _definition.update            2023-03-02
-    _description.text
-;
-    The CATEGORY of data items used to describe the parameters of
-    the crystal unit cell.
-;
-    _name.category_id             DIFFRN
-    _name.object_id               CELL
-    _category_key.name            '_cell.structure_id'
-
-save_
-
-save_cell.structure_id
-
-    _definition.id                '_cell.structure_id'
-    _definition.update            2024-02-05
-    _description.text
-;
-    A code identifying the crystallographic structure associated with this cell
-    description.
-;
-    _name.category_id             cell
-    _name.object_id               structure_id
-    _name.linked_item_id          '_structure.id'
-    _type.purpose                 Link
-    _type.source                  Assigned
-    _type.container               Single
-    _type.contents                Word
-
-save_
-
-save_CELL_MEASUREMENT
-
-    _definition.id                CELL_MEASUREMENT
-    _definition.scope             Category
-    _definition.class             Set
-    _definition.update            2022-05-25
-    _description.text
-;
-    The CATEGORY of data items used to describe the measurement of
-    the cell parameters.
-;
-    _name.category_id             CELL
-    _name.object_id               CELL_MEASUREMENT
-    _category_key.name            '_cell_measurement.structure_id'
-
-save_
-
-save_cell_measurement.condition_id
-
-    _definition.id                '_cell_measurement.condition_id'
-    _definition.update            2023-02-01
-    _description.text
-;
-    A pointer to the diffraction conditions used for cell measurement,
-    where different to the diffraction conditions used for data
-    collection.
-;
-    _name.category_id             cell_measurement
-    _name.object_id               condition_id
-    _name.linked_item_id          '_diffrn.id'
-    _type.purpose                 Link
-    _type.source                  Related
-    _type.container               Single
-    _type.contents                Word
-    _method.purpose               Definition
-    _method.expression
-;
-    _enumeration.default = _cell_measurement.diffrn_id
-;
-
-save_
-
-save_cell_measurement.diffrn_id
-
-    _definition.id                '_cell_measurement.diffrn_id'
-    _definition.update            2023-10-26
-    _description.text
-;
-    A pointer to the diffraction experiment to which the measured cell
-    has been applied.
-;
-    _name.category_id             cell_measurement
-    _name.object_id               diffrn_id
-    _name.linked_item_id          '_diffrn.id'
-    _type.purpose                 Link
-    _type.source                  Related
-    _type.container               Single
-    _type.contents                Word
-
-save_
-
-save_cell_measurement.structure_id
-
-    _definition.id                '_cell_measurement.structure_id'
-    _definition.update            2024-02-05
-    _description.text
-;
-    A code identifying the structure to which the cell being measured belongs.
-;
-    _name.category_id             cell_measurement
-    _name.object_id               structure_id
-    _name.linked_item_id          '_structure.id'
-    _type.purpose                 Link
-    _type.source                  Assigned
-    _type.container               Single
-    _type.contents                Word
-
-save_
-
-save_CELL_MEASUREMENT_REFLN
-
-    _definition.id                CELL_MEASUREMENT_REFLN
-    _definition.scope             Category
-    _definition.class             Loop
-    _definition.update            2023-10-16
-    _description.text
-;
-    The CATEGORY of data items used to describe the reflection data
-    used in the measurement of the crystal unit cell.
-;
-    _name.category_id             CELL_MEASUREMENT
-    _name.object_id               CELL_MEASUREMENT_REFLN
-
-    loop_
-      _category_key.name
-         '_cell_measurement_refln.index_h'
-         '_cell_measurement_refln.index_k'
-         '_cell_measurement_refln.index_l'
-         '_cell_measurement_refln.structure_id'
-
-save_
-
-save_cell_measurement_refln.structure_id
-
-    _definition.id                '_cell_measurement_refln.structure_id'
-    _definition.update            2023-10-16
-    _description.text
-;
-    A code identifying the structure for which the reflections were measured.
-;
-    _name.category_id             cell_measurement_refln
-    _name.object_id               structure_id
-    _name.linked_item_id          '_structure.id'
-    _type.purpose                 Link
-    _type.source                  Assigned
-    _type.container               Single
-    _type.contents                Word
-
-save_
-
 save_EXPTL_CRYSTAL
 
     _definition.id                EXPTL_CRYSTAL
@@ -1416,7 +1419,7 @@ save_
 ;
        All multi-block items from core 3.2.0 added.
 ;
-         1.1.0                    2025-07-07
+         1.1.0                    2025-11-28
 ;
        # Update date above and add audit comments below. Remove
        this comment when ready for release.
@@ -1439,9 +1442,11 @@ save_
 
        Added _model.id as key to MODEL.
 
-       Added GEOM_* and MODEL_SITE categories with _model.id child key data names.
+       Added GEOM_* and MODEL_SITE categories with _model.id child key data
+       names.
 
-       Add DIFFRN_SOURCE category with _diffrn_source.radiation_id key data name.
+       Add DIFFRN_SOURCE category with _diffrn_source.radiation_id key data
+       name.
 
        Add DIFFRN_DETECTOR category with _diffrn_detector.id and
         _diffrn_detector.diffrn_id key data names. Included