[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

sakharuk lon-capa-cvs@mail.lon-capa.org
Fri, 18 Apr 2003 14:55:41 -0000


sakharuk		Fri Apr 18 10:55:41 2003 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
   Nested tables are supported but with two limitations:
  1. The width (TeXwidth) of the cell where you want to put your "internal" (nested) table has to be specified;
  2. Only one nested table has to be in one parent table's cell.
  The second limitation can be removed more or less easily and I am working on this. As to the first limitation - if I remove it table in the finel hard copy will looks crude.
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.127 loncom/xml/londefdef.pm:1.128
--- loncom/xml/londefdef.pm:1.127	Wed Apr 16 15:20:51 2003
+++ loncom/xml/londefdef.pm	Fri Apr 18 10:55:40 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.127 2003/04/16 19:20:51 sakharuk Exp $
+# $Id: londefdef.pm,v 1.128 2003/04/18 14:55:40 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1742,6 +1742,7 @@
 	    $Apache::londefdef::table[-1]{'vvinc'} = '';
 	}
 	$Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
+	$currentstring = '\keephidden{NEW TABLE ENTRY}';
     }
     return $currentstring;
 }
@@ -1817,8 +1818,7 @@
 	if ($#Apache::londefdef::table > 0) {	    
 	    my $inmemory = $Apache::londefdef::table[-1]{'output'};
 	    pop @Apache::londefdef::table;
-	    $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory; ###Need to work with (wrong place to add)
-
+	    $Apache::londefdef::table[-1]{'include'}=$inmemory;
 	} else {
 	    $currentstring .= $Apache::londefdef::table[-1]{'output'};
 	    pop @Apache::londefdef::table;
@@ -1909,8 +1909,8 @@
 		$Apache::londefdef::table[-1]{'TeXlength'} .= '0,';
 	    }        
 	}                                
-	$data='\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
-	@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= $data;
+	$data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}/;
+	@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
     }
     return $currentstring;
 }