From: <mn...@us...> - 2007-01-22 20:10:35
|
Author: mnodine Date: 2007-01-22 21:10:18 +0100 (Mon, 22 Jan 2007) New Revision: 4894 Modified: trunk/prest/lib/Text/Restructured/Writer/html.wrt Log: * Made nbsp generation compatible with perl 5.8.0. * Made the reported encoding agree with the -e flag (if given). Modified: trunk/prest/lib/Text/Restructured/Writer/html.wrt =================================================================== --- trunk/prest/lib/Text/Restructured/Writer/html.wrt 2007-01-22 20:07:23 UTC (rev 4893) +++ trunk/prest/lib/Text/Restructured/Writer/html.wrt 2007-01-22 20:10:18 UTC (rev 4894) @@ -1182,7 +1182,8 @@ my $doc = [[], []]; # Handle the prolog - push @{$doc->[0]}, qq(<?xml version="1.0" encoding="utf-8" ?>\n) + my $enc = $main::opt_e || 'utf-8'; + push @{$doc->[0]}, qq(<?xml version="1.0" encoding="$enc" ?>\n) unless $html_prolog; push @{$doc->[0]}, $DOCTYPE; push (@{$doc->[0]}, qq(<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n)); @@ -1192,7 +1193,7 @@ my $head = [["<head>\n"], ["</head>\n"]]; push (@{$doc->[0]}, $head); push (@{$head->[0]}, - qq(<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n)); + qq(<meta http-equiv="Content-Type" content="text/html; charset=$enc" />\n)); push (@{$head->[0]}, qq(<meta name="generator" content="$main::TOOL_ID" />\n)) unless defined $main::opt_D{generator} && |