[system] / trunk / webwork / system / courseScripts / PGmatrixmacros.pl Repository:
ViewVC logotype

Diff of /trunk/webwork/system/courseScripts/PGmatrixmacros.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1032 Revision 1033
246 $out .= '\displaystyle\left'.$opts{'left'}."\\begin{array}{$aligns} \n"; 246 $out .= '\displaystyle\left'.$opts{'left'}."\\begin{array}{$aligns} \n";
247 } 247 }
248 elsif ($main::displayMode eq 'Latex2HTML') { 248 elsif ($main::displayMode eq 'Latex2HTML') {
249 $out .= "\n\\begin{rawhtml} <TABLE BORDER=0>\n\\end{rawhtml}"; 249 $out .= "\n\\begin{rawhtml} <TABLE BORDER=0>\n\\end{rawhtml}";
250 } 250 }
251 elsif ($main::displayMode eq 'HTML' || $main::displayMode eq 'HTML_tth' || $main::displayMode eq 'HTML_dpng') { 251 elsif ($main::displayMode eq 'HTML' || $main::displayMode eq 'HTML_tth' || $main::displayMode eq 'HTML_dpng' || $main::displayMode eq 'HTML_img') {
252 $out .= "<TABLE BORDER=0>\n" 252 $out .= "<TABLE BORDER=0>\n"
253 } 253 }
254 else { 254 else {
255 $out = "Error: dm_begin_matrix: Unknown displayMode: $main::displayMode.\n"; 255 $out = "Error: dm_begin_matrix: Unknown displayMode: $main::displayMode.\n";
256 } 256 }
270 if($main::displayMode eq 'Latex2HTML') { 270 if($main::displayMode eq 'Latex2HTML') {
271 $brh = "\\begin{rawhtml}"; 271 $brh = "\\begin{rawhtml}";
272 $erh = "\\end{rawhtml}"; 272 $erh = "\\end{rawhtml}";
273 } 273 }
274 274
275 if(($main::displayMode eq 'HTML_dpng') || ($main::displayMode eq 'Latex2HTML')) { 275 if(($main::displayMode eq 'HTML_dpng') || $main::displayMode eq 'HTML_img' || ($main::displayMode eq 'Latex2HTML')) {
276 $out .= "$brh<tr valign=\"center\"><td nowrap=\"nowrap\" align=\"left\">$erh"; 276 $out .= "$brh<tr valign=\"center\"><td nowrap=\"nowrap\" align=\"left\">$erh";
277 $out .= dm_image_delimeter($numrows, $opts{'left'}); 277 $out .= dm_image_delimeter($numrows, $opts{'left'});
278 $out .= "$brh<td><table border=0 cellspacing=5>\n$erh"; 278 $out .= "$brh<td><table border=0 cellspacing=5>\n$erh";
279 return $out; 279 return $out;
280 } 280 }
293 293
294 if ($main::displayMode eq 'TeX' or $opts{'force_tex'}) { 294 if ($main::displayMode eq 'TeX' or $opts{'force_tex'}) {
295 return ""; 295 return "";
296 } 296 }
297 297
298 if(($main::displayMode eq 'HTML_dpng') || ($main::displayMode eq 'Latex2HTML')) { 298 if(($main::displayMode eq 'HTML_dpng') ||$main::displayMode eq 'HTML_img'|| ($main::displayMode eq 'Latex2HTML')) {
299 if($main::displayMode eq 'Latex2HTML') { $out .= '\begin{rawhtml}'; } 299 if($main::displayMode eq 'Latex2HTML') { $out .= '\begin{rawhtml}'; }
300 $out .= "</table><td nowrap=\"nowrap\" align=\"right\">"; 300 $out .= "</table><td nowrap=\"nowrap\" align=\"right\">";
301 if($main::displayMode eq 'Latex2HTML') { $out .= '\end{rawhtml}'; } 301 if($main::displayMode eq 'Latex2HTML') { $out .= '\end{rawhtml}'; }
302 302
303# $out .= "<img alt=\"(\" src = \"". 303# $out .= "<img alt=\"(\" src = \"".
321 $out .= $opts{'force_tex'} ? '' : "\\) "; 321 $out .= $opts{'force_tex'} ? '' : "\\) ";
322 } 322 }
323 elsif ($main::displayMode eq 'Latex2HTML') { 323 elsif ($main::displayMode eq 'Latex2HTML') {
324 $out .= "\n\\begin{rawhtml} </TABLE >\n\\end{rawhtml}"; 324 $out .= "\n\\begin{rawhtml} </TABLE >\n\\end{rawhtml}";
325 } 325 }
326 elsif ($main::displayMode eq 'HTML' || $main::displayMode eq 'HTML_tth' || $main::displayMode eq 'HTML_dpng') { 326 elsif ($main::displayMode eq 'HTML' || $main::displayMode eq 'HTML_tth' || $main::displayMode eq 'HTML_dpng'||$main::displayMode eq 'HTML_img') {
327 $out .= "</TABLE>\n"; 327 $out .= "</TABLE>\n";
328 } 328 }
329 else { 329 else {
330 $out = "Error: PGmatrixmacros: dm_end_matrix: Unknown displayMode: $main::displayMode.\n"; 330 $out = "Error: PGmatrixmacros: dm_end_matrix: Unknown displayMode: $main::displayMode.\n";
331 } 331 }
412 chop($out); # remove last & 412 chop($out); # remove last &
413 $out .= "\\cr \n"; 413 $out .= "\\cr \n";
414 # carriage returns must be added manually for tex 414 # carriage returns must be added manually for tex
415 } elsif ($main::displayMode eq 'HTML' || $main::displayMode eq 'HTML_tth' 415 } elsif ($main::displayMode eq 'HTML' || $main::displayMode eq 'HTML_tth'
416 || $main::displayMode eq 'HTML_dpng' 416 || $main::displayMode eq 'HTML_dpng'
417 || $main::displayMode eq 'HTML_img'
417 || $main::displayMode eq 'Latex2HTML') { 418 || $main::displayMode eq 'Latex2HTML') {
418 $out .= "$brh\n<TR>\n$erh"; 419 $out .= "$brh\n<TR>\n$erh";
419 while (@elements) { 420 while (@elements) {
420 my $myalign; 421 my $myalign;
421 $myalign = shift @align; 422 $myalign = shift @align;

Legend:
Removed from v.1032  
changed lines
  Added in v.1033

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9