diff -c -r phpxref-0.6/phpxref.cfg phpxref-0.6-charset/phpxref.cfg
*** phpxref-0.6/phpxref.cfg	2004-10-27 11:39:39.000000000 +0900
--- phpxref-0.6-charset/phpxref.cfg	2005-11-08 22:22:24.777097366 +0900
***************
*** 43,48 ****
--- 43,51 ----
  # File extension to use on output pages
  EXTENSION=html
  
+ # File extension to use on output pages
+ CHARSET=iso-8859-1
+ 
  # Set to 1 and install the IO::Zlib perl module to compress all output
  # pages.  Requires a correctly configured web server to serve the 
  # resulting files.
diff -c -r phpxref-0.6/phpxref.pl phpxref-0.6-charset/phpxref.pl
*** phpxref-0.6/phpxref.pl	2004-10-27 11:39:39.000000000 +0900
--- phpxref-0.6-charset/phpxref.pl	2005-11-08 22:28:06.541614752 +0900
***************
*** 37,43 ****
  
  # Default header/footer - override here or in the configuration file
  $rundate=localtime();
! $pageheader="<html><head><title>__TITLE__</title></head><body bgcolor=\"#ffffff\">\n";
  $pagefooter="<br><hr><table width=100%><tr><td>Generated: $rundate</td><td align=\"right\"><i>Generated by PHPXref $version</i></td></tr></table></body></html>\n";
  
  # PHP Servers to link to for documentation
--- 37,43 ----
  
  # Default header/footer - override here or in the configuration file
  $rundate=localtime();
! $pageheader="<html><head><title>__TITLE__</title><meta http-equiv=\"content-type\" content=\"text/html;charset=__CHARSET__\"></head><body bgcolor=\"#ffffff\">\n";
  $pagefooter="<br><hr><table width=100%><tr><td>Generated: $rundate</td><td align=\"right\"><i>Generated by PHPXref $version</i></td></tr></table></body></html>\n";
  
  # PHP Servers to link to for documentation
***************
*** 76,81 ****
--- 76,82 ----
  $output_dir=$config{'output'} || die "No OUTPUT directory specified";
  $source_dir=$config{'source'} || die "No SOURCE directory specified";
  $ext=defined($config{'extension'}) ? $config{'extension'} : 'html';
+ $charset=defined($config{'charset'}) ? $config{'charset'} : 'iso-8859-1';
  $project_name=defined($config{'project'}) ? $config{'project'} : 'Unnamed Project';
  $title="PHPXRef $version : $project_name :";
  
***************
*** 189,195 ****
  <html>
  <head>
  <title>PHPXref Explorer</title>
! <meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
  $stylelink
  </head>
  <body bgcolor="#ffffff">
--- 190,196 ----
  <html>
  <head>
  <title>PHPXref Explorer</title>
! <meta http-equiv="content-type" content="text/html;charset=$charset">
  $stylelink
  </head>
  <body bgcolor="#ffffff">
***************
*** 210,216 ****
  <html>
  <head>
  <title>PHPXref Explorer</title>
! <meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
  <script language="JavaScript" type="text/javascript">
    window.location='navframe-js.$ext';
  </script>
--- 211,217 ----
  <html>
  <head>
  <title>PHPXref Explorer</title>
! <meta http-equiv="content-type" content="text/html;charset=$charset">
  <script language="JavaScript" type="text/javascript">
    window.location='navframe-js.$ext';
  </script>
***************
*** 262,267 ****
--- 263,269 ----
  <html>
  <head>
  <title>PHPXref $version: $project_name</title>
+ <meta http-equiv="content-type" content="text/html;charset=$charset">
  <script language="JavaScript" type="text/javascript">
  <!--
  self.name='phpxref';
***************
*** 298,303 ****
--- 300,306 ----
      $INDEX=pxopen("$target/index.$ext",'w');
  	my $newheader=$pageheader;
  	$newheader =~ s/__TITLE__/$title $parent/g;
+ 	$newheader =~ s/__CHARSET__/$charset/g;
      $newheader =~ s/__STYLEFILE__/$relroot$config{stylefile}/g if $config{'stylefile'};
      $newheader =~ s/__PRINTSTYLEFILE__/$relroot$config{printstylefile}/g if $config{'printstylefile'};
      $newheader =~ s/__RELROOT__/$relroot/g;
***************
*** 986,991 ****
--- 989,995 ----
      $FILEINFO=pxopen($pagefile,'w');
  	my $newheader=$pageheader;
  	$newheader =~ s/__TITLE__/$title Detail view of $filename/g;
