Schema validation reuses existing ETree

Author: ascholerChemeketa

pretext/project/__init__.py

@@ -685,7 +685,7 @@ def build(
         time_logger.log("XML syntax validated")
 
         # Validate xml against schema; continue with warning if invalid:
-        utils.xml_source_validates_against_schema(self.source_abspath())
+        utils.xml_validates_against_schema(self.source_element())
         time_logger.log("source validated against schema")
 
         # Clean output upon request

pretext/utils.py

@@ -204,17 +204,13 @@ def xml_syntax_is_valid(xmlfile: Path, root_tag: str = "pretext") -> bool:
     return True
 
 
-def xml_source_validates_against_schema(xmlfile: Path) -> bool:
+def xml_validates_against_schema(etree: ET) -> bool:
     # get path to RelaxNG schema file:
     schemarngfile = resources.resource_base_path() / "core" / "schema" / "pretext.rng"
 
     # Open schemafile for validation:
     relaxng = ET.RelaxNG(file=schemarngfile)
 
-    # Parse xml file:
-    source_xml = ET.parse(xmlfile)
-    source_xml.xinclude()
-
     # just for testing
     # ----------------
     # relaxng.validate(source_xml)
@@ -223,7 +219,7 @@ def xml_source_validates_against_schema(xmlfile: Path) -> bool:
 
     # validate against schema
     try:
-        relaxng.assertValid(source_xml)
+        relaxng.assertValid(etree)
         log.info("PreTeXt source passed schema validation.")
     except ET.DocumentInvalid as err:
         log.debug(