Additional fix for bug #44, as well as test code.

Author: pdvrieze

core/src/commonMain/kotlin/nl/adaptivity/xmlutil/XmlReader.kt

@@ -348,6 +348,7 @@ fun XmlReader.readSimpleElement(): String {
                 EventType.PROCESSING_INSTRUCTION -> {
                 }
                 EventType.TEXT,
+                EventType.ENTITY_REF,
                 EventType.CDSECT                 -> append(t.text)
                 else                             -> throw XmlException(
                     "Expected text content or end tag, found: ${t.eventType}"

serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/TestCommon.kt

@@ -25,6 +25,7 @@ package nl.adaptivity.xml.serialization
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerializationException
+import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonBuilder
 import kotlinx.serialization.modules.EmptySerializersModule
@@ -680,4 +681,23 @@ class TestCommon {
         assertEquals(contentText, serialized)
     }
 
+
+    @Test
+    fun deserializeXmlWithEntity() {
+        val xml = XML {
+            repairNamespaces = true
+            policy = DefaultXmlSerializationPolicy(pedantic = false, autoPolymorphic = false)
+        }
+
+        val expected = StringWithMarkup("Chloroacetic acid, >=99%")
+
+        val actual = xml.decodeFromString<StringWithMarkup>(
+            "<StringWithMarkup xmlns=\"http://pubchem.ncbi.nlm.nih.gov/pug_view\">\n" +
+                    "    <String>Chloroacetic acid, &gt;=99%</String>\n" +
+                    "</StringWithMarkup>"
+                                                           )
+        assertEquals(expected, actual)
+    }
+
+
 }

serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/testClasses.kt

@@ -374,3 +374,10 @@ internal data class Tag(
     }
 
 }
+
+@XmlSerialName("StringWithMarkup", "http://pubchem.ncbi.nlm.nih.gov/pug_view", "")
+@Serializable
+data class StringWithMarkup(
+    @XmlElement(true) @SerialName("String") val string: String = "",
+    val markup: List<String> = emptyList()
+                           )