Item13490: merge out from 2.0.0 core

data/System/TablesContrib.txt

@@ -7,7 +7,7 @@ One line description, required for extensions repository catalog.
 
 %SHORTDESCRIPTION%
 
-Foswiki 1.2.0 introduces a new internal API that supports the parsing and modelling of in-topic tables, designed to canonicalise the handling of tables in the core and extensions. This module makes this tables code available to extensions running under Foswiki versions prior to 1.2.
+Foswiki 2.0 introduces a new internal API that supports the parsing and modelling of in-topic tables, designed to canonicalise the handling of tables in the core and extensions. This module makes this tables code available to extensions running under Foswiki versions prior to 1.2.
 
 %TOC%
 

lib/Foswiki/Tables/Reader.pm

@@ -81,8 +81,16 @@ sub new {
     }
 
     my $this = {
+
+        # Class used to construct tables
         table_class => $table_class,
-        macro       => $table_class->getMacro()
+
+        # 'extra' macro, besides TABLE
+        macro => $table_class->getMacro(),
+
+        # List of lines waiting for inclusion in the output,
+        # as generated by the early_line handler.
+        waiting => undef
     };
 
     return bless( $this, $class );
@@ -147,25 +155,40 @@ sub parse {
 # Parser event handler
 # Detect and process the macro recognised by the table class (e.g. EDITTABLE).
 # This is recorded as "pending" so it can be applied to the next table read.
-# Also procss and remember attributes from the generic TABLE macro.
+# Also process and remember attributes from the generic TABLE macro.
 sub early_line {
     my ( $this, $line ) = @_;
     @{ $this->{waiting} } = ();
 
     return 0 unless $this->{meta};
 
-    # Process the generic TABLE attributes, and replace whatever was
-    # there already
-    my $args = Foswiki::Attrs::findFirstOccurenceAttrs( 'TABLE', $line );
-    if ($args) {
-        $args = $this->{meta}->expandMacros($args);
-        $this->{TABLE} = Foswiki::Attrs->new($args);
+    # Process generic (EDIT)?TABLE attributes.
+    # There may be several on the line (yuck)
+    my $ok = 0;
+    while ( $line =~ /%(TABLE|$this->{macro})(\{.*?\})?%/s ) {
+        $ok = 1 if $this->_early_line( $line, $1 );
+    }
+    push( @{ $this->{waiting} }, $line ) if $ok && length($line);
+    return $ok;
+}
+
+sub _early_line {
+    my ( $this, $line, $macro ) = @_;
+
+    my $args = Foswiki::Attrs::findFirstOccurenceAttrs( $macro, $line );
+    return 0 unless defined $args;    # whoops
+
+    # Remember leading junk, keep trailing for further processing
+    unless ( $_[1] =~ s/^(.*?)(\%$macro(?:\Q{$args}\E)?%)//s ) {
+        ASSERT( 0, "$macro in $line" ) if DEBUG;
     }
 
-    # Can we get a balanced macro expression from the text?
-    $args = Foswiki::Attrs::findFirstOccurenceAttrs( $this->{macro}, $line );
-    return 0 unless ( defined $args );
+    my $spec = $2;
+    push( @{ $this->{waiting} }, $1 ) if length($1);
+
     $args = $this->{meta}->expandMacros($args);
+    $this->{TABLE} = Foswiki::Attrs->new($args);
+
     my $attrs = Foswiki::Attrs->new($args);
 
     # Add attributes from the last TABLE macro seen
@@ -174,14 +197,6 @@ sub early_line {
         delete $this->{TABLE};
     }
 
-    # Remember leading and trailing junk
-    my $ok = $line =~ m/^(.*?)(\%$this->{macro}(?:\Q{$args}\E)?%)(.*)$/s;
-    ASSERT($ok) if DEBUG;
-
-    push( @{ $this->{waiting} }, $1 ) if defined($1) && length($1);
-    my $spec = $2;
-    push( @{ $this->{waiting} }, $3 ) if defined($3) && length($3);
-
     my %read = ( $this->{meta}->getPath() => 1 );
     my $session = $this->{meta}->session;
     while ( $attrs->{include} ) {

lib/Foswiki/Tables/Row.pm

@@ -121,7 +121,7 @@ sub isHeader {
             }
         }
     }
-    return $this->{isHeader};
+    return $this->{isHeader} || 0;
 }
 
 =begin TML
@@ -136,7 +136,7 @@ sub isFooter {
     if ($set) {
         $this->{isFooter} = $set;
     }
-    return $this->{isFooter};
+    return $this->{isFooter} || 0;
 }
 
 =begin TML
@@ -195,8 +195,8 @@ sub setRow {
         if ( $n < scalar( @{ $this->{cols} } ) ) {
 
             # Restore the EDITCELL from the old value, if present
-            if (   $val !~ /%EDITCELL{.*?}%/
-                && $this->{cols}->[$n]->{text} =~ m/(%EDITCELL{.*?}%)/ )
+            if (   $val !~ /%EDITCELL\{.*?\}%/
+                && $this->{cols}->[$n]->{text} =~ m/(%EDITCELL\{.*?\}%)/ )
             {
                 $val .= $1;
             }

lib/Foswiki/Tables/Table.pm

@@ -76,7 +76,6 @@ The following entries in attrs are supported:
 
 sub new {
     my ( $class, $spec, $attrs ) = @_;
-
     my $this = bless(
         {
             spec   => $spec,
@@ -182,8 +181,8 @@ sub makeConsistent {
 
     my $minRows = $this->getHeaderRows() + $this->getFooterRows();
     if ( $this->totalRows() < $minRows ) {
-        if ( defined $this->{headerrows} ) {
-            while ( $this->totalRows() < $this->{headerrows} ) {
+        if ( $this->getHeaderRows() ) {
+            while ( $this->totalRows() < $this->getHeaderRows() ) {
                 my @vals =
                   map { "*$_->{initial_value}*" } @{ $this->{colTypes} };
                 push( @vals, '*?*' ) unless scalar(@vals);