Changeset 4941

Timestamp:

09/15/09 21:35:59 (2 years ago)

Author:

MichaelTempest

Message:

Item1980: Fix the sticky-inside-verbatim case by noting that there is no need to encode the characters for $TT0, $TT1 and TT2 - they should all be removed by the end of the conversion.

Added an explicit check to ensure that there are no more of $TT0, $TT1 and $TT2 after conversion to HTML completes, and throw an exception if it there is. That gives users a chance to save their work.

Location:

trunk/WysiwygPlugin

Files:

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

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

@@ -555 +555 @@
 
     # Look for combinations of sticky and other markup that cause problems together
-    for my $tag ('verbatim', 'literal', keys %xmltag) {
+    for my $tag ('literal', keys %xmltag) {
         while ($text =~ /<$tag\b[^>]*>(.*?)<\/$tag>/gsi) {
             my $inner = $1;

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

@@ -36 +36 @@
 
 use CGI qw( -any );
+use Error qw( :try );
 
 use Foswiki;
@@ -101 +102 @@
     # Substitute back in protected elements
     $content = $this->_dropBack($content);
+
+    if ($content =~ /[$TT0$TT1$TT2]/o) {
+        # There should never be any of these in the text at this point.
+        # If there are, then the conversion failed. 
+        # Encode the original TML as verbatim-style HTML and include it
+        # in an error log, so that the user at least has a chance to save
+        # his/her work.
+        my $originalContent = $_[1];
+        $originalContent =~ s/[$TT0$TT1$TT2]/?/go;
+        $originalContent = _protectVerbatimChars($originalContent);
+        $originalContent =~ s{/}{'&#'.ord('/').';'}ge; # </tag> looks like a path, but it isn't
+        throw Error::Simple( 'Conversion to HTML failed. TML:<br />'.$originalContent );
+    }
 
     # DEBUG
@@ -538 +552 @@
 sub _protectVerbatimChars {
     my $text = shift;
-    $text =~ s/([\000-\011\013-\037<&>'"])/'&#'.ord($1).';'/ges;
+    # $TT0, $TT1 and $TT2 are chr(0), chr(1) and chr(2), respectively. 
+    # They are handled specially, elsewhere
+    $text =~ s/([\003-\011\013-\037<&>'"])/'&#'.ord($1).';'/ges;
     $text =~ s/ /&nbsp;/g;
     $text =~ s/\n/<br \/>/gs;

trunk/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm

@@ -1652 +1652 @@
     },
     {
-        exec => $ROUNDTRIP | $CANNOTWYSIWYG, # SMELL: Fix this case
+        exec => $HTML2TML | $ROUNDTRIP,
         name => 'stickyInsideVerbatimItem1980',
         tml  => <<'GLUED',
@@ -2158 +2158 @@
 
     my $txer = new Foswiki::Plugins::WysiwygPlugin::TML2HTML();
-    my $html = $txer->convert(
-        $tml,
-        $this->TML_HTMLconverterOptions()
-    );
+    # This conversion can throw an exception. 
+    # This might be expected if $args->{exec} also has $CANNOTWYSIWYG set
+    my $html = eval {
+        $txer->convert(
+            $tml,
+            $this->TML_HTMLconverterOptions()
+        );
+    };
+    $html = $@ if $@;
 
     $txer = new Foswiki::Plugins::WysiwygPlugin::HTML2TML();