From 2222cd3aa89d9b348531138a741a390336b2d3e9 Mon Sep 17 00:00:00 2001
From: David Lichteblau <david@lichteblau.com>
Date: Mon, 24 Mar 2008 17:35:59 +0100
Subject: [PATCH] PI recovery

---
 TEST         | 20 ++------------------
 test.lisp    |  1 +
 unparse.lisp |  1 +
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/TEST b/TEST
index 2494b65..61ee137 100644
--- a/TEST
+++ b/TEST
@@ -6573,22 +6573,6 @@ PASS output_output60 [XSLT-Result-Tree]
   Expected output (1): Xalan_Conformance_Tests/output/output_output60.saxon
   Actual output: Xalan_Conformance_Tests/output/output_output60.xuriella
 
-WARNING:
-   comparison failed: Document not well-formed: Entity 'nbsp' is not defined.
-Context:
-  Line 2, column 15 in NIL
-
-WARNING:
-   comparison failed: Document not well-formed: Entity 'nbsp' is not defined.
-Context:
-  Line 3, column 15 in NIL
-
-FAIL output_output61 [XSLT-Result-Tree]: output doesn't match
-  Stylesheet: Xalan_Conformance_Tests/output/output61.noindent-xsl
-  Data: Xalan_Conformance_Tests/output/output61.xml
-  Expected output (1): Xalan_Conformance_Tests/output/output_output61.saxon
-  Actual output: Xalan_Conformance_Tests/output/output_output61.xuriella
-
 PASS output_output62 [XSLT-Result-Tree]
   Stylesheet: Xalan_Conformance_Tests/output/output62.noindent-xsl
   Data: Xalan_Conformance_Tests/output/output62.xml
@@ -6649,7 +6633,7 @@ PASS output_output71 [XSLT-Result-Tree]
   Expected output (1): Xalan_Conformance_Tests/output/output_output71.saxon
   Actual output: Xalan_Conformance_Tests/output/output_output71.xuriella
 
-FAIL output_output72 [XSLT-Result-Tree]: output doesn't match
+PASS output_output72 [XSLT-Result-Tree]
   Stylesheet: Xalan_Conformance_Tests/output/output72.noindent-xsl
   Data: Xalan_Conformance_Tests/output/output72.xml
   Expected output (1): Xalan_Conformance_Tests/output/output_output72.saxon
@@ -22678,4 +22662,4 @@ PASS XSLTFunctions_DocumentFuncWithEmptyArg [Mixed]
   Expected output (1): MSFT_Conformance_Tests/XSLTFunctions/XSLTFunctions_DocumentFuncWithEmptyArg.saxon
   Actual output: MSFT_Conformance_Tests/XSLTFunctions/XSLTFunctions_DocumentFuncWithEmptyArg.xuriella
 
-Passed 2684/3078 tests.
+Passed 2685/3077 tests.
diff --git a/test.lisp b/test.lisp
index 9e74a49..54d20fb 100644
--- a/test.lisp
+++ b/test.lisp
@@ -307,6 +307,7 @@
     ;; entity they're writing, so we can't parse it for comparison.
     "output_output06"
     "output_output10"
+    "output_output61"
     ;; another similar test where the output is unparsable, except that
     ;; here an entity declaration wouldn't have helped either:
     "Copying_ResultTreeFragmentWithEscapedText"
diff --git a/unparse.lisp b/unparse.lisp
index 1885b96..a1cdc3a 100644
--- a/unparse.lisp
+++ b/unparse.lisp
@@ -316,6 +316,7 @@
 
 (defun write-processing-instruction (target data)
   (maybe-emit-start-tag)
+  (setf data (cl-ppcre:regex-replace-all "[?]>" data "? >"))
   (sax:processing-instruction *sink* target data)
   data)
 
-- 
2.11.4.GIT