diff -r de56132c008d -r bdac73ed481e includes/wikiengine/Tables.php
--- a/includes/wikiengine/Tables.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/wikiengine/Tables.php Sun Mar 28 23:10:46 2010 -0400
@@ -30,14 +30,14 @@
function process_tables( $text )
{
- // include some globals, do some parser stuff that would normally be done in the parent parser function
- global $mStripState;
- $x =& $mStripState;
-
- // parse the text
- $text = doTableStuff($text);
+ // include some globals, do some parser stuff that would normally be done in the parent parser function
+ global $mStripState;
+ $x =& $mStripState;
+
+ // parse the text
+ $text = doTableStuff($text);
- return $text;
+ return $text;
}
/**
@@ -48,131 +48,131 @@
* @access private
*/
function doTableStuff( $t ) {
-
- $t = explode ( "\n" , $t ) ;
- $td = array () ; # Is currently a td tag open?
- $ltd = array () ; # Was it TD or TH?
- $tr = array () ; # Is currently a tr tag open?
- $ltr = array () ; # tr attributes
- $has_opened_tr = array(); # Did this table open a
element?
- $indent_level = 0; # indent level of the table
- foreach ( $t AS $k => $x )
- {
- $x = trim ( $x ) ;
- $fc = substr ( $x , 0 , 1 ) ;
- if ( preg_match( '/^(:*)\{\|(.*)$/', $x, $matches ) ) {
- $indent_level = strlen( $matches[1] );
+
+ $t = explode ( "\n" , $t ) ;
+ $td = array () ; # Is currently a td tag open?
+ $ltd = array () ; # Was it TD or TH?
+ $tr = array () ; # Is currently a tr tag open?
+ $ltr = array () ; # tr attributes
+ $has_opened_tr = array(); # Did this table open a
element?
+ $indent_level = 0; # indent level of the table
+ foreach ( $t AS $k => $x )
+ {
+ $x = trim ( $x ) ;
+ $fc = substr ( $x , 0 , 1 ) ;
+ if ( preg_match( '/^(:*)\{\|(.*)$/', $x, $matches ) ) {
+ $indent_level = strlen( $matches[1] );
- $attributes = unstripForHTML( $matches[2] );
+ $attributes = unstripForHTML( $matches[2] );
- $t[$k] = str_repeat( '- ', $indent_level ) .
- '
' ;
- array_push ( $td , false ) ;
- array_push ( $ltd , '' ) ;
- array_push ( $tr , false ) ;
- array_push ( $ltr , '' ) ;
- array_push ( $has_opened_tr, false );
- }
- else if ( count ( $td ) == 0 ) { } # Don't do any of the following
- else if ( '|}' == substr ( $x , 0 , 2 ) ) {
- $z = "
" . substr ( $x , 2);
- $l = array_pop ( $ltd ) ;
- if ( !array_pop ( $has_opened_tr ) ) $z = " |
" . $z ;
- if ( array_pop ( $tr ) ) $z = '
' . $z ;
- if ( array_pop ( $td ) ) $z = ''.$l.'>' . $z ;
- array_pop ( $ltr ) ;
- $t[$k] = $z . str_repeat( '', $indent_level );
- }
- else if ( '|-' == substr ( $x , 0 , 2 ) ) { # Allows for |---------------
- $x = substr ( $x , 1 ) ;
- while ( $x != '' && substr ( $x , 0 , 1 ) == '-' ) $x = substr ( $x , 1 ) ;
- $z = '' ;
- $l = array_pop ( $ltd ) ;
- array_pop ( $has_opened_tr );
- array_push ( $has_opened_tr , true ) ;
- if ( array_pop ( $tr ) ) $z = '' . $z ;
- if ( array_pop ( $td ) ) $z = ''.$l.'>' . $z ;
- array_pop ( $ltr ) ;
- $t[$k] = $z ;
- array_push ( $tr , false ) ;
- array_push ( $td , false ) ;
- array_push ( $ltd , '' ) ;
- $attributes = unstripForHTML( $x );
- array_push ( $ltr , fixTagAttributes( $attributes, 'tr' ) ) ;
- }
- else if ( '|' == $fc || '!' == $fc || '|+' == substr ( $x , 0 , 2 ) ) { # Caption
- # $x is a table row
- if ( '|+' == substr ( $x , 0 , 2 ) ) {
- $fc = '+' ;
- $x = substr ( $x , 1 ) ;
- }
- $after = substr ( $x , 1 ) ;
- if ( $fc == '!' ) $after = str_replace ( '!!' , '||' , $after ) ;
+ $t[$k] = str_repeat( '- ', $indent_level ) .
+ '
' ;
+ array_push ( $td , false ) ;
+ array_push ( $ltd , '' ) ;
+ array_push ( $tr , false ) ;
+ array_push ( $ltr , '' ) ;
+ array_push ( $has_opened_tr, false );
+ }
+ else if ( count ( $td ) == 0 ) { } # Don't do any of the following
+ else if ( '|}' == substr ( $x , 0 , 2 ) ) {
+ $z = "
" . substr ( $x , 2);
+ $l = array_pop ( $ltd ) ;
+ if ( !array_pop ( $has_opened_tr ) ) $z = " |
" . $z ;
+ if ( array_pop ( $tr ) ) $z = '' . $z ;
+ if ( array_pop ( $td ) ) $z = ''.$l.'>' . $z ;
+ array_pop ( $ltr ) ;
+ $t[$k] = $z . str_repeat( '
', $indent_level );
+ }
+ else if ( '|-' == substr ( $x , 0 , 2 ) ) { # Allows for |---------------
+ $x = substr ( $x , 1 ) ;
+ while ( $x != '' && substr ( $x , 0 , 1 ) == '-' ) $x = substr ( $x , 1 ) ;
+ $z = '' ;
+ $l = array_pop ( $ltd ) ;
+ array_pop ( $has_opened_tr );
+ array_push ( $has_opened_tr , true ) ;
+ if ( array_pop ( $tr ) ) $z = '' . $z ;
+ if ( array_pop ( $td ) ) $z = ''.$l.'>' . $z ;
+ array_pop ( $ltr ) ;
+ $t[$k] = $z ;
+ array_push ( $tr , false ) ;
+ array_push ( $td , false ) ;
+ array_push ( $ltd , '' ) ;
+ $attributes = unstripForHTML( $x );
+ array_push ( $ltr , fixTagAttributes( $attributes, 'tr' ) ) ;
+ }
+ else if ( '|' == $fc || '!' == $fc || '|+' == substr ( $x , 0 , 2 ) ) { # Caption
+ # $x is a table row
+ if ( '|+' == substr ( $x , 0 , 2 ) ) {
+ $fc = '+' ;
+ $x = substr ( $x , 1 ) ;
+ }
+ $after = substr ( $x , 1 ) ;
+ if ( $fc == '!' ) $after = str_replace ( '!!' , '||' , $after ) ;
- // Split up multiple cells on the same line.
- // FIXME: This can result in improper nesting of tags processed
- // by earlier parser steps, but should avoid splitting up eg
- // attribute values containing literal "||".
- $after = wfExplodeMarkup( '||', $after );
+ // Split up multiple cells on the same line.
+ // FIXME: This can result in improper nesting of tags processed
+ // by earlier parser steps, but should avoid splitting up eg
+ // attribute values containing literal "||".
+ $after = wfExplodeMarkup( '||', $after );
- $t[$k] = '' ;
+ $t[$k] = '' ;
- # Loop through each table cell
- foreach ( $after AS $theline )
- {
- $z = '' ;
- if ( $fc != '+' )
- {
- $tra = array_pop ( $ltr ) ;
- if ( !array_pop ( $tr ) ) $z = '\n" ;
- array_push ( $tr , true ) ;
- array_push ( $ltr , '' ) ;
- array_pop ( $has_opened_tr );
- array_push ( $has_opened_tr , true ) ;
- }
+ # Loop through each table cell
+ foreach ( $after AS $theline )
+ {
+ $z = '' ;
+ if ( $fc != '+' )
+ {
+ $tra = array_pop ( $ltr ) ;
+ if ( !array_pop ( $tr ) ) $z = '
\n" ;
+ array_push ( $tr , true ) ;
+ array_push ( $ltr , '' ) ;
+ array_pop ( $has_opened_tr );
+ array_push ( $has_opened_tr , true ) ;
+ }
- $l = array_pop ( $ltd ) ;
- if ( array_pop ( $td ) ) $z = ''.$l.'>' . $z ;
- if ( $fc == '|' ) $l = 'td' ;
- else if ( $fc == '!' ) $l = 'th' ;
- else if ( $fc == '+' ) $l = 'caption' ;
- else $l = '' ;
- array_push ( $ltd , $l ) ;
+ $l = array_pop ( $ltd ) ;
+ if ( array_pop ( $td ) ) $z = ''.$l.'>' . $z ;
+ if ( $fc == '|' ) $l = 'td' ;
+ else if ( $fc == '!' ) $l = 'th' ;
+ else if ( $fc == '+' ) $l = 'caption' ;
+ else $l = '' ;
+ array_push ( $ltd , $l ) ;
- # Cell parameters
- $y = explode ( '|' , $theline , 2 ) ;
- # Note that a '|' inside an invalid link should not
- # be mistaken as delimiting cell parameters
- if ( strpos( $y[0], '[[' ) !== false ) {
- $y = array ($theline);
- }
- if ( count ( $y ) == 1 )
- $y = "{$z}<{$l}>{$y[0]}" ;
- else {
- $attributes = unstripForHTML( $y[0] );
- $y = "{$z}<{$l}".fixTagAttributes($attributes, $l).">{$y[1]}" ;
- }
- $t[$k] .= $y ;
- array_push ( $td , true ) ;
- }
- }
- }
+ # Cell parameters
+ $y = explode ( '|' , $theline , 2 ) ;
+ # Note that a '|' inside an invalid link should not
+ # be mistaken as delimiting cell parameters
+ if ( strpos( $y[0], '[[' ) !== false ) {
+ $y = array ($theline);
+ }
+ if ( count ( $y ) == 1 )
+ $y = "{$z}<{$l}>{$y[0]}" ;
+ else {
+ $attributes = unstripForHTML( $y[0] );
+ $y = "{$z}<{$l}".fixTagAttributes($attributes, $l).">{$y[1]}" ;
+ }
+ $t[$k] .= $y ;
+ array_push ( $td , true ) ;
+ }
+ }
+ }
- # Closing open td, tr && table
- while ( count ( $td ) > 0 )
- {
- $l = array_pop ( $ltd ) ;
- if ( array_pop ( $td ) ) $t[] = '' ;
- if ( array_pop ( $tr ) ) $t[] = '
' ;
- if ( !array_pop ( $has_opened_tr ) ) $t[] = " |
" ;
- $t[] = '' ;
- }
+ # Closing open td, tr && table
+ while ( count ( $td ) > 0 )
+ {
+ $l = array_pop ( $ltd ) ;
+ if ( array_pop ( $td ) ) $t[] = '' ;
+ if ( array_pop ( $tr ) ) $t[] = '' ;
+ if ( !array_pop ( $has_opened_tr ) ) $t[] = " |
" ;
+ $t[] = '' ;
+ }
- $t = implode ( "\n" , $t ) ;
-
- # special case: don't return empty table
- if($t == "")
- $t = '';
- return $t ;
+ $t = implode ( "\n" , $t ) ;
+
+ # special case: don't return empty table
+ if($t == "")
+ $t = '';
+ return $t ;
}