[6220] inline functions into _count_added

[Gavin D. Smith]

Revision: 6220
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6220
Author:   gavin
Date:     2015-04-12 18:20:51 +0000 (Sun, 12 Apr 2015)
Log Message:
-----------
inline functions into _count_added

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Plaintext.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-04-12 18:08:11 UTC (rev 6219)
+++ trunk/ChangeLog     2015-04-12 18:20:51 UTC (rev 6220)
@@ -2,6 +2,8 @@
 
        * tp/Texinfo/Convert/Plaintext.pm (new_formatter): Replace
        function call to get_conf with hash lookup.
+       (_count_added): Call Texinfo::Common::count_bytes directly 
+       instead of via _add_text_count, and inline _add_lines_count.
 
 2015-04-09  Gavin Smith  <address@hidden>
 

Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm       2015-04-12 18:08:11 UTC (rev 
6219)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm       2015-04-12 18:20:51 UTC (rev 
6220)
@@ -763,8 +763,13 @@
   my $container = shift;
   my $text = shift;
 
-  $self->_add_lines_count($container->end_line_count());
-  $self->_add_text_count($text);
+  #$self->_add_lines_count($container->end_line_count());
+  $self->{'count_context'}->[-1]->{'lines'} += $container->end_line_count();
+
+  #$self->_add_text_count($text);
+  $self->{'count_context'}->[-1]->{'bytes'} +=
+    Texinfo::Common::count_bytes($self, $text,
+                                 $self->{'output_perl_encoding'});
   return $text;
 }