loncom/xml/londefdef.pm - diff

Return to londefdef.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.230 and 1.231

-version 1.230, 2004/07/15 17:05:20
+version 1.231, 2004/07/20 15:05:32
  Line 2193  sub end_td_tex {
  	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
  	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
  	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+ 	} elsif ($data=~/\\parbox\{\s*\d+\.?\d*\s*(mm|cm|in|pc|pt)*\s*\}/ or $data=~/\\epsfxsize\s*=\s*\d+\.?\d*\s*(mm|cm|in|pc|pt)*/) {
+ 	    my $garbage_data=$data;
+ 	    my $fwidth=0;
+             while ($garbage_data=~/\\parbox\{\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)\s*\}/) {
+ 		my $current_length=&recalc($1);
+ 		$current_length=~/(\d+\.?\d*)/;
+ 		if ($fwidth<$1) {$fwidth=$1;}
+ 		$garbage_data=~s/\\parbox\{\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//;
+ 	    }
+             while ($garbage_data=~/\\epsfxsize\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) {
+ 		my $current_length=&recalc($1);
+ 		$current_length=~/(\d+\.?\d*)/;
+ 		if ($fwidth<$1) {$fwidth=$1;}
+ 		$garbage_data=~s/\\epsfxsize\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//;
+ 	    }
+ 	    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+ 	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
+ 	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+ 	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+ 	    $data=~s/\\\\\s*$//;
  	} else {
  	    $data=~s/^\s+(\S.*)/$1/;
  	    $data=~s/(.*\S)\s+$/$1/;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.230
changed lines
	Added in v.1.231