Changeset 4930 for trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin.pm

Timestamp:

09/15/09 05:41:18 (3 years ago)

Author:

MichaelTempest

Message:

Item1980: First, do no harm

• Let notWyswiwygEditable() check for specific problematic content that is corrupted by a roundtrip tml => html => tml conversion
• Add unit tests for (some of the) content that is corrupted
• In unit tests, check that notWysiwygEditable()'s result is consistent with the success or failure of roundtrip conversions
• Refactor the ExtendedTranslatorTests to reduce duplicated code.

File:

• trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin.pm (modified) (1 diff)

trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin.pm

@@ -510 +510 @@
           || '';
     }
-    return 0 unless $exclusions;
-
-    my $calls_ok = Foswiki::Func::getPreferencesValue('WYSIWYG_EDITABLE_CALLS')
-      || '---';
-    $calls_ok =~ s/\s//g;
-
-    my $ok = 1;
-    if (   $exclusions =~ /calls/
-        && $_[0] =~ /%((?!($calls_ok){)[A-Z_]+{.*?})%/s )
-    {
-        print STDERR "WYSIWYG_DEBUG: has calls $1 (not in $calls_ok)\n"
-          if (WHY);
-        return "Text contains calls";
-    }
-    if ( $exclusions =~ /(macros|variables)/ && $_[0] =~ /%([A-Z_]+)%/s ) {
-        print STDERR "$exclusions WYSIWYG_DEBUG: has macros $1\n"
-          if (WHY);
-        return "Text contains macros";
-    }
-    if (   $exclusions =~ /html/
-        && $_[0] =~ /<\/?((?!literal|verbatim|noautolink|nop|br)\w+)/ )
-    {
-        print STDERR "WYSIWYG_DEBUG: has html: $1\n"
-          if (WHY);
-        return "Text contains HTML";
-    }
-    if ( $exclusions =~ /comments/ && $_[0] =~ /<[!]--/ ) {
-        print STDERR "WYSIWYG_DEBUG: has comments\n"
-          if (WHY);
-        return "Text contains comments";
-    }
-    if ( $exclusions =~ /pre/ && $_[0] =~ /<pre\w/ ) {
-        print STDERR "WYSIWYG_DEBUG: has pre\n"
-          if (WHY);
-        return "Text contains PRE";
-    }
+
+    # Check for explicit exclusions before generic, non-configurable 
+    # purely content-related reasons for exclusion
+    if ($exclusions) {
+        my $calls_ok = Foswiki::Func::getPreferencesValue('WYSIWYG_EDITABLE_CALLS')
+          || '---';
+        $calls_ok =~ s/\s//g;
+
+        my $ok = 1;
+        if (   $exclusions =~ /calls/
+            && $_[0] =~ /%((?!($calls_ok){)[A-Z_]+{.*?})%/s )
+        {
+            print STDERR "WYSIWYG_DEBUG: has calls $1 (not in $calls_ok)\n"
+              if (WHY);
+            return "Text contains calls";
+        }
+        if ( $exclusions =~ /(macros|variables)/ && $_[0] =~ /%([A-Z_]+)%/s ) {
+            print STDERR "$exclusions WYSIWYG_DEBUG: has macros $1\n"
+              if (WHY);
+            return "Text contains macros";
+        }
+        if (   $exclusions =~ /html/
+            && $_[0] =~ /<\/?((?!literal|verbatim|noautolink|nop|br)\w+)/ )
+        {
+            print STDERR "WYSIWYG_DEBUG: has html: $1\n"
+              if (WHY);
+            return "Text contains HTML";
+        }
+        if ( $exclusions =~ /comments/ && $_[0] =~ /<[!]--/ ) {
+            print STDERR "WYSIWYG_DEBUG: has comments\n"
+              if (WHY);
+            return "Text contains comments";
+        }
+        if ( $exclusions =~ /pre/ && $_[0] =~ /<pre\w/ ) {
+            print STDERR "WYSIWYG_DEBUG: has pre\n"
+              if (WHY);
+            return "Text contains PRE";
+        }
+    }
+
+    # Copy the content. 
+    # Then crunch verbatim blocks, because verbatim blocks may contain *anything*.
+    my $text = $_[0];
+
+    # Look for combinations of sticky and other markup that cause problems together
+    for my $tag ('verbatim', 'literal', keys %xmltag) {
+        while ($text =~ /<$tag\b[^>]*>(.*?)<\/$tag>/gsi) {
+            my $inner = $1;
+            if ($inner =~ /<sticky\b[^>]*>/i) {
+                print STDERR "WYSIWYG_DEBUG: <sticky> inside <$tag>\n"
+                  if (WHY);
+                return "<sticky> inside <$tag>";
+            }
+        }
+    }
+
+    my $wasAVerbatimTag = "\000verbatim\001";
+    while ($text =~ s/<verbatim\b[^>]*>(.*?)<\/verbatim>/$wasAVerbatimTag/i) {
+        #my $content = $1;
+        # If there is any content that breaks conversion if it is inside a verbatim block, 
+        # check for it here:
+    }
+
+    # Look for combinations of verbatim and other markup that cause problems together
+    for my $tag ('literal', keys %xmltag) {
+        while ($text =~ /<$tag\b[^>]*>(.*?)<\/$tag>/gsi) {
+            my $inner = $1;
+            if ($inner =~ /$wasAVerbatimTag/i) {
+                print STDERR "WYSIWYG_DEBUG: <verbatim> inside <$tag>\n"
+                  if (WHY);
+                return "<verbatim> inside <$tag>";
+            }
+        }
+    }
+
+    # Look for combinations of literal and other markup that cause problems together
+    for my $tag (keys %xmltag) {
+        while ($text =~ /<$tag\b[^>]*>(.*?)<\/$tag>/gsi) {
+            my $inner = $1;
+            if ($inner =~ /<literal\b[^>]*>/i) {
+                print STDERR "WYSIWYG_DEBUG: <literal> inside <$tag>\n"
+                  if (WHY);
+                return "<literal> inside <$tag>";
+            }
+        }
+    }
+
     return 0;
 }