[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht... |
|
Date: |
Wed, 20 May 2009 23:22:24 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/05/20 23:22:24
Modified files:
. : ChangeLog TODO texi2html.init texi2html.pl
examples : enable_encoding.init info.init
test/coverage/res/comments_info: comments.info
test/encodings : Makefile.am Makefile.in tests.txt
weird_accents.texi
test/encodings/res/texi_weird_accents: weird_accents.passfirst
weird_accents.passtexi
weird_accents.texi
test/encodings/res/weird_accents: weird_accents.html
test/encodings/res/weird_accents_encoding: weird_accents.html
Added files:
test/encodings : enable_encoding_no_use_entity.init
test/encodings/res/accentenc_info: accentenc.info
Log message:
* texi2html.pl, texi2html.init: Suffixes (in
@INPUT_FILE_SUFFIXES)
are concatenated with input file names to try to find a
suitable
file (like makeinfo).
* texi2html.pl, texi2html.init, examples/info.init: handle
--enable-encoding.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.383&r2=1.384
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.194&r2=1.195
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.284&r2=1.285
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/enable_encoding.init?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/comments_info/comments.info?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/Makefile.am?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/Makefile.in?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/tests.txt?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/weird_accents.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/enable_encoding_no_use_entity.init?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/accentenc_info/accentenc.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/texi_weird_accents/weird_accents.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/texi_weird_accents/weird_accents.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/texi_weird_accents/weird_accents.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/weird_accents/weird_accents.html?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/weird_accents_encoding/weird_accents.html?cvsroot=texi2html&r1=1.4&r2=1.5
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -b -r1.383 -r1.384
--- ChangeLog 17 May 2009 20:10:16 -0000 1.383
+++ ChangeLog 20 May 2009 23:22:20 -0000 1.384
@@ -1,3 +1,11 @@
+2009-05-20 Patrice Dumas <address@hidden>
+
+ * texi2html.pl, texi2html.init: Suffixes (in @INPUT_FILE_SUFFIXES)
+ are concatenated with input file names to try to find a suitable
+ file (like makeinfo).
+ * texi2html.pl, texi2html.init, examples/info.init: handle
+ --enable-encoding.
+
2009-05-17 Patrice Dumas <address@hidden>
* texi2html.pl: a path separator may be used for -I and similar
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- TODO 17 May 2009 15:35:15 -0000 1.97
+++ TODO 20 May 2009 23:22:20 -0000 1.98
@@ -264,8 +264,6 @@
* makeinfo has a lot of other short command line switches, but implement
only those that are documented, in --help or info makeinfo.
-* -I can take paths (separated by : or ;) not only directories.
-
* does documentlanguage cmd line apply to first or all files?
ask on bug-texinfo.
@@ -388,13 +386,14 @@
should not be transliteration, but instead perl sorting and i18n stuff
should be used. Cf testcases in encoding/encoding_index*.
-* info with documentencoding
-Local Variables:
-coding: iso-8859-1
-End:
-
* makeinfo: index entry out of document leads to a message
(outside of any node).
instead of node name and line numbers in printindex.
multiple index entries have <1>... appended.
+* `makeinfo' also reads the environment variable
+`TEXINFO_OUTPUT_FORMAT' to determine the output format, if not
+overridden by a command line option. The possible values are:
+
+ docbook html info plaintext xml
+
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -b -r1.194 -r1.195
--- texi2html.init 17 May 2009 15:35:15 -0000 1.194
+++ texi2html.init 20 May 2009 23:22:20 -0000 1.195
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.194 2009/05/17 15:35:15 pertusus Exp $
+# $Id: texi2html.init,v 1.195 2009/05/20 23:22:20 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -297,12 +297,16 @@
$PARAGRAPHINDENT = 3;
$FIRSTPARAGRAPHINDENT = 'none';
+$ENABLE_ENCODING = 0;
+
##############################################################################
#
# The following can only be set in the init file
#
##############################################################################
address@hidden = ('.txi','.texinfo','.texi','.txinfo','');
+
# If true do table of contents even if there is no @content
$DO_CONTENTS = undef;
@@ -352,6 +356,9 @@
# Likewise, if node name equals entry name, do not print entry name.
$AVOID_MENU_REDUNDANCY = 1;
+#Â if true, use the original command if the result is an entity
+$ENABLE_ENCODING_USE_ENTITY = 1;
+
# if set, center @image by default
# otherwise, do not center by default
# Deprecated and not used anymore
@@ -884,6 +891,87 @@
#return $OUT_ENCODING;
};
+sub t2h_encoding_is_entity($)
+{
+ my $text = shift;
+ return 0 if (!$ENABLE_ENCODING_USE_ENTITY);
+ return 1 if ($text =~ /^&/ and $text =~ /;$/);
+}
+
+#Â this is for info.init
+use vars qw(%t2h_enable_encoding_default_accent);
+my @t2h_enable_encoding_accents_stack;
+my %t2h_enable_encoding_default_commands;
+
+sub t2h_enable_encoding_load()
+{
+ push @command_handler_process, \&t2h_enable_encoding_init;
+ push @command_handler_finish, \&t2h_enable_encoding_finish;
+ foreach my $key (keys(%unicode_accents), 'dotless')
+ {
+ $t2h_enable_encoding_default_accent{'normal'}->{$key} =
$style_map{$key}->{'function'};
+ $t2h_enable_encoding_default_accent{'texi'}->{$key} =
$style_map_texi{$key}->{'function'};
+ $t2h_enable_encoding_default_accent{'pre'}->{$key} =
$style_map_pre{$key}->{'function'};
+ $style_map{$key}->{'function'} = \&t2h_enable_encoding_normal_accent;
+ $style_map_texi{$key}->{'function'} = \&t2h_enable_encoding_texi_accent;
+ $style_map_pre{$key}->{'function'} = \&t2h_enable_encoding_pre_accent;
+ }
+ foreach my $key (%things_map)
+ {
+ if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
+ {
+ $t2h_enable_encoding_default_commands{'normal'}->{$key} =
$things_map{$key};
+ $t2h_enable_encoding_default_commands{'texi'}->{$key} = $texi_map{$key};
+ $t2h_enable_encoding_default_commands{'pre'}->{$key} = $pre_map{$key};
+ }
+ }
+}
+
+sub t2h_enable_encoding_finish()
+{
+ foreach my $key (%things_map)
+ {
+ if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
+ {
+ $things_map{$key} =
$t2h_enable_encoding_default_commands{'normal'}->{$key};
+ $texi_map{$key} = $t2h_enable_encoding_default_commands{'texi'}->{$key};
+ $pre_map{$key} = $t2h_enable_encoding_default_commands{'pre'}->{$key};
+ }
+ }
+}
+
+sub t2h_enable_encoding_init()
+{
+ if ($Texi2HTML::THISDOC{'ENCODING_NAME'} eq 'utf-8')
+ {
+ foreach my $key (%things_map)
+ {
+ if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
+ {
+ $things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($things_map{$key}));
+ $texi_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($texi_map{$key}));
+ $pre_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($pre_map{$key}));
+ }
+ }
+ }
+ elsif
(exists($makeinfo_encoding_to_map{$Texi2HTML::THISDOC{'ENCODING_NAME'}}))
+ {
+ my $enc_map =
$makeinfo_encoding_to_map{$Texi2HTML::THISDOC{'ENCODING_NAME'}};
+
+ foreach my $key (%things_map)
+ {
+ if (exists($unicode_map{$key}) and ($unicode_map{$key} ne '') and
+ exists($makeinfo_unicode_to_eight_bit{$enc_map}->{$unicode_map{$key}}))
+ { # we let perl handle the conversion
+ $things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($things_map{$key}));
+ $texi_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($texi_map{$key}));
+ $pre_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($pre_map{$key}));
+ }
+ }
+ @t2h_enable_encoding_accents_stack = ();
+ }
+}
+
sub t2h_default_finish_out()
{
}
@@ -3624,6 +3712,150 @@
return $text . $accent if (defined($accent_map{$accent}));
}
+sub t2h_enable_encoding_normal_accent($$$)
+{
+ return t2h_enable_encoding_accent ('normal', @_);
+}
+sub t2h_enable_encoding_texi_accent($$$)
+{
+ return t2h_enable_encoding_accent ('texi', @_);
+}
+sub t2h_enable_encoding_pre_accent($$$)
+{
+ return t2h_enable_encoding_accent ('pre', @_);
+}
+
+sub t2h_enable_encoding_accent($$$$)
+{
+ my $in = shift;
+ my @other_args = @_;
+
+ my $accent = shift;
+ my $args = shift;
+ my $style_stack = shift;
+ my $text = $args->[0];
+
+#print STDERR "enable_encoding_accent called($in) $accent (@$style_stack)\n";
+
+ return t2h_utf8_accent($accent,[$text],$style_stack) if
($Texi2HTML::THISDOC{'ENCODING_NAME'} eq 'utf-8');
+ return &{$t2h_enable_encoding_default_accent{$in}->{$accent}}(@other_args)
if (!exists($makeinfo_encoding_to_map{$Texi2HTML::THISDOC{'ENCODING_NAME'}}));
+ if (scalar(@t2h_enable_encoding_accents_stack))
+ {
+ #Â in that case, we already have a result ready that corresponds with the
+ #Â formatting of a part of the stack mapped to
+ # t2h_enable_encoding_accents_stack, so it is emptied and the innermost
+ #Â $text is returned as is, such that the unmodified already formatted
+ #Â innermost formatted accented text is returned.
+
+ #print STDERR " doing nothing, still in stack
(@t2h_enable_encoding_accents_stack), accent: $accent";
+ my $stack_accent = shift @t2h_enable_encoding_accents_stack;
+ #print STDERR " stack_accent $stack_accent\n";
+ return $text;
+ }
+
+ #Â in that case there is no t2h_enable_encoding_accents_stack, so we are
+ #Â at the closing of the innermost accented command. We will try to format
+ #Â all the stack in reverse(@$style_stack) that coresponds with
+ # accent commands
+ my @accents_stack = ();
+ my @styles = reverse(@$style_stack);
+
+ #Â accents are formatted and the intermediate results are kept, such
+ #Â that we can return the maximum of multiaccented letters that can be
+ #Â rendered with a given eight bit formatting.
+
+ # first put the letter in the stack
+ my @utf8_partial_results = { 'result' => $text,
+ 'accents_stack' => [ @accents_stack ]};
+
+ # then the accent that is associated with the function call
+ my $current_accent = t2h_utf8_accent($accent,[$text],$style_stack);
+ @accents_stack = ($accent);
+ push @utf8_partial_results, { 'result' => $current_accent,
+ 'accents_stack' => [ @accents_stack ]};
+
+ # and then all the other accents on the stack
+ while (scalar(@styles) and (defined($unicode_accents{$styles[0]}) or
$styles[0] eq 'dotless'))
+ {
+ my $next_style = shift @styles;
+ my @new_stack = reverse(@styles);
+ $current_accent =
t2h_utf8_accent($next_style,[$current_accent],address@hidden);
+ push @accents_stack, $next_style;
+ push @utf8_partial_results, { 'result' => $current_accent,
+ 'accents_stack' => [ @accents_stack ]}
+ ;
+ }
+
+ my $enc_map =
$makeinfo_encoding_to_map{$Texi2HTML::THISDOC{'ENCODING_NAME'}};
+ my $eight_bit;
+ my $result;
+ # At this point we have the utf8 encoded results for the accent
+ #Â commands stack, with all the intermediate results.
+ #Â For each one we'll check if it is possible to encode it in the
+ #Â current eight bit output encoding table
+ foreach my $partial_result (@utf8_partial_results)
+ {
+ my $char = $partial_result->{'result'};
+ my $new_eight_bit = '';
+ my $new_codepoint;
+
+ if (ord($char) <= 128)
+ {
+ $new_eight_bit = uc(sprintf("%02x",ord($char)));
+ $new_codepoint = uc(sprintf("%04x",ord($char)));
+ }
+ elsif (ord($char) <= hex(0xFFFF))
+ {
+ $new_codepoint = uc(sprintf("%04x",ord($char)));
+ if (exists($makeinfo_unicode_to_eight_bit{$enc_map}->{$new_codepoint}))
+ {
+ $new_eight_bit =
$makeinfo_unicode_to_eight_bit{$enc_map}->{$new_codepoint};
+ }
+ }
+ #my $eight_bit_txt = 'undef';
+ #$eight_bit_txt = $eight_bit if (defined($eight_bit));
+ #print STDERR "" . Encode::encode('utf8', "$char") . "
(@{$partial_result->{'accents_stack'}}), new_codepoint: $new_codepoint 8bit:
$new_eight_bit old:$eight_bit_txt\n";
+ #Â no corresponding eight bit character found
+ last if ($new_eight_bit eq '');
+
+ # in that case, the new eight bit character is the same than the one
+ #Â found with one less character (and it isnt a @dotless{i}). It may
+ #Â mean 2 things
+ #Â -> there are 2 characters in accent. This could happen, for example
+ # if an accent that cannot be rendered is found and it leads to
+ #Â appending or prepending a character. For example this happens for
+ # @={@,address@hidden, where @,address@hidden is expanded to a 2
character:
+ # ñ,
+ # In nthat case, the additional utf8 accent is prepended, which
+ # means that it is composed with the , and leaves ñ untouched.
+ # -> ord(char) leads to the same for the more inner character.
+ #Â this, for example, happens for @ubaraccent{a}, where ord(a) is
+ # the same than ord(a̲).
+ last if (defined($eight_bit) and (($new_eight_bit eq $eight_bit)
+ and !($partial_result->{'accents_stack'}[0] eq 'dotless' and $char eq
'i')));
+ $result = $partial_result;
+ $eight_bit = $new_eight_bit;
+ }
+ if (defined($result) and scalar(@{$result->{'accents_stack'}}))
+ {
+ #Â we got a result, return it and put in t2h_enable_encoding_accents_stack
+ #Â the stack of accent commands that were processed. They wont be used
+ #Â further, but only unshifted.
+
+ #print STDERR "Result: ".Encode::encode('utf8', $result->{'result'}) ."
'$eight_bit' (@{$result->{'accents_stack'}})\n" if defined($result);
+ @t2h_enable_encoding_accents_stack = @{$result->{'accents_stack'}};
+ # remove the first, it is the accent being processed
+ shift @t2h_enable_encoding_accents_stack;
+ #Â it should be noted that we return the 'utf8' accent (which is really
+ #Â a codepoint, and not the eight bit representation, we leave the
+ #Â conversion to perl, which should handle it fine
+ return $result->{'result'};
+ }
+
+ return &{$t2h_enable_encoding_default_accent{$in}->{$accent}}(@other_args);
+}
+
+
sub default_sc($$)
{
return '<small>' . uc($_[0]) . '</small>';
@@ -4868,6 +5100,13 @@
my $in_simple = shift;
my $style_stack = shift;
my $state = shift;
+
+ # like utf8.init
+ if ($ENABLE_ENCODING and !$ENABLE_ENCODING_USE_ENTITY and
defined($Texi2HTML::THISDOC{'ENCODING_NAME'}) and
$Texi2HTML::THISDOC{'ENCODING_NAME'} eq 'utf-8')
+ {
+ return t2h_utf8_normal_text($text, $in_raw_text, $in_preformatted,
$in_code, $in_simple, $style_stack, $state);
+ }
+
$text = uc($text) if (in_cmd($style_stack, 'sc'));
$text = &$protect_text($text) unless($in_raw_text);
if (! $in_code and !$in_preformatted)
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -b -r1.284 -r1.285
--- texi2html.pl 17 May 2009 20:10:18 -0000 1.284
+++ texi2html.pl 20 May 2009 23:22:21 -0000 1.285
@@ -85,7 +85,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.284 2009/05/17 20:10:18 pertusus Exp $
+# $Id: texi2html.pl,v 1.285 2009/05/20 23:22:21 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -279,6 +279,7 @@
$INLINE_INSERTCOPYING
$PARAGRAPHINDENT
$FIRSTPARAGRAPHINDENT
+$ENABLE_ENCODING
);
# customization variables
@@ -357,6 +358,8 @@
@NODE_FOOTER_BUTTONS
@LINKS_BUTTONS
@IMAGE_EXTENSIONS
address@hidden
+$ENABLE_ENCODING_USE_ENTITY
);
# customization variables which may be guessed in the script
@@ -1332,7 +1335,7 @@
return ascii_accents($text, $accent);
}
-sub t2h_utf8_normal_text($$$$$)
+sub t2h_utf8_normal_text($$$$$$;$)
{
my $text = shift;
my $in_raw_text = shift;
@@ -1340,6 +1343,7 @@
my $in_code = shift;
my $in_simple = shift;
my $style_stack = shift;
+ my $state = shift;
$text = &$protect_text($text) unless($in_raw_text);
$text = uc($text) if (in_small_caps($style_stack));
@@ -2740,6 +2744,21 @@
'verbose' => "break Info lines at NUM characters (default 72).",
};
+$T2H_OPTIONS -> {'enable-encoding'} =
+{
+ type => '',
+ linkage => \$Texi2HTML::Config::ENABLE_ENCODING,
+ verbose => 'override --disable-encoding (default in Info).',
+};
+
+$T2H_OPTIONS -> {'disable-encoding'} =
+{
+ type => '',
+ linkage => sub {$Texi2HTML::Config::ENABLE_ENCODING = 0},
+ verbose => 'do not output accented and special characters
+ in Info output based on @documentencoding.',
+};
+
$T2H_OPTIONS -> {'monolithic'} =
{
type => '!',
@@ -2747,6 +2766,8 @@
verbose => 'output only one file including ToC, About...',
noHelp => 1
};
+
+
##
## obsolete cmd line options
##
@@ -3436,6 +3457,11 @@
};
}
+if ($Texi2HTML::Config::ENABLE_ENCODING)
+{
+ Texi2HTML::Config::t2h_enable_encoding_load();
+}
+
if (defined($Texi2HTML::Config::DO_CONTENTS))
{
$Texi2HTML::GLOBAL{'DO_CONTENTS'} = $Texi2HTML::Config::DO_CONTENTS;
@@ -14555,7 +14581,7 @@
# main processing
while(@input_files)
{
- my $input_file_name = shift(@input_files);
+ my $input_file_arg = shift(@input_files);
%Texi2HTML::THISDOC = ();
$Texi2HTML::THIS_ELEMENT = undef;
@@ -14565,7 +14591,13 @@
$Texi2HTML::THISDOC{$global_key} = $Texi2HTML::GLOBAL{$global_key};
}
- #set_date() if ($Texi2HTML::GLOBAL{'documentlanguage'});
+ my $input_file_name;
+ #Â try to concatenate with different suffixes. The last suffix is ''
+ #Â such that the plain file name is checked.
+ foreach my $suffix (@Texi2HTML::Config::INPUT_FILE_SUFFIXES)
+ {
+ $input_file_name = $input_file_arg.$suffix if (-e
$input_file_arg.$suffix);
+ }
$Texi2HTML::THISDOC{'input_file_name'} = $input_file_name;
$Texi2HTML::THISDOC{'input_file_number'} = $file_number;
Index: examples/enable_encoding.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/enable_encoding.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- examples/enable_encoding.init 3 Jan 2009 15:29:52 -0000 1.5
+++ examples/enable_encoding.init 20 May 2009 23:22:21 -0000 1.6
@@ -27,6 +27,7 @@
#use Encode;
use strict;
+#Â if true, use the original command if the result is an entity
use vars '$ENABLE_ENCODING_USE_ENTITY';
if (!$ENABLE_ENCODING_USE_ENTITY)
@@ -128,12 +129,14 @@
my $style_stack = shift;
my $text = $args->[0];
+#print STDERR "enable_encoding_accent called($in) $accent (@$style_stack)\n";
+
if (scalar(@enable_encoding_accents_stack))
{
#Â in that case, we already have a result ready that corresponds with the
#Â formatting of a part of the stack mapped to
# enable_encoding_accents_stack, so it is emptied and the innermost
- #Â $text is returned as is such that the unmodified already formatted
+ #Â $text is returned as is, such that the unmodified already formatted
#Â innermost formatted accented text is returned.
#print STDERR " doing nothing, still in stack
(@enable_encoding_accents_stack), accent: $accent";
@@ -187,6 +190,7 @@
my $char = $partial_result->{'result'};
my $new_eight_bit = '';
my $new_codepoint;
+
if (ord($char) <= 128)
{
$new_eight_bit = uc(sprintf("%02x",ord($char)));
@@ -200,8 +204,25 @@
$new_eight_bit =
$makeinfo_unicode_to_eight_bit{$enc_map}->{$new_codepoint};
}
}
- #print STDERR "" . encode('utf8', "$char") . "
(@{$partial_result->{'accents_stack'}}), 8bit: $new_eight_bit\n";
+ #my $eight_bit_txt = 'undef';
+ #$eight_bit_txt = $eight_bit if (defined($eight_bit));
+ #print STDERR "" . Encode::encode('utf8', "$char") . "
(@{$partial_result->{'accents_stack'}}), new_codepoint: $new_codepoint 8bit:
$new_eight_bit old:$eight_bit_txt\n";
+ #Â no corresponding eight bit character found
last if ($new_eight_bit eq '');
+
+ # in that case, the new eight bit character is the same than the one
+ #Â found with one less character (and it isnt a @dotless{i}). It may
+ #Â mean 2 things
+ #Â -> there are 2 characters in accent. This could happen, for example
+ # if an accent that cannot be rendered is found and it leads to
+ #Â appending or prepending a character. For example this happens for
+ # @={@,address@hidden, where @,address@hidden is expanded to a 2
character:
+ # ñ,
+ # In nthat case, the additional utf8 accent is prepended, which
+ # means that it is composed with the , and leaves ñ untouched.
+ # -> ord(char) leads to the same for the more inner character.
+ #Â this, for example, happens for @ubaraccent{a}, where ord(a) is
+ # the same than ord(a̲).
last if (defined($eight_bit) and (($new_eight_bit eq $eight_bit)
and !($partial_result->{'accents_stack'}[0] eq 'dotless' and $char eq
'i')));
$result = $partial_result;
@@ -210,12 +231,16 @@
if (defined($result) and scalar(@{$result->{'accents_stack'}}))
{
#Â we got a result, return it and put in enable_encoding_accents_stack
- #Â the stack of accent commands that were processed.
+ #Â the stack of accent commands that were processed. They wont be used
+ #Â further, but only unshifted.
- #print STDERR "Result: ".encode('utf8', $result->{'result'}) ." '$eight_bit'
(@{$result->{'accents_stack'}})\n" if defined($result);
+ #print STDERR "Result: ".Encode::encode('utf8', $result->{'result'}) ."
'$eight_bit' (@{$result->{'accents_stack'}})\n" if defined($result);
@enable_encoding_accents_stack = @{$result->{'accents_stack'}};
# remove the first, it is the accent being processed
shift @enable_encoding_accents_stack;
+ #Â it should be noted that we return the 'utf8' accent (which is really
+ #Â a codepoint, and not the eight bit representation, we leave the
+ #Â conversion to perl, which should handle it fine
return $result->{'result'};
}
Index: examples/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- examples/info.init 17 May 2009 15:35:16 -0000 1.41
+++ examples/info.init 20 May 2009 23:22:22 -0000 1.42
@@ -27,6 +27,7 @@
$Data::Dumper::Maxdepth = 12;
+
$USE_NODES = 1;
$USE_SECTIONS = 0;
@EXPAND = ('info', 'direntry');
@@ -44,8 +45,12 @@
$USE_MENU_DIRECTIONS = 0;
$USE_UP_FOR_ADJACENT_NODES = 0;
$USE_ISO = 0;
+$ENABLE_ENCODING_USE_ENTITY = 0;
+$ENABLE_ENCODING = 1;
@IMAGE_EXTENSIONS = ('png', 'jpg', 'txt');
$CAPTION_STYLE = 'asis';
+$DEFAULT_ENCODING = 'ascii';
+
$no_paragraph_commands{'anchor'} = 1;
@@ -135,40 +140,7 @@
$style_map{'uref'}->{'function'} = \&info_default_uref;
$style_map{'url'}->{'function'} = \&info_default_uref;
-
-sub info_default_uref($$)
-{
- shift;
- my $args = shift;
- my $url = shift @$args;
- my $text = shift @$args;
- my $replacement = shift @$args;
- #$url =~ s/\s*$//;
- #$url =~ s/^\s*//;
- $url = main::normalise_space($url);
- $replacement = '' if (!defined($replacement));
- $replacement = main::normalise_space($replacement);
- return $replacement if ($replacement ne '');
- $text = '' if (!defined($text));
- $text = main::normalise_space($text);
- return "`$url'" if ($text eq '');
- return "$text ($url)";
-}
-
$style_map{'email'}->{'function'} = \&info_default_email;
-sub info_default_email($$)
-{
- my $command = shift;
- my $args = shift;
- my $mail = shift @$args;
- my $text = shift @$args;
- $mail = main::normalise_space($mail);
- $text = '' if (!defined($text));
- $text = main::normalise_space($text);
- $mail = "<$mail>";
- return $mail unless ($text ne '');
- return "$text $mail";
-}
foreach my $command (keys(%style_map))
{
@@ -204,6 +176,34 @@
$info_default_indented_commands{'format'} = 0;
$info_default_indented_commands{'smallformat'} = 0;
+my $info_default_end_sentence_character = quotemeta($punctuation_characters);
+my $info_default_after_punctuation_characters =
quotemeta($after_punctuation_characters);
+my $info_default_indent_length = 5;
+
+my %info_default_indent_format_length = ('enumerate' => 2,
+ 'itemize' => 3,
+ 'table' => 0,
+ 'vtable' => 0,
+ 'ftable' => 0,
+ );
+
+my %default_info_level_to_symbol = (
+ 0 => '*',
+ 1 => '*',
+ 2 => '=',
+ 3 => '-',
+ 4 => '.'
+);
+
+my $info_default_index_length_to_node = 41;
+
+my $info_default_listoffloat_caption_entry_length = 41;
+my $info_default_listoffloat_append = '...: ';
+
+push @command_handler_init, \&info_default_init_accent_enable_encoding;
+
+my %info_default_enable_encoding_accents;
+
$style = \&info_default_style;
$print_page_head = \&info_default_print_page_head;
$toc_body = \&info_default_noop;
@@ -272,6 +272,70 @@
$line_command = \&info_default_line_command;
$element_file_name = \&info_default_element_file_name;
+#Â FIXME initialize
+my %info_default_state_map = ();
+my $info_default_out_file_nr = 1;
+my $info_default_dir_specification = '';
+my @info_default_pending_indirect = ();
+my @info_default_pending_footnotes = ();
+my $info_default_state_nr = 0;
+
+my %info_default_index_line_string_length = ();
+my %info_default_index_entries = ();
+my $info_default_footnote_index = 0;
+my $info_default_current_node = undef;
+
+#Â this is put in command_handler_init such that it sets things right
+#Â in case $ENABLE_ENCODING is set and haslead to modification of the
+#Â accent functions
+sub info_default_init_accent_enable_encoding()
+{
+ return unless ($ENABLE_ENCODING);
+ foreach my $key (keys(%unicode_accents), 'dotless')
+ {
+ $info_default_enable_encoding_accents{$key} = 1;
+ $t2h_enable_encoding_default_accent{'normal'}->{$key} =
\&t2h_default_ascii_accent;
+ $t2h_enable_encoding_default_accent{'texi'}->{$key} =
\&t2h_default_ascii_accent;
+ $t2h_enable_encoding_default_accent{'pre'}->{$key} =
\&t2h_default_ascii_accent;
+ $style_map{$key}->{'function'} = \&info_default_accent;
+ $style_map_texi{$key}->{'function'} = \&info_default_accent;
+ $style_map_pre{$key}->{'function'} = \&info_default_accent;
+ }
+}
+
+sub info_default_uref($$)
+{
+ shift;
+ my $args = shift;
+ my $url = shift @$args;
+ my $text = shift @$args;
+ my $replacement = shift @$args;
+ #$url =~ s/\s*$//;
+ #$url =~ s/^\s*//;
+ $url = main::normalise_space($url);
+ $replacement = '' if (!defined($replacement));
+ $replacement = main::normalise_space($replacement);
+ return $replacement if ($replacement ne '');
+ $text = '' if (!defined($text));
+ $text = main::normalise_space($text);
+ return "`$url'" if ($text eq '');
+ return "$text ($url)";
+}
+
+sub info_default_email($$)
+{
+ my $command = shift;
+ my $args = shift;
+ my $mail = shift @$args;
+ my $text = shift @$args;
+ $mail = main::normalise_space($mail);
+ $text = '' if (!defined($text));
+ $text = main::normalise_space($text);
+ $mail = "<$mail>";
+ return $mail unless ($text ne '');
+ return "$text $mail";
+}
+
sub info_default_accent($$$)
{
@@ -282,11 +346,19 @@
my $style_stack = shift;
my $state = shift;
+ my $result;
+ if ($ENABLE_ENCODING and $info_default_enable_encoding_accents{$command})
+ {
+ $result = &t2h_enable_encoding_normal_accent(@args);
+ }
+ else
+ {
+ $result = &t2h_default_ascii_accent(@args);
+ }
if (scalar(@$style_stack) and
$info_default_accent_commands{$style_stack->[-1]})
{
- return &t2h_default_ascii_accent(@args);
+ return $result;
}
- my $result = &t2h_default_ascii_accent(@args);
return info_default_store_text($state,$result,'accents_commands');
# return '' if info_default_store_text($state,$result,'accents_commands');
# return $result;
@@ -356,15 +428,6 @@
return ($line_passed, $end_of_line, $last_line, $indented_text,
$blank_line);
}
-#Â FIXME initialize
-my %info_default_state_map = ();
-my $info_default_state;
-my $info_default_out_file_nr = 1;
-my $info_default_dir_specification = '';
-my @info_default_pending_indirect = ();
-my @info_default_pending_footnotes = ();
-my $info_default_state_nr = 0;
-
sub info_default_get_state($)
{
my $state = shift;
@@ -510,7 +573,7 @@
while ($text ne '')
{
-my $pending_word_text = 'UNDEF';
+ my $pending_word_text = 'UNDEF';
$pending_word_text = $pending_word if (defined($pending_word));
#print STDERR "l_c_c $line_char_counter pending_word $pending_word_text,
pending_spaces `$pending_spaces', result `$result'\n";
@@ -657,10 +720,6 @@
return ($line_char_counter, $pending_spaces, $pending_word, $result);
}
-my $info_default_end_sentence_character = quotemeta($punctuation_characters);
-my $info_default_after_punctuation_characters =
quotemeta($after_punctuation_characters);
-my $info_default_indent_length = 5;
-
sub info_default_output($)
{
my $info_state = shift;
@@ -676,15 +735,6 @@
return $result;
}
-my %info_default_index_line_string_length;
-my %info_default_index_entries;
-
-my %info_default_indent_format_length = ('enumerate' => 2,
- 'itemize' => 3,
- 'table' => 0,
- 'vtable' => 0,
- 'ftable' => 0,
- );
sub info_default_process_content($$)
{
@@ -724,18 +774,18 @@
my $text_added = '';
my $item_line_added = 0;
my $indentation_done = 0;
-my $text_item_pending = '';
-$text_item_pending = $item_pending if (defined($item_pending));
-my $text_length = '';
-$text_length = "$content->{'text'}" if defined($content->{'text'});
-my $text_command = '';
-$text_command = $content->{'command'} if defined($content->{'command'});
-my $in_node_count = 0;
-$in_node_count = $info_state->{'line_count'} if
defined($info_state->{'line_count'});
+ my $text_item_pending = '';
+ $text_item_pending = $item_pending if (defined($item_pending));
+ my $text_length = '';
+ $text_length = "$content->{'text'}" if defined($content->{'text'});
+ my $text_command = '';
+ $text_command = $content->{'command'} if defined($content->{'command'});
+ my $in_node_count = 0;
+ $in_node_count = $info_state->{'line_count'} if
defined($info_state->{'line_count'});
print STDERR
"($text_command|$text_length|$close|${all_line_passed}+$in_node_count|l_c_cnt
$line_char_counter) prfrmted $preformatted para $in_para indent_lvl
$indent_level in_exdent $in_exdent only_spaces $info_state->{'only_spaces'}
blank_line $info_state->{'blank_line'} table_item_line $table_item_line
in_table_item $in_table_item item_pending $text_item_pending\n";
-my $pending_word_text = 'undef';
-$pending_word_text = "`$pending_word'" if (defined($pending_word));
-print STDERR " spaces: `$pending_spaces' word: $pending_word_text\n";
+ my $pending_word_text = 'undef';
+ $pending_word_text = "`$pending_word'" if (defined($pending_word));
+ print STDERR " spaces: `$pending_spaces' word: $pending_word_text\n";
my $indent_length = $indent_level * $info_default_indent_length;
my $indent_length_next_line;
@@ -1846,14 +1896,6 @@
}
-my %default_info_level_to_symbol = (
- 0 => '*',
- 1 => '*',
- 2 => '=',
- 3 => '-',
- 4 => '.'
-);
-
sub info_default_node_line($$)
{
my $element = shift;
@@ -1880,8 +1922,6 @@
return $result;
}
-my $info_default_footnote_index;
-my $info_default_current_node;
sub info_default_element_heading($$$$$$$$$$$$)
{
my $element = shift;
@@ -1953,6 +1993,7 @@
sub info_default_normal_text($$$$$$;$)
{
+ my @initial_args = @_;
my $text = shift;
my $in_raw_text = shift; # remove_texi
my $in_preformatted = shift;
@@ -1961,6 +2002,15 @@
my $style_stack = shift;
my $state = shift;
+ #Â $Texi2HTML::THISDOC{'ENCODING_NAME'}) should be defined, but maybe
+ # not when parsing commands in first or second pass, and removeing texi
+ #Â like what is done for @setfilename.
+ if ($ENABLE_ENCODING and !$ENABLE_ENCODING_USE_ENTITY and
defined($Texi2HTML::THISDOC{'ENCODING_NAME'}) and
($Texi2HTML::THISDOC{'ENCODING_NAME'} eq 'utf-8'))
+ {
+ $text = &t2h_utf8_normal_text(@initial_args);
+ }
+ else
+ {
#print STDERR "info_default_normal_text $text $in_preformatted $in_code \n";
$text = uc($text) if (in_cmd($style_stack, 'sc'));
$text = uc($text) if (in_cmd($style_stack, 'var'));
@@ -1982,6 +2032,7 @@
# $text =~ s/'/\&rsquo\;/g unless ($special_code and
exists($main::value{'txicodequoteundirected'}));
# $text =~ s/`/\&lsquo\;/g unless ($special_code and
exists($main::value{'txicodequotebacktick'}));
}
+ }
#Â accented characters are not handled as text, but when the last
#Â accent command on the stack is closed.
if ($style_stack and @$style_stack and
$info_default_accent_commands{$style_stack->[-1]})
@@ -2081,6 +2132,15 @@
print $fh "$prefix: $element->{'text'}\x{7F}$element->{'info_offset'}\n";
}
print $fh "\x{1F}\nEnd Tag Table\n";
+ if (defined($Texi2HTML::THISDOC{'DOCUMENT_ENCODING'}))
+ {
+ my $coding = $Texi2HTML::THISDOC{'DOCUMENT_ENCODING'};
+ if ($coding =~ /^iso-/i)
+ {
+ $coding = lc($coding);
+ }
+ print $fh "\n\x{1F}\nLocal Variables:\ncoding: $coding\nEnd:\n";
+ }
}
sub info_default_print_Top_footer($$$)
@@ -2578,7 +2638,6 @@
return '';
}
-my $info_default_index_length_to_node = 41;
sub info_default_index_entry($$$$$$$$)
{
my $text_href = shift;
@@ -2967,8 +3026,6 @@
return info_default_close_command(undef, 'float', undef, $caption_text,
$additional_arguments);
}
-my $info_default_listoffloat_caption_entry_length = 41;
-my $info_default_listoffloat_append = '...: ';
sub info_default_listoffloats_entry($$$$)
{
my $style_texi = shift;
Index: test/coverage/res/comments_info/comments.info
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/coverage/res/comments_info/comments.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/coverage/res/comments_info/comments.info 17 May 2009 15:35:17
-0000 1.4
+++ test/coverage/res/comments_info/comments.info 20 May 2009 23:22:22
-0000 1.5
@@ -168,3 +168,8 @@
Node: bidule23418
End Tag Table
+
+
+Local Variables:
+coding: iso-8859-1
+End:
Index: test/encodings/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/encodings/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/encodings/Makefile.am 17 May 2009 15:35:20 -0000 1.8
+++ test/encodings/Makefile.am 20 May 2009 23:22:22 -0000 1.9
@@ -5,6 +5,7 @@
at_commands_in_refs_latin1.texi at_commands_in_refs_utf8.texi \
japanese.texi documentlanguage_set.texi \
encoding_index-latin1.texi encoding_index.texi encoding_index-utf8.texi \
+ enable_encoding_no_use_entity.init \
no_unicode.init no_unidecode.init icons.init tests.txt res
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
Index: test/encodings/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/encodings/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- test/encodings/Makefile.in 17 May 2009 15:35:20 -0000 1.11
+++ test/encodings/Makefile.in 20 May 2009 23:22:22 -0000 1.12
@@ -135,6 +135,7 @@
at_commands_in_refs_latin1.texi at_commands_in_refs_utf8.texi \
japanese.texi documentlanguage_set.texi \
encoding_index-latin1.texi encoding_index.texi encoding_index-utf8.texi \
+ enable_encoding_no_use_entity.init \
no_unicode.init no_unidecode.init icons.init tests.txt res
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
Index: test/encodings/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/encodings/tests.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/tests.txt 17 May 2009 15:35:21 -0000 1.6
+++ test/encodings/tests.txt 20 May 2009 23:22:22 -0000 1.7
@@ -42,7 +42,9 @@
formatting_fr_icons ../coverage/formatting.texi -document-language fr -init
icons.init
formatting_converted_to_utf8 ../coverage/formatting.texi -init utf8.init
accentenc accentenc.texi
-accentenc_encoding accentenc.texi -init enable_encoding.init
+#accentenc_encoding accentenc.texi -init enable_encoding.init
+accentenc_encoding accentenc.texi --enable-encoding -init
enable_encoding_no_use_entity.init
+accentenc_encoding_use_entity accentenc.texi --enable-encoding
accent accent.texi
weird_accents weird_accents.texi
weird_accents_encoding weird_accents.texi -init enable_encoding.init
@@ -60,3 +62,4 @@
encoding_index-utf8_toutf8 encoding_index-utf8.texi -init utf8
encoding_index-latin1 encoding_index-latin1.texi
encoding_index-latin1_toutf8 encoding_index-latin1.texi -init utf8
+accentenc_info accentenc.texi -init info.init
Index: test/encodings/weird_accents.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/encodings/weird_accents.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/weird_accents.texi 18 Aug 2008 18:02:16 -0000 1.1
+++ test/encodings/weird_accents.texi 20 May 2009 23:22:22 -0000 1.2
@@ -12,6 +12,8 @@
@address@hidden
address@hidden@address@hidden
+
@address@hidden@'address@hidden
@bye
Index: test/encodings/res/texi_weird_accents/weird_accents.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/texi_weird_accents/weird_accents.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res/texi_weird_accents/weird_accents.passfirst 18 Aug
2008 18:02:57 -0000 1.1
+++ test/encodings/res/texi_weird_accents/weird_accents.passfirst 20 May
2009 23:22:23 -0000 1.2
@@ -11,6 +11,8 @@
weird_accents.texi(,12)
weird_accents.texi(,13) @address@hidden
weird_accents.texi(,14)
-weird_accents.texi(,15) @address@hidden@'address@hidden
+weird_accents.texi(,15) @address@hidden@`r}}
weird_accents.texi(,16)
-weird_accents.texi(,17) @bye
+weird_accents.texi(,17) @address@hidden@'address@hidden
+weird_accents.texi(,18)
+weird_accents.texi(,19) @bye
Index: test/encodings/res/texi_weird_accents/weird_accents.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/texi_weird_accents/weird_accents.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res/texi_weird_accents/weird_accents.passtexi 18 Aug
2008 18:02:58 -0000 1.1
+++ test/encodings/res/texi_weird_accents/weird_accents.passtexi 20 May
2009 23:22:23 -0000 1.2
@@ -11,6 +11,8 @@
weird_accents.texi(,12)
weird_accents.texi(,13) @address@hidden
weird_accents.texi(,14)
-weird_accents.texi(,15) @address@hidden@'address@hidden
+weird_accents.texi(,15) @address@hidden@`r}}
weird_accents.texi(,16)
-weird_accents.texi(,17) @bye
+weird_accents.texi(,17) @address@hidden@'address@hidden
+weird_accents.texi(,18)
+weird_accents.texi(,19) @bye
Index: test/encodings/res/texi_weird_accents/weird_accents.texi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/texi_weird_accents/weird_accents.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res/texi_weird_accents/weird_accents.texi 18 Aug 2008
18:02:58 -0000 1.1
+++ test/encodings/res/texi_weird_accents/weird_accents.texi 20 May 2009
23:22:23 -0000 1.2
@@ -12,6 +12,8 @@
@address@hidden
address@hidden@address@hidden
+
@address@hidden@'address@hidden
@bye
Index: test/encodings/res/weird_accents/weird_accents.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/weird_accents/weird_accents.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/encodings/res/weird_accents/weird_accents.html 2 Apr 2009 09:14:27
-0000 1.4
+++ test/encodings/res/weird_accents/weird_accents.html 20 May 2009 23:22:23
-0000 1.5
@@ -51,6 +51,8 @@
</p>
<p>a_=
</p>
+<p>.r`^
+</p>
<p><code>r`'</code>=
</p>
<hr size="1">
Index: test/encodings/res/weird_accents_encoding/weird_accents.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/weird_accents_encoding/weird_accents.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/encodings/res/weird_accents_encoding/weird_accents.html 2 Apr
2009 09:14:27 -0000 1.4
+++ test/encodings/res/weird_accents_encoding/weird_accents.html 20 May
2009 23:22:24 -0000 1.5
@@ -51,6 +51,8 @@
</p>
<p>a_=
</p>
+<p>.r`^
+</p>
<p><code>r`'</code>=
</p>
<hr size="1">
Index: test/encodings/enable_encoding_no_use_entity.init
===================================================================
RCS file: test/encodings/enable_encoding_no_use_entity.init
diff -N test/encodings/enable_encoding_no_use_entity.init
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/encodings/enable_encoding_no_use_entity.init 20 May 2009 23:22:22
-0000 1.1
@@ -0,0 +1,4 @@
+$ENABLE_ENCODING_USE_ENTITY = 0;
+$USE_ISO = 0;
+
+1;
Index: test/encodings/res/accentenc_info/accentenc.info
===================================================================
RCS file: test/encodings/res/accentenc_info/accentenc.info
diff -N test/encodings/res/accentenc_info/accentenc.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/encodings/res/accentenc_info/accentenc.info 20 May 2009 23:22:23
-0000 1.1
@@ -0,0 +1,90 @@
+This is accentenc.info, produced by makeinfo version 4.13 from
+accentenc.texi.
+
+
+File: accentenc.info, Node: Top, Up: (dir)
+
+Accent encoding test top
+************************
+
+should be e`: è è
+
+ should be e': é é
+
+ should be e^: ê ê
+
+ should be u": ü ü
+
+ should be i`: ì ì
+
+ should be i': í í
+
+ should be i^: î î
+
+ should be u": ü ü
+
+ should be c,: ç ç
+
+ should be n~: ñ ñ
+
+ should be e=: e= e=
+
+ should be e'': e'' e''
+
+ should be e.: e. e.
+
+ should be e*: e* e*
+
+ should be ee[: ee[
+
+ should be e(: e( e(
+
+ should be e_: e_ e_
+
+ should be .e: .e .e
+
+ should be e<: e< e<
+
+ upside down: ¿ ¡
+
+ A-with-circle: å,Å
+
+ AE, OE ligatures: æ Æ oe OE
+
+ dotless i, j: i j
+
+ Polish suppressed-L: /l /L
+
+ O-with-slash: ø Ø
+
+ es-zet or sharp S: ß
+
+ pounds sterling: £
+
+ should be dotless i`: ì
+
+ should be dotless i': í
+
+ should be dotless i^: î
+
+ should be dotless i": ï
+
+ should be dotless j`: j`
+
+ should be dotless j': j'
+
+ should be dotless j^: j^
+
+ should be dotless j": j"
+
+
+
+Tag Table:
+Node: Top80
+
+End Tag Table
+
+
+Local Variables:
+coding: iso-8859-1
+End:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht...,
Patrice Dumas <=