[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp/Texinfo/Convert HTML.pm
From: |
Patrice Dumas |
Subject: |
texinfo/tp/Texinfo/Convert HTML.pm |
Date: |
Thu, 01 Dec 2011 00:54:28 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/12/01 00:54:28
Modified files:
tp/Texinfo/Convert: HTML.pm
Log message:
Handle better missing @def* arguments.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.214&r2=1.215
Patches:
Index: HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -b -r1.214 -r1.215
--- HTML.pm 30 Nov 2011 23:15:08 -0000 1.214
+++ HTML.pm 1 Dec 2011 00:54:28 -0000 1.215
@@ -3830,33 +3830,49 @@
} else {
$name = '';
}
+ my $category;
+ if ($command->{'extra'}->{'def_parsed_hash'}->{'category'}) {
+ $category = $command->{'extra'}->{'def_parsed_hash'}->{'category'};
+ } else {
+ $category = '';
+ }
if ($command_name eq 'deffn'
or $command_name eq 'defvr'
or $command_name eq 'deftp'
or (($command_name eq 'deftypefn'
or $command_name eq 'deftypevr')
- and !$command->{'extra'}->{'def_parsed_hash'}->{'type'})) {
+ and !$command->{'extra'}->{'def_parsed_hash'}->{'type'})
+ or (($command_name eq 'defop'
+ or ($command_name eq 'deftypeop'
+ and !$command->{'extra'}->{'def_parsed_hash'}->{'type'})
+ or $command_name eq 'defcv'
+ or ($command_name eq 'deftypecv'
+ and !$command->{'extra'}->{'def_parsed_hash'}->{'type'}))
+ and !$command->{'extra'}->{'def_parsed_hash'}->{'class'})) {
if ($arguments) {
$tree = $self->gdt("{category}: address@hidden@emph{ {arguments}}", {
- 'category' =>
$command->{'extra'}->{'def_parsed_hash'}->{'category'},
+ 'category' => $category,
'name' => $name,
'arguments' => $arguments});
} else {
$tree = $self->gdt("{category}: address@hidden", {
- 'category' =>
$command->{'extra'}->{'def_parsed_hash'}->{'category'},
+ 'category' => $category,
'name' => $name});
}
} elsif ($command_name eq 'deftypefn'
- or $command_name eq 'deftypevr') {
+ or $command_name eq 'deftypevr'
+ or (($command_name eq 'deftypeop'
+ or $command_name eq 'deftypecv')
+ and !$command->{'extra'}->{'def_parsed_hash'}->{'class'})) {
if ($arguments) {
$tree = $self->gdt("{category}: address@hidden address@hidden@emph{
{arguments}}", {
- 'category' =>
$command->{'extra'}->{'def_parsed_hash'}->{'category'},
+ 'category' => $category,
'name' => $name,
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
'arguments' => $arguments});
} else {
$tree = $self->gdt("{category}: address@hidden address@hidden", {
- 'category' =>
$command->{'extra'}->{'def_parsed_hash'}->{'category'},
+ 'category' => $category,
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
'name' => $name});
}
@@ -3865,13 +3881,13 @@
and !$command->{'extra'}->{'def_parsed_hash'}->{'type'})) {
if ($arguments) {
$tree = $self->gdt("{category} of {class}: address@hidden@emph{
{arguments}}", {
- 'category' =>
$command->{'extra'}->{'def_parsed_hash'}->{'category'},
+ 'category' => $category,
'name' => $name,
'class' => $command->{'extra'}->{'def_parsed_hash'}->{'class'},
'arguments' => $arguments});
} else {
$tree = $self->gdt("{category} of {class}: address@hidden", {
- 'category' =>
$command->{'extra'}->{'def_parsed_hash'}->{'category'},
+ 'category' => $category,
'class' => $command->{'extra'}->{'def_parsed_hash'}->{'class'},
'name' => $name});
}
@@ -3880,27 +3896,27 @@
and !$command->{'extra'}->{'def_parsed_hash'}->{'type'})) {
if ($arguments) {
$tree = $self->gdt("{category} on {class}: address@hidden@emph{
{arguments}}", {
- 'category' =>
$command->{'extra'}->{'def_parsed_hash'}->{'category'},
+ 'category' => $category,
'name' => $name,
'class' => $command->{'extra'}->{'def_parsed_hash'}->{'class'},
'arguments' => $arguments});
} else {
$tree = $self->gdt("{category} on {class}: address@hidden", {
- 'category' =>
$command->{'extra'}->{'def_parsed_hash'}->{'category'},
+ 'category' => $category,
'class' => $command->{'extra'}->{'def_parsed_hash'}->{'class'},
'name' => $name});
}
} elsif ($command_name eq 'deftypeop') {
if ($arguments) {
$tree = $self->gdt("{category} on {class}: address@hidden
address@hidden@emph{ {arguments}}", {
- 'category' =>
$command->{'extra'}->{'def_parsed_hash'}->{'category'},
+ 'category' => $category,
'name' => $name,
'class' => $command->{'extra'}->{'def_parsed_hash'}->{'class'},
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
'arguments' => $arguments});
} else {
$tree = $self->gdt("{category} on {class}: address@hidden
address@hidden", {
- 'category' =>
$command->{'extra'}->{'def_parsed_hash'}->{'category'},
+ 'category' => $category,
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
'class' => $command->{'extra'}->{'def_parsed_hash'}->{'class'},
'name' => $name});
@@ -3908,21 +3924,20 @@
} elsif ($command_name eq 'deftypecv') {
if ($arguments) {
$tree = $self->gdt("{category} of {class}: address@hidden
address@hidden@emph{ {arguments}}", {
- 'category' =>
$command->{'extra'}->{'def_parsed_hash'}->{'category'},
+ 'category' => $category,
'name' => $name,
'class' => $command->{'extra'}->{'def_parsed_hash'}->{'class'},
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
'arguments' => $arguments});
} else {
$tree = $self->gdt("{category} of {class}: address@hidden
address@hidden", {
- 'category' =>
$command->{'extra'}->{'def_parsed_hash'}->{'category'},
+ 'category' => $category,
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
'class' => $command->{'extra'}->{'def_parsed_hash'}->{'class'},
'name' => $name});
}
}
-
return '<dt>'.$index_label.$self->convert_tree({'type' => '_code',
'contents' => [$tree]}) . "</dt>\n";
} else {