--- test/html-webhacc/cc.cgi	2007/11/18 05:30:03	1.25
+++ test/html-webhacc/cc.cgi	2008/02/10 02:30:14	1.32
@@ -52,7 +52,6 @@
 
   $| = 0;
   my $input = get_input_document ($http, $dom);
-  my $inner_html_element = $http->get_parameter ('e');
   my $char_length = 0;
   my %time;
 
@@ -90,47 +89,7 @@
 ];
 
   my $result = {conforming_min => 1, conforming_max => 1};
-  print_http_header_section ($input, $result);
-
-  my $doc;
-  my $el;
-  my $manifest;
-
-  if ($input->{media_type} eq 'text/html') {
-    ($doc, $el) = print_syntax_error_html_section ($input, $result);
-    print_source_string_section
-        (\($input->{s}), $input->{charset} || $doc->input_encoding);
-  } elsif ({
-            'text/xml' => 1,
-            'application/atom+xml' => 1,
-            'application/rss+xml' => 1,
-            'application/svg+xml' => 1,
-            'application/xhtml+xml' => 1,
-            'application/xml' => 1,
-           }->{$input->{media_type}}) {
-    ($doc, $el) = print_syntax_error_xml_section ($input, $result);
-    print_source_string_section (\($input->{s}), $doc->input_encoding);
-  } elsif ($input->{media_type} eq 'text/cache-manifest') {
-## TODO: MUST be text/cache-manifest
-    $manifest = print_syntax_error_manifest_section ($input, $result);
-    print_source_string_section (\($input->{s}), 'utf-8');
-  } else {
-    ## TODO: Change HTTP status code??
-    print_result_unknown_type_section ($input, $result);
-  }
-
-  if (defined $doc or defined $el) {
-    print_structure_dump_dom_section ($doc, $el);
-    my $elements = print_structure_error_dom_section ($doc, $el, $result);
-    print_table_section ($elements->{table}) if @{$elements->{table}};
-    print_id_section ($elements->{id}) if keys %{$elements->{id}};
-    print_term_section ($elements->{term}) if keys %{$elements->{term}};
-    print_class_section ($elements->{class}) if keys %{$elements->{class}};
-  } elsif (defined $manifest) {
-    print_structure_dump_manifest_section ($manifest);
-    print_structure_error_manifest_section ($manifest, $result);
-  }
-
+  check_and_print ($input => $result);
   print_result_section ($result);
 } else {
   print STDOUT qq[</dl></div>];
@@ -167,7 +126,7 @@
       $result->{conforming_min} = 0;
     } elsif ($err->{level} eq 'w' or $err->{level} eq 'g') {
       $result->{$layer}->{warning}++;
-    } elsif ($err->{level} eq 'unsupported') {
+    } elsif ($err->{level} eq 'u' or $err->{level} eq 'unsupported') {
       $result->{$layer}->{unsupported}++;
       $result->{unsupported} = 1;
     } else {
@@ -186,14 +145,62 @@
   }
 } # add_error
 
