[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp texi2any.pl Texinfo/Common.pm Texinf...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp texi2any.pl Texinfo/Common.pm Texinf... |
|
Date: |
Fri, 14 Sep 2012 20:20:17 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/09/14 20:20:16
Modified files:
tp : texi2any.pl
tp/Texinfo : Common.pm Parser.pm Report.pm Structuring.pm
tp/Texinfo/Convert: Converter.pm DocBook.pm HTML.pm Info.pm
Plaintext.pm Text.pm XML.pm
tp/maintain : all_tests.sh
tp/t/results/converters_tests: accentenc.pl
accentenc_enable_encoding.pl
accentenc_no_entity.pl
at_commands_in_refs_latin1.pl
at_commands_in_refs_utf8.pl
char_latin1_latin1_in_refs.pl
char_latin1_utf8_in_refs.pl
char_latin2_latin2_in_refs.pl
documentencoding_utf8_and_insertions.pl
japanese_shift_jis.pl
sample_utf8.pl weird_accents.pl
weird_accents_disable_encoding.pl
tp/t/results/html_tests: utf8_enable_encoding.pl
utf8_enable_encoding_no_use_iso.pl
utf8_no_use_entity.pl
utf8_no_use_entity_enable_encoding.pl
utf8_no_use_entity_enable_encoding_no_use_iso.pl
utf8_no_use_entity_no_use_iso.pl
tp/t/results/include: macro_in_early_commands.pl
verbatiminclude_and_encoding.pl
verbatiminclude_and_encoding_latin1.pl
tp/t/results/indices: encoding_index_ascii.pl
encoding_index_ascii_enable_encoding.pl
encoding_index_latin1.pl
encoding_index_latin1_enable_encoding.pl
encoding_index_utf8.pl
encoding_index_utf8_enable_encoding.pl
tp/t/results/info_tests: encoding_us_ascii.pl
image_text_encoded.pl known_encoding.pl
only_documentencoding.pl
tp/t/results/languages: multiple_lang_chapters.pl
multiple_lang_chapters_texi2html.pl
tp/t/results/misc_commands: invalid_documentencoding.pl
many_lines.pl
tp/t/results/plaintext_tests: accents_in_var_enable_encoding.pl
chinese_mixed_with_en.pl
japanese_utf8.pl
punctuation_and_code_style_commands_utf8.pl
punctuation_and_upper_case_commands_utf8.pl
sc_with_utf8_enable_encoding.pl
tp/t/results/sectioning: no_element.pl
tp/t/results/value: value_in_misc_commands.pl
tp/tests/tex_html: Makefile.am tests-parser.txt
Added files:
tp/tests/tex_html: tex_accents.texi
tp/tests/tex_html/res_parser/tex_accents_httex: tex_accents.html
tex_accents_tex4ht_tex.4ct
tex_accents_tex4ht_tex.4tc
tex_accents_tex4ht_tex.css
tex_accents_tex4ht_tex.lg
tex_accents_tex4ht_tex.tex
tex_accents_tex4ht_tex.tmp
tex_accents_tex4ht_tex.xref
tp/tests/tex_html/res_parser/tex_accents_l2h:
tex_accents-l2h_cache.pm
tex_accents.2
tex_accents.html
tex_accents_l2h.html
tex_accents_l2h.tex
tex_accents_l2h_labels.pl
Log message:
Put customization variables in the correct groups.
Split encoding handling in input_ and output_ encoding. Set the
encodings
to be normal configuration variables.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.140&r2=1.141
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.154&r2=1.155
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.397&r2=1.398
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Report.pm?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.136&r2=1.137
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.256&r2=1.257
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.223&r2=1.224
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/all_tests.sh?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accentenc.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accentenc_enable_encoding.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accentenc_no_entity.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/japanese_shift_jis.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/sample_utf8.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/weird_accents.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/weird_accents_disable_encoding.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/utf8_enable_encoding.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/utf8_no_use_entity.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/utf8_no_use_entity_no_use_iso.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/macro_in_early_commands.pl?cvsroot=texinfo&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/verbatiminclude_and_encoding.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/encoding_index_ascii.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/encoding_index_latin1.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/encoding_index_utf8.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/encoding_us_ascii.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/image_text_encoded.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/known_encoding.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/only_documentencoding.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/languages/multiple_lang_chapters.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/languages/multiple_lang_chapters_texi2html.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/invalid_documentencoding.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/many_lines.pl?cvsroot=texinfo&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/japanese_utf8.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/no_element.pl?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_misc_commands.pl?cvsroot=texinfo&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/Makefile.am?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/tests-parser.txt?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/tex_accents.texi?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.4ct?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.4tc?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.css?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.lg?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.tex?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.tmp?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.xref?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents-l2h_cache.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.2?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.html?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.tex?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h_labels.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- texi2any.pl 12 Sep 2012 00:40:23 -0000 1.140
+++ texi2any.pl 14 Sep 2012 20:20:06 -0000 1.141
@@ -974,6 +974,7 @@
'TOP_NODE_UP', 'MAX_MACRO_CALL_NESTING', 'INLINE_INSERTCOPYING',
'SHOW_MENU', 'IGNORE_BEFORE_SETFILENAME', 'TEST',
'GLOBAL_COMMANDS', 'CPP_LINE_DIRECTIVES',
+ 'INPUT_ENCODING_NAME', 'INPUT_PERL_ENCODING',
'MACRO_BODY_IGNORES_LEADING_SPACE', 'USE_UP_NODE_FOR_ELEMENT_UP') {
if (defined(get_conf($parser_settable_option))) {
$parser_default_options->{$parser_settable_option}
@@ -1087,7 +1088,7 @@
#print STDERR "$texinfo_text\n";
my $macro_expand_file = get_conf('MACRO_EXPAND');
my $macro_expand_fh = Texinfo::Common::open_out($parser,
- $macro_expand_file);
+ $macro_expand_file, $parser->{'INPUT_PERL_ENCODING'});
my $error_macro_expand_file;
if (defined ($macro_expand_fh)) {
Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- Texinfo/Common.pm 11 Sep 2012 00:05:32 -0000 1.154
+++ Texinfo/Common.pm 14 Sep 2012 20:20:07 -0000 1.155
@@ -130,17 +130,21 @@
);
# documented in the Texinfo::Parser pod section
+# all are lower cased in texi2any.pl
our @parser_options = ('EXPANDED_FORMATS', 'GETTEXT', 'INCLUDE_DIRECTORIES',
'ALIASES', 'CLICKSTYLE', 'DOCUMENTLANGUAGE', 'EXPLAINED_COMMANDS',
- 'ENCODING_NAME', 'PERL_ENCODING', 'INDICES', 'KBDINPUTSTYLE', 'LABELS',
+ 'INDICES', 'KBDINPUTSTYLE', 'LABELS',
'MACROS', 'NOVALIDATE', 'SECTIONS_LEVEL', 'VALUES');
my @obsolete_variables = ('TOP_HEADING_AT_BEGINNING', 'USE_SECTIONS',
'IDX_SUMMARY', 'I18N_PERL_HASH', 'USE_UNICODE', 'USE_NLS',
'USE_UP_FOR_ADJACENT_NODES', 'SEPARATE_DESCRIPTION',
- 'NEW_CROSSREF_STYLE', 'SHORT_REF');
+ 'NEW_CROSSREF_STYLE', 'SHORT_REF', 'IGNORE_PREAMBLE_TEXT',
+ 'OUT_ENCODING',
+ 'IN_ENCODING', 'DEFAULT_ENCODING');
-my @variable_settables_not_used = ('COMPLETE_IMAGE_PATHS', 'TOC_FILE');
+my @variable_settables_not_used = ('COMPLETE_IMAGE_PATHS', 'TOC_FILE',
+ 'SPLIT_INDEX');
my @formats_settable = (
'DEBUGCOUNT', 'DEBUGTREE', 'RAWTEXT', 'TEXTCONTENT', 'PLAINTEXINFO'
@@ -151,8 +155,7 @@
'TOP_FILE', 'SHOW_MENU', 'USE_NODES', 'TOC_LINKS', 'SHORTEXTN',
'PREFIX', 'DEF_TABLE', 'L2H', 'MONOLITHIC',
'L2H_L2H', 'L2H_SKIP', 'L2H_TMP', 'L2H_FILE', 'L2H_CLEAN',
- 'L2H_HTML_VERSION', 'IGNORE_PREAMBLE_TEXT', 'EXTERNAL_DIR', 'USE_ISO',
- 'SPLIT_INDEX', 'IN_ENCODING',
+ 'L2H_HTML_VERSION', 'EXTERNAL_DIR', 'USE_ISO',
'VERTICAL_HEAD_NAVIGATION', 'INLINE_CONTENTS', 'NODE_FILE_EXTENSION',
'NO_CSS', 'INLINE_CSS_STYLE', 'USE_TITLEPAGE_FOR_TITLE',
'SIMPLE_MENU', 'EXTENSION', 'INLINE_INSERTCOPYING', 'USE_NUMERIC_ENTITY',
@@ -166,11 +169,13 @@
'COMPLEX_FORMAT_IN_TABLE',
'IGNORE_BEFORE_SETFILENAME',
'USE_NODE_TARGET',
- 'PROGRAM_NAME_IN_FOOTER', 'NODE_FILENAMES', 'DEFAULT_ENCODING',
- 'OUT_ENCODING', 'ENCODING_NAME', 'EXTERNAL_CROSSREF_SPLIT', 'BODYTEXT',
+ 'PROGRAM_NAME_IN_FOOTER', 'NODE_FILENAMES',
+ 'EXTERNAL_CROSSREF_SPLIT', 'BODYTEXT',
'CSS_LINES', 'RENAMED_NODES_REDIRECTIONS', 'RENAMED_NODES_FILE',
'CPP_LINE_DIRECTIVES',
'TEXI2DVI', 'DUMP_TREE', 'MAX_MACRO_CALL_NESTING',
+ 'INPUT_ENCODING_NAME', 'INPUT_PERL_ENCODING',
+ 'OUTPUT_ENCODING_NAME', 'OUTPUT_PERL_ENCODING',
'PACKAGE_VERSION',
'PACKAGE_AND_VERSION', 'PACKAGE_URL', 'PACKAGE', 'PACKAGE_NAME', 'PROGRAM',
'PRE_BODY_CLOSE', 'AFTER_BODY_OPEN', 'PRE_ABOUT', 'AFTER_ABOUT',
@@ -912,8 +917,9 @@
my $file = shift;
my $encoding = shift;
- if (!defined($encoding) and $self and defined($self->{'perl_encoding'})) {
- $encoding = $self->{'perl_encoding'};
+ if (!defined($encoding) and $self
+ and defined($self->get_conf('OUTPUT_PERL_ENCODING'))) {
+ $encoding = $self->get_conf('OUTPUT_PERL_ENCODING');
}
if ($file eq '-') {
@@ -1008,8 +1014,9 @@
$current->{'line_nr'});
}
} else {
- if ($self and defined($self->{'perl_encoding'})) {
- binmode(VERBINCLUDE, ":encoding($self->{'perl_encoding'})");
+ if ($self and defined($self->get_conf('INPUT_PERL_ENCODING'))) {
+ binmode(VERBINCLUDE, ":encoding(".
+ $self->get_conf('INPUT_PERL_ENCODING').")");
}
$verbatiminclude = { 'cmdname' => 'verbatim',
'parent' => $current->{'parent'},
@@ -1388,8 +1395,9 @@
my $renamed_nodes_lines = shift;
if (open(RENAMEDFILE, "<$renamed_nodes_file")) {
- if ($self->{'info'} and $self->{'info'}->{'perl_encoding'}) {
- binmode(RENAMEDFILE, ":encoding($self->{'info'}->{'perl_encoding'})");
+ if ($self->get_conf('INPUT_PERL_ENCODING')) {
+ binmode(RENAMEDFILE, ":encoding(".
+ $self->get_conf('INPUT_PERL_ENCODING').")");
}
my $renamed_nodes_line_nr = 0;
my @old_names = ();
@@ -1466,9 +1474,12 @@
{
my $self = shift;
my %options;
- if ($self->get_conf('ENABLE_ENCODING')
- and $self->{'encoding_name'}) {
- $options{'enabled_encoding'} = $self->{'encoding_name'};
+ if ($self->get_conf('ENABLE_ENCODING')) {
+ if ($self->get_conf('OUTPUT_ENCODING_NAME')) {
+ $options{'enabled_encoding'} = $self->get_conf('OUTPUT_ENCODING_NAME');
+ } elsif ($self->get_conf('INPUT_ENCODING_NAME')) {
+ $options{'enabled_encoding'} = $self->get_conf('INPUT_ENCODING_NAME');
+ }
}
$options{'TEST'} = 1 if ($self->get_conf('TEST'));
$options{'NUMBER_SECTIONS'} = $self->get_conf('NUMBER_SECTIONS');
@@ -1477,14 +1488,18 @@
return %options;
}
-sub count_bytes($$)
+sub count_bytes($$;$)
{
my $self = shift;
my $string = shift;
+ my $encoding = shift;
+
+ if (!defined($encoding) and $self and
$self->get_conf('OUTPUT_PERL_ENCODING')) {
+ $encoding = $self->get_conf('OUTPUT_PERL_ENCODING');
+ }
- if ($self and $self->{'perl_encoding'}
- and $self->{'perl_encoding'} ne 'ascii') {
- return length(Encode::encode($self->{'perl_encoding'}, $string));
+ if ($encoding and $encoding ne 'ascii') {
+ return length(Encode::encode($encoding, $string));
} else {
return length($string);
}
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -b -r1.397 -r1.398
--- Texinfo/Parser.pm 12 Sep 2012 00:40:23 -0000 1.397
+++ Texinfo/Parser.pm 14 Sep 2012 20:20:07 -0000 1.398
@@ -141,9 +141,11 @@
# in the `HTML Xref' node. Value should be
# a node/anchor or float in the tree.
'novalidate' => 0, # same as setting @novalidate.
- 'perl_encoding' => undef, # perl encoding name, set from @documentencoding
- 'encoding_name' => undef, # Current encoding set by @documentencoding
- # and normalized
+ 'INPUT_PERL_ENCODING' => undef, # input perl encoding name, set from
+ # @documentencoding in the default case
+ 'INPUT_ENCODING_NAME' => undef, # encoding name normalized as preferred
+ # IANA, set from @documentencoding in the default
+ # case
'documentlanguage' => undef,
# Current documentlanguage set by
# @documentlanguage
@@ -168,7 +170,7 @@
# The commands in initialization_overrides are not set in the document if
# set at the parser initialization.
my %initialization_overrides = (
- 'encoding_name' => 1,
+ 'INPUT_ENCODING_NAME' => 1,
'documentlanguage' => 1,
);
@@ -832,7 +834,8 @@
$line_nr++;
} else {
# put the line back in the filehandle
- seek($filehandle, -Texinfo::Common::count_bytes($self, $line), 1);
+ seek($filehandle, -Texinfo::Common::count_bytes($self,
+ $line, $self->{'INPUT_PERL_ENCODING'}), 1);
last;
}
}
@@ -943,7 +946,7 @@
# @ dircategory_direntry
# @ unassociated_menus
# perl_encoding
-# encoding_name
+# input_encoding_name
# input_file_name
sub global_informations ($)
{
@@ -3069,8 +3072,8 @@
my $filehandle = do { local *FH };
if (open ($filehandle, $file)) {
$included_file = 1;
- binmode($filehandle, ":encoding($self->{'perl_encoding'})")
- if (defined($self->{'perl_encoding'}));
+ binmode($filehandle, ":encoding($self->{'INPUT_PERL_ENCODING'})")
+ if (defined($self->{'INPUT_PERL_ENCODING'}));
print STDERR "Included $file($filehandle)\n" if
($self->{'DEBUG'});
unshift @{$self->{'input'}}, {
'name' => $file,
@@ -3088,7 +3091,7 @@
$command, $text);
}
} elsif ($command eq 'documentencoding') {
- my ($texinfo_encoding, $perl_encoding, $output_encoding)
+ my ($texinfo_encoding, $perl_encoding, $input_encoding)
= Texinfo::Encoding::encoding_alias($text);
$self->_command_warn($current, $line_nr,
$self->__("Encoding `%s' is not a canonical texinfo
encoding"),
@@ -3098,16 +3101,18 @@
$self->_command_warn($current, $line_nr,
$self->__("unrecognized encoding name `%s'"), $text);
} else {
- if ($output_encoding) {
- $current->{'extra'}->{'encoding_name'} = $output_encoding;
+ if ($input_encoding) {
+ $current->{'extra'}->{'input_encoding_name'} = $input_encoding;
+ if (!$self->{'set'}->{'INPUT_ENCODING_NAME'}) {
+ $self->{'INPUT_ENCODING_NAME'} = $input_encoding;
+ $self->{'info'}->{'input_encoding_name'} = $input_encoding;
}
- $current->{'extra'}->{'perl_encoding'} = $perl_encoding;
-
- if (!$self->{'set'}->{'perl_encoding'}) {
- $self->{'perl_encoding'} = $perl_encoding;
- $self->{'info'}->{'perl_encoding'} = $perl_encoding;
- $self->{'info'}->{'encoding_name'} = $output_encoding;
- print STDERR "Using encoding $perl_encoding\n" if
($self->{'DEBUG'});
+ }
+ $current->{'extra'}->{'input_perl_encoding'} = $perl_encoding;
+
+ if (!$self->{'set'}->{'INPUT_PERL_ENCODING'}) {
+ $self->{'INPUT_PERL_ENCODING'} = $perl_encoding;
+ $self->{'info'}->{'input_perl_encoding'} = $perl_encoding;
foreach my $input (@{$self->{'input'}}) {
binmode($input->{'fh'}, ":encoding($perl_encoding)") if
($input->{'fh'});
}
@@ -5615,12 +5620,13 @@
The name of the main Texinfo input file.
-=item encoding_name
+=item input_encoding_name
-=item perl_encoding
+=item input_perl_encoding
-C<encoding_name> string is the encoding name use for the Texinfo code.
-C<perl_encoding> string is a corresponding perl encoding name.
+C<input_encoding_name> string is the encoding name used for the
+Texinfo code.
+C<input_perl_encoding> string is a corresponding perl encoding name.
=item dircategory_direntry
@@ -5814,13 +5820,14 @@
@acronym{EU, European Union}
-=item encoding_name
+=item INPUT_ENCODING_NAME
-=item perl_encoding
+=item INPUT_PERL_ENCODING
-C<encoding_name> string is the encoding name as set by C<@documentencoding>.
-C<perl_encoding> string is a corresponding perl encoding name. In general
-those two strings should be set simultaneously.
+C<INPUT_ENCODING_NAME> string is the encoding name as set
+by C<@documentencoding>.
+C<INPUT_PERL_ENCODING> string is a corresponding perl encoding name.
+In general those two strings should be set simultaneously.
=item indices
@@ -6560,8 +6567,8 @@
=item @documentencoding
-The argument, normalized is in I<encoding_name> if it is recognized.
-The correpsonding perl encoding name is in I<perl_encoding>.
+The argument, normalized is in I<input_encoding_name> if it is recognized.
+The corresponding perl encoding name is in I<input_perl_encoding>.
=item @click
Index: Texinfo/Report.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Report.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- Texinfo/Report.pm 12 Sep 2012 00:40:24 -0000 1.22
+++ Texinfo/Report.pm 14 Sep 2012 20:20:07 -0000 1.23
@@ -217,12 +217,25 @@
# FIXME do that only once when encoding is seen (or at beginning)
# instead of here, each time that gdt is called?
- my $encoding = $self->{'encoding_name'};
+ my $encoding;
+ if ($self->get_conf('OUTPUT_ENCODING_NAME')) {
+ $encoding = $self->get_conf('OUTPUT_ENCODING_NAME');
+ } elsif ($self->get_conf('INPUT_ENCODING_NAME')) {
+ $encoding = $self->get_conf('INPUT_ENCODING_NAME');
+ }
Locale::Messages::bind_textdomain_codeset($strings_textdomain, $encoding)
if ($encoding and $encoding ne 'us-ascii');
- if (!($encoding and $encoding eq 'us-ascii') and $self->{'perl_encoding'}) {
+ if (!($encoding and $encoding eq 'us-ascii')) {
+ my $perl_encoding;
+ if ($self->get_conf('OUTPUT_PERL_ENCODING')) {
+ $perl_encoding = $self->get_conf('OUTPUT_PERL_ENCODING');
+ } elsif ($self->get_conf('INPUT_PERL_ENCODING')) {
+ $perl_encoding = $self->get_conf('INPUT_PERL_ENCODING');
+ }
+ if ($perl_encoding) {
Locale::Messages::bind_textdomain_filter($strings_textdomain,
- \&_encode_i18n_string, $self->{'perl_encoding'});
+ \&_encode_i18n_string, $perl_encoding);
+ }
}
# FIXME do that once when @documentlanguage changes (or at beginning)
Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- Texinfo/Structuring.pm 9 Sep 2012 21:59:50 -0000 1.136
+++ Texinfo/Structuring.pm 14 Sep 2012 20:20:07 -0000 1.137
@@ -1891,8 +1891,9 @@
my $index_names = shift;
my $options = {'sort_string' => 1};
- if ($self->get_conf('ENABLE_ENCODING') and $self->{'encoding_name'}) {
- $options->{'enabled_encoding'} = $self->{'encoding_name'};
+ if ($self->get_conf('ENABLE_ENCODING')
+ and $self->get_conf('INPUT_ENCODING_NAME')) {
+ $options->{'enabled_encoding'} = $self->get_conf('INPUT_ENCODING_NAME');
}
foreach my $index_name (keys(%$index_entries)) {
foreach my $entry (@{$index_entries->{$index_name}}) {
Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- Texinfo/Convert/Converter.pm 12 Sep 2012 00:40:24 -0000 1.88
+++ Texinfo/Convert/Converter.pm 14 Sep 2012 20:20:07 -0000 1.89
@@ -26,6 +26,7 @@
use File::Basename;
# for file names portability
use File::Spec;
+use Encode;
use Texinfo::Report;
use Texinfo::Common;
@@ -62,8 +63,6 @@
my %defaults = (
'ENABLE_ENCODING' => 1,
-# 'perl_encoding' => 'ascii',
-# 'encoding_name' => 'us-ascii',
'OUTFILE' => undef,
'SUBDIR' => undef,
'documentlanguage' => undef,
@@ -147,10 +146,10 @@
$self->set_conf($cmdname, 1);
} elsif (exists($root->{'extra'}->{'text_arg'})) {
$self->set_conf($cmdname, $root->{'extra'}->{'text_arg'});
- if ($cmdname eq 'documentencoding'
- and defined($root->{'extra'})
- and defined($root->{'extra'}->{'perl_encoding'})
- ){
+ #if ($cmdname eq 'documentencoding'
+ # and defined($root->{'extra'})
+ # and defined($root->{'extra'}->{'perl_encoding'})
+ # ){
# the following does not work with shifijs. The encoding
# has to be set only once by open_out.
#if (defined($self->{'fh'})) {
@@ -163,9 +162,9 @@
# }
# binmode($filehandle, ":encoding($encoding)");
#}
- $self->{'encoding_name'} = $root->{'extra'}->{'encoding_name'};
- $self->{'perl_encoding'} = $root->{'extra'}->{'perl_encoding'};
- }
+ # $self->{'encoding_name'} = $root->{'extra'}->{'encoding_name'};
+ # $self->{'perl_encoding'} = $root->{'extra'}->{'perl_encoding'};
+ #}
} elsif ($root->{'extra'} and $root->{'extra'}->{'misc_args'}
and exists($root->{'extra'}->{'misc_args'}->[0])) {
$self->set_conf($cmdname, $root->{'extra'}->{'misc_args'}->[0]);
@@ -222,9 +221,17 @@
$converter->{'extra'}
= $converter->{'parser'}->global_commands_information();
$converter->{'info'} = $converter->{'parser'}->global_informations();
- if ($converter->{'info'} and $converter->{'info'}->{'perl_encoding'}) {
- $converter->{'perl_encoding'} =
$converter->{'info'}->{'perl_encoding'};
- $converter->{'encoding_name'} =
$converter->{'info'}->{'encoding_name'};
+ if ($converter->{'info'}
+ and $converter->{'info'}->{'input_perl_encoding'}
+ and !defined($conf->{'INPUT_PERL_ENCODING'})) {
+ $conf->{'INPUT_PERL_ENCODING'}
+ = $converter->{'info'}->{'input_perl_encoding'};
+ }
+ if ($converter->{'info'}
+ and $converter->{'info'}->{'input_encoding_name'}
+ and !defined($conf->{'INPUT_ENCODING_NAME'})) {
+ $conf->{'INPUT_ENCODING_NAME'}
+ = $converter->{'info'}->{'input_encoding_name'};
}
my $floats = $converter->{'parser'}->floats_information();
my $labels = $converter->{'parser'}->labels_information();
@@ -265,6 +272,17 @@
$converter->{'set'}->{$key} = 1;
}
}
+ $converter->set_conf('OUTPUT_ENCODING_NAME',
+ $converter->get_conf('INPUT_ENCODING_NAME'))
+ if ($converter->get_conf('INPUT_ENCODING_NAME'));
+ if (!$converter->get_conf('OUTPUT_PERL_ENCODING')
+ and $converter->get_conf('OUTPUT_ENCODING_NAME')) {
+ my $perl_encoding
+ = Encode::resolve_alias($converter->get_conf('OUTPUT_ENCODING_NAME'));
+ if ($perl_encoding) {
+ $converter->set_conf('OUTPUT_PERL_ENCODING', $perl_encoding);
+ }
+ }
if (!defined($converter->{'expanded_formats'})) {
if ($converter->{'parser'}) {
$converter->{'expanded_formats'} =
$converter->{'parser'}->{'expanded_formats'};
@@ -917,7 +935,7 @@
my $encoded;
if ($self->get_conf('ENABLE_ENCODING')) {
$encoded = Texinfo::Convert::Unicode::encoded_accents($result, $stack,
- $self->{'encoding_name'},
+ $self->get_conf('OUTPUT_ENCODING_NAME'),
$format_accents,
$in_upper_case);
}
Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- Texinfo/Convert/DocBook.pm 9 Sep 2012 16:51:46 -0000 1.51
+++ Texinfo/Convert/DocBook.pm 14 Sep 2012 20:20:08 -0000 1.52
@@ -67,8 +67,7 @@
#'ENABLE_ENCODING' => 0,
'SHOW_MENU' => 0,
'EXTENSION' => 'xml', # dbk?
- 'perl_encoding' => 'utf8',
- 'encoding_name' => 'utf-8',
+ 'OUTPUT_ENCODING_NAME' => 'utf-8',
'OUTFILE' => undef,
'SUBDIR' => undef,
'output_format' => 'docbook',
@@ -318,8 +317,9 @@
$self->_set_global_multiple_commands(-1);
my $encoding = '';
- if ($self->{'encoding_name'} and $self->{'encoding_name'} ne 'utf-8') {
- $encoding = " encoding=\"$self->{'encoding_name'}\" ";
+ if ($self->get_conf('OUTPUT_ENCODING_NAME')
+ and $self->get_conf('OUTPUT_ENCODING_NAME') ne 'utf-8') {
+ $encoding = " encoding=\"".$self->get_conf('OUTPUT_ENCODING_NAME')."\" ";
}
my $id;
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -b -r1.256 -r1.257
--- Texinfo/Convert/HTML.pm 12 Sep 2012 00:40:24 -0000 1.256
+++ Texinfo/Convert/HTML.pm 14 Sep 2012 20:20:08 -0000 1.257
@@ -720,7 +720,7 @@
sub _translate_names($)
{
my $self = shift;
- #print STDERR "encoding_name: $self->{'encoding_name'} documentlanguage:
".$self->get_conf('documentlanguage')."\n";
+ #print STDERR "encoding_name: ".$self->get_conf('OUTPUT_ENCODING_NAME')."
documentlanguage: ".$self->get_conf('documentlanguage')."\n";
%BUTTONS_TEXT = (
@@ -910,8 +910,7 @@
my %defaults = (
'ENABLE_ENCODING' => 0,
'SHOW_MENU' => 1,
- 'perl_encoding' => 'utf8',
- 'encoding_name' => 'utf-8',
+ 'OUTPUT_ENCODING_NAME' => 'utf-8',
#'encoding_name' => undef,
#'perl_encoding' => undef,
'OUTFILE' => undef,
@@ -3691,7 +3690,8 @@
$text = $self->protect_text($text);
if ($self->get_conf('ENABLE_ENCODING') and
!$self->get_conf('ENABLE_ENCODING_USE_ENTITY')
- and $self->{'encoding_name'} and $self->{'encoding_name'} eq 'utf-8') {
+ and $self->get_conf('OUTPUT_ENCODING_NAME')
+ and $self->get_conf('OUTPUT_ENCODING_NAME') eq 'utf-8') {
$text = Texinfo::Convert::Unicode::unicode_text($text,
($self->in_code() or
$self->in_math()));
} elsif (!$self->in_code() and !$self->in_math()) {
@@ -4612,11 +4612,11 @@
if (defined($default_commands_formatting{$context}->{$command})) {
if ($self->get_conf('ENABLE_ENCODING')
and Texinfo::Convert::Unicode::unicode_for_brace_no_arg_command(
- $command, $self->{'encoding_name'})
+ $command, $self->get_conf('OUTPUT_ENCODING_NAME'))
and
!$self->_use_entity_is_entity($default_commands_formatting{$context}->{$command}))
{
$self->{'commands_formatting'}->{$context}->{$command}
= Texinfo::Convert::Unicode::unicode_for_brace_no_arg_command(
- $command, $self->{'encoding_name'})
+ $command, $self->get_conf('OUTPUT_ENCODING_NAME'))
} else {
$self->{'commands_formatting'}->{$context}->{$command}
= $default_commands_formatting{$context}->{$command};
@@ -6155,9 +6155,9 @@
my $encoding = '';
$encoding
= "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=".
- $self->{'encoding_name'}."\">"
- if (defined($self->{'encoding_name'})
- and ($self->{'encoding_name'} ne ''));
+ $self->get_conf('OUTPUT_ENCODING_NAME')."\">"
+ if (defined($self->get_conf('OUTPUT_ENCODING_NAME'))
+ and ($self->get_conf('OUTPUT_ENCODING_NAME') ne ''));
my $date = '';
if ($self->get_conf('DATE_IN_HEADER')) {
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- Texinfo/Convert/Info.pm 4 Aug 2012 20:08:02 -0000 1.86
+++ Texinfo/Convert/Info.pm 14 Sep 2012 20:20:08 -0000 1.87
@@ -241,7 +241,7 @@
$tag_text .= "$prefix: $label_text\x{7F}$label->{'bytes'}\n";
}
$tag_text .= "\x{1F}\nEnd Tag Table\n";
- my $coding = $self->{'encoding_name'};
+ my $coding = $self->get_conf('OUTPUT_ENCODING_NAME');
if ($coding) {
$tag_text .= "\n\x{1F}\nLocal Variables:\ncoding: $coding\nEnd:\n";
}
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -b -r1.223 -r1.224
--- Texinfo/Convert/Plaintext.pm 23 Aug 2012 16:58:19 -0000 1.223
+++ Texinfo/Convert/Plaintext.pm 14 Sep 2012 20:20:08 -0000 1.224
@@ -293,8 +293,6 @@
'EXTENSION' => 'info',
'USE_SETFILENAME_EXTENSION' => 1,
- 'encoding_name' => undef,
- 'perl_encoding' => undef,
'OUTFILE' => undef,
'SUBDIR' => undef,
'documentlanguage' => undef,
@@ -366,8 +364,8 @@
}
%{$self->{'style_map'}} = %style_map;
- if ($self->get_conf('ENABLE_ENCODING') and $self->{'encoding_name'}
- and $self->{'encoding_name'} eq 'utf-8') {
+ if ($self->get_conf('ENABLE_ENCODING') and
$self->get_conf('OUTPUT_ENCODING_NAME')
+ and $self->get_conf('OUTPUT_ENCODING_NAME') eq 'utf-8') {
foreach my $quoted_command (@quoted_commands) {
$self->{'style_map'}->{$quoted_command} = ["\x{2018}", "\x{2019}"];
}
@@ -495,8 +493,8 @@
or $context->{'var'}) {
$lower_case_text = lc($text);
}
- if ($self->get_conf('ENABLE_ENCODING') and $self->{'encoding_name'}
- and $self->{'encoding_name'} eq 'utf-8') {
+ if ($self->get_conf('ENABLE_ENCODING') and
$self->get_conf('OUTPUT_ENCODING_NAME')
+ and $self->get_conf('OUTPUT_ENCODING_NAME') eq 'utf-8') {
if (defined($lower_case_text)) {
$lower_case_text
= Texinfo::Convert::Unicode::unicode_text($lower_case_text,
@@ -1206,8 +1204,9 @@
} else {
my $filehandle = do { local *FH };
if (open ($filehandle, $txt_file)) {
- binmode($filehandle, ":encoding($self->{'perl_encoding'})")
- if (defined($self->{'perl_encoding'}));
+ binmode($filehandle, ":encoding("
+ .$self->get_conf('INPUT_PERL_ENCODING').")")
+ if (defined($self->get_conf('INPUT_PERL_ENCODING')));
my $result = '';
while (<$filehandle>) {
$result .= $_;
@@ -1524,7 +1523,7 @@
} elsif ($accent_commands{$root->{'cmdname'}}) {
my $encoding;
if ($self->get_conf('ENABLE_ENCODING')) {
- $encoding = $self->{'encoding_name'};
+ $encoding = $self->get_conf('OUTPUT_ENCODING_NAME');
}
my $sc;
if ($formatter->{'upper_case'}) {
Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- Texinfo/Convert/Text.pm 12 Sep 2012 00:40:24 -0000 1.96
+++ Texinfo/Convert/Text.pm 14 Sep 2012 20:20:08 -0000 1.97
@@ -584,9 +584,11 @@
my $root = $converter->{'extra'}->{$global_command}->[0];
if ($global_command eq 'documentencoding'
and defined($root->{'extra'})
- and defined($root->{'extra'}->{'perl_encoding'})) {
- $converter->{'encoding_name'} = $root->{'extra'}->{'encoding_name'};
- $converter->{'perl_encoding'} = $root->{'extra'}->{'perl_encoding'};
+ and defined($root->{'extra'}->{'input_perl_encoding'})) {
+ $converter->{'OUTPUT_ENCODING_NAME'}
+ = $root->{'extra'}->{'input_encoding_name'};
+ $converter->{'OUTPUT_PERL_ENCODING'}
+ = $root->{'extra'}->{'input_perl_encoding'};
}
}
}
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- Texinfo/Convert/XML.pm 9 Sep 2012 16:51:46 -0000 1.84
+++ Texinfo/Convert/XML.pm 14 Sep 2012 20:20:08 -0000 1.85
@@ -58,8 +58,8 @@
'ENABLE_ENCODING' => 0,
'SHOW_MENU' => 1,
'EXTENSION' => 'xml',
- 'perl_encoding' => 'utf8',
- 'encoding_name' => 'utf-8',
+ #'output_perl_encoding' => 'utf8',
+ 'OUTPUT_ENCODING_NAME' => 'utf-8',
'OUTFILE' => undef,
'SUBDIR' => undef,
'output_format' => 'xml',
@@ -281,8 +281,9 @@
$self->_set_global_multiple_commands(-1);
my $encoding = '';
- if ($self->{'encoding_name'} and $self->{'encoding_name'} ne 'utf-8') {
- $encoding = " encoding=\"$self->{'encoding_name'}\" ";
+ if ($self->get_conf('OUTPUT_ENCODING_NAME')
+ and $self->get_conf('OUTPUT_ENCODING_NAME') ne 'utf-8') {
+ $encoding = " encoding=\"".$self->get_conf('OUTPUT_ENCODING_NAME')."\" ";
}
my $header = "<?xml version=\"1.0\"${encoding}?>".'
Index: maintain/all_tests.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/all_tests.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- maintain/all_tests.sh 5 Sep 2012 22:15:49 -0000 1.6
+++ maintain/all_tests.sh 14 Sep 2012 20:20:08 -0000 1.7
@@ -27,19 +27,19 @@
elif [ "$command" = 'diff' ]; then
if [ z"$test_name" = 'z' ]; then
for result in t/results/*/*.pl; do
- diff -U 3 $result $result.new
+ diff -a -U 3 $result $result.new
done
for result in t/results/*/*/res*/; do
out=`echo $result | sed 's;res\([^/]*/\)$;out\1;'`
- diff -u --exclude=CVS -r $result $out
+ diff -a -u --exclude=CVS -r $result $out
done
else
for result in t/results/$test_name/*.pl; do
- diff -u $result $result.new
+ diff -a -u $result $result.new
done
for result in t/results/$test_name/*/res*/; do
out=`echo $result | sed 's;res\([^/]*/\)$;out\1;'`
- diff -u --exclude=CVS -r $result $out
+ diff -a -u --exclude=CVS -r $result $out
done
fi
elif [ "$command" = 'texis' ]; then
Index: t/results/converters_tests/accentenc.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/accentenc.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/converters_tests/accentenc.pl 26 Aug 2012 14:15:09 -0000
1.14
+++ t/results/converters_tests/accentenc.pl 14 Sep 2012 20:20:09 -0000
1.15
@@ -38,8 +38,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'ISO-8859-1'
},
Index: t/results/converters_tests/accentenc_enable_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/accentenc_enable_encoding.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/converters_tests/accentenc_enable_encoding.pl 23 Aug 2012
18:14:33 -0000 1.2
+++ t/results/converters_tests/accentenc_enable_encoding.pl 14 Sep 2012
20:20:09 -0000 1.3
@@ -38,8 +38,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'ISO-8859-1'
},
Index: t/results/converters_tests/accentenc_no_entity.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/accentenc_no_entity.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/converters_tests/accentenc_no_entity.pl 23 Aug 2012 18:14:33
-0000 1.2
+++ t/results/converters_tests/accentenc_no_entity.pl 14 Sep 2012 20:20:09
-0000 1.3
@@ -38,8 +38,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'ISO-8859-1'
},
Index: t/results/converters_tests/at_commands_in_refs_latin1.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/converters_tests/at_commands_in_refs_latin1.pl 27 Aug 2012
22:04:35 -0000 1.10
+++ t/results/converters_tests/at_commands_in_refs_latin1.pl 14 Sep 2012
20:20:09 -0000 1.11
@@ -77,8 +77,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-15',
- 'perl_encoding' => 'iso-8859-15',
+ 'input_encoding_name' => 'iso-8859-15',
+ 'input_perl_encoding' => 'iso-8859-15',
'spaces_after_command' => {},
'text_arg' => 'ISO-8859-15'
},
Index: t/results/converters_tests/at_commands_in_refs_utf8.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/converters_tests/at_commands_in_refs_utf8.pl 27 Aug 2012
22:04:35 -0000 1.10
+++ t/results/converters_tests/at_commands_in_refs_utf8.pl 14 Sep 2012
20:20:09 -0000 1.11
@@ -77,8 +77,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/converters_tests/char_latin1_latin1_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/char_latin1_latin1_in_refs.pl 27 Aug 2012
22:04:35 -0000 1.4
+++ t/results/converters_tests/char_latin1_latin1_in_refs.pl 14 Sep 2012
20:20:10 -0000 1.5
@@ -105,8 +105,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'iso-8859-1'
},
Index: t/results/converters_tests/char_latin1_utf8_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/char_latin1_utf8_in_refs.pl 27 Aug 2012
22:04:35 -0000 1.4
+++ t/results/converters_tests/char_latin1_utf8_in_refs.pl 14 Sep 2012
20:20:10 -0000 1.5
@@ -105,8 +105,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/converters_tests/char_latin2_latin2_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/char_latin2_latin2_in_refs.pl 27 Aug 2012
22:04:35 -0000 1.4
+++ t/results/converters_tests/char_latin2_latin2_in_refs.pl 14 Sep 2012
20:20:10 -0000 1.5
@@ -100,8 +100,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-2',
- 'perl_encoding' => 'iso-8859-2',
+ 'input_encoding_name' => 'iso-8859-2',
+ 'input_perl_encoding' => 'iso-8859-2',
'spaces_after_command' => {},
'text_arg' => 'ISO-8859-2'
},
Index: t/results/converters_tests/documentencoding_utf8_and_insertions.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/converters_tests/documentencoding_utf8_and_insertions.pl 3 Sep
2012 21:58:42 -0000 1.8
+++ t/results/converters_tests/documentencoding_utf8_and_insertions.pl 14 Sep
2012 20:20:10 -0000 1.9
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/converters_tests/japanese_shift_jis.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/converters_tests/japanese_shift_jis.pl 24 Aug 2012 20:42:55
-0000 1.3
+++ t/results/converters_tests/japanese_shift_jis.pl 14 Sep 2012 20:20:10
-0000 1.4
@@ -51,8 +51,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'shift_jis',
- 'perl_encoding' => 'shiftjis',
+ 'input_encoding_name' => 'shift_jis',
+ 'input_perl_encoding' => 'shiftjis',
'spaces_after_command' => {},
'text_arg' => 'shift_jis'
},
Index: t/results/converters_tests/sample_utf8.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/sample_utf8.pl 24 Aug 2012 20:42:56 -0000
1.4
+++ t/results/converters_tests/sample_utf8.pl 14 Sep 2012 20:20:10 -0000
1.5
@@ -147,8 +147,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'UTF-8'
},
Index: t/results/converters_tests/weird_accents.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/weird_accents.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/converters_tests/weird_accents.pl 26 Aug 2012 14:15:22 -0000
1.10
+++ t/results/converters_tests/weird_accents.pl 14 Sep 2012 20:20:10 -0000
1.11
@@ -38,8 +38,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'ISO-8859-1'
},
Index: t/results/converters_tests/weird_accents_disable_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/weird_accents_disable_encoding.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/converters_tests/weird_accents_disable_encoding.pl 26 Aug
2012 14:15:23 -0000 1.10
+++ t/results/converters_tests/weird_accents_disable_encoding.pl 14 Sep
2012 20:20:10 -0000 1.11
@@ -38,8 +38,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'ISO-8859-1'
},
Index: t/results/html_tests/utf8_enable_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/html_tests/utf8_enable_encoding.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/html_tests/utf8_enable_encoding.pl 23 Aug 2012 18:14:44
-0000 1.2
+++ t/results/html_tests/utf8_enable_encoding.pl 14 Sep 2012 20:20:10
-0000 1.3
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/html_tests/utf8_enable_encoding_no_use_iso.pl 23 Aug 2012
18:14:44 -0000 1.2
+++ t/results/html_tests/utf8_enable_encoding_no_use_iso.pl 14 Sep 2012
20:20:10 -0000 1.3
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/html_tests/utf8_no_use_entity.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/html_tests/utf8_no_use_entity.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/html_tests/utf8_no_use_entity.pl 23 Aug 2012 18:14:44 -0000
1.2
+++ t/results/html_tests/utf8_no_use_entity.pl 14 Sep 2012 20:20:10 -0000
1.3
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/html_tests/utf8_no_use_entity_enable_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/html_tests/utf8_no_use_entity_enable_encoding.pl 23 Aug 2012
18:14:44 -0000 1.2
+++ t/results/html_tests/utf8_no_use_entity_enable_encoding.pl 14 Sep 2012
20:20:10 -0000 1.3
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl
23 Aug 2012 18:14:44 -0000 1.2
+++ t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl
14 Sep 2012 20:20:11 -0000 1.3
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/html_tests/utf8_no_use_entity_no_use_iso.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/html_tests/utf8_no_use_entity_no_use_iso.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/html_tests/utf8_no_use_entity_no_use_iso.pl 23 Aug 2012
18:14:44 -0000 1.2
+++ t/results/html_tests/utf8_no_use_entity_no_use_iso.pl 14 Sep 2012
20:20:11 -0000 1.3
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/include/macro_in_early_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/include/macro_in_early_commands.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- t/results/include/macro_in_early_commands.pl 11 Sep 2012 00:05:34
-0000 1.38
+++ t/results/include/macro_in_early_commands.pl 14 Sep 2012 20:20:11
-0000 1.39
@@ -289,8 +289,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'ISO-8859-1'
},
Index: t/results/include/verbatiminclude_and_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/include/verbatiminclude_and_encoding.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/include/verbatiminclude_and_encoding.pl 23 Aug 2012 18:14:45
-0000 1.2
+++ t/results/include/verbatiminclude_and_encoding.pl 14 Sep 2012 20:20:11
-0000 1.3
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/include/verbatiminclude_and_encoding_latin1.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/include/verbatiminclude_and_encoding_latin1.pl 23 Aug 2012
18:14:45 -0000 1.2
+++ t/results/include/verbatiminclude_and_encoding_latin1.pl 14 Sep 2012
20:20:11 -0000 1.3
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'iso-8859-1'
},
Index: t/results/indices/encoding_index_ascii.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/indices/encoding_index_ascii.pl 23 Aug 2012 18:14:46 -0000
1.2
+++ t/results/indices/encoding_index_ascii.pl 14 Sep 2012 20:20:11 -0000
1.3
@@ -83,8 +83,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'us-ascii',
- 'perl_encoding' => 'ascii',
+ 'input_encoding_name' => 'us-ascii',
+ 'input_perl_encoding' => 'ascii',
'spaces_after_command' => {},
'text_arg' => 'us-ascii'
},
Index: t/results/indices/encoding_index_ascii_enable_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/indices/encoding_index_ascii_enable_encoding.pl 23 Aug 2012
18:14:46 -0000 1.2
+++ t/results/indices/encoding_index_ascii_enable_encoding.pl 14 Sep 2012
20:20:11 -0000 1.3
@@ -83,8 +83,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'us-ascii',
- 'perl_encoding' => 'ascii',
+ 'input_encoding_name' => 'us-ascii',
+ 'input_perl_encoding' => 'ascii',
'spaces_after_command' => {},
'text_arg' => 'us-ascii'
},
Index: t/results/indices/encoding_index_latin1.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/indices/encoding_index_latin1.pl 23 Aug 2012 18:14:46 -0000
1.2
+++ t/results/indices/encoding_index_latin1.pl 14 Sep 2012 20:20:11 -0000
1.3
@@ -83,8 +83,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'iso-8859-1'
},
Index: t/results/indices/encoding_index_latin1_enable_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/indices/encoding_index_latin1_enable_encoding.pl 23 Aug 2012
18:14:46 -0000 1.2
+++ t/results/indices/encoding_index_latin1_enable_encoding.pl 14 Sep 2012
20:20:11 -0000 1.3
@@ -83,8 +83,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'iso-8859-1'
},
Index: t/results/indices/encoding_index_utf8.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/indices/encoding_index_utf8.pl 23 Aug 2012 18:14:46 -0000
1.2
+++ t/results/indices/encoding_index_utf8.pl 14 Sep 2012 20:20:12 -0000
1.3
@@ -83,8 +83,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/indices/encoding_index_utf8_enable_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/indices/encoding_index_utf8_enable_encoding.pl 23 Aug 2012
18:14:46 -0000 1.2
+++ t/results/indices/encoding_index_utf8_enable_encoding.pl 14 Sep 2012
20:20:12 -0000 1.3
@@ -83,8 +83,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/info_tests/encoding_us_ascii.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/encoding_us_ascii.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/info_tests/encoding_us_ascii.pl 23 Aug 2012 18:14:50 -0000
1.10
+++ t/results/info_tests/encoding_us_ascii.pl 14 Sep 2012 20:20:12 -0000
1.11
@@ -44,8 +44,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'us-ascii',
- 'perl_encoding' => 'ascii',
+ 'input_encoding_name' => 'us-ascii',
+ 'input_perl_encoding' => 'ascii',
'spaces_after_command' => {},
'text_arg' => 'US-ASCII'
},
Index: t/results/info_tests/image_text_encoded.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/image_text_encoded.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/info_tests/image_text_encoded.pl 27 Aug 2012 22:04:42 -0000
1.4
+++ t/results/info_tests/image_text_encoded.pl 14 Sep 2012 20:20:12 -0000
1.5
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/info_tests/known_encoding.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/info_tests/known_encoding.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/info_tests/known_encoding.pl 23 Aug 2012 18:14:51 -0000
1.9
+++ t/results/info_tests/known_encoding.pl 14 Sep 2012 20:20:12 -0000
1.10
@@ -44,8 +44,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'latin1'
},
Index: t/results/info_tests/only_documentencoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/only_documentencoding.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/info_tests/only_documentencoding.pl 23 Aug 2012 18:14:52
-0000 1.8
+++ t/results/info_tests/only_documentencoding.pl 14 Sep 2012 20:20:12
-0000 1.9
@@ -30,8 +30,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'ISO-8859-1'
},
Index: t/results/languages/multiple_lang_chapters.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/languages/multiple_lang_chapters.pl 27 Aug 2012 22:04:44
-0000 1.3
+++ t/results/languages/multiple_lang_chapters.pl 14 Sep 2012 20:20:12
-0000 1.4
@@ -77,8 +77,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/languages/multiple_lang_chapters_texi2html.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters_texi2html.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/languages/multiple_lang_chapters_texi2html.pl 27 Aug 2012
22:04:44 -0000 1.3
+++ t/results/languages/multiple_lang_chapters_texi2html.pl 14 Sep 2012
20:20:12 -0000 1.4
@@ -77,8 +77,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/misc_commands/invalid_documentencoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/misc_commands/invalid_documentencoding.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/misc_commands/invalid_documentencoding.pl 23 Aug 2012 18:15:10
-0000 1.12
+++ t/results/misc_commands/invalid_documentencoding.pl 14 Sep 2012 20:20:12
-0000 1.13
@@ -65,8 +65,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'us-ascii',
- 'perl_encoding' => 'ascii',
+ 'input_encoding_name' => 'us-ascii',
+ 'input_perl_encoding' => 'ascii',
'spaces_after_command' => {},
'text_arg' => 'us-ascii'
},
Index: t/results/misc_commands/many_lines.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/many_lines.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- t/results/misc_commands/many_lines.pl 24 Aug 2012 20:42:58 -0000
1.35
+++ t/results/misc_commands/many_lines.pl 14 Sep 2012 20:20:13 -0000
1.36
@@ -962,8 +962,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'ISO-8859-1'
},
Index: t/results/plaintext_tests/accents_in_var_enable_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/plaintext_tests/accents_in_var_enable_encoding.pl 23 Aug 2012
18:15:13 -0000 1.8
+++ t/results/plaintext_tests/accents_in_var_enable_encoding.pl 14 Sep 2012
20:20:13 -0000 1.9
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/plaintext_tests/chinese_mixed_with_en.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/plaintext_tests/chinese_mixed_with_en.pl 24 Aug 2012 20:42:58
-0000 1.3
+++ t/results/plaintext_tests/chinese_mixed_with_en.pl 14 Sep 2012 20:20:13
-0000 1.4
@@ -51,8 +51,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/plaintext_tests/japanese_utf8.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/japanese_utf8.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/plaintext_tests/japanese_utf8.pl 24 Aug 2012 20:42:58 -0000
1.3
+++ t/results/plaintext_tests/japanese_utf8.pl 14 Sep 2012 20:20:13 -0000
1.4
@@ -51,8 +51,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'UTF-8'
},
Index: t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
23 Aug 2012 18:15:14 -0000 1.4
+++ t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
14 Sep 2012 20:20:13 -0000 1.5
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
23 Aug 2012 18:15:14 -0000 1.4
+++ t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
14 Sep 2012 20:20:13 -0000 1.5
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl 23 Aug 2012
18:15:14 -0000 1.7
+++ t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl 14 Sep 2012
20:20:13 -0000 1.8
@@ -36,8 +36,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'utf-8',
- 'perl_encoding' => 'utf-8-strict',
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8-strict',
'spaces_after_command' => {},
'text_arg' => 'utf-8'
},
Index: t/results/sectioning/no_element.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/no_element.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- t/results/sectioning/no_element.pl 27 Aug 2012 22:04:48 -0000 1.33
+++ t/results/sectioning/no_element.pl 14 Sep 2012 20:20:13 -0000 1.34
@@ -77,8 +77,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'ISO-8859-1'
},
Index: t/results/value/value_in_misc_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/value/value_in_misc_commands.pl,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- t/results/value/value_in_misc_commands.pl 24 Aug 2012 20:43:01 -0000
1.52
+++ t/results/value/value_in_misc_commands.pl 14 Sep 2012 20:20:13 -0000
1.53
@@ -1705,8 +1705,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'encoding_name' => 'iso-8859-1',
- 'perl_encoding' => 'iso-8859-1',
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
'spaces_after_command' => {},
'text_arg' => 'ISO-8859-1'
},
Index: tests/tex_html/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/tex_html/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/tex_html/Makefile.am 19 Apr 2012 21:15:10 -0000 1.1
+++ tests/tex_html/Makefile.am 14 Sep 2012 20:20:14 -0000 1.2
@@ -1,5 +1,5 @@
EXTRA_DIST = \
- block_EOL.texi \
+ block_EOL.texi tex_accents.texi \
tex_complex.texi \
tex_in_copying.texi \
math_not_closed.texi tex_not_closed.texi \
Index: tests/tex_html/tests-parser.txt
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/tex_html/tests-parser.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/tex_html/tests-parser.txt 28 Jul 2012 23:47:38 -0000 1.2
+++ tests/tex_html/tests-parser.txt 14 Sep 2012 20:20:14 -0000 1.3
@@ -4,6 +4,8 @@
tex tex.texi --set-customization-variable 'L2H 1' --iftex
tex_notex tex.texi
tex_httex tex.texi --init tex4ht.pm --iftex
+tex_accents_httex tex_accents.texi --init tex4ht.pm --iftex
+tex_accents_l2h tex_accents.texi --set-customization-variable 'L2H 1' --iftex
# No mediawki tests for now
#tex_mediawiki tex.texi --init mediawiki.pm --iftex
#tex_httex_mediawiki tex.texi --html --init tex4ht.pm --init mediawiki.pm
--iftex
Index: tests/tex_html/tex_accents.texi
===================================================================
RCS file: tests/tex_html/tex_accents.texi
diff -N tests/tex_html/tex_accents.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/tex_accents.texi 14 Sep 2012 20:20:14 -0000 1.1
@@ -0,0 +1,4 @@
+
address@hidden
+T\'et
address@hidden tex
Index: tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
diff -N tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_httex/tex_accents.html 14 Sep
2012 20:20:14 -0000 1.1
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
address@hidden "tex_accents_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style:oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nocodebreak {white-space:nowrap}
+span.nolinebreak {white-space:nowrap}
+span.roman {font-family:serif; font-weight:normal}
+span.sansserif {font-family:sans-serif; font-weight:normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+ Tét
+<hr>
+<p><font size="-1">
+ This document was generated on <em>a sunny day</em> using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
+</font></p>
+
+
+</body>
+</html>
Index: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.4ct
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.4ct
diff -N tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.4ct
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.4ct
14 Sep 2012 20:20:14 -0000 1.1
@@ -0,0 +1,2 @@
+\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
+\par
Index: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.4tc
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.4tc
diff -N tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.4tc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.4tc
14 Sep 2012 20:20:14 -0000 1.1
@@ -0,0 +1 @@
+\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
Index: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.css
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.css
diff -N tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.css
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.css
14 Sep 2012 20:20:15 -0000 1.1
@@ -0,0 +1,40 @@
+
+/* start css.sty */
+p.noindent { text-indent: 0em }
+td p.noindent { text-indent: 0em; margin-top:0em; }
+p.nopar { text-indent: 0em; }
+p.indent{ text-indent: 1.5em }
address@hidden print {div.crosslinks {visibility:hidden;}}
+a img { border-top: 0; border-left: 0; border-right: 0; }
+center { margin-top:1em; margin-bottom:1em; }
+td center { margin-top:0em; margin-bottom:0em; }
+.Canvas { position:relative; }
+img.math{vertical-align:middle;}
+.obeylines-h,.obeylines-v {white-space: nowrap; }
+div.obeylines-v p { margin-top:0; margin-bottom:0; }
+.overline{ text-decoration:overline; }
+.overline img{ border-top: 1px solid black; }
+td.displaylines {text-align:center; white-space:nowrap;}
+.centerline {text-align:center;}
+.rightline {text-align:right;}
+span.TEX {letter-spacing: -0.125em; }
+span.TEX span.E{ position:relative;top:0.5ex;left:-0.0417em;}
+a span.TEX span.E {text-decoration: none; }
+.underline{ text-decoration:underline; }
+.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
+div.proclaim { margin-top: 1em; margin-bottom: 1em; }
+p.item {text-indent:-2em; margin-left:2em;}
+p.itemitem {text-indent:-2em; margin-left:4em;}
+span.item, span.itemitem {width:2em; margin-right:0.4em;}
+td.eqalign3 { text-align:right; margin-left:10em;}
+.eqalign td { white-space: nowrap; }
+div.eqalign {text-align:center;}
+td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
+.leqalignno td, .eqalignno td { white-space: nowrap; }
+.leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: normal;
}
+table.leqalignno, table.eqalignno {width:100%;}
+img.cdots{vertical-align:middle;}
+div.pmatrix {text-align:center;}
+table.pmatrix {width:100%;}
+/* end css.sty */
+
Index: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.lg
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.lg
diff -N tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.lg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.lg
14 Sep 2012 20:20:15 -0000 1.1
@@ -0,0 +1,47 @@
+File: tex_accents_tex4ht_tex.html
+File: tex_accents_tex4ht_tex.css
+File: tex_accents_tex4ht_tex.tmp
+Css: p.noindent { text-indent: 0em }
+Css: td p.noindent { text-indent: 0em; margin-top:0em; }
+Css: p.nopar { text-indent: 0em; }
+Css: p.indent{ text-indent: 1.5em }
+Css: @media print {div.crosslinks {visibility:hidden;}}
+Css: a img { border-top: 0; border-left: 0; border-right: 0; }
+Font_Css("4"): .small-caps{font-variant: small-caps; }
+Font_Css("10"): .htf-cmbx {font-weight: bold; font-style:normal;}
+Font_Css("12"): .htf-calligraphy {font-family:cursive}
+Font_Css("14"): .htf-italic {font-style: italic;}
+Font_Css("16"): .htf-bold {font-weight: bold;}
+Font_Css("12"): .htf-calligraphy-bold {font-family:cursive ; font-weight:
bold; }
+Css: center { margin-top:1em; margin-bottom:1em; }
+Css: td center { margin-top:0em; margin-bottom:0em; }
+Css: .Canvas { position:relative; }
+Css: img.math{vertical-align:middle;}
+Css: .obeylines-h,.obeylines-v {white-space: nowrap; }
+Css: div.obeylines-v p { margin-top:0; margin-bottom:0; }
+Css: .overline{ text-decoration:overline; }
+Css: .overline img{ border-top: 1px solid black; }
+Css: td.displaylines {text-align:center; white-space:nowrap;}
+Css: .centerline {text-align:center;}
+Css: .rightline {text-align:right;}
+Css: span.TEX {letter-spacing: -0.125em; }
+Css: span.TEX span.E{ position:relative;top:0.5ex;left:-0.0417em;}
+Css: a span.TEX span.E {text-decoration: none; }
+Css: .underline{ text-decoration:underline; }
+Css: .underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
+Css: div.proclaim { margin-top: 1em; margin-bottom: 1em; }
+Css: p.item {text-indent:-2em; margin-left:2em;}
+Css: p.itemitem {text-indent:-2em; margin-left:4em;}
+Css: span.item, span.itemitem {width:2em; margin-right:0.4em;}
+Css: td.eqalign3 { text-align:right; margin-left:10em;}
+Css: .eqalign td { white-space: nowrap; }
+Css: div.eqalign {text-align:center;}
+Css: td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
+Css: .leqalignno td, .eqalignno td { white-space: nowrap; }
+Css: .leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space:
normal; }
+Css: table.leqalignno, table.eqalignno {width:100%;}
+Css: img.cdots{vertical-align:middle;}
+Css: div.pmatrix {text-align:center;}
+Css: table.pmatrix {width:100%;}
+--- characters ---
+Font("cmr","10","10","100")
Index: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.tex
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.tex
diff -N tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.tex
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.tex
14 Sep 2012 20:20:15 -0000 1.1
@@ -0,0 +1,7 @@
+% Automatically generated
+\csname tex4ht\endcsname
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_accents_tex4ht_tex tex 1
-->\Hnewline}
+T\'et
+\HCode{\Hnewline <!-- tex4ht_end tex_accents_tex4ht_tex tex 1 -->\Hnewline
\Hnewline}
+
+\bye
Index: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.tmp
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.tmp
diff -N tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.tmp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.tmp
14 Sep 2012 20:20:15 -0000 1.1
@@ -0,0 +1,2 @@
+
+/* css.sty */
\ No newline at end of file
Index: tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.xref
===================================================================
RCS file:
tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.xref
diff -N tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.xref
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_httex/tex_accents_tex4ht_tex.xref
14 Sep 2012 20:20:15 -0000 1.1
@@ -0,0 +1 @@
+\:CrossWord{)F1F-}{tex_accents_tex4ht_tex.html}{1}%
Index: tests/tex_html/res_parser/tex_accents_l2h/tex_accents-l2h_cache.pm
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_l2h/tex_accents-l2h_cache.pm
diff -N tests/tex_html/res_parser/tex_accents_l2h/tex_accents-l2h_cache.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_l2h/tex_accents-l2h_cache.pm 14 Sep
2012 20:20:15 -0000 1.1
@@ -0,0 +1,4 @@
+
+$l2h_cache_key = q/T\'et/;
+$l2h_cache{$l2h_cache_key} = q|Tét|;
+1;
\ No newline at end of file
Index: tests/tex_html/res_parser/tex_accents_l2h/tex_accents.2
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_l2h/tex_accents.2
diff -N tests/tex_html/res_parser/tex_accents_l2h/tex_accents.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_l2h/tex_accents.2 14 Sep 2012
20:20:15 -0000 1.1
@@ -0,0 +1,2 @@
+texexpand
+warning: Must specify a title with a title command or @top
Index: tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
diff -N tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html 14 Sep 2012
20:20:15 -0000 1.1
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style:oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nocodebreak {white-space:nowrap}
+span.nolinebreak {white-space:nowrap}
+span.roman {font-family:serif; font-weight:normal}
+span.sansserif {font-family:sans-serif; font-weight:normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+Tét
+<hr>
+<p><font size="-1">
+ This document was generated on <em>a sunny day</em> using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
+</font></p>
+
+
+</body>
+</html>
Index: tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.html
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.html
diff -N tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.html 14 Sep
2012 20:20:16 -0000 1.1
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<!--Converted with LaTeX2HTML
+original version by: Nikos Drakos, CBLU, University of Leeds
+* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
+* with significant contributions from:
+ Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
+<HTML>
+<HEAD>
+<TITLE>tex_accents_l2h</TITLE>
+<META NAME="description" CONTENT="tex_accents_l2h">
+<META NAME="keywords" CONTENT="tex_accents_l2h">
+<META NAME="resource-type" CONTENT="document">
+<META NAME="distribution" CONTENT="global">
+
+<META NAME="Generator" CONTENT="LaTeX2HTML">
+<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
+
+<LINK REL="STYLESHEET" HREF="tex_accents_l2h.css">
+
+</HEAD>
+
+<BODY >
+
+<!-- l2h_begin tex_accents_l2h 1 -->
+Tét
+
+<!-- l2h_end tex_accents_l2h 1 -->
+<BR>
+<HR>
+</BODY>
+</HTML>
Index: tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.tex
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.tex
diff -N tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.tex
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.tex 14 Sep
2012 20:20:16 -0000 1.1
@@ -0,0 +1,15 @@
+% This document was automatically generated by the l2h extenstion of texi2html
+% DO NOT EDIT !!!
+\documentclass{article}
+\usepackage{html}
+\begin{document}
+\begin{rawhtml}
+
+<!-- l2h_begin tex_accents_l2h 1 -->
+\end{rawhtml}
+T\'et
+\begin{rawhtml}
+<!-- l2h_end tex_accents_l2h 1 -->
+
+\end{rawhtml}
+\end{document}
Index: tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h_labels.pl
===================================================================
RCS file: tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h_labels.pl
diff -N tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h_labels.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h_labels.pl 14 Sep
2012 20:20:16 -0000 1.1
@@ -0,0 +1,13 @@
+# LaTeX2HTML
+# Associate labels original text with physical files.
+
+
+1;
+
+
+# LaTeX2HTML
+# labels from external_latex_labels array.
+
+
+1;
+
- texinfo/tp texi2any.pl Texinfo/Common.pm Texinf...,
Patrice Dumas <=