texinfo/tp TODO DebugTexinfo/DebugTree.pm Texin...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/10/02 09:01:44

Modified files:
        tp             : TODO 
        tp/DebugTexinfo: DebugTree.pm 
        tp/Texinfo     : Structuring.pm 
        tp/Texinfo/Convert: HTML.pm 

Log message:
        With NO_MONOLITHIC split may be undef, while split_by_section is called.
        Also in HTML add a footer for special elements if NO_MONOLITHIC and 
!split.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.184&r2=1.185
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/DebugTexinfo/DebugTree.pm?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.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.166&r2=1.167

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -b -r1.184 -r1.185
--- TODO        1 Oct 2011 23:09:23 -0000       1.184
+++ TODO        2 Oct 2011 09:01:43 -0000       1.185
@@ -112,8 +112,6 @@
 instead of, currently 
  *note chapter: (file name)chapter.
 
-Document that NO_USE_SETFILENAME replaced USE_SETFILENAME
-
 Test @w{'} for the substitution of '.
 
 Before the release, verify that everything on 
@@ -250,8 +248,6 @@
 there could be a warning
  warning: @setfilename after the first element
 
-No &copy; &ldquo; &rdquo; in docbook.  Use instead numeric entities.
-
 Add @value to the corresponding commands categories?
 
 Functions:
@@ -292,6 +288,9 @@
 @@verbatiminclude dot.
 @verbatiminclude ./formatting/simplest.texi
 
+NO_MONOLITHIC
+in layout/no_monolithic
+
 done: test/invalid. Not completly incorporated
 error_in_footnote_caption.texi    (at least partly done in 
                     info_tests/error_in_footnote.  More shouldn't be needed)

Index: DebugTexinfo/DebugTree.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/DebugTexinfo/DebugTree.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- DebugTexinfo/DebugTree.pm   17 Sep 2011 20:24:25 -0000      1.1
+++ DebugTexinfo/DebugTree.pm   2 Oct 2011 09:01:43 -0000       1.2
@@ -41,7 +41,8 @@
     $elements = Texinfo::Structuring::split_by_section($root);
   }
   my $pages;
-  if ($elements and $self->get_conf('SPLIT')) {
+  if ($elements and ($self->get_conf('SPLIT') 
+                     or !$self->get_conf('MONOLITHIC'))) {
     #print STDERR "S ".$self->get_conf('SPLIT')."\n";
     $pages = Texinfo::Structuring::split_pages($elements,
                                                $self->get_conf('SPLIT'));

Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- Texinfo/Structuring.pm      29 Sep 2011 23:24:42 -0000      1.91
+++ Texinfo/Structuring.pm      2 Oct 2011 09:01:43 -0000       1.92
@@ -687,17 +687,17 @@
   return undef if (!$elements or address@hidden);
 
   my $split_level;
-  if ($split eq 'chapter') {
-    $split_level = 1;
-  } elsif ($split eq 'section') {
-    $split_level = 2;
-  } elsif (!$split) {
+  if (!$split) {
     my $page = {'type' => 'page'};
     foreach my $element (@$elements) {
       push @{$page->{'contents'}}, $element;
       $element->{'parent'} = $page;
     }
     return [$page];
+  } elsif ($split eq 'chapter') {
+    $split_level = 1;
+  } elsif ($split eq 'section') {
+    $split_level = 2;
   }
 
   my @pages = ();

Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- Texinfo/Convert/HTML.pm     1 Oct 2011 22:54:12 -0000       1.166
+++ Texinfo/Convert/HTML.pm     2 Oct 2011 09:01:43 -0000       1.167
@@ -3855,7 +3855,6 @@
     }
   }
   $result .= $content unless ($special_element);
-  # FIXME footnotes
 
   my $is_top = $self->_element_is_top($element);
   my $next_is_top = ($self->{'global_target_elements'}->{'Top'}
@@ -3863,7 +3862,7 @@
     and $self->{'global_target_elements'}->{'Top'} eq 
$element->{'element_next'});
   my $next_is_special = (defined($element->{'element_next'})
     and $element->{'element_next'}->{'extra'}->{'special_element'});
-  # no 'parent' defined happens if there are no pages, and elements 
+  # no 'parent' defined happens if there are no pages, and there are elements 
   # which should only happen when called with $self->get_conf('OUTFILE') 
   # set to ''.
   my $end_page = (!$element->{'element_next'} 
@@ -3882,7 +3881,7 @@
   my $buttons;
   my $maybe_in_page;
   if (($is_top or $is_special)
-      and $self->get_conf('SPLIT')
+      and ($self->get_conf('SPLIT') or !$self->get_conf('MONOLITHIC'))
       and ($end_page 
          and ($self->get_conf('HEADERS') 
               or ($self->get_conf('SPLIT') and $self->get_conf('SPLIT') ne 
'node')))) {
@@ -3891,15 +3890,11 @@
     } else {
       $buttons = $self->get_conf('MISC_BUTTONS');
     }
-    #$rule = $self->get_conf('DEFAULT_RULE');
   } elsif ($end_page and $self->get_conf('SPLIT') eq 'section') {
     $buttons = $self->get_conf('SECTION_FOOTER_BUTTONS');
-    #$rule = $self->get_conf('DEFAULT_RULE');
   } elsif ($end_page and $self->get_conf('SPLIT') eq 'chapter') {
     $buttons = $self->get_conf('CHAPTER_BUTTONS');
-    #$rule = $self->get_conf('DEFAULT_RULE');
   } elsif ($self->get_conf('SPLIT') eq 'node' and $self->get_conf('HEADERS')) {
-    #$rule = $self->get_conf('DEFAULT_RULE');
     my $no_footer_word_count;
     if ($self->get_conf('WORDS_IN_PAGE')) {
       my @cnt = split(/\W*\s+\W*/, $content);