From fb11d849ffed76a34d6e849e37fddace1894a48a Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 23 Oct 2008 00:47:12 +0200 Subject: Disable wrap on macro begin at middle of a line. --- perl/Locale/Po4a/Text.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'perl/Locale/Po4a/Text.pm') diff --git a/perl/Locale/Po4a/Text.pm b/perl/Locale/Po4a/Text.pm index ee56046..32f9dec 100644 --- a/perl/Locale/Po4a/Text.pm +++ b/perl/Locale/Po4a/Text.pm @@ -247,7 +247,7 @@ sub parse { or $paragraph =~ /^\$(\S+[{}]\S*\s*)+/ms # Xapian macro or $paragraph =~ /<(?![a-z]+[:@])/ms # maybe html (tags but not wiki ) or $paragraph =~ /^[^<]+>/ms # maybe html (tag with vertical space) - or $paragraph =~ /^\s*\[\[\!\S[^\]]+$/ms # macro begin + or $paragraph =~ /\[\[\!\S[^\]]+$/ms # macro begin ); } if ($end_of_paragraph) { -- cgit v1.2.3 From e35add35a02e84a99b83a4090870ac634e344ca6 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 23 Oct 2008 01:06:18 +0200 Subject: Drop superfluous /ms regex extensions. --- perl/Locale/Po4a/Text.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'perl/Locale/Po4a/Text.pm') diff --git a/perl/Locale/Po4a/Text.pm b/perl/Locale/Po4a/Text.pm index 32f9dec..0caec0b 100644 --- a/perl/Locale/Po4a/Text.pm +++ b/perl/Locale/Po4a/Text.pm @@ -242,12 +242,12 @@ sub parse { if ($markdown) { # Some Markdown markup can (or might) not survive wrapping $wrapped_mode = 0 if ( - $paragraph =~ /^>/ms # blockquote - or $paragraph =~ /^( {8}|\t)/ms # monospaced - or $paragraph =~ /^\$(\S+[{}]\S*\s*)+/ms # Xapian macro - or $paragraph =~ /<(?![a-z]+[:@])/ms # maybe html (tags but not wiki ) - or $paragraph =~ /^[^<]+>/ms # maybe html (tag with vertical space) - or $paragraph =~ /\[\[\!\S[^\]]+$/ms # macro begin + $paragraph =~ /^>/ # blockquote + or $paragraph =~ /^( {8}|\t)/ # monospaced + or $paragraph =~ /^\$(\S+[{}]\S*\s*)+/ # Xapian macro + or $paragraph =~ /<(?![a-z]+[:@])/ # maybe html (tags but not wiki ) + or $paragraph =~ /^[^<]+>/ # maybe html (tag with vertical space) + or $paragraph =~ /\[\[\!\S[^\]]+$/ # macro begin ); } if ($end_of_paragraph) { -- cgit v1.2.3 From 74a1a276366acb235e5312feeecf89a696898a32 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 23 Oct 2008 13:25:30 +0200 Subject: Revert "Drop superfluous /ms regex extensions." It is indeed needed for templates. This reverts commit e35add35a02e84a99b83a4090870ac634e344ca6. --- perl/Locale/Po4a/Text.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'perl/Locale/Po4a/Text.pm') diff --git a/perl/Locale/Po4a/Text.pm b/perl/Locale/Po4a/Text.pm index 0caec0b..32f9dec 100644 --- a/perl/Locale/Po4a/Text.pm +++ b/perl/Locale/Po4a/Text.pm @@ -242,12 +242,12 @@ sub parse { if ($markdown) { # Some Markdown markup can (or might) not survive wrapping $wrapped_mode = 0 if ( - $paragraph =~ /^>/ # blockquote - or $paragraph =~ /^( {8}|\t)/ # monospaced - or $paragraph =~ /^\$(\S+[{}]\S*\s*)+/ # Xapian macro - or $paragraph =~ /<(?![a-z]+[:@])/ # maybe html (tags but not wiki ) - or $paragraph =~ /^[^<]+>/ # maybe html (tag with vertical space) - or $paragraph =~ /\[\[\!\S[^\]]+$/ # macro begin + $paragraph =~ /^>/ms # blockquote + or $paragraph =~ /^( {8}|\t)/ms # monospaced + or $paragraph =~ /^\$(\S+[{}]\S*\s*)+/ms # Xapian macro + or $paragraph =~ /<(?![a-z]+[:@])/ms # maybe html (tags but not wiki ) + or $paragraph =~ /^[^<]+>/ms # maybe html (tag with vertical space) + or $paragraph =~ /\[\[\!\S[^\]]+$/ms # macro begin ); } if ($end_of_paragraph) { -- cgit v1.2.3