[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Fri, 22 Dec 2023 04:30:05 -0500 (EST) |
branch: master
commit 5c401dd6b83404c0e413baf7f802de9c35f965b1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Dec 22 10:29:59 2023 +0100
* tp/Texinfo/Convert/HTML.pm (%style_commands_formatting): do not put
indicateurl in %style_commands_formatting and do not associate it,
even temporarily, to _convert_style_command, as it has its own
formatting function.
---
ChangeLog | 7 +++++++
tp/Texinfo/Convert/HTML.pm | 2 ++
tp/Texinfo/XS/convert/convert_html.c | 10 ++++------
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 89df93f0a5..b69976e673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-12-22 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (%style_commands_formatting): do not put
+ indicateurl in %style_commands_formatting and do not associate it,
+ even temporarily, to _convert_style_command, as it has its own
+ formatting function.
+
2023-12-22 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/get_html_perl_info.c
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 1ceb813451..18fc2947cc 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -3125,6 +3125,8 @@ my @all_style_commands = keys %{{ map { $_ => 1 }
keys(%style_commands_element), keys(%quoted_style_commands)) }};
foreach my $command (@all_style_commands) {
+ # indicateurl is formatted with a specific function
+ next if ($command eq 'indicateurl');
$style_commands_formatting{$command} = {};
# default is no element.
foreach my $context ('normal', 'string', 'preformatted') {
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index f5e9082867..ec24e06dcb 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -9617,9 +9617,9 @@ static COMMAND_INTERNAL_CONVERSION
commands_internal_conversion_table[] = {
{CM_w, &convert_w_command},
{CM_today, &convert_today_command},
- /* note that this prevents indicateurl to be associated to
- convert_style_command, otherwise it would be as it is in
- self->style_formatted_cmd */
+ /* note that if indicateurl had been in self->style_formatted_cmd this
+ would have prevented indicateurl to be associated to
+ convert_style_command */
{CM_indicateurl, &convert_indicateurl_command},
{CM_contents, &convert_contents_command},
@@ -10542,9 +10542,7 @@ html_converter_initialize (CONVERTER *self)
/* all the commands in style_formatted_cmd are implemented in C.
It is not only the style commands, some others too. indicateurl
- is on style_formatted_cmd, but is not set as it is already set
- from commands_internal_conversion_table since it has a specific
- formatting function */
+ is not in style_formatted_cmd for now either */
if (self->style_formatted_cmd.number)
{
for (i = 0; i < self->style_formatted_cmd.number; i++)