diff options
| -rw-r--r-- | htdocs/config/attref.cfg | 243 | ||||
| -rw-r--r-- | htdocs/config/eref.cfg | 96 | ||||
| -rw-r--r-- | htdocs/config/validator.conf | 15 | ||||
| -rwxr-xr-x | htdocs/docs/install.html | 13 | ||||
| -rw-r--r-- | htdocs/docs/install_win.html | 13 | ||||
| -rwxr-xr-x | httpd/cgi-bin/check | 57 | ||||
| -rw-r--r-- | misc/bundle/META.yml | 1 | ||||
| -rw-r--r-- | misc/bundle/Makefile.PL | 1 | ||||
| -rw-r--r-- | misc/bundle/lib/Bundle/W3C/Validator.pm | 1 |
9 files changed, 8 insertions, 432 deletions
diff --git a/htdocs/config/attref.cfg b/htdocs/config/attref.cfg deleted file mode 100644 index f42b550..0000000 --- a/htdocs/config/attref.cfg +++ /dev/null @@ -1,243 +0,0 @@ -# -# Mapping of HTML attribute names and their types -# -# $Id: attref.cfg,v 1.1 2009-02-13 20:51:19 ot Exp $ - -<abbr> -</abbr> -<accept> -</accept> -<accept-charset> -</accept-charset> -<accesskey> -</accesskey> -<action> -</action> -<align> -</align> -<alink> -</alink> -<alt> -</alt> -<archive> -</archive> -<axis> -</axis> -<background> -</background> -<bgcolor> -</bgcolor> -<border> -</border> -<cellpadding> -</cellpadding> -<cellspacing> -</cellspacing> -<char> -</char> -<charoff> -</charoff> -<charset> -</charset> -<checked> -</checked> -<cite> -</cite> -<class> -</class> -<classid> -</classid> -<clear> -</clear> -<code> -</code> -<codebase> -</codebase> -<codetype> -</codetype> -<color> -</color> -<cols> -</cols> -<colspan> -</colspan> -<compact> -</compact> -<content> -</content> -<coords> -</coords> -<data> -</data> -<datetime> -</datetime> -<declare> -</declare> -<defer> -</defer> -<dir> -</dir> -<disabled> -</disabled> -<enctype> -</enctype> -<face> -</face> -<for> -</for> -<frame> -</frame> -<frameborder> -</frameborder> -<headers> -</headers> -<height> -</height> -<href> -</href> -<hreflang> -</hreflang> -<hspace> -</hspace> -<http-equiv> -</http-equiv> -<id> -</id> -<ismap> -</ismap> -<label> -</label> -<lang> -</lang> -<language> -</language> -<link> -</link> -<longdesc> -</longdesc> -<marginheight> -</marginheight> -<marginwidth> -</marginwidth> -<maxlength> -</maxlength> -<media> -</media> -<method> -</method> -<multiple> -</multiple> -<name> -</name> -<nohref> -</nohref> -<noresize> -</noresize> -<noshade> -</noshade> -<nowrap> -</nowrap> -<object> -</object> -<onblur> -</onblur> -<onchange> -</onchange> -<onclick> -</onclick> -<ondblclick> -</ondblclick> -<onfocus> -</onfocus> -<onkeydown> -</onkeydown> -<onkeypress> -</onkeypress> -<onkeyup> -</onkeyup> -<onload> -</onload> -<onmousedown> -</onmousedown> -<onmousemove> -</onmousemove> -<onmouseout> -</onmouseout> -<onmouseover> -</onmouseover> -<onmouseup> -</onmouseup> -<onreset> -</onreset> -<onselect> -</onselect> -<onsubmit> -</onsubmit> -<onunload> -</onunload> -<profile> -</profile> -<prompt> -</prompt> -<readonly> -</readonly> -<rel> -</rel> -<rev> -</rev> -<rows> -</rows> -<rowspan> -</rowspan> -<rules> -</rules> -<scheme> -</scheme> -<scope> -</scope> -<scrolling> -</scrolling> -<selected> -</selected> -<shape> -</shape> -<size> -</size> -<span> -</span> -<src> -</src> -<standby> -</standby> -<start> -</start> -<style> -</style> -<summary> -</summary> -<tabindex> -</tabindex> -<target> -</target> -<text> -</text> -<title> -</title> -<type> -</type> -<usemap> -</usemap> -<valign> -</valign> -<value> -</value> -<valuetype> -</valuetype> -<version> -</version> -<vlink> -</vlink> -<vspace> -</vspace> -<width> -</width> diff --git a/htdocs/config/eref.cfg b/htdocs/config/eref.cfg deleted file mode 100644 index 6b75cfb..0000000 --- a/htdocs/config/eref.cfg +++ /dev/null @@ -1,96 +0,0 @@ -# -# Mapping of element names to an URL fragment for their definition. -# -# $Id: eref.cfg,v 1.3 2004-07-21 15:07:00 link Exp $ - -a = special/a.html -abbr = phrase/abbr.html -acronym = phrase/acronym.html -address = block/address.html -applet = special/applet.html -area = special/area.html -b = fontstyle/b.html -base = head/base.html -basefont = special/basefont.html -bdo = special/bdo.html -big = fontstyle/big.html -blockquote = block/blockquote.html -body = html/body.html -br = special/br.html -button = forms/button.html -caption = tables/caption.html -center = block/center.html -cite = phrase/cite.html -code = phrase/code.html -col = tables/col.html -colgroup = tables/colgroup.html -dd = lists/dd.html -del = phrase/del.html -dfn = phrase/dfn.html -dir = lists/dir.html -div = block/div.html -dl = lists/dl.html -dt = lists/dt.html -em = phrase/em.html -fieldset = forms/fieldset.html -font = special/font.html -form = forms/form.html -frame = frames/frame.html -frameset = frames/frameset.html -h1 = block/h1.html -h2 = block/h2.html -h3 = block/h3.html -h4 = block/h4.html -h5 = block/h5.html -h6 = block/h6.html -head = head/head.html -hr = block/hr.html -html = html/html.html -i = fontstyle/i.html -iframe = special/iframe.html -img = special/img.html -input = forms/input.html -ins = phrase/ins.html -isindex = block/isindex.html -kbd = phrase/kbd.html -label = forms/label.html -legend = forms/legend.html -li = lists/li.html -link = head/link.html -map = special/map.html -menu = lists/menu.html -meta = head/meta.html -noframes = frames/noframes.html -noscript = block/noscript.html -object = special/object.html -ol = lists/ol.html -optgroup = forms/optgroup.html -option = forms/option.html -p = block/p.html -param = special/param.html -pre = block/pre.html -q = special/q.html -s = fontstyle/s.html -samp = phrase/samp.html -script = special/script.html -select = forms/select.html -small = fontstyle/small.html -span = special/span.html -strike = fontstyle/strike.html -strong = phrase/strong.html -style = head/style.html -sub = special/sub.html -sup = special/sup.html -table = tables/table.html -tbody = tables/tbody.html -td = tables/td.html -textarea = forms/textarea.html -tfoot = tables/tfoot.html -th = tables/th.html -thead = tables/thead.html -title = head/title.html -tr = tables/tr.html -tt = fontstyle/tt.html -u = fontstyle/u.html -ul = lists/ul.html -var = phrase/var.html diff --git a/htdocs/config/validator.conf b/htdocs/config/validator.conf index f2a5202..2853e28 100644 --- a/htdocs/config/validator.conf +++ b/htdocs/config/validator.conf @@ -1,7 +1,7 @@ # Main Configuration File for the W3C Markup Validation Service. # -# $Id: validator.conf,v 1.36 2009-09-13 19:29:24 ville Exp $ +# $Id: validator.conf,v 1.37 2009-09-16 19:15:19 ville Exp $ # # See 'perldoc Config::General' for the syntax, and be aware that the # 'SplitPolicy' is 'equalsign', ie. keys and values are separated by '\s*=\s*', @@ -88,19 +88,6 @@ Languages = en # # -# Maps element names to URLs. -<Elements> - Include eref.cfg -</Elements> - -# -# Maps attribute names -<Attributes> - Include attref.cfg -</Attributes> - - -# # Main document Type Registry; contains all information on the types # of documents we support and how they are processed. <Types> diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html index ed82ec5..7d86ffe 100755 --- a/htdocs/docs/install.html +++ b/htdocs/docs/install.html @@ -1,5 +1,5 @@ -<!--#set var="revision" value="\$Id: install.html,v 1.54 2009-09-05 11:45:16 ville Exp $" ---><!--#set var="date" value="\$Date: 2009-09-05 11:45:16 $" +<!--#set var="revision" value="\$Id: install.html,v 1.55 2009-09-16 19:15:19 ville Exp $" +--><!--#set var="date" value="\$Date: 2009-09-16 19:15:19 $" --><!--#set var="title" value="Installation Documentation for The W3C Markup Validation Service" --><!--#set var="relroot" value="../" --><!--#include virtual="../header.html" --> @@ -184,10 +184,6 @@ install Bundle::W3C::Validator <dd> The Perl binding for libxml2, used to check the syntax of XML-based document types. </dd> - <dt><a href="http://search.cpan.org/dist/String-Approx/">String-Approx</a></dt> - <dd> - A library for fuzzy matching of text used to make the validator suggest automated corrections. - </dd> </dl> <h6>For reference: List of optional Perl module distributions</h6> @@ -317,11 +313,6 @@ HTML5 = http://localhost:8888/html5/ Maps character sets to conversion parameters for validator's internal UTF-8 conversion. </dd> - <dt>eref.cfg</dt> - <dd> - Contains the mappings from element names to a URL path - (relative to a configurable URL) for their definitions. - </dd> <dt>types.conf</dt> <dd> Maps MIME/HTTP Content-Types to an internal "document type" which diff --git a/htdocs/docs/install_win.html b/htdocs/docs/install_win.html index 2a2a3c9..1d70d0b 100644 --- a/htdocs/docs/install_win.html +++ b/htdocs/docs/install_win.html @@ -1,5 +1,5 @@ -<!--#set var="revision" value="\$Id: install_win.html,v 1.21 2009-09-05 11:45:16 ville Exp $" ---><!--#set var="date" value="\$Date: 2009-09-05 11:45:16 $" +<!--#set var="revision" value="\$Id: install_win.html,v 1.22 2009-09-16 19:15:19 ville Exp $" +--><!--#set var="date" value="\$Date: 2009-09-16 19:15:19 $" --><!--#set var="title" value="Installation Documentation for The W3C Markup Validation Service (Windows, Apache)" --><!--#set var="relroot" value="../" --><!--#include virtual="../header.html" --> @@ -71,7 +71,6 @@ At <a href="http://ppm.activestate.com/">Active State</a>, <li>XML-NamespaceSupport</li> <li>XML-SAX</li> <li>XML-LibXML-Common</li> - <li>String-Approx</li> </ul> <p>...and the following are optional:</p> <ul> @@ -270,7 +269,7 @@ Include conf/extra/httpd-manual.conf <pre># # Main Configuration File for the W3C Markup Validation Service. # -# $Id: install_win.html,v 1.21 2009-09-05 11:45:16 ville Exp $ +# $Id: install_win.html,v 1.22 2009-09-16 19:15:19 ville Exp $ # # See 'perldoc Config::General' for the syntax, and be aware that the # 'SplitPolicy' is 'equalsign', ie. keys and values are separated by '\s*=\s*', @@ -357,12 +356,6 @@ Languages = en # # -# Maps element names to URLs. -<Elements> - Include eref.cfg -</Elements> - -# # Main document Type Registry; contains all information on the types # of documents we support and how they are processed. <Types> diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 6f0f044..18a471b 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -14,7 +14,7 @@ # This source code is available under the license at: # http://www.w3.org/Consortium/Legal/copyright-software # -# $Id: check,v 1.695 2009-09-16 17:32:07 ville Exp $ +# $Id: check,v 1.696 2009-09-16 19:15:19 ville Exp $ # # Disable buffering on STDOUT! $| = 1; @@ -64,7 +64,6 @@ use SGML::Parser::OpenSP 0.991 qw(); use URI qw(); use URI::Escape qw(uri_escape); use XML::LibXML qw(); -use String::Approx qw(); ############################################################################### #### Constant definitions. #################################################### @@ -206,7 +205,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.695 $; + $VERSION = q$Revision: 1.696 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -3122,58 +3121,6 @@ sub error # in that case the error message will be #344 } - if ( ($err->{num} eq '108') or ($err->{num} eq '76') ) - # element or attribute does not exist? Let's try and fuzzy-match it - { - my $bogus_elt_attr = $err->{msg}; - $bogus_elt_attr =~ s/.*"(.+)".*/$1/; - if ($err->{num} eq '108') { - $err->{msg} = "Attribute \"".$bogus_elt_attr."\" is not a valid attribute"; - } - - if(($err->{num} eq '108') and - (exists $self->{CFG}->{Attributes}->{lc($bogus_elt_attr)}) and - (!$is_xml || $bogus_elt_attr eq lc($bogus_elt_attr))) { - # attribute not available in this context. - $err->{msg} = "Attribute \"$bogus_elt_attr\" can not be used for this element."; - } - elsif ( ( - ((exists $self->{CFG}->{Attributes}->{lc($bogus_elt_attr)}) and ($err->{num} eq '108')) - or - ((exists $self->{CFG}->{Elements}->{lc($bogus_elt_attr)}) and ($err->{num} eq '76')) - ) - and (lc($bogus_elt_attr) ne $bogus_elt_attr) - ) - { - $err->{msg} .= '. Did you mean "'.lc($bogus_elt_attr).'"?'; - } - else { #fuzzy-match and suggest alternatives - my @matches; - if ($err->{num} eq '108') { - @matches = String::Approx::amatch($bogus_elt_attr, ["3i"], keys %{$self->{CFG}->{Attributes}}); - } - elsif ($err->{num} eq '76') { - @matches = String::Approx::amatch($bogus_elt_attr, ["3i"], keys %{$self->{CFG}->{Elements}}); - } - if (@matches){ - my %distances; - @distances{@matches} = map { abs } String::Approx::adist(lc($bogus_elt_attr), @matches); - my @matches_sorted = sort { $distances{$a} <=> $distances{$b} } @matches; - # a bit of printf debugging can't hurt - # foreach my $match (@matches_sorted) { - # $err->{msg} .= '<br /> match '.$match.': '.$distances{$match}; - # } - if (@matches > 1){ - $err->{msg} .= '. Did you mean "'.$matches_sorted[0].'" or "'.$matches_sorted[1].'"?'; - - } - else { - $err->{msg} .= '. Did you mean "'.$matches_sorted[0].'"?'; - } - } - } - } - if (($err->{num} eq '113') and ($err->{msg} =~ /xml:space/)) { # FIXME # this is a problem with some of the "flattened" W3C DTDs, filtering them out to not confuse users. diff --git a/misc/bundle/META.yml b/misc/bundle/META.yml index 7f6f139..478a88a 100644 --- a/misc/bundle/META.yml +++ b/misc/bundle/META.yml @@ -31,7 +31,6 @@ requires: Net::IP: 0 SGML::Parser::OpenSP: 0.991 Socket: 0 - String::Approx: 0 URI: 0 URI::Escape: 0 XML::LibXML: 0 diff --git a/misc/bundle/Makefile.PL b/misc/bundle/Makefile.PL index e5f7915..794a36c 100644 --- a/misc/bundle/Makefile.PL +++ b/misc/bundle/Makefile.PL @@ -30,7 +30,6 @@ WriteMakefile( Net::IP => 0, SGML::Parser::OpenSP => 0.991, Socket => 0, - String::Approx => 0, URI => 0, URI::Escape => 0, XML::LibXML => 0, diff --git a/misc/bundle/lib/Bundle/W3C/Validator.pm b/misc/bundle/lib/Bundle/W3C/Validator.pm index e3b4c8a..87e14d3 100644 --- a/misc/bundle/lib/Bundle/W3C/Validator.pm +++ b/misc/bundle/lib/Bundle/W3C/Validator.pm @@ -43,7 +43,6 @@ C<perl -MCPAN -e "install Bundle::W3C::Validator"> Net::hostent SGML::Parser::OpenSP 0.991 Socket - String::Approx URI URI::Escape XML::LibXML |