Applying patches from Dave Evans (with minor tweaks).

See <http://lists.w3.org/Archives/Public/www-validator/2003Jan/0005.html>

5 files changed, 39 insertions, 14 deletions

diff --git a/htdocs/config/types.conf b/htdocs/config/types.conf
index e75183b..8604091 100644
--- a/htdocs/config/types.conf
+++ b/htdocs/config/types.conf
@@ -1,7 +1,7 @@
 #
 # Main Document Type Database for the W3C MarkUp Validation Service.
 #
-# $Id: types.conf,v 1.1 2002-12-08 01:46:44 link Exp $
+# $Id: types.conf,v 1.2 2003-01-03 20:21:55 ville Exp $
 #
 # Maintains all information for each of the document types we support.
 # See 'perldoc Config::General' for the syntax, and be aware that the
@@ -173,7 +173,7 @@
   Display    = HTML 4.0 Frameset
   Info_URL   = http://www.w3.org/TR/1998/REC-html40-19980424/
   PubID      = -//W3C//DTD HTML 4.0 Frameset//EN
-  SysID      http://www.w3.org/TR/1998/REC-html40-19980424/frameset.dtd
+  SysID      = http://www.w3.org/TR/1998/REC-html40-19980424/frameset.dtd
   Parse_Mode = SGML
   <Content_Types>
     Allowed   = text/html
@@ -241,7 +241,7 @@
   Name       = html
   Display    = HTML 4.01 Frameset
   Info_URL   = http://www.w3.org/TR/1999/REC-html401-19991224/
-  PubID      = -//W3C//DTD HTML 4.01 Transitional//EN
+  PubID      = -//W3C//DTD HTML 4.01 Frameset//EN
   SysID      = http://www.w3.org/TR/1999/REC-html401-19991224/frameset.dtd
   Parse_Mode = SGML
   <Content_Types>
diff --git a/htdocs/config/validator.conf b/htdocs/config/validator.conf
index 6e1543e..bf72bbf 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.5 2002-12-08 01:46:44 link Exp $
+# $Id: validator.conf,v 1.6 2003-01-03 20:21:55 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*'.
@@ -53,7 +53,7 @@ SGML_Library        = /usr/local/validator/htdocs/sgml-lib
 </Charsets>
 
 <Types>
-  Include types.cfg
+  Include types.conf
 </Types>
 
 
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index e1a2a35..aa9d0cf 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.320 2002-12-08 17:51:46 ville Exp $
+# $Id: check,v 1.321 2003-01-03 20:21:55 ville Exp $
 
 #
 # Disable buffering on STDOUT!
@@ -144,7 +144,7 @@ The error reported was: '$@'
 
   #
   # Strings
-  $VERSION    =  q$Revision: 1.320 $;
+  $VERSION    =  q$Revision: 1.321 $;
   $VERSION    =~ s/Revision: ([\d\.]+) /$1/;
 
 } # end of BEGIN block.
@@ -732,6 +732,7 @@ sub prep_template ($$) {
   $T->param(opt_show_parsetree => $File->{Opt}->{'Show Parsetree'});
   $T->param(opt_show_noatt     => $File->{Opt}->{'No Attributes'});
   $T->param(opt_verbose        => $File->{Opt}->{'Verbose'});
+  $T->param(opt_no200          => $File->{Opt}->{'No200'});
 
   #
   # Tip of the Day...
diff --git a/share/templates/en_US/opt_show_source.tmpl b/share/templates/en_US/opt_show_source.tmpl
index b0f510f..c4d3cf3 100644
--- a/share/templates/en_US/opt_show_source.tmpl
+++ b/share/templates/en_US/opt_show_source.tmpl
@@ -4,7 +4,7 @@
     <p>Below is the source input I used for this validation:</p>
     <ol class="source">
 <TMPL_LOOP NAME="file_source">
-      <li id="<TMPL_VAR NAME="file_source_index">"><TMPL_VAR NAME="file_source_line"></li>
+      <li id="line-<TMPL_VAR NAME="file_source_i">"><TMPL_VAR NAME="file_source_line"></li>
 </TMPL_LOOP> 
     </ol>
   </div>
diff --git a/share/templates/en_US/table.tmpl b/share/templates/en_US/table.tmpl
index 2fa6f51..a80a3a6 100644
--- a/share/templates/en_US/table.tmpl
+++ b/share/templates/en_US/table.tmpl
@@ -67,16 +67,40 @@
         <td colspan="2">
           <table class="options">
             <tr>
-              <td><label title="Show Page Source (accesskey: 5)" for="ss"><input type="checkbox" value="1" id="ss" name="ss" accesskey="5" />Show&nbsp;Source</label></td>
-              <td><label title="Show an Outline of the document (accesskey: 6)" for="outline"><input type="checkbox" value="1" id="outline" name="outline" accesskey="6" />Outline</label></td>
+              <td><label title="Show Page Source (accesskey: 5)" for="ss"><input type="checkbox" value="1" id="ss" name="ss" accesskey="5"
+<TMPL_IF NAME="opt_show_source">
+	checked="checked"
+</TMPL_IF>
+		/>Show&nbsp;Source</label></td>
+              <td><label title="Show an Outline of the document (accesskey: 6)" for="outline"><input type="checkbox" value="1" id="outline" name="outline" accesskey="6"
+<TMPL_IF NAME="opt_show_outline">
+	checked="checked"
+</TMPL_IF>
+		/>Outline</label></td>
             </tr>
             <tr>
-              <td><label title="Show Parse Tree (accesskey: 7)" for="sp"><input type="checkbox" value="1" id="sp" name="sp" accesskey="7" />Parse&nbsp;Tree</label></td>
-              <td><label title="Exclude Attributes from Parse Tree (accesskey: 8)" for="noatt"><input type="checkbox" value="1" id="noatt" name="noatt" accesskey="8" />...no&nbsp;attributes</label></td>
+              <td><label title="Show Parse Tree (accesskey: 7)" for="sp"><input type="checkbox" value="1" id="sp" name="sp" accesskey="7"
+<TMPL_IF NAME="opt_show_parsetree">
+	checked="checked"
+</TMPL_IF>
+		/>Parse&nbsp;Tree</label></td>
+              <td><label title="Exclude Attributes from Parse Tree (accesskey: 8)" for="noatt"><input type="checkbox" value="1" id="noatt" name="noatt" accesskey="8"
+<TMPL_IF NAME="opt_show_noatt">
+	checked="checked"
+</TMPL_IF>
+		/>...no&nbsp;attributes</label></td>
             </tr>
             <tr>
-              <td><label title="Validate also pages for which the HTTP status code indicates an error" for="No200"><input type="checkbox" value="1" id="No200" name="No200" />Validate&nbsp;error&nbsp;pages</label></td>
-              <td><label title="Show Verbose Output" for="verbose"><input type="checkbox" value="1" id="verbose" name="verbose" checked="checked" />Verbose&nbsp;Output</label></td>
+              <td><label title="Validate also pages for which the HTTP status code indicates an error" for="No200"><input type="checkbox" value="1" id="No200" name="No200"
+<TMPL_IF NAME="opt_no200">
+	checked="checked"
+</TMPL_IF>
+		/>Validate&nbsp;error&nbsp;pages</label></td>
+              <td><label title="Show Verbose Output" for="verbose"><input type="checkbox" value="1" id="verbose" name="verbose"
+<TMPL_IF NAME="opt_verbose">
+	checked="checked"
+</TMPL_IF>
+		/>Verbose&nbsp;Output</label></td>
             </tr>
           </table>
         </td>