On 11/1/20 7:10 AM, Gavin Smith wrote:
The colon is still present in the category, as I mentioned in
my other message.
That colon is way ugly, but it seems easy to fix - see attachment.
Note I prefer <br/> rather than <br> because it helps makes the output
well-formed XML, which I think is useful. (There are other changes
needed before we're XML-compatible, of course.)
--
--Per Bothner
[email protected] http://per.bothner.com/
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index e27d165cbc..4079d582f7 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -4128,11 +4128,12 @@ sub _convert_def_line_type($$$$)
}
my $category = $command->{'extra'}->{'def_parsed_hash'}->{'category'};
my $category_result = '';
+ my $category_suffix = '<span class="category-suffix">: </span>';
my $category_tree;
if ($category) {
$category_tree
= {'type' => '_code',
- 'contents'=>[$self->gdt("{category}: ", {'category' => $category})]
+ 'contents'=>[$self->gdt("{category}", {'category' => $category})]
};
# NB perhaps the category shouldn't be in_code.
} else {
@@ -4190,10 +4191,11 @@ sub _convert_def_line_type($$$$)
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
'name' => $name};
if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $category_suffix = '<span class="category-suffix">:<br/></span>';
$category_tree
= {'type' => '_code',
'contents'
- => [$self->gdt("{category}:\@* ", {'category' => $category})]
+ => [$self->gdt("{category}", {'category' => $category})]
};
} else {
$tree = $self->gdt("\@emph{{type}} \@strong{{name}}",
@@ -4303,7 +4305,7 @@ sub _convert_def_line_type($$$$)
if ($category_result ne '') {
$category_result = $self->_attribute_class('span', 'category')
- .">$category_result</span>";
+ .">$category_result</span>".$category_suffix;
}
return "<dt$index_label>"
.$category_result.$self->convert_tree({'type' => '_code',
