texinfo/tp/Texinfo/Convert HTML.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/06/04 17:49:19

Modified files:
        tp/Texinfo/Convert: HTML.pm 

Log message:
        Internal refs have no manual nor book argument.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.79&r2=1.80

Patches:
Index: HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- HTML.pm     4 Jun 2011 17:02:22 -0000       1.79
+++ HTML.pm     4 Jun 2011 17:49:19 -0000       1.80
@@ -2453,8 +2453,24 @@
     $name = $args->[1]->{'normal'}
   }
 
+  if ($cmdname eq 'inforef') {
+    $args->[4] = $args->[3];
+    $args->[3] = undef;
+  }
+
+  my $file_arg_tree;
+  my $file = '';
+  if (defined($args->[3]->{'text'}) and $args->[3]->{'text'} ne '') {
+    $file_arg_tree = $args->[3]->{'tree'};
+    $file = $args->[3]->{'text'};
+  }
+
+  my $book = '';
+  $book = $args->[4]->{'normal'} if (defined($args->[4]->{'normal'}));
+
   # internal reference
-  if ($root->{'extra'}->{'node_argument'}
+  if ($book eq '' and $file eq ''
+      and $root->{'extra'}->{'node_argument'}
       and $root->{'extra'}->{'node_argument'}->{'normalized'}
       and !$root->{'extra'}->{'node_argument'}->{'manual_content'}
       and $self->{'labels'}
@@ -2504,22 +2520,12 @@
          { 'reference_name' => {'type' => '_converted', 'text' => $reference} 
});
     }
   } else {
-    if ($cmdname eq 'inforef') {
-      $args->[4] = $args->[3];
-      $args->[3] = undef;
-    }
     my $node_entry = {};
     $node_entry->{'node_content'} = 
$root->{'extra'}->{'node_argument'}->{'node_content'}
       if ($root->{'extra'}->{'node_argument'}->{'node_content'});
     $node_entry->{'normalized'} = 
$root->{'extra'}->{'node_argument'}->{'normalized'} 
       if (exists($root->{'extra'}->{'node_argument'}->{'normalized'}));
 
-    my $file_arg_tree;
-    my $file = '';
-    if (defined($args->[3]->{'text'}) and $args->[3]->{'text'} ne '') {
-      $file_arg_tree = $args->[3]->{'tree'};
-      $file = $args->[3]->{'text'};
-    }
 
     # file argument takes precedence over the file in the node (file)node entry
     if (defined($file_arg_tree)) {
@@ -2529,12 +2535,9 @@
         = $root->{'extra'}->{'node_argument'}->{'manual_content'};
     }
     my $href = $self->command_href($node_entry);
-    my $book = '';
-    $book = $args->[4]->{'normal'} if (defined($args->[4]->{'normal'})
-                                      and $args->[4]->{'normal'} ne '');
     $name = $args->[0]->{'code'} if (!defined($name));
       
-    if (!defined($book) and $file ne '') {
+    if ($book eq '' and $file ne '') {
       $name = "($file)$name";
     }
     $name = '' if (!defined($name));