[Jtidy-cvs] SF.net SVN: jtidy:[1172] branches/CodeUpdateAndJava5/src/main

[<ad...@us...>]

Revision: 1172
          http://jtidy.svn.sourceforge.net/jtidy/?rev=1172&view=rev
Author:   aditsu
Date:     2010-11-06 14:32:58 +0000 (Sat, 06 Nov 2010)

Log Message:
-----------
fixed test 1632218 - modified encodingError to use the decimal character value for INVALID_NCR, and adjusted messages

Modified Paths:
--------------
    branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
    branches/CodeUpdateAndJava5/src/main/resources/org/w3c/tidy/TidyMessages.properties

Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java	2010-11-06 13:54:31 UTC (rev 1171)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java	2010-11-06 14:32:58 UTC (rev 1172)
@@ -514,11 +514,7 @@
                 break;
             case INVALID_NCR:
                 lexer.badChars |= BC_INVALID_NCR;
-                messageLexer(
-                    lexer,
-                    Level.WARNING,
-                    code,
-                    replaceMode, buf);
+                messageLexer(lexer, Level.WARNING, code, replaceMode, c);
                 break;
             }
         }

Modified: branches/CodeUpdateAndJava5/src/main/resources/org/w3c/tidy/TidyMessages.properties
===================================================================
--- branches/CodeUpdateAndJava5/src/main/resources/org/w3c/tidy/TidyMessages.properties	2010-11-06 13:54:31 UTC (rev 1171)
+++ branches/CodeUpdateAndJava5/src/main/resources/org/w3c/tidy/TidyMessages.properties	2010-11-06 14:32:58 UTC (rev 1172)
@@ -54,7 +54,7 @@
 invalid_attribute={0} attribute name "{1}" (value="{2}") is invalid
 invalid_char={0,choice,0#replacing|1#discarding} invalid character code {1}
 invalid_ncr={0,choice,0#replacing|1#discarding} invalid numeric character reference {1}
-invalid_sgml_chars=Character codes 128 to 159 (U+0080 to U+009F) are not allowed in HTML;\u000aeven if they were, they would likely be unprintable control characters.\u000aTidy assumed you wanted to refer to a character with the same byte value in the \u000a{0,choice,0#specified|1#Windows-1252|2#MacRoman} encoding and replaced that reference with the Unicode equivalent.
+invalid_sgml_chars=Character codes 128 to 159 (U+0080 to U+009F) are not allowed in HTML;\u000aeven if they were, they would likely be unprintable control characters.\u000aTidy assumed you wanted to refer to a character with the same byte value in the \u000a{0,choice,0#specified|1#Windows-1252|2#MacRoman} encoding and replaced that reference with the Unicode equivalent.\n
 invalid_utf16={0,choice,0#replacing|1#discarding} invalid UTF-16 surrogate pair (char. code {1})
 invalid_utf16_summary=Character codes for UTF-16 must be in the range: U+0000 to U+10FFFF.\u000aThe definition of UTF-16 in Annex C of ISO/IEC 10646-1:2000 does not allow the\u000amapping of unpaired surrogates. For more information please refer to\u000ahttp://www.unicode.org/unicode and http://www.cl.cam.ac.uk/~mgk25/unicode.html
 invalid_utf8={0,choice,0#replacing|1#discarding} invalid UTF-8 bytes (char. code {1})
@@ -74,7 +74,7 @@
 missing_imagemap={0} should use client-side image map
 missing_quotemark={0} attribute with missing trailing quote mark
 missing_semicolon=entity "{0}" doesn''t end in '';''
-missing_semicolon_ncr=numeric character reference "{0}" doesn''t end in ";"
+missing_semicolon_ncr=numeric character reference "{0}" doesn''t end in '';''
 missing_starttag=missing <{0}>
 missing_title_element=inserting missing ''title'' element
 needs_author_intervention=This document has errors that must be fixed before\u000ausing HTML Tidy to generate a tidied up version.\n


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.