5039 2005-09-18 05:00:24 -0700 XSLT text output doesn't work 2005-09-24 04:44:21 -0700 1 1 1 Unclassified WebKit XML 420+ Mac OS X 10.4 VERIFIED FIXED P2 Normal --- 1 ap hyatt oldest_to_newest 19853 0 ap 2005-09-18 05:00:24 -0700 This patch fixes several issues with xsl:output method="text". I couldn't find any circumstances under which it would work previously, thus a vague summary. What is addressed: 1) Added an XML text declaration. 2) Corrected DTD URI. 3) Added a HEAD with a TITLE. 4) Got rid of a CDATA section. Safari wouldn't display it; besides, it wasn't used correctly (the output could contain "]]>" itself). Instead, replaces < and & with entities. 5) Removed a newline after <pre>. 19854 1 3934 ap 2005-09-18 05:03:26 -0700 Created attachment 3934 test case Unlike the patch, this test relies on bug 3418 being fixed (it uses non-ASCII text). 19855 2 3935 ap 2005-09-18 05:04:08 -0700 Created attachment 3935 proposed patch 19957 3 3935 eric 2005-09-18 12:42:36 -0700 Comment on attachment 3935 proposed patch I agree w/ the doctype fix. I'm not entirely sure as why "text output" wouldn't just get displayed as text.. instead of parsed as xhtml (hyatt might know). Also, why only replace amp and lt? I would expect you would at least need to replace gt as well. And probably all of the predefined entities: http://www.w3.org/TR/REC-xml/#sec-predefined-ent I also think it makes sense to have a newline after <pre> unless it gets displayed as part of the text. Finally, it looks like you might have used tabs instead of spaces (or maybe the whole method is tabs and you used spaces, which would be correct). For the lack of gt replacement, I'm going to review: -. Hyatt and darin may have further opinions as they are more familiar with the xslt code. 19960 4 ap 2005-09-18 13:27:49 -0700 (In reply to comment #3) > Also, why only replace amp and lt? If these two are replaced, nothing else can be mistakengly recognized as markup. > I also think it makes sense to have a newline after <pre> unless it gets > displayed as part of the text. I removed it because it does get displayed (that's the primary function of <pre> :) ) Indentation also looks correct... Resetting review? flag after discussing this with Eric on IRC. 20045 5 3935 darin 2005-09-19 15:49:16 -0700 Comment on attachment 3935 proposed patch Is it really OK to put the title in without any escaping at all? Are we somehow guaranteed that the title won't have the string "</title>" in it? Otherwise, this looks fine to me. Feel free to move this back to review? if you answer that question. 20063 6 3956 ap 2005-09-19 21:29:45 -0700 Created attachment 3956 patch that uses an empty title My idea was that XML document's title is its file name - if so, a closing tag cannot be in the title (because it includes a path separator). However, 1) an opening tag can, which I missed; 2) I've just tested and saw that m_sourceDocument->title() comes empty in my test - and that doesn't prevent Safari from displaying the file name in the title. So, I think that always setting an empty path is a safer solution than escaping it - entities in the title will not look good, if a later change makes m_sourceDocument->title() return the document's file name. 20108 7 3956 darin 2005-09-20 16:52:12 -0700 Comment on attachment 3956 patch that uses an empty title I don't understand the argument for the empty <title> element. How is this different from any other XML document without a title? Is putting an empty <title> in really the best way to get the result we're after? 20137 8 ap 2005-09-20 21:24:08 -0700 (In reply to comment #7) The document must have a HEAD with a TITLE in it, because it's XHTML-strict (W3C validator rejected it otherwise, and the spec says the same IIRC). The original XML has no intrinsic title other than its file name, and Safari still displays the file name in the window title in my test case. On the other hand, putting the file name in TITLE would probably be not very nice - it's not a real title, but a Safari courtesy. Unless I'm missing something, it cannot be made any better :) 20168 9 3956 darin 2005-09-21 11:56:59 -0700 Comment on attachment 3956 patch that uses an empty title OK. I think <title/> would have been slightly more elegant, but I understand. r=me 20433 10 darin 2005-09-24 03:03:46 -0700 The idea of just displaying text as text instead of making an XML document still seems like a good future possibility. 3934 2005-09-18 05:03:26 -0700 2005-09-18 05:03:26 -0700 test case xslt-text-test.zip application/octet-stream 1232 ap UEsDBBQACAAIAER/MjMAAAAAAAAAAAAAAAANABAAeHNsdC10ZXh0LnhtbFVYDAD4Vi1DT1YtQ/UB 9QGzsa/IzVEoSy0qzszPs1Uy1DNQUkjNS85PycxLt1UKDXHTtVCyt+OyASnTLS6pzEktzkhNLVEo qSxItVUqSa0o0a8ozlFSyChKTbNVAjJLdEGCeiBBkL4Q1+AQu2D/0CBnV4UIXx8rBbWcEms4Tswt sL7YdGHrxcaLTWCOnZ1aeom1jT5YGxcAUEsHCMXUk32IAAAAnQAAAFBLAwQKAAAAAAAcgDIzAAAA AAAAAAAAAAAACQAQAF9fTUFDT1NYL1VYDAD4Vi1D+FYtQ/UB9QFQSwMEFAAIAAgARH8yMwAAAAAA AAAAAAAAABgAEABfX01BQ09TWC8uX3hzbHQtdGV4dC54bWxVWAwA+FYtQ09WLUP1AfUBY2AVY2dg YsAEIDFOIDYCYgUoPwgkEeIaEYJFPRwAAFBLBwjBzWWFHwAAAFIAAABQSwMEFAAIAAgAnX4yMwAA AAAAAAAAAAAAAA0AEAB4c2x0LXRleHQueHNsVVgMAPhWLUMaVS1D9QH1AWWQz2qDQBDGz/Epli14 0430Ev/shhBSGlpaUAu9itloYNcVd4zm2LxT36O+UU2M0tDDwMzHzPebmWDZSoGOvNIHVVDs2HOM eJGq3aHIKP6In6wFXjIjaLXwNJwE1znngPqhQnu9SHEOUHqENE1jN4+2qjLiuK5LPqNXEldJofeq kviewIzBUNVQ1oAkh1ztKAbewl/6y/t2YYWY3PDAZSkS4EgmkOYUx5soxmz9vApX63gTRmj7hnpq 7CFTgD9FIku/O/98d1/d+VowZmbgD55JWYqTNTprwm6kFpj54Mz9gEz1mA6t4wnTUsyYza7KMRE1 t9QeaS54ChTbGF1O+DdO7n/KjF9QSwcIPfmdGQYBAACMAQAAUEsDBBQACAAIAJ1+MjMAAAAAAAAA AAAAAAAYABAAX19NQUNPU1gvLl94c2x0LXRleHQueHNsVVgMAPhWLUMaVS1D9QH1AWNgFWNnYGLA BCAxTiA2AmIFKD8IJBHiGhGCRT0cAABQSwcIwc1lhR8AAABSAAAAUEsBAhUDFAAIAAgARH8yM8XU k32IAAAAnQAAAA0ADAAAAAAAAAAAQKSBAAAAAHhzbHQtdGV4dC54bWxVWAgA+FYtQ09WLUNQSwEC FQMKAAAAAAAcgDIzAAAAAAAAAAAAAAAACQAMAAAAAAAAAABA/UHTAAAAX19NQUNPU1gvVVgIAPhW LUP4Vi1DUEsBAhUDFAAIAAgARH8yM8HNZYUfAAAAUgAAABgADAAAAAAAAAAAQKSBCgEAAF9fTUFD T1NYLy5feHNsdC10ZXh0LnhtbFVYCAD4Vi1DT1YtQ1BLAQIVAxQACAAIAJ1+MjM9+Z0ZBgEAAIwB AAANAAwAAAAAAAAAAECkgX8BAAB4c2x0LXRleHQueHNsVVgIAPhWLUMaVS1DUEsBAhUDFAAIAAgA nX4yM8HNZYUfAAAAUgAAABgADAAAAAAAAAAAQKSB0AIAAF9fTUFDT1NYLy5feHNsdC10ZXh0Lnhz bFVYCAD4Vi1DGlUtQ1BLBQYAAAAABQAFAHUBAABFAwAAAAA= 3935 2005-09-18 05:04:08 -0700 2005-09-19 21:29:45 -0700 proposed patch XSLTTextPatch.txt text/plain 1455 ap SW5kZXg6IHhzbHRfcHJvY2Vzc29yaW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9y b290L1dlYkNvcmUva2h0bWwveHNsL3hzbHRfcHJvY2Vzc29yaW1wbC5jcHAsdgpyZXRyaWV2aW5n IHJldmlzaW9uIDEuOApkaWZmIC1wIC11IC1yMS44IHhzbHRfcHJvY2Vzc29yaW1wbC5jcHAKLS0t IHhzbHRfcHJvY2Vzc29yaW1wbC5jcHAJMzEgQXVnIDIwMDUgMDc6MzQ6NTUgLTAwMDAJMS44Cisr KyB4c2x0X3Byb2Nlc3NvcmltcGwuY3BwCTE4IFNlcCAyMDA1IDExOjM3OjM4IC0wMDAwCkBAIC0x ODYsMTIgKzE4NiwxNCBAQCBEb2N1bWVudEltcGwgKlhTTFRQcm9jZXNzb3JJbXBsOjpkb2N1bWVu CiAKICAgICAgICAgaWYgKHhtbFN0ckVxdWFsKG1ldGhvZCwgKGNvbnN0IHhtbENoYXIgKikidGV4 dCIpKSB7CiAgICAgICAgICAgICAvLyBNb2RpZnkgdGhlIG91dHB1dCBzbyB0aGF0IGl0IGlzIGEg d2VsbC1mb3JtZWQgWEhUTUwgZG9jdW1lbnQgd2l0aCBhIDxwcmU+IHRhZyBlbmNsb3NpbmcgdGhl IHRleHQuCi0gICAgICAgICAgICBtX3Jlc3VsdE91dHB1dCA9ICI8IURPQ1RZUEUgaHRtbCBQVUJM SUMgXCItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTlwiIFwiaHR0cDovL3d3dy53My5v cmcvVFIveGh0bWwxL0RURC9zdHJpY3QuZHRkXCI+XG4iCisgICAgICAgICAgICBtX3Jlc3VsdE91 dHB1dC5yZXBsYWNlKCcmJywgIiZhbXA7Iik7CisgICAgICAgICAgICBtX3Jlc3VsdE91dHB1dC5y ZXBsYWNlKCc8JywgIiZsdDsiKTsKKyAgICAgICAgICAgIG1fcmVzdWx0T3V0cHV0ID0gIjw/eG1s IHZlcnNpb249XCIxLjBcIiBlbmNvZGluZz1cIlVURi04XCI/PlxuIgorICAgICAgICAgICAgICAg ICI8IURPQ1RZUEUgaHRtbCBQVUJMSUMgXCItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9F TlwiIFwiaHR0cDovL3d3dy53My5vcmcvVFIveGh0bWwxL0RURC94aHRtbDEtc3RyaWN0LmR0ZFwi PlxuIgogICAgICAgICAgICAgICAgICI8aHRtbCB4bWxucz1cImh0dHA6Ly93d3cudzMub3JnLzE5 OTkveGh0bWxcIj5cbiIKKyAgICAgICAgICAgICAgICAiPGhlYWQ+PHRpdGxlPiIgKyBtX3NvdXJj ZURvY3VtZW50LT50aXRsZSgpLnFzdHJpbmcoKSArICI8L3RpdGxlPjwvaGVhZD5cbiIKICAgICAg ICAgICAgICAgICAiPGJvZHk+XG4iCi0gICAgICAgICAgICAgICAgIjxwcmU+XG4iCi0gICAgICAg ICAgICAgICAgIjwhW0NEQVRBWyIgKyBtX3Jlc3VsdE91dHB1dCArICJdXT5cbiIKLSAgICAgICAg ICAgICAgICAiPC9wcmU+XG4iCisgICAgICAgICAgICAgICAgIjxwcmU+IiArIG1fcmVzdWx0T3V0 cHV0ICsgIjwvcHJlPlxuIgogICAgICAgICAgICAgICAgICI8L2JvZHk+XG4iCiAgICAgICAgICAg ICAgICAgIjwvaHRtbD5cbiI7CiAgICAgICAgIH0K 3956 2005-09-19 21:29:45 -0700 2005-09-21 11:56:59 -0700 patch that uses an empty title XSLTTextPatch2.txt text/plain 1412 ap SW5kZXg6IHhzbHRfcHJvY2Vzc29yaW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9y b290L1dlYkNvcmUva2h0bWwveHNsL3hzbHRfcHJvY2Vzc29yaW1wbC5jcHAsdgpyZXRyaWV2aW5n IHJldmlzaW9uIDEuOApkaWZmIC1wIC11IC1yMS44IHhzbHRfcHJvY2Vzc29yaW1wbC5jcHAKLS0t IHhzbHRfcHJvY2Vzc29yaW1wbC5jcHAJMzEgQXVnIDIwMDUgMDc6MzQ6NTUgLTAwMDAJMS44Cisr KyB4c2x0X3Byb2Nlc3NvcmltcGwuY3BwCTE4IFNlcCAyMDA1IDExOjM3OjM4IC0wMDAwCkBAIC0x ODYsMTIgKzE4NiwxNCBAQCBEb2N1bWVudEltcGwgKlhTTFRQcm9jZXNzb3JJbXBsOjpkb2N1bWVu CiAKICAgICAgICAgaWYgKHhtbFN0ckVxdWFsKG1ldGhvZCwgKGNvbnN0IHhtbENoYXIgKikidGV4 dCIpKSB7CiAgICAgICAgICAgICAvLyBNb2RpZnkgdGhlIG91dHB1dCBzbyB0aGF0IGl0IGlzIGEg d2VsbC1mb3JtZWQgWEhUTUwgZG9jdW1lbnQgd2l0aCBhIDxwcmU+IHRhZyBlbmNsb3NpbmcgdGhl IHRleHQuCi0gICAgICAgICAgICBtX3Jlc3VsdE91dHB1dCA9ICI8IURPQ1RZUEUgaHRtbCBQVUJM SUMgXCItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTlwiIFwiaHR0cDovL3d3dy53My5v cmcvVFIveGh0bWwxL0RURC9zdHJpY3QuZHRkXCI+XG4iCisgICAgICAgICAgICBtX3Jlc3VsdE91 dHB1dC5yZXBsYWNlKCcmJywgIiZhbXA7Iik7CisgICAgICAgICAgICBtX3Jlc3VsdE91dHB1dC5y ZXBsYWNlKCc8JywgIiZsdDsiKTsKKyAgICAgICAgICAgIG1fcmVzdWx0T3V0cHV0ID0gIjw/eG1s IHZlcnNpb249XCIxLjBcIiBlbmNvZGluZz1cIlVURi04XCI/PlxuIgorICAgICAgICAgICAgICAg ICI8IURPQ1RZUEUgaHRtbCBQVUJMSUMgXCItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9F TlwiIFwiaHR0cDovL3d3dy53My5vcmcvVFIveGh0bWwxL0RURC94aHRtbDEtc3RyaWN0LmR0ZFwi PlxuIgogICAgICAgICAgICAgICAgICI8aHRtbCB4bWxucz1cImh0dHA6Ly93d3cudzMub3JnLzE5 OTkveGh0bWxcIj5cbiIKKyAgICAgICAgICAgICAgICAiPGhlYWQ+PHRpdGxlPjwvdGl0bGU+PC9o ZWFkPlxuIgogICAgICAgICAgICAgICAgICI8Ym9keT5cbiIKLSAgICAgICAgICAgICAgICAiPHBy ZT5cbiIKLSAgICAgICAgICAgICAgICAiPCFbQ0RBVEFbIiArIG1fcmVzdWx0T3V0cHV0ICsgIl1d PlxuIgotICAgICAgICAgICAgICAgICI8L3ByZT5cbiIKKyAgICAgICAgICAgICAgICAiPHByZT4i ICsgbV9yZXN1bHRPdXRwdXQgKyAiPC9wcmU+XG4iCiAgICAgICAgICAgICAgICAgIjwvYm9keT5c biIKICAgICAgICAgICAgICAgICAiPC9odG1sPlxuIjsKICAgICAgICAgfQo=