| 1 | Patch derived from discussion at https://savannah.nongnu.org/bugs/?37503
|
| 2 |
|
| 3 | |
| 4 | |
| 5 | @@ -2589,7 +2589,12 @@
|
| 6 | my $state = shift;
|
| 7 |
|
| 8 | # FIXME this should be done only once, for @documentencoding
|
| 9 | - my $encoding = lc(Texi2HTML::Config::get_conf('DOCUMENT_ENCODING'));
|
| 10 | + my $encoding;
|
| 11 | + my $input_encoding = Texi2HTML::Config::get_conf('documentencoding');
|
| 12 | + if (defined($input_encoding))
|
| 13 | + {
|
| 14 | + $encoding = lc($input_encoding);
|
| 15 | + }
|
| 16 | if (defined($encoding) and $encoding ne '' and exists($Texi2HTML::Config::t2h_encoding_aliases{$encoding}))
|
| 17 | {
|
| 18 | $encoding = $Texi2HTML::Config::t2h_encoding_aliases{$encoding};
|
| 19 |
|
| 20 | Fix failures in test/encodings.
|
| 21 |
|
| 22 | |
| 23 | |
| 24 | @@ -53,6 +53,7 @@
|
| 25 | # for translations
|
| 26 | #use encoding 'utf8';
|
| 27 | #use utf8;
|
| 28 | +binmode STDERR, ':encoding(utf8)';
|
| 29 |
|
| 30 | #
|
| 31 | # According to
|