+ 	$newheader =~ s/__CHARSET__/$charset/g;
      $newheader =~ s/__STYLEFILE__/$relroot$config{stylefile}/g if $config{'stylefile'};
      $newheader =~ s/__PRINTSTYLEFILE__/$relroot$config{printstylefile}/g if $config{'printstylefile'};
      $newheader =~ s/__RELROOT__/$relroot/g;
***************
*** 1153,1158 ****
--- 1157,1163 ----
          $FILEXREF=pxopen($xreffile,'w');
  		$newheader=$pageheader;
  		$newheader =~ s/__TITLE__/$title Require cross reference for $filename/g;
+ 	$newheader =~ s/__CHARSET__/$charset/g;
          $newheader =~ s/__STYLEFILE__/$relroot$config{stylefile}/g if $config{'stylefile'};
          $newheader =~ s/__PRINTSTYLEFILE__/$relroot$config{printstylefile}/g if $config{'printstylefile'};
          $newheader =~ s/__RELROOT__/$relroot/g;
***************
*** 1205,1210 ****
--- 1210,1216 ----
      $incomment=0;
  	$newheader=$pageheader;
  	$newheader =~ s/__TITLE__/$title $subdir$filename source/g;
+ 	$newheader =~ s/__CHARSET__/$charset/g;
      $newheader =~ s/__STYLEFILE__/$relroot$config{stylefile}/g if $config{'stylefile'};
      $newheader =~ s/__PRINTSTYLEFILE__/$relroot$config{printstylefile}/g if $config{'printstylefile'};
      $newheader =~ s/__RELROOT__/$relroot/g;
***************
*** 1556,1561 ****
--- 1562,1568 ----
  		my $varnameid=$var_ids{$varname};
  		my $newheader=$pageheader;
  		$newheader =~ s/__TITLE__/$title Variable Reference: \$$varname/g;
+ 	$newheader =~ s/__CHARSET__/$charset/g;
          $newheader =~ s/__STYLEFILE__/..\/$config{stylefile}/g if $config{'stylefile'};
          $newheader =~ s/__PRINTSTYLEFILE__/..\/$config{printstylefile}/g if $config{'printstylefile'};
          $newheader =~ s/__RELROOT__/..\//g;
***************
*** 1604,1609 ****
--- 1611,1617 ----
      $INDEX=pxopen("$output_dir/_variables/index.$ext",'w');
  	my $newheader=$pageheader;
  	$newheader =~ s/__TITLE__/$title Full Variable Index/g;
+ 	$newheader =~ s/__CHARSET__/$charset/g;
      $newheader =~ s/__STYLEFILE__/..\/$config{stylefile}/g if $config{'stylefile'};
      $newheader =~ s/__PRINTSTYLEFILE__/..\/$config{printstylefile}/g if $config{'printstylefile'};
      $newheader =~ s/__RELROOT__/..\//g;
***************
*** 1679,1684 ****
--- 1687,1693 ----
  		}
  		my $newheader=$pageheader;
  		$newheader =~ s/__TITLE__/$title Function Reference: $funcname\(\)/g;
+ 	$newheader =~ s/__CHARSET__/$charset/g;
          $newheader =~ s/__STYLEFILE__/..\/$config{stylefile}/g if $config{'stylefile'};
          $newheader =~ s/__PRINTSTYLEFILE__/..\/$config{printstylefile}/g if $config{'printstylefile'};
          $newheader =~ s/__RELROOT__/..\//g;
***************
*** 1734,1739 ****
--- 1743,1749 ----
      $INDEX=pxopen("$output_dir/_functions/index.$ext",'w');
  	$newheader=$pageheader;
  	$newheader =~ s/__TITLE__/$title Full Function Index/g;
+ 	$newheader =~ s/__CHARSET__/$charset/g;
      $newheader =~ s/__STYLEFILE__/..\/$config{stylefile}/g if $config{'stylefile'};
      $newheader =~ s/__PRINTSTYLEFILE__/..\/$config{printstylefile}/g if $config{'printstylefile'};
      $newheader =~ s/__RELROOT__/..\//g;
***************
*** 1820,1825 ****
--- 1830,1836 ----
          my $classnameid=$class_ids{$classname};
          my $newheader=$pageheader;
          $newheader =~ s/__TITLE__/$title Class Reference: $classname/g;
+ 	$newheader =~ s/__CHARSET__/$charset/g;
          $newheader =~ s/__STYLEFILE__/..\/$config{stylefile}/g if $config{'stylefile'};
          $newheader =~ s/__PRINTSTYLEFILE__/..\/$config{printstylefile}/g if $config{'printstylefile'};
          $newheader =~ s/__RELROOT__/..\//g;
