Commits

Shlomi Fish committed 85776dd

All tests in t/01-convert-to-xsl-fo.t pass.

Comments (0)

Files changed (1)

Text-Qantor/lib/Text/Qantor/Parser.pm

 {
     my ($self) = @_;
 
-    my $Para_Text_Wrapper_s = $self->list_of(
-        qr/\n(?!\n)/,
+    my $Para_Text_Wrapper_s = $self->sequence_of(
+        # qr/\n(?!\n)/,
         sub { $self->_parse_Para_Text_Wrapper(); }
     );
 
         qr/\}/,
     );
 
-    return { MACRO_NAME => $name, inner => $inner, };
+    return { Macro_Para_Text => { Raw_Para => $inner, }, };
 }
 
 sub _parse_MACRO_START
 
     my $token = $self->generic_token(
         'Plain_Para_Text' => qr/(?:[^\\\n\{\}]+(?!\n{2})?)/ms,
-        sub { my ($self, $text) = @_; return {Plain_Para_Text => $text}; },
+        sub { my ($self, $text) = @_; return $text; },
     );
 
     my $suffix = '';
-    if ($self->{str} =~ m/\G(?=\n)/gc) {
+    if ($self->maybe(sub { $self->generic_token('Foo' => qr/\n(?!\n)/, sub { 1; } ); } )) {
         $suffix = "\n";
     }
 
         $self->fail();
     }
 
-    $token->{Plain_Para_Text} .= $suffix;
-
-    return $token;
+    return {Plain_Para_Text => $token.$suffix, };
 }
 
 =begin Removed