Changeset 3900

Timestamp:

05/13/09 20:16:40 (3 years ago)

Author:

MichaelTempest

Message:

Item1535, Item1397: Merge changes from trunk to release branch

Location:

branches/Release01x00/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin

Files:

• HTML2TML.pm (modified) (2 diffs)
• HTML2TML/Node.pm (modified) (5 diffs)
• TML2HTML.pm (modified) (2 diffs)

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

@@ -66 +66 @@
 
     my $this = new HTML::Parser(
-        start_h       => [ \&_openTag,  'self,tagname,attr' ],
-        end_h         => [ \&_closeTag, 'self,tagname' ],
-        declaration_h => [ \&_ignore,   'self' ],
-        default_h     => [ \&_text,     'self,text' ],
-        comment_h     => [ \&_comment,  'self,text' ]
+        start_h          => [ \&_openTag,  'self,tagname,attr' ],
+        end_h            => [ \&_closeTag, 'self,tagname' ],
+        text_h           => [ \&_text,     'self,text' ],
+        comment_h        => [ \&_comment,  'self,text' ],
+        declaration_h    => [ \&_ignore,   'self' ],
+        start_document_h => [ \&_ignore,   'self' ],
+        end_document_h   => [ \&_ignore,   'self' ],
+        default_h        => [ \&_default,  'self,event,text' ]
     );
 
@@ -220 +223 @@
 }
 
+sub _default {
+        my ( $this, $event, $text ) = @_;
+    # Unexpected $event event from HTML::Parser; text contains '$text'
+        ASSERT(0);
+}
+
 sub _apply {
     my ( $this, $tag ) = @_;

branches/Release01x00/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm

@@ -363 +363 @@
 
 # Collapse adjacent VERBATIM nodes together
-# Collapse a <p> than contains only a protected span into a protected P
+# Collapse a <p> that contains only a protected span into a protected P
 # Collapse em in em
 # Collapse adjacent text nodes
@@ -444 +444 @@
 }
 
+# If this node has the specified class, insert a new "span" node with that
+# class between this node and all of this node's children.
+sub _moveClassToSpan
+{
+    my $this = shift;
+    my $class = shift;
+
+    if ( $this->{tag} and 
+         lc($this->{tag}) ne 'span' and
+         $this->_removeClass($class) ) {
+         
+        my $newspan = new Foswiki::Plugins::WysiwygPlugin::HTML2TML::Node( $this->{context}, 'span', { class => $class } );
+        my $kid = $this->{head};
+        while ($kid) {
+            $newspan->addChild($kid);
+            $kid = $kid->{next};
+        }
+        $this->{head} = $this->{tail} = $newspan;
+    }
+}
+
 # the actual generate function. rootGenerate is only applied to the root node.
 sub generate {
@@ -487 +508 @@
     $tag =~ s/!//;    # DOCTYPE
     my $tmlFn = '_handle' . uc($tag);
+
+    $this->_moveClassToSpan('WYSIWYG_TT');
 
     # See if we have a TML translation function for this tag
@@ -839 +862 @@
     while ($kid) {
         if ( $kid->{tag} eq 'th' ) {
+            $kid->_moveClassToSpan('WYSIWYG_TT');
             ( $flags, $text ) = $kid->_flatten($options);
             $text = _TDtrim($text);
@@ -844 +868 @@
         }
         elsif ( $kid->{tag} eq 'td' ) {
+            $kid->_moveClassToSpan('WYSIWYG_TT');
             ( $flags, $text ) = $kid->_flatten($options);
             $text = _TDtrim($text);

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

@@ -472 +472 @@
       (CGI::span({class => 'WYSIWYG_TT'}, $1))gem;
 
-    # Handle [[][] and [[]] links
+    # Handle [[][]] and [[]] links
 
     # We _not_ support [[http://link text]] syntax
@@ -772 +772 @@
         }
 
-        push( @tr, { fn => $fn, attr => $attr, text => $cell } );
+        $cell = ' '.$cell if $cell =~ /^(?:\*|==?|__?)[^\s]/;
+        $cell = $cell.' ' if $cell =~ /[^\s](?:\*|==?|__?)$/;
+
+        push( @tr, { fn => $fn, attr => $attr, text => $cell } ); 
     }