Kill more environment variables. Use the SGML Open Catalog mechanism "CATALOG"

to include the catalogs for MathML and XHTML. Provide SGML Declaration on the
command line.

3 files changed, 12 insertions, 11 deletions

diff --git a/htdocs/sgml-lib/REC-xhtml1-20000126/xhtml.soc b/htdocs/sgml-lib/REC-xhtml1-20000126/xhtml.soc
index 0624dea..851d17e 100755
--- a/htdocs/sgml-lib/REC-xhtml1-20000126/xhtml.soc
+++ b/htdocs/sgml-lib/REC-xhtml1-20000126/xhtml.soc
@@ -1,4 +1,3 @@
-OVERRIDE	YES
         -- Oasis entity catalog for Extensible HTML 1.0 --
 
 PUBLIC  "-//W3C//DTD XHTML 1.0 Strict//EN"        "xhtml1-strict.dtd"
@@ -11,4 +10,3 @@ PUBLIC	"-//W3C//ENTITIES Latin 1 for XHTML//EN"  "xhtml-lat1.ent"
 PUBLIC	"-//W3C//ENTITIES Symbols for XHTML//EN" "xhtml-symbol.ent"
 PUBLIC	"-//W3C//ENTITIES Special for XHTML//EN" "xhtml-special.ent"
 
-SGMLDECL "xhtml1.dcl"
diff --git a/htdocs/sgml-lib/catalog b/htdocs/sgml-lib/catalog
index b45f530..0ee6e04 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.13 2000-10-19 00:21:34 gerald Exp $ --
+	-- $Id: catalog,v 1.14 2001-05-27 11:36:30 link Exp $ --
 
 OVERRIDE YES	-- prefer public identifiers to system identifiers --
 
@@ -147,3 +147,8 @@ 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 242613f..48447ff 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.104 2001-05-27 11:05:39 link Exp $
+# $Id: check,v 1.105 2001-05-27 11:36:30 link Exp $
 
 #
 # We need Perl 5.004.
@@ -75,9 +75,9 @@ my $element_ref = 'http://www.htmlhelp.com/reference/html40/';
 
 #
 # Strings
-$VERSION    =  q$Revision: 1.104 $;
+$VERSION    =  q$Revision: 1.105 $;
 $VERSION    =~ s/Revision: ([\d\.]+) /$1/;
-$DATE       =  q$Date: 2001-05-27 11:05:39 $;
+$DATE       =  q$Date: 2001-05-27 11:36:30 $;
 $MAINTAINER =  'gerald@w3.org';
 $NOTICE     =  ''; # "<p><strong>Note: This service will be ...</strong>";
 
@@ -361,11 +361,10 @@ print(' ' x 4, q(<li>Content length: ), $File->{Size},     qq(</li>\n))
 
 my $xmlflags = '';
 my $decl     = '';
-my $catalog  = '';
+my $catalog  = $sgmlstuff . '/catalog';
 my $path     = $sgmlstuff;
 
 if ($File->{Type} eq 'xhtml') {
-  $catalog               = $sgmlstuff . '/REC-xhtml1-20000126/xhtml.soc';
   $path                  = $sgmlstuff . '/REC-xhtml1-20000126/';
   $ENV{SP_CHARSET_FIXED} = 'YES';
   $ENV{SP_ENCODING}      = 'UTF-8';
@@ -375,10 +374,10 @@ if ($File->{Type} eq 'xhtml') {
   }
   $decl                  = $xhtmldecl;
 } elsif ($File->{Type} eq 'mathml') {
-  $catalog               = $sgmlstuff . '/CR-MathML2-20001113/catalog';
   $ENV{SP_CHARSET_FIXED} = 'YES';
   $ENV{SP_ENCODING}      = 'XML';
   $xmlflags              = '-wxml ';
+  $decl                  = $xmldecl;
 } elsif ($File->{Type} eq 'xml' or $guessed_doctype == 2) {
   # no doctype, with xmlns attr on 1st element
   $File->{Type} = 'xml'; # @@ probably a better way to do this
@@ -389,8 +388,7 @@ if ($File->{Type} eq 'xhtml') {
   $xmlflags              = '-wxml -wno-valid ';
   $decl                  = $xmldecl;
 } else { # must be HTML (for now)
-  $decl    = $sgmldecl;
-  $catalog = $sgmlstuff . '/catalog';
+  $decl = $sgmldecl;
 }
 
 my $command  = "$sp -f$temp -E0 $xmlflags -c $catalog -D $path $decl";