[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: @url/@uref url independent of output encoding in
From: |
Patrice Dumas |
Subject: |
branch master updated: @url/@uref url independent of output encoding in HTML |
Date: |
Sat, 06 Aug 2022 18:11:52 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new ffc21ed7e2 @url/@uref url independent of output encoding in HTML
ffc21ed7e2 is described below
commit ffc21ed7e20ffa51c47424114ad99fca8f92c4e1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 7 00:11:42 2022 +0200
@url/@uref url independent of output encoding in HTML
* tp/Texinfo/Convert/HTML.pm (_convert_uref_command):
convert the url @uref/@url argument to raw text using UTF-8 encoding
to get an url to be percent protected independent of the encoding
and more in line with the underlying characters.
---
ChangeLog | 9 +
doc/customization_api.texi | 10 +-
tp/Texinfo/Convert/HTML.pm | 27 ++-
tp/Texinfo/Convert/Text.pm | 5 +-
tp/t/html_tests.t | 9 +-
tp/t/results/html_tests/uref_accented_letter.pl | 31 +++-
.../html_tests/uref_accented_letter_ascii.pl | 31 +++-
.../html_tests/uref_accented_letter_latin1.pl | 205 +++++++++++++++++++++
8 files changed, 307 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index efa5ec3401..37b758bb40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-08-06 Patrice Dumas <pertusus@free.fr>
+
+ @url/@uref url independent of output encoding in HTML
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_uref_command):
+ convert the url @uref/@url argument to raw text using UTF-8 encoding
+ to get an url to be percent protected independent of the encoding
+ and more in line with the underlying characters.
+
2022-08-06 Gavin Smith <gavinsmith0123@gmail.com>
Indent def_item in LaTeX
diff --git a/doc/customization_api.texi b/doc/customization_api.texi
index 131a3df61d..d4236cd479 100644
--- a/doc/customization_api.texi
+++ b/doc/customization_api.texi
@@ -1955,13 +1955,17 @@ as @code{@@inlineraw} second argument.
@item string
In string context. @xref{Init File Expansion Contexts}.
+@item tree
+The Texinfo tree element corresponding to the argument.
+@xref{Texinfo Tree Elements in User Defined Functions}.
+
@end table
The formatted arguments contexts depend on the @@-command, there could be none,
for @code{@@footnote} argument which is not directly converted where the
-footnote command is, or multiple, for example for the first argument of
-@code{@@email} which is both available as @samp{monospace} and
-@samp{monospacestring}.
+footnote command is, or multiple, for example for the fourth argument of
+@code{@@image} which is both available as @samp{normal} and
+@samp{string}.
For example, @code{$args->[0]->@{'normal'@}} is the first argument converted in
normal context.
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 19e902ae34..646e94741a 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2846,17 +2846,32 @@ sub _convert_uref_command($$$$)
my $text_arg = shift @args;
my $replacement_arg = shift @args;
- my ($url, $text, $replacement);
- #$url = $url_arg->{'monospacestring'} if defined($url_arg);
- $url = $url_arg->{'monospacetext'} if defined($url_arg);
+ my ($url, $url_string, $text, $replacement);
+ if (defined($url_arg)) {
+ $url = $url_arg->{'monospacetext'};
+ $url_string
+ = &{$self->formatting_function('format_protect_text')}($self, $url);
+ }
$text = $text_arg->{'normal'} if defined($text_arg);
$replacement = $replacement_arg->{'normal'} if defined($replacement_arg);
$text = $replacement if (defined($replacement) and $replacement ne '');
- $text = &{$self->formatting_function('format_protect_text')}($self, $url)
- if (!defined($text) or $text eq '');
+ $text = $url_string if (!defined($text) or $text eq '');
return $text if (!defined($url) or $url eq '');
- return "$text ($url)" if ($self->in_string());
+ return "$text ($url_string)" if ($self->in_string());
+
+ # Convert again, but this time with encoding set to UTF-8
+ # to have a normalized percent encoded file name not dependent
+ # on the encoding, and representing better the underlying characters
+ my $output_encoding = $self->get_conf('OUTPUT_ENCODING_NAME');
+ if (not defined($output_encoding) or $output_encoding ne 'utf-8') {
+ my $text_conversion_options = {'code' => 1,
+ Texinfo::Convert::Text::copy_options_for_convert_text($self, 1)};
+ $text_conversion_options->{'enabled_encoding'} = 'utf-8';
+ $url
+ = Texinfo::Convert::Text::convert_to_text($url_arg->{'tree'},
+ $text_conversion_options);
+ }
return $self->html_attribute_class('a', [$cmdname])
.' href="'.$self->url_protect_url_text($url)."\">$text</a>";
}
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 0fed56ef78..fb255b9c46 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -923,9 +923,10 @@ The following options may be set:
=item enabled_encoding
If set, the value is considered to be the encoding name texinfo accented
-letters should be converted to. This option corresponds to the
+letters should be converted to. This option being set corresponds to the
C<--enable-encoding> option, or the C<ENABLE_ENCODING> customization
-variable.
+variable for Info and Plaintext. For HTML, DocBook or Texinfo XML, this
+variable should in general be set unless the output encoding is US-ASCII.
=item sc
diff --git a/tp/t/html_tests.t b/tp/t/html_tests.t
index addee5d9e9..cb06848a9b 100644
--- a/tp/t/html_tests.t
+++ b/tp/t/html_tests.t
@@ -578,15 +578,18 @@ example with @@-commands and other special characters
@end example
'],
['uref_accented_letter',
-'@uref{http://example.com/acc_@"a}
+'@uref{http://example.com/acc_@"a@ogonek{a}}
'],
['uref_accented_letter_ascii',
'@documentencoding US-ASCII
-@uref{http://example.com/acc_@"a}
+@uref{http://example.com/acc_@"a@ogonek{a}}
'],
+['uref_accented_letter_latin1',
+'@documentencoding ISO-8859-1
-
+@uref{http://example.com/acc_@"a@ogonek{a}}
+'],
);
my $test_accents_sc_no_brace_commands_quotes = '@u{--a}
diff --git a/tp/t/results/html_tests/uref_accented_letter.pl
b/tp/t/results/html_tests/uref_accented_letter.pl
index eebd32f1eb..a8a7caa488 100644
--- a/tp/t/results/html_tests/uref_accented_letter.pl
+++ b/tp/t/results/html_tests/uref_accented_letter.pl
@@ -40,6 +40,28 @@ $result_trees{'uref_accented_letter'} = {
'line_nr' => 1,
'macro' => ''
}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ogonek',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
}
],
'parent' => {},
@@ -75,17 +97,20 @@
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0];
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0];
$result_trees{'uref_accented_letter'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'uref_accented_letter'}{'contents'}[0];
$result_trees{'uref_accented_letter'}{'contents'}[0]{'parent'} =
$result_trees{'uref_accented_letter'};
-$result_texis{'uref_accented_letter'} = '@uref{http://example.com/acc_@"a}
+$result_texis{'uref_accented_letter'} =
'@uref{http://example.com/acc_@"a@ogonek{a}}
';
-$result_texts{'uref_accented_letter'} = 'http://example.com/acc_a"
+$result_texts{'uref_accented_letter'} = 'http://example.com/acc_a"a;
';
$result_errors{'uref_accented_letter'} = [];
@@ -113,7 +138,7 @@ $result_converted{'html'}->{'uref_accented_letter'} =
'<!DOCTYPE html>
</head>
<body lang="en">
-<p><a class="uref"
href="http://example.com/acc_%c3%a4">http://example.com/acc_ä</a>
+<p><a class="uref"
href="http://example.com/acc_%c3%a4%c4%85">http://example.com/acc_äą</a>
</p>
diff --git a/tp/t/results/html_tests/uref_accented_letter_ascii.pl
b/tp/t/results/html_tests/uref_accented_letter_ascii.pl
index 0804bd9f72..edae0ba627 100644
--- a/tp/t/results/html_tests/uref_accented_letter_ascii.pl
+++ b/tp/t/results/html_tests/uref_accented_letter_ascii.pl
@@ -77,6 +77,28 @@ $result_trees{'uref_accented_letter_ascii'} = {
'line_nr' => 3,
'macro' => ''
}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ogonek',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
}
],
'parent' => {},
@@ -116,6 +138,9 @@
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'conte
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2];
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'contents'}[2];
@@ -124,12 +149,12 @@
$result_trees{'uref_accented_letter_ascii'}{'contents'}[0]{'parent'} = $result_t
$result_texis{'uref_accented_letter_ascii'} = '@documentencoding US-ASCII
-@uref{http://example.com/acc_@"a}
+@uref{http://example.com/acc_@"a@ogonek{a}}
';
$result_texts{'uref_accented_letter_ascii'} = '
-http://example.com/acc_a"
+http://example.com/acc_a"a;
';
$result_errors{'uref_accented_letter_ascii'} = [];
@@ -158,7 +183,7 @@ $result_converted{'html'}->{'uref_accented_letter_ascii'} =
'<!DOCTYPE html>
<body lang="en">
-<p><a class="uref"
href="http://example.com/acc_a%22">http://example.com/acc_a"</a>
+<p><a class="uref"
href="http://example.com/acc_%c3%a4%c4%85">http://example.com/acc_a"a;</a>
</p>
diff --git a/tp/t/results/html_tests/uref_accented_letter_latin1.pl
b/tp/t/results/html_tests/uref_accented_letter_latin1.pl
new file mode 100644
index 0000000000..5f16453bbc
--- /dev/null
+++ b/tp/t/results/html_tests/uref_accented_letter_latin1.pl
@@ -0,0 +1,205 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'uref_accented_letter_latin1'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'ISO-8859-1'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'documentencoding',
+ 'extra' => {
+ 'input_encoding_name' => 'iso-8859-1',
+ 'input_perl_encoding' => 'iso-8859-1',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'ISO-8859-1'
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'http://example.com/acc_'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '"',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ogonek',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'uref',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[0];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'uref_accented_letter_latin1'}{'contents'}[0];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'uref_accented_letter_latin1'}{'contents'}[0];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'uref_accented_letter_latin1'}{'contents'}[0];
+$result_trees{'uref_accented_letter_latin1'}{'contents'}[0]{'parent'} =
$result_trees{'uref_accented_letter_latin1'};
+
+$result_texis{'uref_accented_letter_latin1'} = '@documentencoding ISO-8859-1
+
+@uref{http://example.com/acc_@"a@ogonek{a}}
+';
+
+
+$result_texts{'uref_accented_letter_latin1'} = '
+http://example.com/acc_a"a;
+';
+
+$result_errors{'uref_accented_letter_latin1'} = [];
+
+
+$result_floats{'uref_accented_letter_latin1'} = {};
+
+
+
+$result_converted{'html'}->{'uref_accented_letter_latin1'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<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="viewport" content="width=device-width,initial-scale=1">
+
+
+
+</head>
+
+<body lang="en">
+
+<p><a class="uref"
href="http://example.com/acc_%c3%a4%c4%85">http://example.com/acc_äa;</a>
+</p>
+
+
+</body>
+</html>
+';
+
+$result_converted_errors{'html'}->{'uref_accented_letter_latin1'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'uref_accented_letter_latin1.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
+1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: @url/@uref url independent of output encoding in HTML,
Patrice Dumas <=