Index: /lang/perl/Text-MicroTemplate/trunk/t/04-multiline.t
===================================================================
--- /lang/perl/Text-MicroTemplate/trunk/t/04-multiline.t (revision 26831)
+++ /lang/perl/Text-MicroTemplate/trunk/t/04-multiline.t (revision 27051)
@@ -1,5 +1,5 @@
 use strict;
 use warnings;
-use Test::More tests => 7;
+use Test::More tests => 4;
 use Text::MicroTemplate qw(:all);
 
@@ -14,14 +14,4 @@
 };
 
-# raw expr (expected behaviour from code)
-do {
-    my $y;
-    is render_mt(<<'...', sub { $y = 1 })->as_string, "abc 1 def\n", 'multiline rawexpr';
-abc <?=r 1
- $_[0]->() ?> def
-...
-    ok $y;
-};
-
 # automatic semicolon insertion
 is render_mt(<<'...')->as_string, "abc\n1\n-1\ndef\n", 'expr auto-sci';
@@ -29,10 +19,4 @@
 ?= 1
 ?= -1
-def
-...
-is render_mt(<<'...')->as_string, "abc\n1\n-1\ndef\n", 'expr auto-sci';
-abc
-?=r 1
-?=r -1
 def
 ...
Index: /lang/perl/Text-MicroTemplate/trunk/t/03-modes.t
===================================================================
--- /lang/perl/Text-MicroTemplate/trunk/t/03-modes.t (revision 26831)
+++ /lang/perl/Text-MicroTemplate/trunk/t/03-modes.t (revision 27051)
@@ -1,5 +1,5 @@
 use strict;
 use warnings;
-use Test::More tests => 8;
+use Test::More tests => 6;
 use Text::MicroTemplate qw(:all);
 
@@ -16,8 +16,6 @@
 do {
     is render_mt('<?= $_[0] ?>', 'foo<a')->as_string, 'foo&lt;a';
-    is render_mt('<?=r $_[0] ?>', 'foo<a')->as_string, 'foo<a';
     my $rs = encoded_string('foo<a');
     is render_mt('<?= $_[0] ?>', $rs)->as_string, 'foo<a';
-    is render_mt('<?=r $_[0] ?>', $rs)->as_string, 'foo<a';
 };
 do {
Index: /lang/perl/Text-MicroTemplate/trunk/lib/Text/MicroTemplate.pm
===================================================================
--- /lang/perl/Text-MicroTemplate/trunk/lib/Text/MicroTemplate.pm (revision 27003)
+++ /lang/perl/Text-MicroTemplate/trunk/lib/Text/MicroTemplate.pm (revision 27051)
@@ -25,5 +25,4 @@
         comment_mark        => '#',
         expression_mark     => '=',
-        raw_expression_mark => '=r',
         line_start          => '?',
         template            => undef,
@@ -122,10 +121,4 @@
                 $lines[-1] .= "\$_MT_T = scalar $value; \$_MT .= ref \$_MT_T eq 'Text::MicroTemplate::EncodedString' ? \$\$_MT_T : $escape_func(\$_MT_T);";
             }
-
-            # Raw Expression
-            if ($type eq 'raw_expr') {
-                
-                $lines[-1] .= "\$_MT_T = $value; \$_MT .= ref \$_MT_T eq q(Text::MicroTemplate::EncodedString) ? \$\$_MT_T : \$_MT_T;";
-            }
         }
     }
@@ -160,5 +153,4 @@
     my $cmnt_mark     = quotemeta $self->{comment_mark};
     my $expr_mark     = quotemeta $self->{expression_mark};
-    my $raw_expr_mark = quotemeta $self->{raw_expression_mark};
 
     # Tokenize
@@ -191,14 +183,4 @@
         }
 
-        # Perl line with raw return value
-        if ($line =~ /^$line_start$raw_expr_mark\s+(.+)$/) {
-            push @{$self->{tree}}, [
-                'raw_expr', $1,
-                $newline ? ('text', "\n") : (),
-            ];
-            $multiline_expression = 0;
-            next;
-        }
-
         # Comment line, dummy token needed for line count
         if ($line =~ /^$line_start$cmnt_mark\s+$/) {
@@ -231,6 +213,4 @@
         for my $token (split /
             (
-                $tag_start$raw_expr_mark # Raw Expression
-            |
                 $tag_start$expr_mark     # Expression
             |
@@ -258,9 +238,4 @@
             elsif ($token =~ /^$tag_start$cmnt_mark$/) { $state = 'cmnt' }
 
-            # Raw Expression
-            elsif ($token =~ /^$tag_start$raw_expr_mark$/) {
-                $state = 'raw_expr';
-            }
-
             # Expression
             elsif ($token =~ /^$tag_start$expr_mark$/) {
@@ -278,5 +253,5 @@
                 $state = 'code' if $multiline_expression;
                 $multiline_expression = 1
-                    if $state eq 'expr' || $state eq 'raw_expr';
+                    if $state eq 'expr';
 
                 # Store value
@@ -487,8 +462,4 @@
     ?= $expr                 (per-line)
 
-    # output the result expression without escape (tag style)
-    <?=r $raw_str ?>
-    ?=r $raw_str
-
     # execute perl code (tag style)
     <? foo() ?>