[Po4a-commits] "po4a/lib/Locale/Po4a Text.pm,1.23,1.24"

[Nicolas FRANCOIS]

Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory alioth:/tmp/cvs-serv31517/lib/Locale/Po4a

Modified Files:
	Text.pm 
Log Message:
	* lib/Locale/Po4a/Text.pm, t/data-30/Lists.po: Added support for
	list items followed by a backslash (item text on teh same line as
	label).


Index: Text.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Text.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Text.pm	24 Oct 2008 21:46:51 -0000	1.23
+++ Text.pm	24 Oct 2008 22:55:44 -0000	1.24
@@ -358,14 +358,13 @@
             undef $self->{bullet};
             undef $self->{indent};
         } elsif ($asciidoc and not defined $self->{verbatim} and
-                 ($line =~ m/^(\s*)(\S.*)((?:::|;;)\s+)(.*)$/)) {
+                 ($line =~ m/^(\s*)([*_+`'#[:alnum:]].*)((?:::|;;|\?\?|:-)(?: *\\)?)$/)) {
             my $indent = $1;
             my $label = $2;
             my $labelend = $3;
-            my $labeltext = $4;
-            # Found Horizontal Labeled Lists
+            # Found labeled list
             do_paragraph($self,$paragraph,$wrapped_mode);
-            $paragraph=$labeltext."\n";
+            $paragraph="";
             $wrapped_mode = 1;
             $self->{bullet} = "";
             $self->{indent} = $indent;
@@ -373,15 +372,16 @@
                                      $self->{ref},
                                      "Labeled list",
                                      "wrap" => 0);
-            $self->pushline("$indent$t$labelend");
+            $self->pushline("$indent$t$labelend\n");
         } elsif ($asciidoc and not defined $self->{verbatim} and
-                 ($line =~ m/^(\s*)([[:alnum:]].*)(::|;;|\?\?|:-)$/)) {
+                 ($line =~ m/^(\s*)(\S.*)((?:::|;;)\s+)(.*)$/)) {
             my $indent = $1;
             my $label = $2;
             my $labelend = $3;
-            # Found labeled list
+            my $labeltext = $4;
+            # Found Horizontal Labeled Lists
             do_paragraph($self,$paragraph,$wrapped_mode);
-            $paragraph="";
+            $paragraph=$labeltext."\n";
             $wrapped_mode = 1;
             $self->{bullet} = "";
             $self->{indent} = $indent;
@@ -389,7 +389,7 @@
                                      $self->{ref},
                                      "Labeled list",
                                      "wrap" => 0);
-            $self->pushline("$indent$t$labelend\n");
+            $self->pushline("$indent$t$labelend");
         } elsif ($asciidoc and not defined $self->{verbatim} and
                  ($line =~ m/^\:(\S.*?)(:\s*)(.*)$/)) {
             my $attrname = $1;