Changeset 5502

Timestamp:

11/12/09 18:36:27 (2 years ago)

Author:

MichaelTempest

Message:

Item2352: Use Foswiki's regex instead of a hard-coded regex, so that WysiwygPlugin will always "see" macros in the same way as Foswiki's renderer.

Location:

branches/Release01x00/WysiwygPlugin

Files:

• lib/Foswiki/Plugins/WysiwygPlugin/TML2HTML.pm (modified) (2 diffs)
• test/unit/WysiwygPlugin/TranslatorTests.pm (modified) (1 diff)

branches/Release01x00/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/TML2HTML.pm

@@ -197 +197 @@
             if ( $token eq '%' && $stackTop =~ /}$/ ) {
                 while ( scalar(@stack)
-                    && $stackTop !~ /^\n?%([A-Z0-9_:]+){.*}$/os )
+                    && $stackTop !~ /^\n?%($Foswiki::regex{tagNameRegex}){.*}$/os )
                 {
                     $stackTop = pop(@stack) . $stackTop;
@@ -203 +203 @@
             }
             if (   $token eq '%'
-                && $stackTop =~ m/^(\n?)%([A-Z0-9_:]+)({.*})?$/os )
+                && $stackTop =~ m/^(\n?)%($Foswiki::regex{tagNameRegex})({.*})?$/os )
             {
                 my $nl = $1;

branches/Release01x00/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm

@@ -1315 +1315 @@
         tml  => "fred *%WIKINAME%* fred",
         html => "<p>fred <b>$protecton%WIKINAME%$protectoff</b> fred</p>",
+    },
+    {
+        exec => $TML2HTML | $ROUNDTRIP,
+        name => 'Item2352',
+        tml  => '%Foo%',
+        html => "<p>" . $protecton . '%Foo%' . $protectoff . "</p>"
     },
     {