[7793] Do not strip \r from end of line.

[gavinsmith0123]

Revision: 7793
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7793
Author:   gavin
Date:     2017-05-17 17:10:02 -0400 (Wed, 17 May 2017)
Log Message:
-----------
Do not strip \r from end of line.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/tests/coverage/tests-parser.txt

Removed Paths:
-------------
    trunk/tp/tests/coverage/formatting-cr.texi
    trunk/tp/tests/coverage/res_parser/formatting_cr/
    trunk/tp/tests/coverage/res_parser_info/formatting_cr/
    trunk/tp/tests/test_scripts/coverage_formatting_cr.sh

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-05-17 20:34:55 UTC (rev 7792)
+++ trunk/ChangeLog     2017-05-17 21:10:02 UTC (rev 7793)
@@ -1,3 +1,13 @@
+2017-05-17  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Parser.pm (_next_text):
+       Do not strip \r from end of line.  This reverses the change
+       on 2017-04-29.
+       * tp/tests/test_scripts/coverage_formatting_cr.sh,
+       * tp/tests/coverage (formatting_cr): Remove test.
+       texi2any does not support CR LF line endings on GNU/Linux.
+       * tp/tests/coverage/formatting_cr.texi: Removed.
+
 2017-05-17  gettextize  <address@hidden>
 
        * gnulib/m4/gettext.m4: New file, from gettext-0.19.8.

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2017-05-17 20:34:55 UTC (rev 7792)
+++ trunk/tp/Texinfo/Parser.pm  2017-05-17 21:10:02 UTC (rev 7793)
@@ -2022,9 +2022,6 @@
         # add an end of line if there is none at the end of file
         if (eof($fh) and $line !~ /\n/) {
           $line .= "\n";
-        } else {
-          # Convert any MS-DOS style line endings.
-          $line =~ s/\r\n$/\n/;
         }
         $line =~ s/\x{7F}.*\s*//;
         if ($self->{'CPP_LINE_DIRECTIVES'}

Deleted: trunk/tp/tests/coverage/formatting-cr.texi
===================================================================
--- trunk/tp/tests/coverage/formatting-cr.texi  2017-05-17 20:34:55 UTC (rev 
7792)
+++ trunk/tp/tests/coverage/formatting-cr.texi  2017-05-17 21:10:02 UTC (rev 
7793)
@@ -1,137 +0,0 @@
-\input texinfo @c -*-texinfo-*-
address@hidden formatting.info
-
address@hidden Formatting @'e @code{@@ @TeX{}} test
address@hidden
-* Truc: (formatting).           The GNU documentation truc.
-* @code{@@ @'e @equiv{}}: (formatting).  address@hidden something}'' 
-                           @command{cmd} @`a
address@hidden direntry
address@hidden Top
address@hidden Top section
-
address@hidden
-* chapter::               chapter
-
-Menu comment
-
-* description:chapter2.   Chapter 2
address@hidden menu
-
address@hidden coverage_macro-cr.texi
-
address@hidden
-In copying
address@hidden
address@hidden copying
-
address@hidden
address@hidden title --a
address@hidden formatting subtitle --a
address@hidden subtitle 2 --a
address@hidden author1 --a with accents in name T@'e@,ca
address@hidden author2 --a
-In titlepage
address@hidden
-
-Insercopying in titlepage
address@hidden
address@hidden titlepage
-
-Insertcopying in normal text
address@hidden
-
-Normal text
address@hidden
-
-In example.
address@hidden
address@hidden
address@hidden example
-
address@hidden t--ruc
address@hidden T--ruc
address@hidden .
address@hidden ?
address@hidden a
address@hidden t--ruc
address@hidden T--ruc
address@hidden .
address@hidden ?
address@hidden a
-
-
-cp
address@hidden cp
-
-fn
address@hidden fn
-
-vr
address@hidden vr
-
-ky
address@hidden ky
-
-pg
address@hidden pg
-
-tp
address@hidden tp
-
-
-
address@hidden chapter
address@hidden chapter
-
address@hidden footnote}
-
address@hidden
address@hidden 
-* address@hidden:: address@hidden
-
-Menu comment
-``simple-double--three---four----''@*
-
address@hidden menu
address@hidden format
-
address@hidden address@hidden
address@hidden A section
-
address@hidden
-* subsection:: 
-
address@hidden
-In detailmenu
-
-* subsubsection ``simple-double--::
-* subsubsection three---four----''::
address@hidden detailmenu
address@hidden menu
-
address@hidden subsection
address@hidden subsection
-
address@hidden
-* subsubsection ``simple-double--::
-* subsubsection three---four----''::
address@hidden menu
-
address@hidden
-
address@hidden subsubsection ``simple-double--
address@hidden subsubsection ``simple-double--
-
address@hidden subsubsection three---four----''
address@hidden three---four----''
-
address@hidden chapter2
address@hidden chapter 2
-
address@hidden cp
address@hidden fn
-
address@hidden
address@hidden
address@hidden

Modified: trunk/tp/tests/coverage/tests-parser.txt
===================================================================
--- trunk/tp/tests/coverage/tests-parser.txt    2017-05-17 20:34:55 UTC (rev 
7792)
+++ trunk/tp/tests/coverage/tests-parser.txt    2017-05-17 21:10:02 UTC (rev 
7793)
@@ -6,4 +6,3 @@
 # test below skipped because of different results with XSParagraph
 #formatting_utf8_enable_encoding formatting_utf8.texi --enable-encoding
 formatting_fr formatting.texi --document-language fr
-formatting_cr formatting-cr.texi

Deleted: trunk/tp/tests/test_scripts/coverage_formatting_cr.sh
===================================================================
--- trunk/tp/tests/test_scripts/coverage_formatting_cr.sh       2017-05-17 
20:34:55 UTC (rev 7792)
+++ trunk/tp/tests/test_scripts/coverage_formatting_cr.sh       2017-05-17 
21:10:02 UTC (rev 7793)
@@ -1,27 +0,0 @@
-#! /bin/sh
-# This file generated by maintain/regenerate_cmd_tests.sh
-
-if test z"$srcdir" = "z"; then
-  srcdir=.
-fi
-
-command=run_parser_all.sh
-one_test_logs_dir=test_log
-diffs_dir=diffs
-
-
-dir=coverage
-arg='formatting_cr'
-name='formatting_cr'
-[ -d "$dir" ] || mkdir $dir
-
-srcdir_test=$dir; export srcdir_test;
-"$srcdir"/"$command" -dir $dir $arg
-exit_status=$?
-cat $dir/$one_test_logs_dir/$name.log
-if test -f $dir/$diffs_dir/$name.diff; then
-  echo 
-  cat $dir/$diffs_dir/$name.diff
-fi
-exit $exit_status
-