This should fix bug 941, for the charset part.

As written in
http://www.w3.org/Bugs/Public/show_bug.cgi?id=941#c3
I am not entirely satisfied by the solution, but it is a working solution,
and will do for the time being (?)...

2 files changed, 44 insertions, 40 deletions

diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index 0aacb11..0c011e8 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.412 2005-03-31 07:43:42 ot Exp $
+# $Id: check,v 1.413 2005-03-31 21:33:04 ot Exp $
 
 #
 # Disable buffering on STDOUT!
@@ -220,7 +220,7 @@ Directory not readable (permission denied): @_r
 
   #
   # Strings
-  $VERSION    =  q$Revision: 1.412 $;
+  $VERSION    =  q$Revision: 1.413 $;
   $VERSION    =~ s/Revision: ([\d\.]+) /$1/;
 
   #
@@ -935,9 +935,13 @@ sub prep_template ($$) {
   $T->param(file_namespaces => \@nss) if @nss;
   
   if ($File->{Opt}->{DOCTYPE}) {
-      my $over_doctype_param = "override $File->{Opt}->{DOCTYPE}";
-       $T->param($over_doctype_param => TRUE);
-      
+      my $over_doctype_param = "override doctype $File->{Opt}->{DOCTYPE}";
+       $T->param($over_doctype_param => TRUE);   
+  }
+  
+  if ($File->{Opt}->{Charset}) {
+      my $over_charset_param = "override charset $File->{Opt}->{Charset}";
+       $T->param($over_charset_param => TRUE);   
   }
   
 }
diff --git a/share/templates/en_US/popup_charset.tmpl b/share/templates/en_US/popup_charset.tmpl
index 93dd41f..7bf1fa4 100644
--- a/share/templates/en_US/popup_charset.tmpl
+++ b/share/templates/en_US/popup_charset.tmpl
@@ -1,38 +1,38 @@
 <select name="charset" id="charset">
   <option value="(detect automatically)">(detect automatically)</option>
