resolve entities in opf so that xmlencoding and decoding is more robust

ChangeLog.txt

@@ -4,6 +4,7 @@ Sigil-1.4.2
       - fix bug in multiple language spellchecking dialog word lookup 
             when no language attributes used
       - update de, nl, sv, ko, ru translations that missed the Sigil 1.4.0 initial release
+      - fix bug in OPF metadata attributes that use named entities
 
 Sigil-1.4.1
     Bug Fixes:

src/Resource_Files/plugin_launchers/python/sigil_bs4/builder/_lxml.py

@@ -68,7 +68,7 @@ def default_parser(self, encoding):
         if self._default_parser is not None:
             return self._default_parser
         return etree.XMLParser(
-            target=self, strip_cdata=False, recover=True, encoding=encoding, resolve_entities=False)
+            target=self, strip_cdata=False, recover=True, encoding=encoding, resolve_entities=True)
 
     def parser_for(self, encoding):
         # Use the default parser.
@@ -77,7 +77,7 @@ def parser_for(self, encoding):
         if isinstance(parser, Callable):
             # Instantiate the parser with default arguments
             if self.is_xml:
-                parser = parser(target=self, strip_cdata=False, encoding=encoding, resolve_entities=False)
+                parser = parser(target=self, strip_cdata=False, encoding=encoding, resolve_entities=True)
             else:
                 parser = parser(target=self, strip_cdata=False, encoding=encoding)
         return parser

src/Resource_Files/plugin_launchers/python/sigil_bs4/element.py

@@ -180,7 +180,7 @@ class PageElement(object):
 
     XML_FORMATTERS = {
         "html" : EntitySubstitution.substitute_html,
-        "minimal" : EntitySubstitution.substitute_xml,
+        "minimal" : EntitySubstitution.substitute_xml_containing_entities,
         None : None
         }
 

src/Resource_Files/python3lib/xmlprocessor.py

@@ -41,7 +41,7 @@ def _well_formed(data):
     if isinstance(newdata, str):
         newdata = newdata.encode('utf-8')
     try:
-        parser = etree.XMLParser(encoding='utf-8', recover=False, resolve_entities=False)
+        parser = etree.XMLParser(encoding='utf-8', recover=False, resolve_entities=True)
         tree = etree.parse(BytesIO(newdata), parser)
     except Exception:
         result = False
@@ -53,7 +53,7 @@ def _reformat(data):
     if isinstance(newdata, str):
         newdata = newdata.encode('utf-8')
     parser = etree.XMLParser(encoding='utf-8', recover=True, ns_clean=True,
-                             remove_comments=True, remove_pis=True, strip_cdata=True, resolve_entities=False)
+                             remove_comments=True, remove_pis=True, strip_cdata=True, resolve_entities=True)
     tree = etree.parse(BytesIO(newdata), parser)
     newdata = etree.tostring(tree.getroot(),encoding='UTF-8', xml_declaration=False)
     return newdata 
@@ -125,7 +125,7 @@ def WellFormedXMLErrorCheck(data, mtype=""):
     column = "-1"
     message = "well-formed"
     try:
-        parser = etree.XMLParser(encoding='utf-8', recover=False, resolve_entities=False)
+        parser = etree.XMLParser(encoding='utf-8', recover=False, resolve_entities=True)
         tree = etree.parse(BytesIO(newdata), parser)
     except Exception:
         line = "0"