--- loncom/interface/lonsyllabus.pm	2004/06/02 00:42:15	1.32
+++ loncom/interface/lonsyllabus.pm	2004/06/11 16:37:42	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.32 2004/06/02 00:42:15 www Exp $
+# $Id: lonsyllabus.pm,v 1.37 2004/06/11 16:37:42 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -109,22 +109,28 @@ ENDDOCUMENT
                  $Apache::lonnet::domaindescription{$cdom}.'}\\\\');
     }
 # -------------------------------------------------------------- Announcements?
-    $r->print(&Apache::lonannounce::showday(time,2,
+    if ($target ne 'tex') {
+	$r->print(&Apache::lonannounce::showday(time,2,
                          &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)));
+    } else {
+	$r->print(&Apache::lonxml::xmlparse($r,'tex',
+		       &Apache::lonannounce::showday(time,2,
+                       &Apache::lonannounce::readcalendar($cdom.'_'.$cnum))));
+    }
 # -------------------------------------------------------- Get course personnel
     my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
     if ($target ne 'tex') {
 	$r->print('<table border="2">');
     } else {
-	$r->print('\begin{tabular}{|c|c|}\hline');
+	$r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
     }
-    foreach (sort keys %coursepersonnel) {
+    foreach my $element (sort keys %coursepersonnel) {
 	if ($target ne 'tex') {
-	    $r->print('<tr><td>'.$_.'</td><td>');
+	    $r->print('<tr><td>'.$element.'</td><td>');
 	} else {
-	    $r->print(' '.$_.'\\\\  '); 
+	    $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); 
 	}
-        foreach (split(/\,/,$coursepersonnel{$_})) {
+        foreach (split(/\,/,$coursepersonnel{$element})) {
 	    my ($puname,$pudom)=split(/\:/,$_);
 	    if ($target ne 'tex') {
 		$r->print(' '.&Apache::loncommon::aboutmewrapper(
@@ -182,8 +188,11 @@ ENDDOCUMENT
        if (($allowed) && ($ENV{'form.storesyl'})) {
 	   foreach (keys %syllabusfields) {
                my $field=$ENV{'form.'.$_};
+	       chomp($field);
                $field=~s/\s+$//s;
-               $field=&Apache::lonfeedback::clear_out_html($field,1);
+	       $field=~s/^\s+//s;
+	       $field=~s/\<br\s*\/*\>$//s;
+	       $field=&Apache::lonfeedback::clear_out_html($field,1);
 	       $syllabus{$_}=$field;
                if ($_ eq 'lll_includeurl') { # clean up included URLs
                   my $field='';
@@ -240,6 +249,7 @@ ENDDOCUMENT
 	   $r->print('<form method="post">'.
 		     '<input type="hidden" name="forceedit" value="edit" />');
        }
+       my @htmlids=();
        foreach (sort keys %syllabusfields) {
           if (($syllabus{$_}=~/\w/) || ($allowed)) {
               my $message=$syllabus{$_};
@@ -258,7 +268,11 @@ ENDDOCUMENT
 # embed as an image
                          $output='<img src="'.$filelink.'" />';
 		      }
-                      $message.='<p>'.$output.'</p>';
+		      if ($target ne 'tex') {
+			  $message.='<p>'.$output.'</p>';
+		      } else {
+			  $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
+		      }		      
                   }
                   if ($allowed) {
                      $r->print('<h3>'.$syllabusfields{$_}.
@@ -280,21 +294,25 @@ ENDDOCUMENT
 		     $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'.
 			       &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
 		 }
+		 push @htmlids,$_;
 	     }
               if ($allowed) {
-                 $r->print('<br /><textarea cols="80" rows="6" name="'.$_.'">'.
+                 $r->print(
+	   '<br /><textarea cols="80" rows="12" name="'.$_.'" id="'.$_.'">'.
 			   $syllabus{$_}.
-           '</textarea><input type="submit" name="storesyl" value="Store" />');
+           '</textarea> <input type="submit" name="storesyl" value="Store" />');
 	      }
 	  }
        }
        if ($allowed) {
 	   $r->print('</form>'.
-		     &Apache::lonhtmlcommon::htmlareaactive());
+		     &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
        }
        if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
     } else {
-       $r->print('<p>No syllabus information provided.</p>');
+	if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');} 
+	$r->print('No syllabus information provided.');
+	if ($target ne 'tex') {$r->print('</p>');}
     }
     if ($target ne 'tex') {$r->print('</body></html>');} else {$r->print('\end{document}');}
     return OK;