***************
*** 1869,1874 ****
--- 1880,1886 ----
      $INDEX=pxopen("$output_dir/_classes/index.$ext",'w');
      $newheader=$pageheader;
      $newheader =~ s/__TITLE__/$title Full Class Index/g;
+     $newheader =~ s/__CHARSET__/$charset/g;
      $newheader =~ s/__STYLEFILE__/..\/$config{stylefile}/g if $config{'stylefile'};
      $newheader =~ s/__PRINTSTYLEFILE__/..\/$config{printstylefile}/g if $config{'printstylefile'};
      $newheader =~ s/__RELROOT__/..\//g;
***************
*** 1918,1923 ****
--- 1930,1936 ----
          $CONSTINDEX=pxopen("$output_dir/_constants/$constname.$ext",'w');
          my $newheader=$pageheader;
          $newheader =~ s/__TITLE__/$title Constant Reference: $constname/g;
+ 	$newheader =~ s/__CHARSET__/$charset/g;
          $newheader =~ s/__STYLEFILE__/..\/$config{stylefile}/g if $config{'stylefile'};
          $newheader =~ s/__PRINTSTYLEFILE__/..\/$config{printstylefile}/g if $config{'printstylefile'};
          $newheader =~ s/__RELROOT__/..\//g;
***************
*** 1966,1971 ****
--- 1979,1985 ----
      $INDEX=pxopen("$output_dir/_constants/index.$ext",'w');
      $newheader=$pageheader;
      $newheader =~ s/__TITLE__/$title Full Constant Index/g;
+     $newheader =~ s/__CHARSET__/$charset/g;
      $newheader =~ s/__STYLEFILE__/..\/$config{stylefile}/g if $config{'stylefile'};
      $newheader =~ s/__PRINTSTYLEFILE__/..\/$config{printstylefile}/g if $config{'printstylefile'};
      $newheader =~ s/__RELROOT__/..\//g;
***************
*** 2014,2019 ****
--- 2028,2034 ----
          $TABLEINDEX=pxopen("$output_dir/_tables/$tablenameid.$ext",'w');
  		$newheader=$pageheader;
  		$newheader =~ s/__TITLE__/$title Table Reference: $tablename/g;
+ 	$newheader =~ s/__CHARSET__/$charset/g;
          $newheader =~ s/__STYLEFILE__/..\/$config{stylefile}/g if $config{'stylefile'};
          $newheader =~ s/__PRINTSTYLEFILE__/..\/$config{printstylefile}/g if $config{'printstylefile'};
          $newheader =~ s/__RELROOT__/..\//g;
***************
*** 2068,2073 ****
--- 2083,2089 ----
      $INDEX=pxopen("$output_dir/_tables/index.$ext",'w');
  	$newheader=$pageheader;
  	$newheader =~ s/__TITLE__/$title Full Table Index/g;
+ 	$newheader =~ s/__CHARSET__/$charset/g;
      $newheader =~ s/__STYLEFILE__/..\/$config{stylefile}/g if $config{'stylefile'};
      $newheader =~ s/__PRINTSTYLEFILE__/..\/$config{printstylefile}/g if $config{'printstylefile'};
      $newheader =~ s/__RELROOT__/..\//g;
diff -c -r phpxref-0.6/sample_header.html phpxref-0.6-charset/sample_header.html
*** phpxref-0.6/sample_header.html	2004-10-27 11:39:39.000000000 +0900
--- phpxref-0.6-charset/sample_header.html	2005-11-08 22:24:23.076198179 +0900
***************
*** 5,11 ****
      <link rel="stylesheet" href="__STYLEFILE__" type="text/css">
      <link rel="stylesheet" href="__PRINTSTYLEFILE__" type="text/css" media="print">
      <style id="hilight" type="text/css"></style>
!     <meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
  </head>
  <body bgcolor="#ffffff" text="#000000" link="#801800" vlink="#300540" alink="#ffffff">
  <table class="pagetitle" width="100%">
--- 5,11 ----
      <link rel="stylesheet" href="__STYLEFILE__" type="text/css">
      <link rel="stylesheet" href="__PRINTSTYLEFILE__" type="text/css" media="print">
      <style id="hilight" type="text/css"></style>
!     <meta http-equiv="content-type" content="text/html;charset=__CHARSET__">
  </head>
  <body bgcolor="#ffffff" text="#000000" link="#801800" vlink="#300540" alink="#ffffff">
  <table class="pagetitle" width="100%">

