Changeset 5573 for trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm

Timestamp:

11/18/09 06:27:14 (3 years ago)

Author:

MichaelTempest

Message:

Item2369: Add rowspan support to the WYSIWYG editor
This also fixed a bug in how Web.WikiWord links are rendered, if the link is the only text in the table cell.

Tables are no longer "normalised" when converting from HTML to TML by appending |'s so that every row has the same number of |'s. The logic to do so when supporting rowspans is complex (read: likely to be buggy) and the "normalisation" feature is seldom used (it only had any effect if the HTML has a table with a hole in it.) Taking out the normalisation does not result in loss of content.

File:

• trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm (modified) (9 diffs)

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

@@ -823 +823 @@
 }
 
-# probe down into a list type to determine if it
+# probe down into a table to determine if it
 # can be converted to TML.
 sub _isConvertableTable {
@@ -831 +831 @@
         return 0;
     }
+
+    my $rowspan = undef;
+    $rowspan    = [] if Foswiki::Func::getContext()->{'TablePluginEnabled'};
 
     my $kid = $this->{head};
@@ -843 +846 @@
                 return 0;
             }
-            my $row = $kid->_isConvertableTableRow($options);
+            my $row = $kid->_isConvertableTableRow( $options, $rowspan );
             unless ($row) {
                 return 0;
@@ -850 +853 @@
         }
         $kid = $kid->{next};
+    }
+
+    if ( $rowspan and grep { $_ } @$rowspan ) {
+
+        # One or more cells span rows past the last row in the table.
+        # This is a defect in the HTML table which TML cannot represent.
+        return 0;
     }
     return 1;
@@ -865 +875 @@
 }
 
-# probe down into a list item to determine if the
+# probe down into a table row to determine if the
 # containing table can be converted to TML.
 sub _isConvertableTableRow {
-    my ( $this, $options ) = @_;
+    my ( $this, $options, $rowspan ) = @_;
 
     return 0 if ( $this->_isProtectedByAttrs() );
@@ -876 +886 @@
     my $ignoreCols = 0;
     my $kid        = $this->{head};
+    my $colIdx     = 0;
+    while ( $rowspan and $rowspan->[$colIdx] ) {
+        push @row, $WC::NBSP . '^' . $WC::NBSP;
+        $rowspan->[$colIdx]--;
+        $colIdx++;
+    }
     while ($kid) {
         if ( $kid->{tag} eq 'th' ) {
@@ -913 +929 @@
             }
             if ( $kid->{attrs}->{rowspan} && $kid->{attrs}->{rowspan} > 1 ) {
-                return 0;
+                return 0 unless $rowspan;
+                $rowspan->[$colIdx] = $kid->{attrs}->{rowspan} - 1;
             }
         }
@@ -937 +954 @@
         # Pad to allow wikiwords to work
         push( @row, $text );
+        $colIdx++;
         while ( $ignoreCols > 1 ) {
+            if ( $rowspan and $rowspan->[$colIdx] ) {
+
+                # rowspan and colspan into the same cell
+                return 0;
+            }
             push( @row, '' );
             $ignoreCols--;
+            $colIdx++;
+        }
+        while ( $rowspan and $rowspan->[$colIdx] ) {
+            push @row, $WC::NBSP . '^' . $WC::NBSP;
+            $rowspan->[$colIdx]--;
+            $colIdx++;
         }
         $kid = $kid->{next};
@@ -1565 +1594 @@
         \@table );
 
-    my $maxrow = 0;
-    my $row;
-    foreach $row (@table) {
-        my $rw = scalar(@$row);
-        $maxrow = $rw if ( $rw > $maxrow );
-    }
-    foreach $row (@table) {
-        while ( scalar(@$row) < $maxrow ) {
-            push( @$row, '' );
-        }
-    }
     my $text = $WC::CHECKn;
-    foreach $row (@table) {
+    foreach my $row (@table) {
 
         # isConvertableTableRow has already formatted the cell