-  <option value="utf-8 (Unicode, worldwide)">utf-8 (Unicode, worldwide)</option>
-  <option value="utf-16 (Unicode, worldwide)">utf-16 (Unicode, worldwide)</option>
-  <option value="iso-8859-1 (Western Europe)">iso-8859-1 (Western Europe)</option>
-  <option value="iso-8859-2 (Central Europe)">iso-8859-2 (Central Europe)</option>
-  <option value="iso-8859-3 (Southern Europe)">iso-8859-3 (Southern Europe)</option>
-  <option value="iso-8859-4 (Baltic Rim)">iso-8859-4 (Baltic Rim)</option>
-  <option value="iso-8859-5 (Cyrillic)">iso-8859-5 (Cyrillic)</option>
-  <option value="iso-8859-6-i (Arabic)">iso-8859-6-i (Arabic)</option>
-  <option value="iso-8859-7 (Greek)">iso-8859-7 (Greek)</option>
-  <option value="iso-8859-8-i (Hebrew)">iso-8859-8-i (Hebrew)</option>
-  <option value="iso-8859-9 (Turkish)">iso-8859-9 (Turkish)</option>
-  <option value="iso-8859-10 (Latin 6)">iso-8859-10 (Latin 6)</option>
-  <option value="iso-8859-13 (Latin 7)">iso-8859-13 (Latin 7)</option>
-  <option value="iso-8859-14 (Celtic)">iso-8859-14 (Celtic)</option>
-  <option value="iso-8859-15 (Latin 9)">iso-8859-15 (Latin 9)</option>
-  <option value="us-ascii (basic English)">us-ascii (basic English)</option>
-  <option value="euc-jp (Japanese, Unix)">euc-jp (Japanese, Unix)</option>
-  <option value="shift_jis (Japanese, Win/Mac)">shift_jis (Japanese, Win/Mac)</option>
-  <option value="iso-2022-jp (Japanese, email)">iso-2022-jp (Japanese, email)</option>
-  <option value="euc-kr (Korean)">euc-kr (Korean)</option>
-  <option value="gb2312 (Chinese, simplified)">gb2312 (Chinese, simplified)</option>
-  <option value="gb18030 (Chinese, simplified)">gb18030 (Chinese, simplified)</option>
-  <option value="big5 (Chinese, traditional)">big5 (Chinese, traditional)</option>
-  <option value="tis-620 (Thai)">tis-620 (Thai)</option>
-  <option value="koi8-r (Russian)">koi8-r (Russian)</option>
-  <option value="koi8-u (Ukrainian)">koi8-u (Ukrainian)</option>
-  <option value="macintosh (MacRoman)">macintosh (MacRoman)</option>
-  <option value="windows-1250 (Central Europe)">windows-1250 (Central Europe)</option>
-  <option value="windows-1251 (Cyrillic)">windows-1251 (Cyrillic)</option>
-  <option value="windows-1252 (Western Europe)">windows-1252 (Western Europe)</option>
-  <option value="windows-1253 (Greek)">windows-1253 (Greek)</option>
-  <option value="windows-1254 (Turkish)">windows-1254 (Turkish)</option>
-  <option value="windows-1255 (Hebrew)">windows-1255 (Hebrew)</option>
-  <option value="windows-1256 (Arabic)">windows-1256 (Arabic)</option>
-  <option value="windows-1257 (Baltic Rim)">windows-1257 (Baltic Rim)</option>
+  <option value="utf-8 (Unicode, worldwide)" <TMPL_IF NAME="override charset utf-8 (Unicode, worldwide)">selected="selected"</TMPL_IF>>utf-8 (Unicode, worldwide)</option>
+  <option value="utf-16 (Unicode, worldwide)" <TMPL_IF NAME="override charset utf-16 (Unicode, worldwide)">selected="selected"</TMPL_IF>>utf-16 (Unicode, worldwide)</option>
+  <option value="iso-8859-1 (Western Europe)" <TMPL_IF NAME="override charset iso-8859-1 (Western Europe)">selected="selected"</TMPL_IF>>iso-8859-1 (Western Europe)</option>
+  <option value="iso-8859-2 (Central Europe)" <TMPL_IF NAME="override charset iso-8859-2 (Central Europe)">selected="selected"</TMPL_IF>>iso-8859-2 (Central Europe)</option>
+  <option value="iso-8859-3 (Southern Europe)" <TMPL_IF NAME="override charset iso-8859-3 (Southern Europe)">selected="selected"</TMPL_IF>>iso-8859-3 (Southern Europe)</option>
+  <option value="iso-8859-4 (Baltic Rim)" <TMPL_IF NAME="override charset iso-8859-4 (Baltic Rim)">selected="selected"</TMPL_IF>>iso-8859-4 (Baltic Rim)</option>
+  <option value="iso-8859-5 (Cyrillic)" <TMPL_IF NAME="override charset iso-8859-5 (Cyrillic)">selected="selected"</TMPL_IF>>iso-8859-5 (Cyrillic)</option>
+  <option value="iso-8859-6-i (Arabic)" <TMPL_IF NAME="override charset iso-8859-6-i (Arabic)">selected="selected"</TMPL_IF>>iso-8859-6-i (Arabic)</option>
+  <option value="iso-8859-7 (Greek)" <TMPL_IF NAME="override charset iso-8859-7 (Greek)">selected="selected"</TMPL_IF>>iso-8859-7 (Greek)</option>
+  <option value="iso-8859-8-i (Hebrew)" <TMPL_IF NAME="override charset iso-8859-8-i (Hebrew)">selected="selected"</TMPL_IF>>iso-8859-8-i (Hebrew)</option>
+  <option value="iso-8859-9 (Turkish)" <TMPL_IF NAME="override charset iso-8859-9 (Turkish)">selected="selected"</TMPL_IF>>iso-8859-9 (Turkish)</option>
+  <option value="iso-8859-10 (Latin 6)" <TMPL_IF NAME="override charset iso-8859-10 (Latin 6)">selected="selected"</TMPL_IF>>iso-8859-10 (Latin 6)</option>
+  <option value="iso-8859-13 (Latin 7)" <TMPL_IF NAME="override charset iso-8859-13 (Latin 7)">selected="selected"</TMPL_IF>>iso-8859-13 (Latin 7)</option>
+  <option value="iso-8859-14 (Celtic)" <TMPL_IF NAME="override charset iso-8859-14 (Celtic)">selected="selected"</TMPL_IF>>iso-8859-14 (Celtic)</option>
+  <option value="iso-8859-15 (Latin 9)" <TMPL_IF NAME="override charset iso-8859-15 (Latin 9)">selected="selected"</TMPL_IF>>iso-8859-15 (Latin 9)</option>
+  <option value="us-ascii (basic English)" <TMPL_IF NAME="override charset us-ascii (basic English)">selected="selected"</TMPL_IF>>us-ascii (basic English)</option>
+  <option value="euc-jp (Japanese, Unix)" <TMPL_IF NAME="override charset euc-jp (Japanese, Unix)">selected="selected"</TMPL_IF>>euc-jp (Japanese, Unix)</option>
+  <option value="shift_jis (Japanese, Win/Mac)" <TMPL_IF NAME="override charset shift_jis (Japanese, Win/Mac)">selected="selected"</TMPL_IF>>shift_jis (Japanese, Win/Mac)</option>
+  <option value="iso-2022-jp (Japanese, email)" <TMPL_IF NAME="override charset iso-2022-jp (Japanese, email)">selected="selected"</TMPL_IF>>iso-2022-jp (Japanese, email)</option>
+  <option value="euc-kr (Korean)" <TMPL_IF NAME="override charset euc-kr (Korean)">selected="selected"</TMPL_IF>>euc-kr (Korean)</option>
+  <option value="gb2312 (Chinese, simplified)" <TMPL_IF NAME="override charset gb2312 (Chinese, simplified)">selected="selected"</TMPL_IF>>gb2312 (Chinese, simplified)</option>
+  <option value="gb18030 (Chinese, simplified)" <TMPL_IF NAME="override charset gb18030 (Chinese, simplified)">selected="selected"</TMPL_IF>>gb18030 (Chinese, simplified)</option>
+  <option value="big5 (Chinese, traditional)" <TMPL_IF NAME="override charset big5 (Chinese, traditional)">selected="selected"</TMPL_IF>>big5 (Chinese, traditional)</option>
+  <option value="tis-620 (Thai)" <TMPL_IF NAME="override charset tis-620 (Thai)">selected="selected"</TMPL_IF>>tis-620 (Thai)</option>
+  <option value="koi8-r (Russian)" <TMPL_IF NAME="override charset koi8-r (Russian)">selected="selected"</TMPL_IF>>koi8-r (Russian)</option>
+  <option value="koi8-u (Ukrainian)" <TMPL_IF NAME="override charset koi8-u (Ukrainian)">selected="selected"</TMPL_IF>>koi8-u (Ukrainian)</option>
+  <option value="macintosh (MacRoman)" <TMPL_IF NAME="override charset macintosh (MacRoman)">selected="selected"</TMPL_IF>>macintosh (MacRoman)</option>
+  <option value="windows-1250 (Central Europe)" <TMPL_IF NAME="override charset windows-1250 (Central Europe)">selected="selected"</TMPL_IF>>windows-1250 (Central Europe)</option>
+  <option value="windows-1251 (Cyrillic)" <TMPL_IF NAME="override charset windows-1251 (Cyrillic)">selected="selected"</TMPL_IF>>windows-1251 (Cyrillic)</option>
+  <option value="windows-1252 (Western Europe)" <TMPL_IF NAME="override charset windows-1252 (Western Europe)">selected="selected"</TMPL_IF>>windows-1252 (Western Europe)</option>
+  <option value="windows-1253 (Greek)" <TMPL_IF NAME="override charset windows-1253 (Greek)">selected="selected"</TMPL_IF>>windows-1253 (Greek)</option>
+  <option value="windows-1254 (Turkish)" <TMPL_IF NAME="override charset windows-1254 (Turkish)">selected="selected"</TMPL_IF>>windows-1254 (Turkish)</option>
+  <option value="windows-1255 (Hebrew)" <TMPL_IF NAME="override charset windows-1255 (Hebrew)">selected="selected"</TMPL_IF>>windows-1255 (Hebrew)</option>
+  <option value="windows-1256 (Arabic)" <TMPL_IF NAME="override charset windows-1256 (Arabic)">selected="selected"</TMPL_IF>>windows-1256 (Arabic)</option>
+  <option value="windows-1257 (Baltic Rim)" <TMPL_IF NAME="override charset windows-1257 (Baltic Rim)">selected="selected"</TMPL_IF>>windows-1257 (Baltic Rim)</option>
 </select>