--- loncom/xml/londefdef.pm 2002/01/09 23:11:59 1.39 +++ loncom/xml/londefdef.pm 2002/03/22 17:52:20 1.49 @@ -1,7 +1,9 @@ + # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.39 2002/01/09 23:11:59 albertel Exp $ +# $Id: londefdef.pm,v 1.49 2002/03/22 17:52:20 albertel Exp $ +# # # Copyright Michigan State University Board of Trustees # @@ -39,6 +41,7 @@ # # last modified 06/26/00 by Alexander Sakharuk # 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer +# 01/18 Alex Sakharuk package Apache::londefdef; @@ -47,7 +50,7 @@ use Apache::lonxml; BEGIN { - &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','table','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','tr','td','allow','frameset')); + &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','table','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','tr','td','allow','frameset','pre','insert','externallink')); } @@ -101,7 +104,7 @@ sub end_m { #-- tag sub start_html { my ($target,$token) = @_; - my $currentstring = ''; + my $currentstring = ''; if ($ENV{'browser.mathml'}) { &tth::ttminit(); } else { @@ -112,15 +115,9 @@ sub end_m { &Apache::lonxml::fontsettings(); } elsif ($target eq 'tex') { $currentstring .= '\documentclass[letterpaper]{article} - \setlength{\oddsidemargin}{-40pt} - \setlength{\evensidemargin}{-60pt} - \setlength{\topmargin}{200pt} - \setlength{\textwidth}{4.4in} - \setlength{\textheight}{6.8in} - \setlength{\parindent}{20pt} - \setlength{\marginparwidth}{90pt} - \setlength{\textfloatsep}{8pt plus 2.0pt minus 4.0pt} - \newcommand{\keephidden}[1]{}'; + \newcommand{\keephidden}[1]{} + \usepackage[dvips]{graphicx} + \usepackage{epsfig}'; } return $currentstring; } @@ -145,7 +142,7 @@ sub end_m { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = &Apache::lonxml::registerurl(). + $currentstring = &Apache::lonxml::registerurl(undef,$target). $token->[2]; } return $currentstring; @@ -322,11 +319,13 @@ sub end_m { } #-- tag sub start_body { - my ($target,$token) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; +# my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { if (!$Apache::lonxml::registered) { - $currentstring.=''.&Apache::lonxml::registerurl().''; + $currentstring.=''. + &Apache::lonxml::registerurl(undef,$target).''; } my $onLoad=''; foreach my $key (keys(%{$token->[2]})) { @@ -351,6 +350,13 @@ sub end_m { $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; } $currentstring.='>'; + if ($ENV{'request.state'} ne 'published') { + $currentstring.=(< + + +EDITBUTTON + } } elsif ($target eq 'tex') { $currentstring = '\begin{document}'; } @@ -519,7 +525,7 @@ sub end_m { if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\large{\textbf'; + $currentstring .= '\large{\textbf{'; } return $currentstring; } @@ -828,7 +834,7 @@ sub end_m { if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\\'; + $currentstring .= '\\\\'; } elsif ($target eq 'latexsource') { $currentstring .= '\\'; } @@ -851,7 +857,7 @@ sub end_m { } elsif ($target eq 'tex') { $currentstring .= '\large{'; } elsif ($target eq 'latexsource') { - $currentstring .= '\large{'; + $currentstring .= '{\Large '; } return $currentstring; } @@ -874,9 +880,9 @@ sub end_m { if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\footnotesize{'; + $currentstring .= '{\footnotesize '; } elsif ($target eq 'latexsource') { - $currentstring .= '\footnotesize{'; + $currentstring .= '{\footnotesize '; } return $currentstring; } @@ -1115,7 +1121,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = " \\begin{itemize} "; + $currentstring = '\begin{itemize}'; } return $currentstring; } @@ -1125,7 +1131,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = " \\end{itemize}"; + $currentstring = '\end{itemize}'; } return $currentstring; } @@ -1178,7 +1184,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = " \\begin{enumerate} "; + $currentstring = '\begin{enumerate}'; } return $currentstring; } @@ -1188,7 +1194,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = " \\end{enumerate}"; + $currentstring = '\end{enumerate}'; } return $currentstring; } @@ -1199,7 +1205,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = " \\begin{description} "; + $currentstring = '\begin{description}'; } return $currentstring; } @@ -1209,7 +1215,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = " \\end{description}"; + $currentstring = '\end{description}'; } return $currentstring; } @@ -1220,7 +1226,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = "\\item[ "; + $currentstring = '\item['; } return $currentstring; } @@ -1230,7 +1236,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = "]"; + $currentstring = ']'; } return $currentstring; } @@ -1258,7 +1264,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = ""; + $currentstring = ''; } return $currentstring; } @@ -1268,7 +1274,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = ""; + $currentstring = ''; } return $currentstring; } @@ -1289,7 +1295,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = ""; + $currentstring = ''; } return $currentstring; } @@ -1298,7 +1304,7 @@ sub end_m { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { $currentstring = ''; } @@ -1308,34 +1314,57 @@ sub end_m { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = ""; - } + $currentstring = ''; + } return $currentstring; } #-- tag - sub start_img { - my ($target,$token) = @_; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= $token->[2]->{'src'}; my $currentstring = ''; - if ($target eq 'web') { + + if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = " \\begin{figure} "; - } - return $currentstring; + my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval); + my $file; + my $path; + if ($src =~ m!(.*)/([^/]*)$!) { + $file = $2; + $path = $1; + if ($path=~m:^/:) { + $path = '/home/httpd/html'.$path; + } elsif ($path =~ /^\./) { + $path = $Apache::lonxml::pwd[-1].'/'.$path; + } else { + #else it is a full url don't print + $path = undef; + } + } else { + $path = $Apache::lonxml::pwd[-1]; + $file = $src; + } + $file=~s/(\.gif|\.jpg)$/\.eps/; + if ($path) { + $currentstring = '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}'; + } else { + $currentstring = 'See the image at \tt{'.$src.'}'; + } + } + return $currentstring; } sub end_img { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = " \\end{figure}"; - } + $currentstring = ''; + } return $currentstring; } #-- tag @@ -1344,41 +1373,41 @@ sub end_m { my ($target,$token) = @_; $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= $token->[2]->{'code'}; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= $token->[2]->{'archive'}; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = " \\begin{figure} "; - } - return $currentstring; - } - sub end_applet { - my ($target,$token) = @_; - my $currentstring = ''; - if ($target eq 'web') { - $currentstring = $token->[2]; - } elsif ($target eq 'tex') { - $currentstring = " \\end{figure}"; + $currentstring = " \\begin{figure} "; } return $currentstring; } +sub end_applet { + my ($target,$token) = @_; + my $currentstring = ''; + if ($target eq 'web') { + $currentstring = $token->[2]; + } elsif ($target eq 'tex') { + $currentstring = " \\end{figure}"; + } + return $currentstring; +} #-- tag - sub start_embed { - my ($target,$token) = @_; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'src'}; - my $currentstring = ''; - if ($target eq 'web') { - $currentstring = $token->[4]; - } elsif ($target eq 'tex') { - $currentstring = " \\begin{figure} "; - } - return $currentstring; - } +sub start_embed { + my ($target,$token) = @_; + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= + $token->[2]->{'src'}; + my $currentstring = ''; + if ($target eq 'web') { + $currentstring = $token->[4]; + } elsif ($target eq 'tex') { + $currentstring = " \\begin{figure} "; + } + return $currentstring; +} sub end_embed { my ($target,$token) = @_; my $currentstring = ''; @@ -1438,7 +1467,8 @@ sub end_m { my $currentstring = ''; if ($target eq 'web') { if (!$Apache::lonxml::registered) { - $currentstring.=''.&Apache::lonxml::registerurl().''; + $currentstring.=''. + &Apache::lonxml::registerurl(undef,$target).''; } $currentstring .= $token->[4]; } @@ -1452,5 +1482,62 @@ sub end_m { } return $currentstring; } +#-- 
+	sub start_pre {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= $token->[4];
+	    } elsif ($target eq 'tex') {
+		$currentstring .= '\begin{verbatim}';
+	    } 
+           return $currentstring;
+	}
+        sub end_pre {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= $token->[2];
+	    } elsif ($target eq 'tex') {
+		$currentstring .= '\end{verbatim}';
+	    }
+           return $currentstring;
+	}
+#-- 
+	sub start_insert {
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+		my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
+	       $currentstring .= ''.$display.'';;
+	    }
+           return $currentstring;
+	}
+        sub end_insert {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= '';
+	    }
+           return $currentstring;
+	}
+#-- 
+	sub start_externallink {
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+		my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
+	       $currentstring .= ''.$display.'';;
+	    }
+           return $currentstring;
+	}
+        sub end_externallink {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= '';
+	    }
+           return $currentstring;
+	}
 1;
 __END__