From 020bdfc67d7c772f866d01f526716fee2cb540d0 Mon Sep 17 00:00:00 2001 From: David Lichteblau Date: Mon, 24 Mar 2008 11:28:37 +0100 Subject: [PATCH] Fixed disable-output-escaping=no --- TEST | 26 +++----------------------- parser.lisp | 4 ++-- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/TEST b/TEST index 8b49651..99b6ebe 100644 --- a/TEST +++ b/TEST @@ -6251,23 +6251,13 @@ FAIL output_output06 [XSLT-Result-Tree]: output doesn't match Expected output (1): Xalan_Conformance_Tests/output/output_output06.saxon Actual output: Xalan_Conformance_Tests/output/output_output06.xuriella -WARNING: - comparison failed: Document not well-formed: Entity 'nbsp' is not defined. -Context: - Line 3, 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_output07 [XSLT-Result-Tree]: output doesn't match +PASS output_output07 [XSLT-Result-Tree] Stylesheet: Xalan_Conformance_Tests/output/output07.noindent-xsl Data: Xalan_Conformance_Tests/output/output07.xml Expected output (1): Xalan_Conformance_Tests/output/output_output07.saxon Actual output: Xalan_Conformance_Tests/output/output_output07.xuriella -FAIL output_output08 [XSLT-Result-Tree]: output doesn't match +PASS output_output08 [XSLT-Result-Tree] Stylesheet: Xalan_Conformance_Tests/output/output08.noindent-xsl Data: Xalan_Conformance_Tests/output/output08.xml Expected output (1): Xalan_Conformance_Tests/output/output_output08.saxon @@ -13690,16 +13680,6 @@ PASS Elements__78358 [XSLT-Result-Tree]: raised an xslt-error as expected Expected output (1): MSFT_Conformance_Tests/Elements/Elements__78358.saxon Actual output: MSFT_Conformance_Tests/Elements/Elements__78358.xuriella -WARNING: - comparison failed: Document not well-formed: Expected '!' or '?' after '<' in DTD. -Context: - Line 3, column 8 in NIL - -WARNING: - comparison failed: Document not well-formed: Expected '!' or '?' after '<' in DTD. -Context: - Line 3, column 8 in NIL - FAIL Elements__78362 [XSLT-Result-Tree]: output doesn't match Stylesheet: MSFT_Conformance_Tests/Elements/78362.noindent-xsl Data: MSFT_Conformance_Tests/Elements/books.xml @@ -22655,4 +22635,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 2664/3081 tests. +Passed 2666/3081 tests. diff --git a/parser.lisp b/parser.lisp index 6ff812c..fbec9c8 100644 --- a/parser.lisp +++ b/parser.lisp @@ -236,7 +236,7 @@ (define-instruction-parser |text| (node) (stp:with-attributes (select disable-output-escaping) node - (if disable-output-escaping + (if (equal disable-output-escaping "yes") `(xsl:unescaped-text ,(stp:string-value node)) `(xsl:text ,(stp:string-value node))))) @@ -250,7 +250,7 @@ (define-instruction-parser |value-of| (node) (stp:with-attributes (select disable-output-escaping) node - (if disable-output-escaping + (if (equal disable-output-escaping "yes") `(xsl:unescaped-value-of ,select) `(xsl:value-of ,select)))) -- 2.11.4.GIT