texinfo/tp/Texinfo Common.pm Parser.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/12/27 22:29:27

Modified files:
        tp/Texinfo     : Common.pm Parser.pm 

Log message:
        Parse deftypefnnewline.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.343&r2=1.344

Patches:
Index: Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- Common.pm   22 Dec 2011 10:54:41 -0000      1.106
+++ Common.pm   27 Dec 2011 22:29:26 -0000      1.107
@@ -86,7 +86,8 @@
         'evenfooting', 'oddheading', 'oddfooting', 'headings',
         'allowcodebreaks', 'frenchspacing', 'exampleindent',
         'firstparagraphindent', 'paragraphindent', 'clickstyle',
-        'documentlanguage', 'xrefautomaticsectiontitle');
+        'documentlanguage', 'xrefautomaticsectiontitle',
+        'deftypefnnewline');
 
 # those should be unique
 my @document_global_at_commands = ('contents', 'shortcontents',
@@ -282,6 +283,7 @@
   'codequoteundirected'       => 1, # on off
   'codequotebacktick'         => 1, # on off
   'xrefautomaticsectiontitle' => 1, # on off
+  'deftypefnnewline'  => 1, # on off
   'fonttextsize'      => 1, # 10 11
   'allowcodebreaks'   => 1, # false or true
   'exampleindent'     => 1, # asis or a number

Index: Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -b -r1.343 -r1.344
--- Parser.pm   22 Dec 2011 10:54:41 -0000      1.343
+++ Parser.pm   27 Dec 2011 22:29:27 -0000      1.344
@@ -287,7 +287,8 @@
   'kbdinputstyle', 'paragraphindent', 'firstparagraphindent',
   'frenchspacing', 'hyphenation', 'urefbreakstyle',
   'xrefautomaticsectiontitle', 'codequoteundirected',
-  'codequotebacktick', 'titlefont', 'footnote', 'printindex') {
+  'codequotebacktick', 'titlefont', 'footnote', 'printindex',
+  'deftypefnnewline') {
   $global_multiple_commands{$global_multiple_command} = 1;
 }
 
@@ -1889,8 +1890,8 @@
   if ($current->{'contents'} and @{$current->{'contents'}} 
        and $current->{'contents'}->[-1]->{'type'}
        and ($current->{'contents'}->[-1]->{'type'} eq 'empty_line' 
-           or $current->{'contents'}->[-1]->{'type'} eq 
'empty_spaces_before_argument'
            or $current->{'contents'}->[-1]->{'type'} eq 
'empty_line_after_command'
+           or $current->{'contents'}->[-1]->{'type'} eq 
'empty_spaces_before_argument'
            or $current->{'contents'}->[-1]->{'type'} eq 
'empty_spaces_after_close_brace')) {
     print STDERR "ABORT EMPTY additional text |$additional_text|, current 
|$current->{'contents'}->[-1]->{'text'}|\n" if ($self->{'DEBUG'});
     $current->{'contents'}->[-1]->{'text'} .= $additional_text;
@@ -4965,7 +4966,8 @@
   } elsif ($command eq 'frenchspacing' 
            or $command eq 'xrefautomaticsectiontitle'
            or $command eq 'codequoteundirected'
-           or $command eq 'codequotebacktick') {
+           or $command eq 'codequotebacktick'
+           or $command eq 'deftypefnnewline') {
     if ($line eq 'on' or $line eq 'off') {
       $args = [$line];
     } else {