+sub check_and_print ($$) {
+  my ($input, $result) = @_;
+  $input->{id_prefix} = '';
+  #$input->{nested} = 1/0;
+
+  print_http_header_section ($input, $result);
+
+  my $doc;
+  my $el;
+  my $manifest;
+
+  if ($input->{media_type} eq 'text/html') {
+    ($doc, $el) = print_syntax_error_html_section ($input, $result);
+    print_source_string_section
+        (\($input->{s}), $input->{charset} || $doc->input_encoding);
+  } elsif ({
+            'text/xml' => 1,
+            'application/atom+xml' => 1,
+            'application/rss+xml' => 1,
+            'application/svg+xml' => 1,
+            'application/xhtml+xml' => 1,
+            'application/xml' => 1,
+           }->{$input->{media_type}}) {
+    ($doc, $el) = print_syntax_error_xml_section ($input, $result);
+    print_source_string_section (\($input->{s}), $doc->input_encoding);
+  } elsif ($input->{media_type} eq 'text/cache-manifest') {
+## TODO: MUST be text/cache-manifest
+    $manifest = print_syntax_error_manifest_section ($input, $result);
+    print_source_string_section (\($input->{s}), 'utf-8');
+  } else {
+    ## TODO: Change HTTP status code??
+    print_result_unknown_type_section ($input, $result);
+  }
+
+  if (defined $doc or defined $el) {
+    print_structure_dump_dom_section ($input, $doc, $el);
+    my $elements = print_structure_error_dom_section
+        ($input, $doc, $el, $result);
+    print_table_section ($input, $elements->{table}) if @{$elements->{table}};
+    print_id_section ($input, $elements->{id}) if keys %{$elements->{id}};
+    print_term_section ($input, $elements->{term}) if keys %{$elements->{term}};
+    print_class_section ($input, $elements->{class}) if keys %{$elements->{class}};
+  } elsif (defined $manifest) {
+    print_structure_dump_manifest_section ($input, $manifest);
+    print_structure_error_manifest_section ($input, $manifest, $result);
+  }
+} # check_and_print
+
 sub print_http_header_section ($$) {
   my ($input, $result) = @_;
   return unless defined $input->{header_status_code} or
       defined $input->{header_status_text} or
       @{$input->{header_field}};
   
-  push @nav, ['#source-header' => 'HTTP Header'];
-  print STDOUT qq[<div id="source-header" class="section">
+  push @nav, ['#source-header' => 'HTTP Header'] unless $input->{nested};
+  print STDOUT qq[<div id="$input->{id_prefix}source-header" class="section">
 <h2>HTTP Header</h2>
 
 <p><strong>Note</strong>: Due to the limitation of the
@@ -227,11 +234,11 @@
   require Whatpm::HTML;
   
   print STDOUT qq[
-<div id="parse-errors" class="section">
+<div id="$input->{id_prefix}parse-errors" class="section">
 <h2>Parse Errors</h2>
 
 <dl>];
-  push @nav, ['#parse-errors' => 'Parse Error'];
+  push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{nested};
 
   my $onerror = sub {
     my (%opt) = @_;
@@ -253,8 +260,9 @@
 
   my $doc = $dom->create_document;
   my $el;
+  my $inner_html_element = $http->get_parameter ('e');
   if (defined $inner_html_element and length $inner_html_element) {
-    $input->{charset} ||= 'ISO-8859-1'; ## TODO: for now.
+    $input->{charset} ||= 'windows-1252'; ## TODO: for now.
     my $time1 = time;
     my $t = Encode::decode ($input->{charset}, $input->{s});
     $time{decode} = time - $time1;
@@ -270,6 +278,8 @@
         ($input->{charset}, $input->{s} => $doc, $onerror);
     $time{parse_html} = time - $time1;
   }
+  $doc->manakai_charset ($input->{official_charset})
+      if defined $input->{official_charset};
   
   print STDOUT qq[</dl></div>];
 
@@ -282,11 +292,11 @@
   require Message::DOM::XMLParserTemp;
   
   print STDOUT qq[
-<div id="parse-errors" class="section">
+<div id="$input->{id_prefix}parse-errors" class="section">
 <h2>Parse Errors</h2>
 
 <dl>];
-  push @nav, ['#parse-errors' => 'Parse Error'];
+  push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{prefix};
 
   my $onerror = sub {
     my $err = shift;
@@ -310,6 +320,8 @@
   my $doc = Message::DOM::XMLParserTemp->parse_byte_stream
       ($fh => $dom, $onerror, charset => $input->{charset});
   $time{parse_xml} = time - $time1;
+  $doc->manakai_charset ($input->{official_charset})
+      if defined $input->{official_charset};
 
   print STDOUT qq[</dl></div>];
 
@@ -322,16 +334,17 @@
   require Whatpm::CacheManifest;
 
   print STDOUT qq[
-<div id="parse-errors" class="section">
+<div id="$input->{id_prefix}parse-errors" class="section">
 <h2>Parse Errors</h2>
 
 <dl>];
-  push @nav, ['#parse-errors' => 'Parse Error'];
+  push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{nested};
 
   my $onerror = sub {
     my (%opt) = @_;
     my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level});
-    print STDOUT qq[<dt class="$cls">], get_error_label (\%opt), qq[</dt>];
+    print STDOUT qq[<dt class="$cls">], get_error_label ($input, \%opt),
+        qq[</dt>];
     $type =~ tr/ /-/;
     $type =~ s/\|/%7C/g;
     $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];
@@ -358,20 +371,22 @@
 
   my $s = \($enc->decode (${$_[0]}));
   my $i = 1;                             
-  push @nav, ['#source-string' => 'Source'];
-  print STDOUT qq[<div id="source-string" class="section">
+  push @nav, ['#source-string' => 'Source'] unless $input->{nested};
+  print STDOUT qq[<div id="$input->{id_prefix}source-string" class="section">
 <h2>Document Source</h2>
 <ol lang="">\n];
   if (length $$s) {
     while ($$s =~ /\G([^\x0A]*?)\x0D?\x0A/gc) {
-      print STDOUT qq[<li id="line-$i">], htescape $1, "</li>\n";
+      print STDOUT qq[<li id="$input->{id_prefix}line-$i">], htescape $1,
+          "</li>\n";
       $i++;
     }
     if ($$s =~ /\G([^\x0A]+)/gc) {
-      print STDOUT qq[<li id="line-$i">], htescape $1, "</li>\n";
+      print STDOUT qq[<li id="$input->{id_prefix}line-$i">], htescape $1,
+          "</li>\n";
     }
   } else {
-    print STDOUT q[<li id="line-1"></li>];
+    print STDOUT q[<li id="$input->{id_prefix}line-1"></li>];
   }
   print STDOUT "</ol></div>";
 } # print_input_string_section
@@ -388,7 +403,7 @@
       next;
     }
 
-    my $node_id = 'node-'.refaddr $child;
+    my $node_id = $input->{id_prefix} . 'node-'.refaddr $child;
     my $nt = $child->node_type;
     if ($nt == $child->ELEMENT_NODE) {
       my $child_nsuri = $child->namespace_uri;
@@ -399,7 +414,7 @@
         $r .= '<ul class="attributes">';
         for my $attr (sort {$a->[0] cmp $b->[0]} map { [$_->name, $_->value, $_->namespace_uri, 'node-'.refaddr $_] }
                       @{$child->attributes}) {
-          $r .= qq[<li id="$attr->[3]" class="tree-attribute"><code title="@{[defined $_->[2] ? $_->[2] : '']}">] . htescape ($attr->[0]) . '</code> = '; ## ISSUE: case?
+          $r .= qq[<li id="$input->{id_prefix}$attr->[3]" class="tree-attribute"><code title="@{[defined $attr->[2] ? htescape ($attr->[2]) : '']}">] . htescape ($attr->[0]) . '</code> = '; ## ISSUE: case?
           $r .= '<q>' . htescape ($attr->[1]) . '</q></li>'; ## TODO: children
         }
         $r .= '</ul>';
@@ -420,6 +435,21 @@
     } elsif ($nt == $child->DOCUMENT_NODE) {
       $r .= qq'<li id="$node_id" class="tree-document">Document';
       $r .= qq[<ul class="attributes">];
+      my $cp = $child->manakai_charset;
+      if (defined $cp) {
+        $r .= qq[<li><code>charset</code> parameter = <code>];
+        $r .= htescape ($cp) . qq[</code></li>];
+      }
+      $r .= qq[<li><code>inputEncoding</code> = ];
+      my $ie = $child->input_encoding;
+      if (defined $ie) {
+        $r .= qq[<code>@{[htescape ($ie)]}</code>];
+        if ($child->manakai_has_bom) {
+          $r .= qq[ (with <code class=charname><abbr>BOM</abbr></code>)];
+        }
+      } else {
+        $r .= qq[(<code>null</code>)];
+      }
       $r .= qq[<li>@{[scalar get_text ('manakaiIsHTML:'.($child->manakai_is_html?1:0))]}</li>];
       $r .= qq[<li>@{[scalar get_text ('manakaiCompatMode:'.$child->manakai_compat_mode)]}</li>];
       unless ($child->manakai_is_html) {
@@ -453,28 +483,28 @@
   print STDOUT $r;
 } # print_document_tree
 
-sub print_structure_dump_dom_section ($$) {
-  my ($doc, $el) = @_;
+sub print_structure_dump_dom_section ($$$) {
+  my ($input, $doc, $el) = @_;
 
   print STDOUT qq[
-<div id="document-tree" class="section">
+<div id="$input->{id_prefix}document-tree" class="section">
 <h2>Document Tree</h2>
 ];
-  push @nav, ['#document-tree' => 'Tree'];
+  push @nav, ['#document-tree' => 'Tree'] unless $input->{nested};
 
   print_document_tree ($el || $doc);
 
   print STDOUT qq[</div>];
 } # print_structure_dump_dom_section
 
-sub print_structure_dump_manifest_section ($) {
-  my $manifest = shift;
+sub print_structure_dump_manifest_section ($$) {
+  my ($input, $manifest) = @_;
 
   print STDOUT qq[
-<div id="dump-manifest" class="section">
+<div id="$input->{id_prefix}dump-manifest" class="section">
 <h2>Cache Manifest</h2>
 ];
-  push @nav, ['#dump-manifest' => 'Caceh Manifest'];
+  push @nav, ['#dump-manifest' => 'Caceh Manifest'] unless $input->{nested};
 
   print STDOUT qq[<dl><dt>Explicit entries</dt>];
   for my $uri (@{$manifest->[0]}) {
@@ -501,14 +531,14 @@
   print STDOUT qq[</dl></div>];
 } # print_structure_dump_manifest_section
 
-sub print_structure_error_dom_section ($$$) {
-  my ($doc, $el, $result) = @_;
+sub print_structure_error_dom_section ($$$$) {
+  my ($input, $doc, $el, $result) = @_;
 
-  print STDOUT qq[<div id="document-errors" class="section">
+  print STDOUT qq[<div id="$input->{id_prefix}document-errors" class="section">
 <h2>Document Errors</h2>
 
 <dl>];
-  push @nav, ['#document-errors' => 'Document Error'];
+  push @nav, ['#document-errors' => 'Document Error'] unless $input->{nested};
 
   require Whatpm::ContentChecker;
   my $onerror = sub {
@@ -517,7 +547,7 @@
     $type =~ tr/ /-/;
     $type =~ s/\|/%7C/g;
     $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];
-    print STDOUT qq[<dt class="$cls">] . get_error_label (\%opt) .
+    print STDOUT qq[<dt class="$cls">] . get_error_label ($input, \%opt) .
         qq[</dt>\n<dd class="$cls">], get_error_level_label (\%opt);
     print STDOUT $msg, "</dd>\n";
     add_error ('structure', \%opt => $result);
@@ -538,13 +568,13 @@
 } # print_structure_error_dom_section
 
 sub print_structure_error_manifest_section ($$$) {
-  my ($manifest, $result) = @_;
+  my ($input, $manifest, $result) = @_;
 
-  print STDOUT qq[<div id="document-errors" class="section">
+  print STDOUT qq[<div id="$input->{id_prefix}document-errors" class="section">
 <h2>Document Errors</h2>
 
 <dl>];
-  push @nav, ['#document-errors' => 'Document Error'];
+  push @nav, ['#document-errors' => 'Document Error'] unless $input->{nested};
 
   require Whatpm::CacheManifest;
   Whatpm::CacheManifest->check_manifest ($manifest, sub {
@@ -553,7 +583,7 @@
     $type =~ tr/ /-/;
     $type =~ s/\|/%7C/g;
     $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];
-    print STDOUT qq[<dt class="$cls">] . get_error_label (\%opt) .
+    print STDOUT qq[<dt class="$cls">] . get_error_label ($input, \%opt) .
         qq[</dt>\n<dd class="$cls">], $msg, "</dd>\n";
     add_error ('structure', \%opt => $result);
   });
@@ -561,12 +591,12 @@
   print STDOUT qq[</div>];
 } # print_structure_error_manifest_section
 
-sub print_table_section ($) {
-  my $tables = shift;
+sub print_table_section ($$) {
+  my ($input, $tables) = @_;
   
-  push @nav, ['#tables' => 'Tables'];
+  push @nav, ['#tables' => 'Tables'] unless $input->{nested};
   print STDOUT qq[
-<div id="tables" class="section">
+<div id="$input->{id_prefix}tables" class="section">
 <h2>Tables</h2>
 
 <!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
@@ -581,8 +611,8 @@
   my $i = 0;
   for my $table_el (@$tables) {
     $i++;
-    print STDOUT qq[<div class="section" id="table-$i"><h3>] .
-        get_node_link ($table_el) . q[</h3>];
+    print STDOUT qq[<div class="section" id="$input->{id_prefix}table-$i"><h3>] .
+        get_node_link ($input, $table_el) . q[</h3>];
 
     ## TODO: Make |ContentChecker| return |form_table| result
     ## so that this script don't have to run the algorithm twice.
@@ -614,18 +644,19 @@
         
     print STDOUT '</div><script type="text/javascript">tableToCanvas (';
     print STDOUT JSON::objToJson ($table);
-    print STDOUT qq[, document.getElementById ('table-$i'));</script>];
+    print STDOUT qq[, document.getElementById ('$input->{id_prefix}table-$i')];
+    print STDOUT qq[, '$input->{id_prefix}');</script>];
   }
   
   print STDOUT qq[</div>];
 } # print_table_section
 
-sub print_id_section ($) {
-  my $ids = shift;
+sub print_id_section ($$) {
+  my ($input, $ids) = @_;
   
-  push @nav, ['#identifiers' => 'IDs'];
+  push @nav, ['#identifiers' => 'IDs'] unless $input->{nested};
   print STDOUT qq[
-<div id="identifiers" class="section">
+<div id="$input->{id_prefix}identifiers" class="section">
 <h2>Identifiers</h2>
 
 <dl>
@@ -633,18 +664,18 @@
   for my $id (sort {$a cmp $b} keys %$ids) {
     print STDOUT qq[<dt><code>@{[htescape $id]}</code></dt>];
     for (@{$ids->{$id}}) {
-      print STDOUT qq[<dd>].get_node_link ($_).qq[</dd>];
+      print STDOUT qq[<dd>].get_node_link ($input, $_).qq[</dd>];
     }
   }
   print STDOUT qq[</dl></div>];
 } # print_id_section
 
-sub print_term_section ($) {
-  my $terms = shift;
+sub print_term_section ($$) {
+  my ($input, $terms) = @_;
   
-  push @nav, ['#terms' => 'Terms'];
+  push @nav, ['#terms' => 'Terms'] unless $input->{nested};
   print STDOUT qq[
-<div id="terms" class="section">
+<div id="$input->{id_prefix}terms" class="section">
 <h2>Terms</h2>
 
 <dl>
@@ -652,18 +683,18 @@
   for my $term (sort {$a cmp $b} keys %$terms) {
     print STDOUT qq[<dt>@{[htescape $term]}</dt>];
     for (@{$terms->{$term}}) {
-      print STDOUT qq[<dd>].get_node_link ($_).qq[</dd>];
+      print STDOUT qq[<dd>].get_node_link ($input, $_).qq[</dd>];
     }
   }
   print STDOUT qq[</dl></div>];
 } # print_term_section
 
-sub print_class_section ($) {
-  my $classes = shift;
+sub print_class_section ($$) {
+  my ($input, $classes) = @_;
   
-  push @nav, ['#classes' => 'Classes'];
+  push @nav, ['#classes' => 'Classes'] unless $input->{nested};
   print STDOUT qq[
-<div id="classes" class="section">
+<div id="$input->{id_prefix}classes" class="section">
 <h2>Classes</h2>
 
 <dl>
@@ -671,7 +702,7 @@
   for my $class (sort {$a cmp $b} keys %$classes) {
     print STDOUT qq[<dt><code>@{[htescape $class]}</code></dt>];
     for (@{$classes->{$class}}) {
-      print STDOUT qq[<dd>].get_node_link ($_).qq[</dd>];
+      print STDOUT qq[<dd>].get_node_link ($input, $_).qq[</dd>];
     }
   }
   print STDOUT qq[</dl></div>];
@@ -787,9 +818,9 @@
 </div>
 ];
   push @nav, ['#parse-errors' => 'Errors'];
-  add_error (char => {level => 'unsupported'} => $result);
-  add_error (syntax => {level => 'unsupported'} => $result);
-  add_error (structure => {level => 'unsupported'} => $result);
+  add_error (char => {level => 'u'} => $result);
+  add_error (syntax => {level => 'u'} => $result);
+  add_error (structure => {level => 'u'} => $result);
 } # print_result_unknown_type_section
 
 sub print_result_input_error_section ($) {
@@ -798,10 +829,10 @@
 <p><em><strong>Input Error</strong>: @{[htescape ($input->{error_status_text})]}</em></p>
 </div>];
   push @nav, ['#result-summary' => 'Result'];
-} # print_Result_input_error_section
+} # print_result_input_error_section
 
-sub get_error_label ($) {
-  my $err = shift;
+sub get_error_label ($$) {
+  my ($input, $err) = @_;
 
   my $r = '';
 
@@ -816,7 +847,7 @@
 
   if (defined $err->{node}) {
     $r .= ' ' if length $r;
-    $r = get_node_link ($err->{node});
+    $r = get_node_link ($input, $err->{node});
   }
 
   if (defined $err->{index}) {
@@ -846,7 +877,7 @@
   } elsif ($err->{level} eq 'w') {
     $r = qq[<strong><a href="../error-description#level-w">Warning</a></strong>:
         ];
-  } elsif ($err->{level} eq 'unsupported') {
+  } elsif ($err->{level} eq 'u' or $err->{level} eq 'unsupported') {
     $r = qq[<strong><a href="../error-description#level-u">Not
         supported</a></strong>: ];
   } else {
@@ -885,9 +916,9 @@
   return join '/', @r;
 } # get_node_path
 
-sub get_node_link ($) {
-  return qq[<a href="#node-@{[refaddr $_[0]]}">] .
-      htescape (get_node_path ($_[0])) . qq[</a>];
+sub get_node_link ($$) {
+  return qq[<a href="#$_[0]->{id_prefix}node-@{[refaddr $_[1]]}">] .
+      htescape (get_node_path ($_[1])) . qq[</a>];
 } # get_node_link
 
 {
@@ -895,7 +926,8 @@
 
 sub load_text_catalog ($) {
   my $lang = shift; # MUST be a canonical lang name
-  open my $file, '<', "cc-msg.$lang.txt" or die "$0: cc-msg.$lang.txt: $!";
+  open my $file, '<:utf8', "cc-msg.$lang.txt"
+      or die "$0: cc-msg.$lang.txt: $!";
   while (<$file>) {
     if (s/^([^;]+);([^;]*);//) {
       my ($type, $cls, $msg) = ($1, $2, $_);
@@ -908,6 +940,7 @@
 sub get_text ($) {
   my ($type, $level, $node) = @_;
   $type = $level . ':' . $type if defined $level;
+  $level = 'm' unless defined $level;
   my @arg;
   {
     if (defined $Msg->{$type}) {
@@ -932,13 +965,13 @@
           ? htescape ($node->owner_element->manakai_local_name)
           : ''
       }ge;
-      return ($type, $Msg->{$type}->[0], $msg);
+      return ($type, 'level-' . $level . ' ' . $Msg->{$type}->[0], $msg);
     } elsif ($type =~ s/:([^:]*)$//) {
       unshift @arg, $1;
       redo;
     }
   }
-  return ($type, '', htescape ($_[0]));
+  return ($type, 'level-'.$level, htescape ($_[0]));
 } # get_text
 
 }
@@ -994,6 +1027,7 @@
     $ua->protocols_allowed ([qw/http/]);
     $ua->max_size (1000_000);
     my $req = HTTP::Request->new (GET => $request_uri);
+    $req->header ('Accept-Encoding' => 'identity, *; q=0');
     my $res = $ua->request ($req);
     ## TODO: 401 sets |is_success| true.
     if ($res->is_success or $http->get_parameter ('error-page')) {
@@ -1006,6 +1040,7 @@
       if (defined $ct and $ct =~ /;\s*charset\s*=\s*"?([^\s;"]+)"?/i) {
         $r->{charset} = lc $1;
         $r->{charset} =~ tr/\\//d;
+        $r->{official_charset} = $r->{charset};
       }
 
       my $input_charset = $http->get_parameter ('charset');
@@ -1049,6 +1084,7 @@
     $r->{charset} = ''.$http->get_parameter ('_charset_');
     $r->{charset} =~ s/\s+//g;
     $r->{charset} = 'utf-8' if $r->{charset} eq '';
+    $r->{official_charset} = $r->{charset};
     $r->{header_field} = [];
 
     require Whatpm::ContentType;
@@ -1076,6 +1112,7 @@
   if ($r->{media_type} eq 'text/xml') {
     unless (defined $r->{charset}) {
       $r->{charset} = 'us-ascii';
+      $r->{official_charset} = $r->{charset};
     } elsif ($r->{charset_overridden} and $r->{charset} eq 'us-ascii') {
       $r->{charset_overridden} = 0;
     }
@@ -1126,4 +1163,4 @@
 
 =cut
 
-## $Date: 2007/11/18 05:30:03 $
+## $Date: 2008/02/10 02:30:14 $