Fix computation of expand-text

ndw · Oct 24, 2021 · 66f54c2 · 66f54c2
1 parent eccd853
commit 66f54c2
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/src/main/scala/com/xmlcalabash/model/xml/Artifact.scala b/src/main/scala/com/xmlcalabash/model/xml/Artifact.scala
@@ -278,6 +278,27 @@ class Artifact(val config: XMLCalabash) {
     }
   }
 
+  def inScopeExpandText(node: XdmNode): Boolean = {
+    if (node.getNodeKind == XdmNodeKind.ELEMENT) {
+      val attr = if (node.getNodeName.getNamespaceURI == XProcConstants.ns_p) {
+        XProcConstants._expand_text
+      } else {
+        XProcConstants.p_expand_text
+      }
+      val expand = Option(node.getAttributeValue(attr))
+      if (expand.isDefined) {
+        // FIXME: what about AVT? what about invalid values?
+        return expand.get == "true"
+      }
+    }
+
+    if (Option(node.getParent).isDefined) {
+      inScopeExpandText(node.getParent)
+    } else {
+      false
+    }
+  }
+
   protected[model] def parse(node: XdmNode): Unit = {
     _synthetic = false
     _tumbleId = tumbleId(node)

diff --git a/src/main/scala/com/xmlcalabash/model/xml/Inline.scala b/src/main/scala/com/xmlcalabash/model/xml/Inline.scala
@@ -23,9 +23,10 @@ class Inline(override val config: XMLCalabash, srcNode: XdmNode, implied: Boolea
   private var _context_provided = false
   private val nameBindings = mutable.HashSet.empty[QName]
   private val _statics = mutable.HashMap.empty[String, Message]
+  private var _expandText = false
 
   if (srcNode.getNodeKind != XdmNodeKind.DOCUMENT) {
-    throw new RuntimeException("inline document must be a document")
+    throw XProcException.xiThisCantHappen(s"Attempt to create p:inline from something that isn't a document node: ${srcNode}")
   }
 
   def this(config: XMLCalabash, srcNode: XdmNode) = {
@@ -44,6 +45,7 @@ class Inline(override val config: XMLCalabash, srcNode: XdmNode, implied: Boolea
     nameBindings ++= copy.nameBindings
     _inScopeDynamics = copy._inScopeDynamics
     _inScopeStatics = copy._inScopeStatics
+    _expandText = copy._expandText
     staticContext = copy.staticContext
   }
 
@@ -107,9 +109,12 @@ class Inline(override val config: XMLCalabash, srcNode: XdmNode, implied: Boolea
       if (_contentType.isEmpty) {
         _contentType = Some(MediaType.XML)
       }
+
+      _expandText = inScopeExpandText(node)
     }
   }
 
+  def expandText: Boolean = _expandText
   def encoding: Option[String] = _encoding
 
   def excludeURIs: Set[String] = {

diff --git a/src/main/scala/com/xmlcalabash/runtime/XMLCalabashRuntime.scala b/src/main/scala/com/xmlcalabash/runtime/XMLCalabashRuntime.scala
@@ -76,7 +76,7 @@ class XMLCalabashRuntime protected[xmlcalabash] (val decl: DeclareStep) extends
                 if (inline.documentProperties.isDefined) {
                   expander.documentProperties = inline.documentProperties.get
                 }
-                defaults += expander.loadDocument()
+                defaults += expander.loadDocument(inline.expandText)
               case doc: Document =>
                 defaults += doc.loadDocument()
               case _ =>

diff --git a/src/main/scala/com/xmlcalabash/steps/internal/InlineExpander.scala b/src/main/scala/com/xmlcalabash/steps/internal/InlineExpander.scala
@@ -31,7 +31,6 @@ protected[xmlcalabash] class InlineExpander(val config: XMLCalabash, val node: X
   var encoding: Option[String] = None
   var excludeURIs: Set[String] = Set()
   var msgBindings: Map[String, XProcItemMessage] = Map()
-  var expandText: Boolean = true
   var contextItem: Option[XProcItemMessage] = None
 
   private var _documentProperties: Map[QName, XdmValue] = Map.empty[QName, XdmValue]
@@ -60,7 +59,7 @@ protected[xmlcalabash] class InlineExpander(val config: XMLCalabash, val node: X
     _documentProperties = Map.empty[QName, XdmValue] ++ props
   }
 
-  def loadDocument(): DocumentRequest = {
+  def loadDocument(expandText: Boolean): DocumentRequest = {
     if (encoding.isDefined) {
       if (contentType.xmlContentType || contentType.htmlContentType) {
         throw XProcException.xdCannotEncodeMarkup(encoding.get, contentType, exprContext.location)

diff --git a/src/main/scala/com/xmlcalabash/steps/internal/InlineLoader.scala b/src/main/scala/com/xmlcalabash/steps/internal/InlineLoader.scala
@@ -129,11 +129,10 @@ class InlineLoader() extends AbstractLoader {
       Set()
     }
     expander.msgBindings = msgBindings.toMap
-    expander.expandText = expandText
     expander.contextItem = contextItem
     expander.documentProperties = docProps
 
-    val req = expander.loadDocument()
+    val req = expander.loadDocument(expandText)
     val resp = config.documentManager.parse(req)
     if (resp.shadow.isDefined) {
       consumer.receive("result", resp.shadow.get, new XProcMetadata(resp.contentType, resp.props))