texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp TODO Texinfo/Convert/Plaintext.pm t/...


From: Patrice Dumas
Subject: texinfo/tp TODO Texinfo/Convert/Plaintext.pm t/...
Date: Mon, 07 Nov 2011 22:59:50 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/11/07 22:59:50

Modified files:
        tp             : TODO 
        tp/Texinfo/Convert: Plaintext.pm 
        tp/t           : info_tests.t 
Added files:
        tp/t/results/info_tests: nested_footnotes_separate.pl 

Log message:
        Note that nested footnotes with footnotestyle separate lead to a 
        discrepancy between the footnote anchor name and the reference to
        the footnote anchor.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.220&r2=1.221
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.188&r2=1.189
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/info_tests.t?cvsroot=texinfo&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/nested_footnotes_separate.pl?cvsroot=texinfo&rev=1.1

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -b -r1.220 -r1.221
--- TODO        7 Nov 2011 22:19:20 -0000       1.220
+++ TODO        7 Nov 2011 22:59:49 -0000       1.221
@@ -45,6 +45,8 @@
 listoffloats;  Line numbers are right, though, so maybe this is not
 an issue.
 
+warn nested footnotes.
+
 
 Missing tests
 =============

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- Texinfo/Convert/Plaintext.pm        7 Nov 2011 22:20:17 -0000       1.188
+++ Texinfo/Convert/Plaintext.pm        7 Nov 2011 22:59:50 -0000       1.189
@@ -678,6 +678,11 @@
     while (@{$self->{'pending_footnotes'}}) {
       my $footnote = shift (@{$self->{'pending_footnotes'}});
 
+      # If nested within another footnote and footnotestyle is separate,
+      # the element here will be the parent element and not the footnote
+      # element, while the pxref will point to the name with the 
+      # footnote node taken into account.  Not really problematic as
+      # nested footnotes are not right.
       if ($element) {
         my $node_contents = 
address@hidden>{'extra'}->{'node'}->{'extra'}->{'node_content'}},
                     {'text' => "-Footnote-$footnote->{'number'}"}];

Index: t/info_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/info_tests.t,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- t/info_tests.t      1 Nov 2011 00:53:26 -0000       1.35
+++ t/info_tests.t      7 Nov 2011 22:59:50 -0000       1.36
@@ -375,6 +375,15 @@
 
 @listoffloats Text
 '],
+['nested_footnotes_separate',
+'@footnotestyle separate
address@hidden Top
+
address@hidden
+
address@hidden
+}
+'],
 ['encoding_us_ascii',
 '
 @documentencoding US-ASCII

Index: t/results/info_tests/nested_footnotes_separate.pl
===================================================================
RCS file: t/results/info_tests/nested_footnotes_separate.pl
diff -N t/results/info_tests/nested_footnotes_separate.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/info_tests/nested_footnotes_separate.pl   7 Nov 2011 22:59:50 
-0000       1.1
@@ -0,0 +1,312 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'nested_footnotes_separate'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'separate'
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'footnotestyle',
+          'extra' => {
+            'misc_args' => [
+              'separate'
+            ]
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 1,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'parent' => {},
+      'type' => 'text_root'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'Top'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'F'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'F1
+'
+                        }
+                      ],
+                      'parent' => {},
+                      'type' => 'paragraph'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'empty_line'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'V'
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'F2'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'paragraph'
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_context'
+                            }
+                          ],
+                          'cmdname' => 'footnote',
+                          'contents' => [],
+                          'line_nr' => {
+                            'file_name' => '',
+                            'line_nr' => 6,
+                            'macro' => ''
+                          },
+                          'parent' => {}
+                        },
+                        {
+                          'parent' => {},
+                          'text' => '
+'
+                        }
+                      ],
+                      'parent' => {},
+                      'type' => 'paragraph'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'brace_command_context'
+                }
+              ],
+              'cmdname' => 'footnote',
+              'contents' => [],
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 4,
+                'macro' => ''
+              },
+              'parent' => {}
+            },
+            {
+              'parent' => {},
+              'text' => '
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        }
+      ],
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [],
+            'normalized' => 'Top'
+          }
+        ],
+        'normalized' => 'Top'
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 2,
+        'macro' => ''
+      },
+      'parent' => {}
+    }
+  ],
+  'type' => 'document_root'
+};
+$result_trees{'nested_footnotes_separate'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'nested_footnotes_separate'}{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nested_footnotes_separate'}{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_footnotes_separate'}{'contents'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_footnotes_separate'};
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'nested_footnotes_separate'}{'contents'}[1];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'args'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'args'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'args'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'nested_footnotes_separate'}{'contents'}[1];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nested_footnotes_separate'}{'contents'}[1];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nested_footnotes_separate'}{'contents'}[1];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'parent'} = 
$result_trees{'nested_footnotes_separate'};
+
+$result_texis{'nested_footnotes_separate'} = '@footnotestyle separate
address@hidden Top
+
address@hidden
+
address@hidden
+}
+';
+
+
+$result_texts{'nested_footnotes_separate'} = '
+F
+';
+
+$result_sectioning{'nested_footnotes_separate'} = {};
+
+$result_nodes{'nested_footnotes_separate'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  },
+  'node_up' => {
+    'extra' => {
+      'manual_content' => [
+        {
+          'text' => 'dir'
+        }
+      ],
+      'top_node_up' => {}
+    },
+    'type' => 'top_node_up'
+  }
+};
+$result_nodes{'nested_footnotes_separate'}{'node_up'}{'extra'}{'top_node_up'} 
= $result_nodes{'nested_footnotes_separate'};
+
+$result_menus{'nested_footnotes_separate'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  }
+};
+
+$result_errors{'nested_footnotes_separate'} = [];
+
+
+
+$result_converted{'info'}->{'nested_footnotes_separate'} = 'This is , produced 
by tp version from .
+
+
+File: ,  Node: Top,  Up: (dir)
+
+F(1) (*note Top-Footnote-1::)
+
+
+File: ,  Node: Top-Footnotes,  Up: Top
+
+   (1) F1
+
+   V(2) (*note Top-Footnotes-Footnote-2::)
+
+   (2) F2
+
+
+
+Tag Table:
+Node: Top41
+Node: Top-Footnotes106
+Ref: Top-Footnote-1148
+Ref: Top-Footnote-2203
+
+End Tag Table
+';
+
+1;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]