[Po4a-commits] r2299 - in /branches/manpage: debian/changelog debian/control lib/Locale/Po4a/Text.pm

[taffit-guest at users.alioth.debian.org]

Author: taffit-guest
Date: Mon Oct 25 00:50:46 2010
New Revision: 2299

URL: http://svn.debian.org/wsvn/po4a/?sc=1&rev=2299
Log:
merge last trunk changes to branches/manpage

Modified:
    branches/manpage/debian/changelog
    branches/manpage/debian/control
    branches/manpage/lib/Locale/Po4a/Text.pm

Modified: branches/manpage/debian/changelog
URL: http://svn.debian.org/wsvn/po4a/branches/manpage/debian/changelog?rev=2299&op=diff
==============================================================================
--- branches/manpage/debian/changelog (original)
+++ branches/manpage/debian/changelog Mon Oct 25 00:50:46 2010
@@ -23,7 +23,11 @@
   [ Updated program translations ]
   * Vietnamese, by Clytie Siddall (Closes: #598560)
 
- -- David Prévot <david at tilapin.org>  Thu, 30 Sep 2010 09:15:48 -0400
+  [ Jonas Smedegaard ]
+  * Add myself as uploader
+  * Fix preserve force-break (trailing space) in markdown mode of Text module.
+
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Wed, 25 Aug 2010 23:16:59 +0200
 
 po4a (0.40.1-1) unstable; urgency=low
 

Modified: branches/manpage/debian/control
URL: http://svn.debian.org/wsvn/po4a/branches/manpage/debian/control?rev=2299&op=diff
==============================================================================
--- branches/manpage/debian/control (original)
+++ branches/manpage/debian/control Mon Oct 25 00:50:46 2010
@@ -2,7 +2,9 @@
 Section: text
 Priority: optional
 Maintainer: Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>
-Uploaders: Martin Quinson <mquinson at debian.org>, Neil Williams <codehelp at debian.org>
+Uploaders: Martin Quinson <mquinson at debian.org>,
+ Neil Williams <codehelp at debian.org>,
+ Jonas Smedegaard <dr at jones.dk>
 Standards-Version: 3.8.4
 Build-Depends-Indep: perl-modules (>= 5.10.0-16), docbook-xml, docbook-xsl, 
  gettext (>= 0.16), libmodule-build-perl, libterm-readkey-perl, sgmlspl, xsltproc

Modified: branches/manpage/lib/Locale/Po4a/Text.pm
URL: http://svn.debian.org/wsvn/po4a/branches/manpage/lib/Locale/Po4a/Text.pm?rev=2299&op=diff
==============================================================================
--- branches/manpage/lib/Locale/Po4a/Text.pm (original)
+++ branches/manpage/lib/Locale/Po4a/Text.pm Mon Oct 25 00:50:46 2010
@@ -652,6 +652,7 @@
                 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
             );
         }