--- loncom/xml/londefdef.pm	2005/05/18 16:34:03	1.272
+++ loncom/xml/londefdef.pm	2005/07/05 18:59:03	1.276
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.272 2005/05/18 16:34:03 albertel Exp $
+# $Id: londefdef.pm,v 1.276 2005/07/05 18:59:03 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -90,7 +90,8 @@ sub start_m {
 	    $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
 	    #&Apache::lonxml::debug("M is evaulated to:$inside:");
 	}
-	$currentstring = &Apache::lontexconvert::converted(\$inside);
+	my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
+	$currentstring = &Apache::lontexconvert::converted(\$inside,$display);
 	if ($Apache::lontexconvert::errorstring) {
 	    &Apache::lonxml::warning("tth error: ".
 				     $Apache::lontexconvert::errorstring);
@@ -660,7 +661,7 @@ sub start_h1 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
     } elsif ($target eq 'meta') {
 	$currentstring='<subject>';
 	&start_output($target);
@@ -709,7 +710,7 @@ sub start_h2 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
     } 
     return $currentstring;
 }
@@ -752,7 +753,7 @@ sub start_h3 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
     } 
     return $currentstring;
 }
@@ -795,7 +796,7 @@ sub start_h4 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
     } 
     return $currentstring;
 }
@@ -838,7 +839,7 @@ sub start_h5 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
     } 
     return $currentstring;
 }
@@ -881,7 +882,7 @@ sub start_h6 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
     } 
     return $currentstring;
 }
@@ -3776,10 +3777,13 @@ sub image_replication {
 #        height_param
 #        width_param    - Initial picture dimensions.
 #        scaling        - A scale factor.
-#        parstack, 
-#        safeeval,
-#        depth,
-#        cis           - The usual xml stuff ???
+#        parstack,      - the current stack of tag attributes 
+#                         from the xml parser
+#        safeeval,      - pointer to the safespace
+#        depth,         - from what level in the stack to look for attributes
+#                         (assumes -1 if unspecified)
+#        cis            - look for attrubutes case insensitively
+#                         (assumes false)
 #
 # Returns:
 #   height, width   - new dimensions.