diff options
| -rwxr-xr-x | htdocs/sgml-lib/REC-xhtml1-20000126/xhtml.soc | 3 | ||||
| -rw-r--r-- | htdocs/sgml-lib/catalog | 7 | ||||
| -rwxr-xr-x | httpd/cgi-bin/check | 18 |
3 files changed, 10 insertions, 18 deletions
diff --git a/htdocs/sgml-lib/REC-xhtml1-20000126/xhtml.soc b/htdocs/sgml-lib/REC-xhtml1-20000126/xhtml.soc index 851d17e..2d5b4e2 100755 --- a/htdocs/sgml-lib/REC-xhtml1-20000126/xhtml.soc +++ b/htdocs/sgml-lib/REC-xhtml1-20000126/xhtml.soc @@ -1,3 +1,6 @@ +OVERRIDE YES +SGMLDECL "../sp-1.3/pubtext/xml.dcl" + -- Oasis entity catalog for Extensible HTML 1.0 -- PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "xhtml1-strict.dtd" diff --git a/htdocs/sgml-lib/catalog b/htdocs/sgml-lib/catalog index 0ee6e04..932c5ea 100644 --- a/htdocs/sgml-lib/catalog +++ b/htdocs/sgml-lib/catalog @@ -1,6 +1,6 @@ -- SGML catalog for the W3C HTML Validation Service -- - -- $Id: catalog,v 1.14 2001-05-27 11:36:30 link Exp $ -- + -- $Id: catalog,v 1.15 2001-05-27 15:45:02 link Exp $ -- OVERRIDE YES -- prefer public identifiers to system identifiers -- @@ -147,8 +147,3 @@ PUBLIC "ISO/IEC 15445:2000//DTD HTML//EN" ISO-HTML/15445.dtd PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML" REC-html401-19991224/HTMLlat1.ent PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML" REC-html401-19991224/HTMLsymbol.ent - -- Include catalog for XHTML -- -CATALOG "REC-xhtml1-20000126/xhtml.soc" - -- Include catalog for MathML -- -CATALOG "CR-MathML2-20001113/catalog" - diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 835b93e..c242e2e 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -8,7 +8,7 @@ # This source code is available under the license at: # http://www.w3.org/Consortium/Legal/copyright-software # -# $Id: check,v 1.107 2001-05-27 11:58:52 link Exp $ +# $Id: check,v 1.108 2001-05-27 15:45:02 link Exp $ # # We need Perl 5.004. @@ -57,8 +57,6 @@ my $frag_db = $html_path . 'config/frag.cfg'; my $type_db = $html_path . 'config/type.cfg'; my $dtds_db = $html_path . 'config/doctypes.cfg'; my $sgmlstuff = $html_path . 'sgml-lib'; -my $sgmldecl = $sgmlstuff . '/REC-html401-19991224/HTML4.decl'; -my $xmldecl = $sgmlstuff . '/sp-1.3/pubtext/xml.dcl'; my $temp = "/tmp/validate.$$"; # @@ Use POSIX/IO::File tmpfiles instead! # @@ -76,9 +74,9 @@ my $element_ref = 'http://www.htmlhelp.com/reference/html40/'; # # Strings -$VERSION = q$Revision: 1.107 $; +$VERSION = q$Revision: 1.108 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; -$DATE = q$Date: 2001-05-27 11:58:52 $; +$DATE = q$Date: 2001-05-27 15:45:02 $; $MAINTAINER = 'gerald@w3.org'; $NOTICE = ''; # "<p><strong>Note: This service will be ...</strong>"; @@ -361,12 +359,10 @@ print(' ' x 4, q(<li>Content length: ), $File->{Size}, qq(</li>\n)) my $xmlflags = ''; -my $decl = $xmldecl; my $catalog = $sgmlstuff . '/catalog'; -my $path = $sgmlstuff; if ($File->{Type} eq 'xhtml') { - $path = $sgmlstuff . '/REC-xhtml1-20000126/'; + $catalog = $sgmlstuff . '/REC-xhtml1-20000126/xhtml.soc'; $ENV{SP_CHARSET_FIXED} = 'YES'; $ENV{SP_ENCODING} = 'UTF-8'; $xmlflags = '-wxml '; @@ -374,6 +370,7 @@ if ($File->{Type} eq 'xhtml') { $xmlflags .= '-wno-valid '; } } elsif ($File->{Type} eq 'mathml') { + $catalog = $sgmlstuff . '/CR-MathML2-20001113/catalog'; $ENV{SP_CHARSET_FIXED} = 'YES'; $ENV{SP_ENCODING} = 'XML'; $xmlflags = '-wxml '; @@ -381,15 +378,12 @@ if ($File->{Type} eq 'xhtml') { # no doctype, with xmlns attr on 1st element $File->{Type} = 'xml'; # @@ probably a better way to do this $catalog = $sgmlstuff . '/sp-1.3/pubtext/xml.soc'; - $path = $sgmlstuff . '/sp-1.3/pubtext/'; $ENV{SP_CHARSET_FIXED} = 'YES'; $ENV{SP_ENCODING} = 'XML'; $xmlflags = '-wxml -wno-valid '; -} else { # must be HTML (for now) - $decl = $sgmldecl; } -my $command = "$sp -f$temp -E0 $xmlflags -c $catalog -D $path $decl"; +my $command = "$sp -f$temp -E0 $xmlflags -c $catalog"; print "\t<li>nsgmls command line: <code>$command</code>\n" if $DEBUG; |