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

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/04/17 07:27:57

Modified files:
        tp             : TODO texi2any.pl 
        tp/Texinfo     : Common.pm 
        tp/Texinfo/Convert: Converter.pm 
        tp/t           : 30sectioning.t 
        tp/t/results/sectioning: setfilename_on_top_and_after_node.pl 

Log message:
        Replace USE_SETFILENAME by NO_USE_SETFILENAME and use it.  This allows 
to have
        undef as a default to be right.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/30sectioning.t?cvsroot=texinfo&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl?cvsroot=texinfo&r1=1.5&r2=1.6

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- TODO        17 Apr 2011 06:27:08 -0000      1.121
+++ TODO        17 Apr 2011 07:27:56 -0000      1.122
@@ -51,6 +51,9 @@
 Add an API for everything used in conf, for example in page_head, use 
 $self->title_string() and so on and so forth.  
 
+html tests which should be right:
+sectioning setfilename_on_top_and_after_node
+
 Handle
 @xrefautomaticsectiontitle on|off
 (does nothing in info, in HTML automatically set the section name as 3rd
@@ -65,6 +68,8 @@
 In Info A ref like @ref{node,,,manual} should lead to
 *note (manual)node::.
 
+Document that NO_USE_SETFILENAME replaced USE_SETFILENAME
+
 Test @w{'} for the substitution of '.
 
 Before the release, verify that everything on 

Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- texi2any.pl 15 Apr 2011 06:39:32 -0000      1.33
+++ texi2any.pl 17 Apr 2011 07:27:57 -0000      1.34
@@ -326,11 +326,14 @@
 my @css_files = ();
 my @css_refs = ();
 
-# defaults for options relevant in the main program, and not undef. 
-# Others are set in the converters.
+# defaults for options relevant in the main program, not undef, and also
+# defaults for all the converters.
 # Other relevant options (undef) are NO_WARN FORCE OUTFILE
-
+# Others are set in the converters.
 my $converter_default_options = { 'ERROR_LIMIT' => 100 };
+
+# this associates the command line options to the arrays set during
+# command line parsing.
 my $cmdline_options = { 'CSS_FILES' => address@hidden,
                         'CSS_REFS' => address@hidden };
 
@@ -386,7 +389,7 @@
 
 sub _set_variables_texi2html()
 {
-  set_from_cmdline('USE_SETFILENAME', 0);
+  set_from_cmdline('NO_USE_SETFILENAME', 1);
   set_from_cmdline('USE_SETFILENAME_EXTENSION', 0);
   set_from_cmdline('footnotestyle', 'separate');
   set_from_cmdline('INLINE_CONTENTS', 0);

Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- Texinfo/Common.pm   15 Apr 2011 06:39:32 -0000      1.35
+++ Texinfo/Common.pm   17 Apr 2011 07:27:57 -0000      1.36
@@ -117,7 +117,7 @@
   'TOP_NODE_FILE_TARGET', 'SHOW_TITLE', 'WORDS_IN_PAGE',
   'HEADER_IN_TABLE', 'USE_ACCESSKEY', 'USE_REL_REV', 'USE_LINKS',
   'OVERVIEW_LINK_TO_TOC', 'AVOID_MENU_REDUNDANCY', 'NODE_NAME_IN_MENU',
-  'NODE_NAME_IN_INDEX', 'USE_SETFILENAME', 'USE_SETFILENAME_EXTENSION',
+  'NODE_NAME_IN_INDEX', 'NO_USE_SETFILENAME', 'USE_SETFILENAME_EXTENSION',
   'COMPLEX_FORMAT_IN_TABLE',
   'USE_UP_FOR_ADJACENT_NODES', 'TOP_HEADING_AT_BEGINNING',
   'SEPARATE_DESCRIPTION', 'IGNORE_BEFORE_SETFILENAME',

Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- Texinfo/Convert/Converter.pm        16 Apr 2011 16:36:38 -0000      1.15
+++ Texinfo/Convert/Converter.pm        17 Apr 2011 07:27:57 -0000      1.16
@@ -290,7 +290,7 @@
   # determine output file and output file name
   my $outfile;
   if (!defined($self->get_conf('OUTFILE'))) {
-    if (defined($setfilename)) {
+    if (defined($setfilename) and !$self->get_conf('NO_USE_SETFILENAME')) {
       $outfile = $setfilename;
       if (!$self->get_conf('USE_SETFILENAME_EXTENSION')) {
         $outfile =~ s/\.[^\.]*$//;
@@ -327,7 +327,8 @@
   my $output_basename = $self->get_conf('OUTFILE');
   # this is a case that should happen rarely: one wants to get 
   # the result in a string and there is a setfilename.
-  if ($self->get_conf('OUTFILE') eq '' and defined($setfilename)) {
+  if ($self->get_conf('OUTFILE') eq '' and defined($setfilename)
+      and !$self->get_conf('NO_USE_SETFILENAME')) {
     $output_basename = $setfilename;
     $document_name = $setfilename;
     if (!$self->get_conf('USE_SETFILENAME_EXTENSION')) {

Index: t/30sectioning.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/30sectioning.t,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- t/30sectioning.t    3 Apr 2011 17:04:32 -0000       1.34
+++ t/30sectioning.t    17 Apr 2011 07:27:57 -0000      1.35
@@ -266,6 +266,12 @@
 
 @contents
 '],
+['setfilename_on_top_and_after_node',
+'@node Top
address@hidden In top @setfilename very badly placed setfilename
+
address@hidden a bit too late
+'],
 ['section_in_unnumbered_plaintext',
 $section_in_unnumbered_text
 ],
@@ -1076,12 +1082,6 @@
 
 Second top.
 '],
-['setfilename_on_top_and_after_node',
-'@node Top
address@hidden In top @setfilename very badly placed setfilename
-
address@hidden a bit too late
-'],
 ['unnumbered_before_top',
 '@unnumbered before top
 

Index: t/results/sectioning/setfilename_on_top_and_after_node.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/sectioning/setfilename_on_top_and_after_node.pl   6 Mar 2011 
14:44:09 -0000       1.5
+++ t/results/sectioning/setfilename_on_top_and_after_node.pl   17 Apr 2011 
07:27:57 -0000      1.6
@@ -293,4 +293,10 @@
 ];
 
 
+
+$result_converted{'plaintext'}->{'setfilename_on_top_and_after_node'} = 'In top
+******
+
+';
+
 1;