--- loncom/interface/lonsyllabus.pm	2004/05/10 14:12:14	1.31
+++ loncom/interface/lonsyllabus.pm	2004/06/11 15:41:36	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.31 2004/05/10 14:12:14 sakharuk Exp $
+# $Id: lonsyllabus.pm,v 1.35 2004/06/11 15:41:36 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ use Apache::lontexconvert;
 use Apache::lonfeedback;
 use Apache::lonannounce;
 use Apache::lonlocal;
+use Apache::lonhtmlcommon;
 
 sub handler {
     my $r = shift;
@@ -98,7 +99,8 @@ ENDDOCUMENT
 # ------------------------------------- There is such a course, get environment
     my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
     if ($target ne 'tex') {
-	$r->print('</head>'.&Apache::loncommon::bodytag
+	$r->print(&Apache::lonhtmlcommon::htmlareaheaders().
+		  '</head>'.&Apache::loncommon::bodytag
             ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'}));
 	$r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'.
                  $Apache::lonnet::domaindescription{$cdom}.'</h3>');
@@ -107,8 +109,14 @@ 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') {
@@ -180,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='';
@@ -238,8 +249,9 @@ ENDDOCUMENT
 	   $r->print('<form method="post">'.
 		     '<input type="hidden" name="forceedit" value="edit" />');
        }
+       my @htmlids=();
        foreach (sort keys %syllabusfields) {
-          if (($syllabus{$_}) || ($allowed)) {
+          if (($syllabus{$_}=~/\w/) || ($allowed)) {
               my $message=$syllabus{$_};
               if ($_ eq 'lll_includeurl') { # this is the "included" field
 		  my $urls=$message;
@@ -256,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{$_}.
@@ -278,16 +294,19 @@ 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>');
+	   $r->print('</form>'.
+		     &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
        }
        if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
     } else {