texinfo/tp/Texinfo Parser.pm Convert/HTML.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/05/31 23:55:21

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

Log message:
        Add argument on def line...
        In internal refs, anchors and floats are not sectioning commands.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.254&r2=1.255
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.71&r2=1.72

Patches:
Index: Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -b -r1.254 -r1.255
--- Parser.pm   31 May 2011 20:29:15 -0000      1.254
+++ Parser.pm   31 May 2011 23:55:19 -0000      1.255
@@ -1185,7 +1185,7 @@
                     'parent' => $current,
                     'contents' => []};
   # remove everything that is not an @item/@items or before_item to 
-  #Â put it in the table_item, starting from the end.
+  # put it in the table_item, starting from the end.
   my $contents_count = scalar(@{$current->{'contents'}});
   for (my $i = 0; $i < $contents_count; $i++) {
     if (($current->{'contents'}->[-1]->{'type'} 
@@ -1256,7 +1256,7 @@
   }
 
   if ($item_line_commands{$current->{'cmdname'}}) {
-    #Â no end at this point
+    # no end at this point
     #my $end;
     #if ($current->{'extra'}->{'end_command'}) {
     #  $end = pop @{$current->{'contents'}};

Index: Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- Convert/HTML.pm     31 May 2011 23:24:37 -0000      1.71
+++ Convert/HTML.pm     31 May 2011 23:55:20 -0000      1.72
@@ -1888,7 +1888,7 @@
   my $command = shift;
   my $args = shift;
 
-  #Â FIXME do something better with css and span?
+  # FIXME do something better with css and span?
   my $preformatted = $self->in_preformatted();
   
   if ($preformatted) {
@@ -2143,8 +2143,12 @@
     my $reference = $name;
     $reference = "<a href=\"$href\">$name</a>" if ($href ne '');
 
+    # maybe use {'extra'}->{'node_argument'}?
+    my $is_section = ($command->{'cmdname'} ne 'node' 
+                      and $command->{'cmdname'} ne 'anchor'
+                      and $command->{'cmdname'} ne 'float');
     if ($cmdname eq 'pxref') {
-      if ($command->{'cmdname'} ne 'node') {
+      if ($is_section) {
         $tree = $self->gdt('see section {reference_name}', 
          { 'reference_name' => {'type' => '_converted', 'text' => $reference} 
});
       } else {
@@ -2152,7 +2156,7 @@
          { 'reference_name' => {'type' => '_converted', 'text' => $reference} 
});
       }
     } elsif ($cmdname eq 'xref' or $cmdname eq 'inforef') {
-      if ($command->{'cmdname'} ne 'node') {
+      if ($is_section) {
         $tree = $self->gdt('See section {reference_name}',
          { 'reference_name' => {'type' => '_converted', 'text' => $reference} 
});
       } else {
@@ -2811,6 +2815,7 @@
         'contents' => [$command->{'extra'}->{'def_parsed_hash'}->{'name'}]});
   }
   $type_name .= ' <strong>' . $name . '</strong>' if ($name ne '');
+  $type_name .= $arguments;
 
   my $index_label = '';
   my $index_id = $self->command_id ($command);