diff options
| -rw-r--r-- | htdocs/config/doctypes.cfg | 6 | ||||
| -rw-r--r-- | htdocs/config/fpis.cfg | 5 | ||||
| -rwxr-xr-x | htdocs/dev/tests/index.html | 7 | ||||
| -rwxr-xr-x | htdocs/dev/tests/xhtml11-minimal.html | 12 | ||||
| -rwxr-xr-x | httpd/cgi-bin/check | 12 |
5 files changed, 31 insertions, 11 deletions
diff --git a/htdocs/config/doctypes.cfg b/htdocs/config/doctypes.cfg index 69f7b2e..77d03be 100644 --- a/htdocs/config/doctypes.cfg +++ b/htdocs/config/doctypes.cfg @@ -1,7 +1,7 @@ # # Mapping of HTML Version "names" to DOCTYPEs. Used for DOCTYPE overide. # -# $Id: doctypes.cfg,v 1.3 2001-06-16 18:58:35 link Exp $ +# $Id: doctypes.cfg,v 1.4 2001-07-16 09:02:19 link Exp $ HTML 0.0 <!DOCTYPE html PUBLIC "-//IETF//DTD HTML Level 0//EN//2.0"> Strict HTML 0.0 <!DOCTYPE html PUBLIC "-//IETF//DTD HTML Strict Level 0//EN//2.0"> @@ -23,6 +23,7 @@ MSIE 3.0 HTML <!DOCTYPE html PUBLIC "-//Microsoft//DTD Internet Explorer 3.0 H Strict MSIE 3.0 HTML <!DOCTYPE html PUBLIC "-//Microsoft//DTD Internet Explorer 3.0 HTML Strict//EN"> ORA HTML Extended v1.0 <!DOCTYPE html PUBLIC "-//OReilly and Associates//DTD HTML Extended 1.0//EN"> ORA HTML Extended Relaxed v1.0 <!DOCTYPE html PUBLIC "-//OReilly and Associates//DTD HTML Extended Relaxed 1.0//EN"> +Apple Help 1.0 <!DOCTYPE HTML PUBLIC "-//bebop.net//DTD HTML Apple Help 1.0//EN" "http://www.bebop.net/AppleHelpDTD/AppleHelp1.0.dtd"> HTML 2.2 <!DOCTYPE html PUBLIC "-//IETF//DTD HTML V2.2//EN"> HTML 1996-01 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1996-01//EN"> HTML 3.2 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> @@ -40,5 +41,4 @@ XHTML 1.0 Strict <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http XHTML 1.0 Transitional <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> XHTML 1.0 Frameset <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> XHTML Basic 1.0 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"> -Apple Help 1.0 <!DOCTYPE HTML PUBLIC "-//bebop.net//DTD HTML Apple Help 1.0//EN" "http://www.bebop.net/AppleHelpDTD/AppleHelp1.0.dtd"> - +XHTML 1.1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> diff --git a/htdocs/config/fpis.cfg b/htdocs/config/fpis.cfg index d2c8ab2..6451575 100644 --- a/htdocs/config/fpis.cfg +++ b/htdocs/config/fpis.cfg @@ -1,7 +1,7 @@ # # Mapping of FPIs to plain text version strings. # -# $Id: fpis.cfg,v 1.10 2001-06-16 18:58:35 link Exp $ +# $Id: fpis.cfg,v 1.11 2001-07-16 09:02:19 link Exp $ -//IETF//DTD HTML Level 0//EN//2.0 HTML 0.0 -//IETF//DTD HTML Strict Level 0//EN//2.0 Strict HTML 0.0 @@ -27,6 +27,7 @@ -//Microsoft//DTD Internet Explorer 3.0 HTML Strict//EN Strict MSIE 3.0 HTML -//OReilly and Associates//DTD HTML Extended 1.0//EN O\'Reilly HTML Extended v1.0 -//OReilly and Associates//DTD HTML Extended Relaxed 1.0//EN O\'Reilly HTML Extended Relaxed v1.0 +-//bebop.net//DTD HTML Apple Help 1.0//EN Apple Help 1.0 -//IETF//DTD HTML V2.2//EN HTML 2.2 -//W3C//DTD HTML 1996-01//EN HTML 1996-01 @@ -53,5 +54,5 @@ ISO/IEC 15445:2000//DTD HTML//EN <a href="http://purl.org/NET/ISO+IEC.15445/1544 -//W3C//DTD XHTML Basic 1.0//EN <a href="http://www.w3.org/TR/2000/REC-xhtml-basic-20001219/">XHTML Basic 1.0</a> --//bebop.net//DTD HTML Apple Help 1.0//EN Apple Help 1.0 +-//W3C//DTD XHTML 1.1//EN <a href="http://www.w3.org/TR/2001/REC-xhtml11-20010531/">XHTML 1.1</a> diff --git a/htdocs/dev/tests/index.html b/htdocs/dev/tests/index.html index 5e3b555..9df0041 100755 --- a/htdocs/dev/tests/index.html +++ b/htdocs/dev/tests/index.html @@ -5,7 +5,7 @@ <title>W3C HTML Validation Service: Tests</title> <link rev="made" href="mailto:gerald@w3.org"> <meta name="revision" - content="$Id: index.html,v 1.31 2001-07-16 07:54:05 link Exp $"> + content="$Id: index.html,v 1.32 2001-07-16 09:06:45 link Exp $"> </head> <body bgcolor="#FFFFFF" text="#000000" link="#0000ee" vlink="#551a8b"> @@ -40,6 +40,7 @@ <li><a href="/check?uri=http://validator.w3.org/dev/tests/xhtml1-strict-minimal.html;ss">XHTML 1.0 Strict, minimal document from xhtml spec</a> <li><a href="/check?uri=http://validator.w3.org/dev/tests/xhtml1-strict-missing-xmlns.html;ss">XHTML 1.0 Strict, missing xmlns attribute (valid)</a> <li><a href="/check?uri=http://validator.w3.org/dev/tests/xhtml-basic10.html;ss">XHTML Basic 1.0 (valid)</a> +<li><a href="/check?uri=http://validator.w3.org/dev/tests/xhtml11-minimal.html;ss">XHTML 1.1 (minimal document)</a> <li><a href="/check?uri=http://www.w3.org/Protocols/rfc2616/rfc2616.html">XHTML sans doctype</a> (DanC's HTMLized RFC 2616) <li><a href="/check?uri=http://www.w3.org/TR/1999/WD-xhtml1-19991124/">XHTML 1.0</a> <li><a href="/check?uri=http://www.w3.org/TR/1998/REC-xml-19980210.xml">XML 1.0</a> @@ -83,7 +84,7 @@ <li><a href="/check?uri=http://www.w3.org/2001/01/xml-latin1.html;ss;sp;noatt">us-ascii xml document with a latin1 character</a> (should be invalid) <li><a href="/check?uri=http://validator.w3.org/dev/tests/no-newlines.html;ss;sp;noatt">no newlines</a> <li><a href="/check?uri=file%3A///etc/passwd">a file: URI</a> -<li><a href="/check?uri=http://localhost/dev/tests/nonSGML-chars.html">Non-SGML Chars.</a> +<li><a href="/check?uri=http://validator.w3.org/dev/tests/nonSGML-chars.html">Non-SGML Chars.</a> </ul> @@ -112,7 +113,7 @@ src="http://validator.w3.org/images/vh40.gif" height=31 width=88 align=right border=0 alt="Valid W3C HTML 4.0!"></a> <a href="/feedback.html">Gerald Oskoboiny</A><br> - $Date: 2001-07-16 07:54:05 $ + $Date: 2001-07-16 09:06:45 $ </address> </body> diff --git a/htdocs/dev/tests/xhtml11-minimal.html b/htdocs/dev/tests/xhtml11-minimal.html new file mode 100755 index 0000000..663f6f5 --- /dev/null +++ b/htdocs/dev/tests/xhtml11-minimal.html @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > +<head> +<title>Virtual Library</title> +</head> +<body> +<p>Moved to <a href="http://vlib.org/">vlib.org</a>.</p> +</body> +</html> + diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 84af918..75b1f10 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -9,7 +9,7 @@ # This source code is available under the license at: # http://www.w3.org/Consortium/Legal/copyright-software # -# $Id: check,v 1.141 2001-07-16 08:08:34 link Exp $ +# $Id: check,v 1.142 2001-07-16 09:03:47 link Exp $ # # We need Perl 5.004. @@ -80,9 +80,9 @@ my $element_ref = 'http://www.htmlhelp.com/reference/html40/'; # # Strings -$VERSION = q$Revision: 1.141 $; +$VERSION = q$Revision: 1.142 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; -$DATE = q$Date: 2001-07-16 08:08:34 $; +$DATE = q$Date: 2001-07-16 09:03:47 $; $MAINTAINER = 'gerald@w3.org'; $NOTICE = ''; # "<p><strong>Note: This service will be ...</strong>"; @@ -1270,6 +1270,12 @@ sub report_valid { $gifborder = ""; $gifhw = ' height="31" width="88"'; $xhtmlendtag = " /"; + } elsif ($version =~ /XHTML 1.1/) { + $image_uri = "${abs_svc_uri}/images/vxhtml11"; + $alttext = "Valid XHTML 1.1!"; + $gifborder = ""; + $gifhw = ' height="31" width="88"'; + $xhtmlendtag = " /"; } elsif ($version =~ /HTML 3\.0/) { $image_uri = "${abs_svc_uri}images/vh30"; $alttext = "Valid HTML 3.0!"; |