[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (%default_commands_a
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (%default_commands_args) (_convert_email_command, _convert_uref_command): use monospacestring for the url formatted as a string instead of protecting plain text conversion. |
|
Date: |
Sun, 07 Aug 2022 06:31:43 -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 731ef2ac75 * tp/Texinfo/Convert/HTML.pm (%default_commands_args)
(_convert_email_command, _convert_uref_command): use monospacestring for the
url formatted as a string instead of protecting plain text conversion.
731ef2ac75 is described below
commit 731ef2ac757bfd483866d955c5d81bc20141725f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 7 12:31:34 2022 +0200
* tp/Texinfo/Convert/HTML.pm (%default_commands_args)
(_convert_email_command, _convert_uref_command): use
monospacestring for the url formatted as a string instead of
protecting plain text conversion.
---
ChangeLog | 7 +++++++
tp/Texinfo/Convert/HTML.pm | 12 +++++-------
tp/t/results/html_tests/uref_accented_letter.pl | 2 +-
tp/t/results/html_tests/uref_accented_letter_ascii.pl | 2 +-
tp/t/results/html_tests/uref_accented_letter_latin1.pl | 2 +-
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b5733566ad..c2e71e7458 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-08-07 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (%default_commands_args)
+ (_convert_email_command, _convert_uref_command): use
+ monospacestring for the url formatted as a string instead of
+ protecting plain text conversion.
+
2022-08-07 Patrice Dumas <pertusus@free.fr>
If TEST is set, do not use system init file directories
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 646e94741a..944970c9d6 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2135,11 +2135,11 @@ my %default_code_types = (
# specification of arguments formatting
my %default_commands_args = (
'anchor' => [['monospacestring']],
- 'email' => [['monospacetext'], ['normal']],
+ 'email' => [['monospacetext', 'monospacestring'], ['normal']],
'footnote' => [[]],
'printindex' => [[]],
- 'uref' => [['monospacetext'], ['normal'], ['normal']],
- 'url' => [['monospacetext'], ['normal'], ['normal']],
+ 'uref' => [['monospacetext', 'monospacestring'], ['normal'], ['normal']],
+ 'url' => [['monospacetext', 'monospacestring'], ['normal'], ['normal']],
'sp' => [[]],
'inforef' => [['monospace'],['normal'],['monospacetext']],
'xref' => [['monospace'],['normal'],['normal'],['monospacetext'],['normal']],
@@ -2630,8 +2630,7 @@ sub _convert_email_command($$$$)
my $mail_string;
if (defined($mail_arg)) {
$mail = $mail_arg->{'monospacetext'};
- $mail_string
- = &{$self->formatting_function('format_protect_text')}($self, $mail);
+ $mail_string = $mail_arg->{'monospacestring'};
}
my $text = '';
if (defined($text_arg)) {
@@ -2849,8 +2848,7 @@ sub _convert_uref_command($$$$)
my ($url, $url_string, $text, $replacement);
if (defined($url_arg)) {
$url = $url_arg->{'monospacetext'};
- $url_string
- = &{$self->formatting_function('format_protect_text')}($self, $url);
+ $url_string = $url_arg->{'monospacestring'};
}
$text = $text_arg->{'normal'} if defined($text_arg);
$replacement = $replacement_arg->{'normal'} if defined($replacement_arg);
diff --git a/tp/t/results/html_tests/uref_accented_letter.pl
b/tp/t/results/html_tests/uref_accented_letter.pl
index a8a7caa488..9c2a1bf8d5 100644
--- a/tp/t/results/html_tests/uref_accented_letter.pl
+++ b/tp/t/results/html_tests/uref_accented_letter.pl
@@ -138,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%c4%85";>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 edae0ba627..9b62ef9638 100644
--- a/tp/t/results/html_tests/uref_accented_letter_ascii.pl
+++ b/tp/t/results/html_tests/uref_accented_letter_ascii.pl
@@ -183,7 +183,7 @@ $result_converted{'html'}->{'uref_accented_letter_ascii'} =
'<!DOCTYPE html>
<body lang="en">
-<p><a class="uref"
href="http://example.com/acc_%c3%a4%c4%85";>http://example.com/acc_a"a;</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_latin1.pl
b/tp/t/results/html_tests/uref_accented_letter_latin1.pl
index 5f16453bbc..9b431deb52 100644
--- a/tp/t/results/html_tests/uref_accented_letter_latin1.pl
+++ b/tp/t/results/html_tests/uref_accented_letter_latin1.pl
@@ -183,7 +183,7 @@ $result_converted{'html'}->{'uref_accented_letter_latin1'}
= '<!DOCTYPE html>
<body lang="en">
-<p><a class="uref"
href="http://example.com/acc_%c3%a4%c4%85";>http://example.com/acc_äa;</a>
+<p><a class="uref"
href="http://example.com/acc_%c3%a4%c4%85";>http://example.com/acc_äą</a>
</p>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (%default_commands_args) (_convert_email_command, _convert_uref_command): use monospacestring for the url formatted as a string instead of protecting plain text conversion.,
Patrice Dumas <=