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

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/08/18 23:01:56

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

Log message:
        When XREF_USE_FLOAT_LABEL do not use the float label but instead the 
        type followed by the number.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.134&r2=1.135
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.253&r2=1.254

Patches:
Index: Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- Structuring.pm      14 Jul 2012 23:20:08 -0000      1.134
+++ Structuring.pm      18 Aug 2012 23:01:56 -0000      1.135
@@ -777,7 +777,7 @@
       }
     }
     # it may happen (rarely) that the node_up is a manual entry
-    # and therefore $node->{'node_up'}->{'extra'}->{'manual_content'}
+    # and therefore $node->{'node_up'}->{'extra'}->{'manual_content'}.
     # The node_up should always be different from the menu_up, therefore
     # if in a menu, the second condition/error message applies.
     if ($node->{'node_up'} and 
($node->{'node_up'}->{'extra'}->{'manual_content'}

Index: Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -b -r1.253 -r1.254
--- Convert/HTML.pm     14 Aug 2012 07:36:58 -0000      1.253
+++ Convert/HTML.pm     18 Aug 2012 23:01:56 -0000      1.254
@@ -946,7 +946,7 @@
   'NODE_NAME_IN_MENU'    => 1,
   'NODE_NAME_IN_INDEX'   => 1,
   'XREF_USE_NODE_NAME_ARG' => undef,
-  'XREF_USE_FLOAT_LABEL'   => 1,
+  'XREF_USE_FLOAT_LABEL'   => 0,
   'OVERVIEW_LINK_TO_TOC' => 1,
   'COMPLEX_FORMAT_IN_TABLE' => 0,
   'WORDS_IN_PAGE'        => 300,
@@ -3059,7 +3059,7 @@
         $command = $node->{'extra'}->{'associated_section'};
         $name = $self->command_text($command, 'text_nonumber');
       } elsif ($node->{'cmdname'} eq 'float') {
-        if ($self->get_conf('XREF_USE_FLOAT_LABEL')) {
+        if (!$self->get_conf('XREF_USE_FLOAT_LABEL')) {
           $name = $self->command_text($command);
         }
         if (!defined($name) or $name eq '') {