Merge branch 'master' into _scs_scs

1 files changed, 4 insertions, 3 deletions

diff --git a/perl/Locale/Po4a/Text.pm b/perl/Locale/Po4a/Text.pm
index 676363d..bbb78af 100644
--- a/perl/Locale/Po4a/Text.pm
+++ b/perl/Locale/Po4a/Text.pm
@@ -25,11 +25,11 @@
 
 =head1 NAME
 
-Locale::Po4a::Text - Convert text documents from/to PO files
+Locale::Po4a::Text - convert text documents from/to PO files
 
 =head1 DESCRIPTION
 
-The po4a (po for anything) project goal is to ease translations (and more
+The po4a (PO for anything) project goal is to ease translations (and more
 interestingly, the maintenance of translations) using gettext tools on
 areas where they were not expected like documentation.
 
@@ -202,7 +202,7 @@ sub parse {
     my $end_of_paragraph = 0;
     ($line,$ref)=$self->shiftline();
     my $file = $ref;
-    $file =~ s/:[0-9]+$//;
+    $file =~ s/:[0-9]+$// if defined($line);
     while (defined($line)) {
         $ref =~ m/^(.*):[0-9]+$/;
         if ($1 ne $file) {
@@ -651,6 +651,7 @@ sub parse {
                 or $paragraph =~ /^\$(\S+[{}]\S*\s*)+/ms # Xapian macro
                 or $paragraph =~ /<(?![a-z]+[:@])/ms     # maybe html (tags but not wiki <URI>)
                 or $paragraph =~ /^[^<]+>/ms             # maybe html (tag with vertical space)
+                or $paragraph =~ /\S  $/ms               # explicit newline
                 or $paragraph =~ /\[\[\!\S[^\]]+$/ms     # macro begin
             );
         }