texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp TODO texi2any.pl Texinfo/Common.pm T...


From: Patrice Dumas
Subject: texinfo/tp TODO texi2any.pl Texinfo/Common.pm T...
Date: Thu, 03 Nov 2011 23:54:51 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/11/03 23:54:51

Modified files:
        tp             : TODO texi2any.pl 
        tp/Texinfo     : Common.pm 
        tp/Texinfo/Convert: HTML.pm 
        tp/t/results/coverage_braces: empty_commands.pl footnote.pl 
                                      footnote_ending_on_empty_line.pl 
                                      footnote_no_node.pl 
                                      format_on_first_footnote_line.pl 
                                      heading_in_footnote.pl 
                                      nested_in_sc.pl 
                                      space_in_footnote.pl 
        tp/t/results/misc_commands: footnote_in_center.pl 
        tp/t/results/paragraph: paragraph_command.pl 
        tp/t/results/regions: anchor_in_copying_in_footnote.pl 
        tp/t/results/sectioning: no_element.pl 
                                 placed_things_before_element.pl 

Log message:
        Use FOOTNOTE_END_HEADER_LEVEL for the level of footnote headings when 
        footnotestyle is end, and FOOTNOTE_SEPARATE_HEADER_LEVEL when footnotes
        are on a separate element.
        
        Set defaults to 4 for those variables.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.209&r2=1.210
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.201&r2=1.202
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/empty_commands.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/footnote.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/footnote_no_node.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/format_on_first_footnote_line.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/footnote_in_center.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/paragraph_command.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/regions/anchor_in_copying_in_footnote.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/no_element.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/placed_things_before_element.pl?cvsroot=texinfo&r1=1.20&r2=1.21

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- TODO        3 Nov 2011 23:40:35 -0000       1.209
+++ TODO        3 Nov 2011 23:54:49 -0000       1.210
@@ -5,12 +5,6 @@
 Before next release
 ===================
 
-Always use <h3> as max heading for footnotes headings even when 
-in a special element.
-
-When footnotestyle is end always try to have the footnote be one less 
-h-level than the current sectioning level?
-
 
 Bugs
 ====
@@ -63,6 +57,12 @@
 listoffloats;  Line numbers are right, though, so maybe this is not
 an issue.
 
+In singular manual, the first node is the Top node, it has no associated
+sectioning command.  The up_section for this node is set to the first
+sectioning element, the Preface, which is also associated with that node but
+is below, and maybe they are in the same element?  In any case it seems to
+be wrong.
+
 
 Missing tests
 =============
@@ -191,12 +191,6 @@
  @end quotation
 Is it really a bug?
 
-In singular manual, the first node is the Top node, it has no associated
-sectioning command.  The up_section for this node is set to the first
-sectioning element, the Preface, which is also associated with that node but
-is below, and maybe they are in the same element?  In any case it seems to
-be wrong.
-
 In @copying things like some raw formats may be expanded.  However it is
 not clear that it should be the same than in the main converter.  Maybe a 
 specific list of formats could be passed to Convert::Text::convert, which

Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- texi2any.pl 2 Nov 2011 23:08:17 -0000       1.82
+++ texi2any.pl 3 Nov 2011 23:54:49 -0000       1.83
@@ -456,6 +456,8 @@
   ['NODE_NAME_IN_INDEX', 0],
   ['CHAPTER_HEADER_LEVEL', 1],
   ['BIG_RULE', '<hr size="6">'],
+  ['FOOTNOTE_END_HEADER_LEVEL', 3],
+  ['FOOTNOTE_SEPARATE_HEADER_LEVEL', 1],
   ['SECTION_BUTTONS', ['FastBack', 'Back', 'Up', 'Forward', 'FastForward',
                              ' ', ' ', ' ', ' ',
                              'Top', 'Contents', 'Index', 'About' ]],

Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- Texinfo/Common.pm   3 Nov 2011 18:45:01 -0000       1.91
+++ Texinfo/Common.pm   3 Nov 2011 23:54:49 -0000       1.92
@@ -163,7 +163,9 @@
   'MENU_ENTRY_COLON', 'INDEX_ENTRY_COLON', 'MENU_SYMBOL', 'DO_ABOUT',
   'CSS_FILES', 'CSS_REFS', 'BEFORE_OVERVIEW', 'AFTER_OVERVIEW',
   'BEFORE_TOC_LINES', 'AFTER_TOC_LINES', 'GLOBAL_COMMANDS',
