diff options
| -rwxr-xr-x | httpd/cgi-bin/check | 13 | ||||
| -rw-r--r-- | share/templates/en_US/ucn_output.tmpl | 12 | ||||
| -rw-r--r-- | share/templates/en_US/valid.tmpl | 12 |
3 files changed, 27 insertions, 10 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index ff48402..ad34210 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -276,7 +276,7 @@ $File->{XMLWF_ONLY} = FALSE; # Listrefs. $File->{Warnings} = []; # Warnings... $File->{Namespaces} = []; # Other (non-root) Namespaces. -$File->{Parsers} = []; # Parsers used {name, link, options} +$File->{Parsers} = []; # Parsers used {name, link, type, options} # By default, doctype-less documents can not be valid $File->{"DOCTYPEless OK"} = FALSE; @@ -869,6 +869,7 @@ sub compoundxml_validate (\$) @{$File->{Parsers}}, { name => "Compound XML", link => "http://qa-dev.w3.org/", # TODO? + type => "", options => "" } ); @@ -1029,6 +1030,7 @@ sub html5_validate (\$) @{$File->{Parsers}}, { name => "validator.nu", link => "http://validator.nu/", + type => "HTML5", options => "" } ); @@ -1226,6 +1228,7 @@ sub dtd_validate (\$) @{$File->{Parsers}}, { name => "OpenSP", link => "http://openjade.sourceforge.net/", + type => "SGML/XML", options => join(" ", @spopt) } ); @@ -1287,7 +1290,11 @@ sub xmlwf (\$) push( @{$File->{Parsers}}, - {name => "libxml2", link => "http://xmlsoft.org/", options => ""} + { name => "libxml2", + link => "http://xmlsoft.org/", + type => "XML", + options => "" + } ); # Restrict file reading similar to what SGML::Parser::OpenSP does. Note @@ -1558,6 +1565,8 @@ sub fin_template ($$) ); } + $T->param(parsers => $File->{Parsers}); + if (!$File->{Doctype} && (!$File->{Version} || $File->{Version} eq 'unknown' || diff --git a/share/templates/en_US/ucn_output.tmpl b/share/templates/en_US/ucn_output.tmpl index 5cff656..139b3d5 100644 --- a/share/templates/en_US/ucn_output.tmpl +++ b/share/templates/en_US/ucn_output.tmpl @@ -26,8 +26,8 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF> <TMPL_IF NAME="is_tentative"> was <em>tentatively</em> checked as <TMPL_VAR NAME="file_version" ESCAPE="HTML">. This means that with the use of some fallback or override mechanism, - we successfully performed a formal validation using an SGML, HTML5 and/or XML - Parser(s). In other words, the document would validate as + we successfully performed a formal validation of it. + In other words, the document would validate as <TMPL_VAR NAME="file_version" ESCAPE="HTML"> if you changed the markup to match the changes we have performed automatically, but <em>it will not be valid until you make these changes</em>. @@ -43,10 +43,14 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF> <TMPL_ELSE> This means that the resource in question identified itself as "<TMPL_VAR NAME="file_version" ESCAPE="HTML">" and that we successfully - performed a formal validation using an SGML, HTML5 and/or XML - Parser(s) (depending on the markup language used). + performed a formal validation of it. </TMPL_IF> </TMPL_IF> + The parser implementations we used for this check are based on + <TMPL_LOOP NAME="parsers"> + <TMPL_UNLESS NAME="__first__"><TMPL_IF NAME="__last__">and </TMPL_IF></TMPL_UNLESS> + <a href="<TMPL_VAR NAME="link" ESCAPE="HTML">"><TMPL_VAR NAME="name" ESCAPE="HTML"></a><TMPL_IF NAME="type"> (<TMPL_VAR NAME="type" ESCAPE="HTML">)</TMPL_IF><TMPL_IF NAME="__inner__">,</TMPL_IF><TMPL_IF NAME="__last__">.</TMPL_IF> + </TMPL_LOOP> <TMPL_IF NAME="badge_uri"> <p>To show your readers that you have taken the care to create an interoperable Web page, you may display this icon on any page diff --git a/share/templates/en_US/valid.tmpl b/share/templates/en_US/valid.tmpl index 818aebc..4cba639 100644 --- a/share/templates/en_US/valid.tmpl +++ b/share/templates/en_US/valid.tmpl @@ -32,8 +32,8 @@ <TMPL_IF NAME="is_tentative"> was <em>tentatively</em> checked as <TMPL_VAR NAME="file_version" ESCAPE="HTML">. This means that with the use of some fallback or override mechanism, - we successfully performed a formal validation using an SGML, HTML5 and/or XML - Parser(s). In other words, the document would validate as + we successfully performed a formal validation of it. + In other words, the document would validate as <TMPL_VAR NAME="file_version" ESCAPE="HTML"> if you changed the markup to match the changes we have performed automatically, but <strong>it will not be valid until you make these changes</strong>. @@ -48,10 +48,14 @@ <TMPL_ELSE> This means that the resource in question identified itself as "<TMPL_VAR NAME="file_version" ESCAPE="HTML">" and that we successfully - performed a formal validation using an SGML, HTML5 and/or XML - Parser(s) (depending on the markup language used). + performed a formal validation of it. </TMPL_IF> </TMPL_IF> + The parser implementations we used for this check are based on + <TMPL_LOOP NAME="parsers"> + <TMPL_UNLESS NAME="__first__"><TMPL_IF NAME="__last__">and </TMPL_IF></TMPL_UNLESS> + <a href="<TMPL_VAR NAME="link" ESCAPE="HTML">"><TMPL_VAR NAME="name" ESCAPE="HTML"></a><TMPL_IF NAME="type"> (<TMPL_VAR NAME="type" ESCAPE="HTML">)</TMPL_IF><TMPL_IF NAME="__inner__">,</TMPL_IF><TMPL_IF NAME="__last__">.</TMPL_IF> + </TMPL_LOOP> </p> <TMPL_IF NAME="badge_uri"> <h4>"valid" Icon(s) on your Web page</h4> |