revert unintentional changes from cherry-pick

Makefile

@@ -60,6 +60,9 @@ test ::
 
 clean ::
 	$(RM) -rf $(BUILD_DIR)
+	$(RM) -rf $(BASE_CLASS_DIR)/$(NYAML_SUBDIR)
+	$(RM) -rf $(APPDEF_DIR)/$(NYAML_SUBDIR)
+	$(RM) -rf $(CONTRIB_DIR)/$(NYAML_SUBDIR)
 
 prepare ::
 	$(PYTHON) -m dev_tools manual --prepare --build-root $(BUILD_DIR)
@@ -94,10 +97,24 @@ all ::
 	@echo "HTML built: `ls -lAFgh $(BUILD_DIR)/manual/build/html/index.html`"
 	@echo "PDF built: `ls -lAFgh $(BUILD_DIR)/manual/build/latex/nexus.pdf`"
 
+$(BASE_CLASS_DIR)/%.nxdl.xml : $(BASE_CLASS_DIR)/$(NYAML_SUBDIR)/%.yaml
+	nyaml2nxdl $< --output-file $@
+
+$(CONTRIB_DIR)/%.nxdl.xml : $(CONTRIB_DIR)/$(NYAML_SUBDIR)/%.yaml
+	nyaml2nxdl $< --output-file $@
+
+$(APPDEF_DIR)/%.nxdl.xml : $(APPDEF_DIR)/$(NYAML_SUBDIR)/%.yaml
+	nyaml2nxdl $< --output-file $@
+
+nxdl: $(YBC_NXDL_TARGETS) $(YCONTRIB_NXDL_TARGETS) $(YAPPDEF_NXDL_TARGETS)
+
+nyaml:
+	$(MAKE) -f nyaml.mk
+
 
 # NeXus - Neutron and X-ray Common Data Format
 #
-# Copyright (C) 2008-2022 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2008-2024 NeXus International Advisory Committee (NIAC)
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -113,4 +130,4 @@ all ::
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# For further information, see http://www.nexusformat.org
+# For further information, see http://www.nexusformat.org

contributed_definitions/NXcollectioncolumn.nxdl.xml

@@ -101,5 +101,4 @@
              Individual lenses in the collection column section
         </doc>
     </group>
-    <group type="NXfabrication"/>
 </definition>

contributed_definitions/NXenergydispersion.nxdl.xml

@@ -21,7 +21,7 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" type="group" name="NXenergydispersion" extends="NXobject" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" name="NXenergydispersion" extends="NXobject" type="group" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
     <doc>
          Subclass of NXelectronanalyser to describe the energy dispersion section of a
          photoelectron analyser.
@@ -87,17 +87,4 @@
              Individual lenses in the energy dispersive section
         </doc>
     </group>
-    <group type="NXfabrication"/>
-    <group type="NXtransformations">
-        <doc>
-             Collection of axis-based translations and rotations to describe the location and
-             geometry of the energy dispersive element as a component in the instrument. 
-             Conventions from the NXtransformations base class are used. In principle, 
-             the McStas coordinate system is used. The first transformation has to point 
-             either to another  component of the system or . (for pointing to the reference frame)
-             to relate it relative to the experimental setup. Typically, the components of a system 
-             should all be related relative to each other and only one component should relate to
-             the reference coordinate system.
-        </doc>
-    </group>
 </definition>

contributed_definitions/NXmanipulator.nxdl.xml

@@ -21,7 +21,7 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" type="group" name="NXmanipulator" extends="NXobject" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" name="NXmanipulator" extends="NXobject" type="group" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
     <doc>
          Extension of NXpositioner to include fields to describe the use of manipulators
          in photoemission experiments.
@@ -79,7 +79,6 @@
              Class to describe the motors that are used in the manipulator
         </doc>
     </group>
-    <group type="NXfabrication"/>
     <field name="depends_on" type="NX_CHAR">
         <doc>
              Refers to the last transformation specifying the positon of the manipulator in

contributed_definitions/NXmpes.nxdl.xml

@@ -143,7 +143,6 @@ with higher granularity in the data description.-->
                             <item value="Deflector"/>
                             <item value="PEEM"/>
                             <item value="Momentum Microscope"/>
-                            <item value="torroidal"/>
                         </enumeration>
                     </field>
                     <field name="mode" recommended="true"/>