-  'MAX_HEADER_LEVEL', 'CHAPTER_HEADER_LEVEL');
+  'MAX_HEADER_LEVEL', 'CHAPTER_HEADER_LEVEL',
+  'FOOTNOTE_END_HEADER_LEVEL', 'FOOTNOTE_SEPARATE_HEADER_LEVEL',
+);
 
 my %valid_options;
 foreach my $var (@document_settable_at_commands, @document_global_at_commands,

Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -b -r1.201 -r1.202
--- Texinfo/Convert/HTML.pm     3 Nov 2011 18:45:01 -0000       1.201
+++ Texinfo/Convert/HTML.pm     3 Nov 2011 23:54:49 -0000       1.202
@@ -954,6 +954,8 @@
   'MONOLITHIC'           => 1,
   'CHAPTER_HEADER_LEVEL' => 2,
   'MAX_HEADER_LEVEL'     => 4,
+  'FOOTNOTE_END_HEADER_LEVEL' => 4,
+  'FOOTNOTE_SEPARATE_HEADER_LEVEL' => 4,
   
   'BUTTONS_REL'          => \%BUTTONS_REL,
   'BUTTONS_ACCESSKEY'    => \%BUTTONS_ACCESSKEY,
@@ -3290,6 +3292,10 @@
         = $self->convert_tree 
($self->get_conf('SPECIAL_ELEMENTS_NAME')->{$element_name});
     }
     my $class = $self->get_conf('SPECIAL_ELEMENTS_CLASS')->{$element_name};
+    my $level = $self->get_conf('CHAPTER_HEADER_LEVEL');
+    if ($element_name eq 'Footnotes') {
+      $level = $self->get_conf('FOOTNOTE_SEPARATE_HEADER_LEVEL');
+    }
     $result .= &{$self->{'format_heading_text'}}($self, $class.'-heading', 
                        $heading, $self->get_conf('CHAPTER_HEADER_LEVEL'))."\n";
     $result .= $content . "\n";
@@ -5916,8 +5922,9 @@
   my $footnote_heading 
     = $self->convert_tree 
($self->get_conf('SPECIAL_ELEMENTS_NAME')->{'Footnotes'});
   my $class = $self->get_conf('SPECIAL_ELEMENTS_CLASS')->{'Footnotes'};
+  my $level = $self->get_conf('FOOTNOTE_END_HEADER_LEVEL');
   $result .= &{$self->{'format_heading_text'}}($self, $class.'-heading', 
-                                        $footnote_heading, 3)."\n";
+                                        $footnote_heading, $level)."\n";
   $result .= &{$self->{'format_special_element_body'}}($self, 'Footnotes',
                                                $self->{'current_element'});
   $result .= "</div>\n";

Index: t/results/coverage_braces/empty_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/coverage_braces/empty_commands.pl 3 Nov 2011 18:45:02 -0000       
1.6
+++ t/results/coverage_braces/empty_commands.pl 3 Nov 2011 23:54:49 -0000       
1.7
@@ -276,7 +276,7 @@
 <p> <abbr></abbr>  <code></code><a name="DOCF1" href="#FOOT1">(1)</a> ~  
<tt></tt>
 </p><div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 

Index: t/results/coverage_braces/footnote.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/footnote.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/coverage_braces/footnote.pl       3 Nov 2011 18:45:02 -0000       
1.25
+++ t/results/coverage_braces/footnote.pl       3 Nov 2011 23:54:50 -0000       
1.26
@@ -129,7 +129,7 @@
 
 $result_converted{'html_text'}->{'footnote'} = '<p>text<a name="DOCF1" 
href="#FOOT1">(1)</a> after footnote.</p><div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 <p>in footnote.

Index: t/results/coverage_braces/footnote_ending_on_empty_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/coverage_braces/footnote_ending_on_empty_line.pl  3 Nov 2011 
18:45:02 -0000       1.21
+++ t/results/coverage_braces/footnote_ending_on_empty_line.pl  3 Nov 2011 
23:54:50 -0000       1.22
@@ -91,7 +91,7 @@
 
 $result_converted{'html_text'}->{'footnote_ending_on_empty_line'} = '<p>text<a 
name="DOCF1" href="#FOOT1">(1)</a></p><div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 <p>in footnote.

Index: t/results/coverage_braces/footnote_no_node.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/footnote_no_node.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage_braces/footnote_no_node.pl       3 Nov 2011 18:45:03 
-0000       1.7
+++ t/results/coverage_braces/footnote_no_node.pl       3 Nov 2011 23:54:50 
-0000       1.8
@@ -171,7 +171,7 @@
 <p>F<a name="DOCF1" href="#FOOT1">(1)</a>.
 </p><div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 <p>In footnote</p>

