diff --git a/XMLCONF b/XMLCONF index dd2b7d3..c4df4bd 100644 --- a/XMLCONF +++ b/XMLCONF @@ -506,10 +506,7 @@ sun/not-wf/encoding04.xml [not-wf?] not-wf sun/not-wf/encoding05.xml [not-wf?] not-wf sun/not-wf/encoding06.xml [not-wf?] not-wf sun/not-wf/encoding07.xml [not-wf?] not-wf -sun/not-wf/pi.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - No space between PI target name and data] +sun/not-wf/pi.xml [not-wf?] not-wf sun/not-wf/pubid01.xml [not-wf?] not-wf sun/not-wf/pubid02.xml [not-wf?] not-wf sun/not-wf/pubid03.xml [not-wf?] not-wf @@ -1064,12 +1061,7 @@ ibm/not-wf/P23/ibm23n04.xml [not-wf?] not-wf ibm/not-wf/P23/ibm23n05.xml [not-wf?] not-wf ibm/not-wf/P23/ibm23n06.xml [not-wf?] not-wf ibm/not-wf/P24/ibm24n01.xml [not-wf?] not-wf -ibm/not-wf/P24/ibm24n02.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests VersionInfo with a required field missing. The white space is - missing between the key word "xml" and the VersionInfo in the XMLDecl. - ] +ibm/not-wf/P24/ibm24n02.xml [not-wf?] not-wf ibm/not-wf/P24/ibm24n03.xml [not-wf?] not-wf ibm/not-wf/P24/ibm24n04.xml [not-wf?] not-wf ibm/not-wf/P24/ibm24n05.xml [not-wf?] not-wf @@ -1604,630 +1596,110 @@ ibm/not-wf/P86/ibm86n01.xml [not-wf?] not-wf ibm/not-wf/P86/ibm86n02.xml [not-wf?] not-wf ibm/not-wf/P86/ibm86n03.xml [not-wf?] not-wf ibm/not-wf/P86/ibm86n04.xml [not-wf?] not-wf -ibm/not-wf/P87/ibm87n01.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x02FF - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n02.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0346 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n03.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0362 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n04.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0487 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n05.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x05A2 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n06.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x05BA - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n07.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x05BE - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n08.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x05C0 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n09.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x05C3 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n10.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0653 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n11.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x06B8 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n12.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x06B9 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n13.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x06E9 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n14.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x06EE - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n15.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0904 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n16.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x093B - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n17.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x094E - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n18.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0955 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n19.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0964 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n20.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0984 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n21.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x09C5 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n22.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x09C9 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n23.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x09CE - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n24.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x09D8 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n25.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x09E4 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n26.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0A03 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n27.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0A3D - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n28.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0A46 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n29.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0A49 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n30.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0A4E - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n31.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0A80 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n32.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0A84 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n33.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0ABB - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n34.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0AC6 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n35.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0ACA - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n36.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0ACE - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n37.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0B04 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n38.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0B3B - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n39.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0B44 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n40.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0B4A - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n41.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0B4E - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n42.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0B58 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n43.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0B84 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n44.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0BC3 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n45.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0BC9 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n46.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0BD6 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n47.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0C0D - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n48.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0C45 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n49.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0C49 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n50.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0C54 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n51.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0C81 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n52.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0C84 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n53.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0CC5 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n54.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0CC9 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n55.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0CD4 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n56.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0CD7 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n57.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0D04 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n58.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0D45 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n59.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0D49 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n60.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0D4E - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n61.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0D58 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n62.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0E3F - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n63.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0E3B - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n64.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0E4F - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n66.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0EBA - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n67.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0EBE - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n68.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0ECE - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n69.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0F1A - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n70.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0F36 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n71.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0F38 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n72.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0F3B - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n73.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0F3A - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n74.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0F70 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n75.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0F85 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n76.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0F8C - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n77.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0F96 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n78.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0F98 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n79.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0FB0 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n80.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0FB8 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n81.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x0FBA - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n82.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x20DD - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n83.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x20E2 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n84.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x3030 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P87/ibm87n85.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CombiningChar with an illegal character. The character #x309B - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n01.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x0029 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n02.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x003B - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n03.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x066A - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n04.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x06FA - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n05.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x0970 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n06.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x09F2 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n08.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x0AF0 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n09.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x0B70 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n10.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x0C65 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n11.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x0CE5 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n12.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x0CF0 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n13.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x0D70 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n14.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x0E5A - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n15.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x0EDA - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P88/ibm88n16.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Digit with an illegal character. The character #x0F2A - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P89/ibm89n01.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Extender with an illegal character. The character #x00B6 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P89/ibm89n02.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Extender with an illegal character. The character #x00B8 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P89/ibm89n03.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Extender with an illegal character. The character #x02D2 - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P89/ibm89n04.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Extender with an illegal character. The character #x03FE - occurs as the second character in the PITarget in the PI in the DTD. - ] -ibm/not-wf/P89/ibm89n05.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests Extender with an illegal character. The character #x065F - occurs as the second character in the PITarget in the PI in the DTD. - ] +ibm/not-wf/P87/ibm87n01.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n02.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n03.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n04.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n05.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n06.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n07.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n08.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n09.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n10.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n11.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n12.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n13.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n14.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n15.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n16.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n17.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n18.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n19.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n20.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n21.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n22.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n23.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n24.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n25.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n26.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n27.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n28.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n29.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n30.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n31.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n32.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n33.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n34.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n35.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n36.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n37.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n38.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n39.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n40.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n41.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n42.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n43.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n44.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n45.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n46.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n47.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n48.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n49.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n50.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n51.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n52.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n53.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n54.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n55.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n56.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n57.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n58.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n59.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n60.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n61.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n62.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n63.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n64.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n66.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n67.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n68.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n69.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n70.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n71.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n72.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n73.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n74.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n75.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n76.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n77.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n78.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n79.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n80.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n81.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n82.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n83.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n84.xml [not-wf?] not-wf +ibm/not-wf/P87/ibm87n85.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n01.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n02.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n03.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n04.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n05.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n06.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n08.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n09.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n10.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n11.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n12.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n13.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n14.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n15.xml [not-wf?] not-wf +ibm/not-wf/P88/ibm88n16.xml [not-wf?] not-wf +ibm/not-wf/P89/ibm89n01.xml [not-wf?] not-wf +ibm/not-wf/P89/ibm89n02.xml [not-wf?] not-wf +ibm/not-wf/P89/ibm89n03.xml [not-wf?] not-wf +ibm/not-wf/P89/ibm89n04.xml [not-wf?] not-wf +ibm/not-wf/P89/ibm89n05.xml [not-wf?] not-wf ibm/not-wf/P89/ibm89n06.xml [not-wf?] not-wf ibm/not-wf/P89/ibm89n07.xml [not-wf?] not-wf ibm/not-wf/P89/ibm89n08.xml [not-wf?] not-wf @@ -2381,4 +1853,4 @@ ibm/valid/P86/ibm86v01.xml [not validating:] input [validating:] input ibm/valid/P87/ibm87v01.xml [not validating:] input [validating:] input ibm/valid/P88/ibm88v01.xml [not validating:] input [validating:] input ibm/valid/P89/ibm89v01.xml [not validating:] input [validating:] input -120/1786 tests failed; 376 tests were skipped \ No newline at end of file +14/1786 tests failed; 376 tests were skipped \ No newline at end of file diff --git a/xml/unparse.lisp b/xml/unparse.lisp index 4eee275..cf9c57b 100644 --- a/xml/unparse.lisp +++ b/xml/unparse.lisp @@ -8,6 +8,8 @@ ;;; License: LGPL (See file COPYING for details). ;;; --------------------------------------------------------------------------- ;;; © copyright 1999 by Gilbert Baumann +;;; © copyright 2004 by knowledgeTools Int. GmbH +;;; © copyright 2004 by David Lichteblau (for headcraft.de) ;;; This library is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU Library General Public @@ -77,6 +79,7 @@ (notations :initform (make-buffer :element-type t) :accessor notations) (name-for-dtd :accessor name-for-dtd) (previous-notation :initform nil :accessor previous-notation) + (have-doctype :initform nil :accessor have-doctype) (stack :initform nil :accessor stack))) (defmethod initialize-instance :after ((instance sink) &key) @@ -154,9 +157,32 @@ ;;;; doctype and notations +(defmethod sax:start-document ((sink sink)) + (unless (canonical sink) + (write-rod #"" sink) + (write-rune #/U+000A sink))) + (defmethod sax:start-dtd ((sink sink) name public-id system-id) - (declare (ignore public-id system-id)) - (setf (name-for-dtd sink) name)) + (setf (name-for-dtd sink) name) + (unless (canonical sink) + (ensure-doctype sink public-id system-id))) + +(defun ensure-doctype (sink &optional public-id system-id) + (unless (have-doctype sink) + (setf (have-doctype sink) t) + (write-rod #"= (canonical sink) 2)) @@ -166,9 +192,7 @@ (unless (rod< prev name) (error "misordered notations; cannot unparse canonically"))) (t - ;; need a doctype declaration - (write-rod #"" sink) + (when (have-doctype sink) + (when (previous-notation sink) + (write-rod #"]" sink)) + (write-rod #">" sink) (write-rune #/U+000A sink))) ;;;; elements +(defstruct (tag (:constructor make-tag (name))) + name + (n-children 0) + (have-gt nil)) + (defun sink-fresh-line (sink) (unless (zerop (column sink)) (write-rune-0 10 sink) (indent sink))) +(defun maybe-close-tag (sink) + (let ((tag (car (stack sink)))) + (when (and (tag-p tag) (not (tag-have-gt tag))) + (setf (tag-have-gt tag) t) + (write-rune #/> sink)))) + (defmethod sax:start-element ((sink sink) namespace-uri local-name qname attributes) (declare (ignore namespace-uri local-name)) + (maybe-close-tag sink) (when (stack sink) - (incf (cdr (first (stack sink))))) - (push (cons qname 0) (stack sink)) + (incf (tag-n-children (first (stack sink))))) + (push (make-tag qname) (stack sink)) (when (indentation sink) (sink-fresh-line sink) (start-indentation-block sink)) @@ -224,37 +262,46 @@ (write-rune #/\" sink) (map nil (lambda (c) (unparse-datachar c sink)) (sax:attribute-value a)) (write-rune #/\" sink))) - (write-rod '#.(string-rod ">") sink)) + (when (canonical sink) + (maybe-close-tag sink))) (defmethod sax:end-element ((sink sink) namespace-uri local-name qname) (declare (ignore namespace-uri local-name)) - (let ((cons (pop (stack sink)))) - (unless (consp cons) + (let ((tag (pop (stack sink)))) + (unless (tag-p tag) (error "output does not nest: not in an element")) - (unless (rod= (car cons) qname) + (unless (rod= (tag-name tag) qname) (error "output does not nest: expected ~A but got ~A" - (rod qname) (rod (car cons)))) + (rod qname) (rod (tag-name tag)))) (when (indentation sink) (end-indentation-block sink) - (unless (zerop (cdr cons)) - (sink-fresh-line sink)))) - (write-rod '#.(string-rod "") sink)) + (unless (zerop (tag-n-children tag)) + (sink-fresh-line sink))) + (cond + ((tag-have-gt tag) + (write-rod '#.(string-rod "") sink)) + (t + (write-rod #"/>" sink))))) (defmethod sax:processing-instruction ((sink sink) target data) + (maybe-close-tag sink) (unless (rod-equal target '#.(string-rod "xml")) (write-rod '#.(string-rod "") sink))) (defmethod sax:start-cdata ((sink sink)) + (maybe-close-tag sink) (push :cdata (stack sink))) (defmethod sax:characters ((sink sink) data) + (maybe-close-tag sink) (cond ((and (eq (car (stack sink)) :cdata) (not (canonical sink)) @@ -312,6 +359,9 @@ (t (write-rune-0 32 sink)))))) +(defun unparse-string (str sink) + (map nil (lambda (c) (unparse-datachar c sink)) str)) + (defun unparse-datachar (c sink) (cond ((rune= c #/&) (write-rod '#.(string-rod "&") sink)) ((rune= c #/<) (write-rod '#.(string-rod "<") sink)) @@ -399,8 +449,8 @@ (sax:end-document *sink*))) (defmacro with-element (qname &body body) - ;; XXX Statt qname soll man in zukunft auch mal (lname uri) angeben koennen. - ;; Hat aber Zeit bis DOM 2. + ;; XXX Statt qname soll man in zukunft auch mal (lname prefix) angeben + ;; koennen. Hat aber Zeit bis DOM 2. (when (listp qname) (destructuring-bind (n) qname (setf qname n))) @@ -414,6 +464,7 @@ (setf *current-element* nil))) (defun invoke-with-element (fn qname) + (setf qname (rod qname)) (maybe-emit-start-tag) (let ((*current-element* (list qname))) (multiple-value-prog1 @@ -422,17 +473,29 @@ (sax:end-element *sink* nil nil qname)))) (defun attribute (name value) - (push (sax:make-attribute :qname name :value value) + (push (sax:make-attribute :qname (rod name) :value (rod value)) (cdr *current-element*)) value) (defun cdata (data) (sax:start-cdata *sink*) - (sax:characters *sink* data) + (sax:characters *sink* (rod data)) (sax:end-cdata *sink*) data) (defun text (data) (maybe-emit-start-tag) - (sax:characters *sink* data) + (sax:characters *sink* (rod data)) data) + +(defun rod-to-utf8-string (rod) + (with-output-to-string (s) + (write-rod rod (cxml:make-character-stream-sink s)))) + +(defun utf8-string-to-rod (str) + (let* ((bytes (map '(vector (unsigned-byte 8)) #'char-code str)) + (buffer (make-array (length bytes) :element-type '(unsigned-byte 16))) + (n (decode-sequence :utf-8 bytes 0 (length bytes) buffer 0 0 nil)) + (result (make-array n :element-type 'rod))) + (map-into result #'code-rune buffer) + result)) diff --git a/xml/xml-parse.lisp b/xml/xml-parse.lisp index 62b177e..67d4533 100644 --- a/xml/xml-parse.lisp +++ b/xml/xml-parse.lisp @@ -1079,7 +1079,7 @@ (setf (elmdef-external-p e) *markup-declaration-external-p*) e)))) -(defvar *redefinition-warning* t) +(defvar *redefinition-warning* nil) (defun define-attribute (dtd element name type default) (let ((adef (make-attdef :element element @@ -1313,6 +1313,11 @@ (t (error "Bad character ~S after \")) + (wf-error "malformed processing instruction")) + (values name ""))))) (defun read-pi-content (input &aux d) (read-S? input) @@ -1557,6 +1564,8 @@ (tagbody state-1 (setf d (read-rune input)) + (unless d + (error 'end-of-xstream)) (unless (data-rune-p d) (error "Illegal char: ~S." d)) (when (rune= d #/?) (go state-2)) @@ -1564,6 +1573,8 @@ (go state-1) state-2 ;; #/? seen (setf d (read-rune input)) + (unless d + (error 'end-of-xstream)) (unless (data-rune-p d) (error "Illegal char: ~S." d)) (when (rune= d #/>) (return))