Index: t/results/coverage_braces/format_on_first_footnote_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/format_on_first_footnote_line.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/coverage_braces/format_on_first_footnote_line.pl  3 Nov 2011 
18:45:03 -0000       1.10
+++ t/results/coverage_braces/format_on_first_footnote_line.pl  3 Nov 2011 
23:54:50 -0000       1.11
@@ -309,7 +309,7 @@
 <p>Last text <a name="DOCF2" href="#FOOT2">(2)</a>
 </p><div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 <blockquote>

Index: t/results/coverage_braces/heading_in_footnote.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/coverage_braces/heading_in_footnote.pl    3 Nov 2011 18:45:03 
-0000       1.15
+++ t/results/coverage_braces/heading_in_footnote.pl    3 Nov 2011 23:54:50 
-0000       1.16
@@ -235,7 +235,7 @@
 $result_converted{'html_text'}->{'heading_in_footnote'} = '<p>T<a name="DOCF1" 
href="#FOOT1">(1)</a>
 </p><div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 <p>AAA

Index: t/results/coverage_braces/nested_in_sc.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/coverage_braces/nested_in_sc.pl   3 Nov 2011 18:45:04 -0000       
1.10
+++ t/results/coverage_braces/nested_in_sc.pl   3 Nov 2011 23:54:50 -0000       
1.11
@@ -289,7 +289,7 @@
 <tt>in verb</tt></small></small>
 </p><div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 <p>In footnote</p>

Index: t/results/coverage_braces/space_in_footnote.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/coverage_braces/space_in_footnote.pl      3 Nov 2011 18:45:04 
-0000       1.21
+++ t/results/coverage_braces/space_in_footnote.pl      3 Nov 2011 23:54:50 
-0000       1.22
@@ -81,7 +81,7 @@
 
 $result_converted{'html_text'}->{'space_in_footnote'} = '<p>text<a 
name="DOCF1" href="#FOOT1">(1)</a></p><div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 <p>in footnote.</p>

Index: t/results/misc_commands/footnote_in_center.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/footnote_in_center.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/misc_commands/footnote_in_center.pl       3 Nov 2011 18:45:08 
-0000       1.10
+++ t/results/misc_commands/footnote_in_center.pl       3 Nov 2011 23:54:50 
-0000       1.11
@@ -403,7 +403,7 @@
 $result_converted{'html_text'}->{'footnote_in_center'} = '<p 
align="center">Centered text with a footnote<a name="DOCF1" 
href="#FOOT1">(1)</a> and text after the footnote.
 </p><div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 <p>This footnote

Index: t/results/paragraph/paragraph_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/paragraph/paragraph_command.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/paragraph/paragraph_command.pl    3 Nov 2011 18:45:08 -0000       
1.23
+++ t/results/paragraph/paragraph_command.pl    3 Nov 2011 23:54:51 -0000       
1.24
@@ -396,7 +396,7 @@
 </p>
 <div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 <p>lone footnote</p>

Index: t/results/regions/anchor_in_copying_in_footnote.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/regions/anchor_in_copying_in_footnote.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/regions/anchor_in_copying_in_footnote.pl  3 Nov 2011 18:45:08 
-0000       1.13
+++ t/results/regions/anchor_in_copying_in_footnote.pl  3 Nov 2011 23:54:51 
-0000       1.14
@@ -554,7 +554,7 @@
 </p>
 <div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 <p>In footnote.

Index: t/results/sectioning/no_element.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/no_element.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/sectioning/no_element.pl  3 Nov 2011 18:45:11 -0000       1.21
+++ t/results/sectioning/no_element.pl  3 Nov 2011 23:54:51 -0000       1.22
@@ -1162,7 +1162,7 @@
 <a name="index-index-entry"></a>
 <div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 <p>In footnote.

Index: t/results/sectioning/placed_things_before_element.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_element.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/sectioning/placed_things_before_element.pl        3 Nov 2011 
18:45:11 -0000       1.20
+++ t/results/sectioning/placed_things_before_element.pl        3 Nov 2011 
23:54:51 -0000       1.21
@@ -1289,7 +1289,7 @@
 <a href="#Anchor-in-footnote">Anchor in footnote</a>
 </p><div class="footnote">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
 <p>In footnote.



reply via email to

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