--- loncom/homework/CAPA-converter/capaCommon.c	2000/05/15 20:33:33	1.3
+++ loncom/homework/CAPA-converter/capaCommon.c	2001/11/15 21:42:42	1.8
@@ -153,8 +153,8 @@ extern  void       (*Status_Func)();
   begin_text();
   /*if ( !yyparse() )  { errcode = Lexi_qnum; } else { errcode = 0; }*/
   if (!(temp=yylex())) { errcode = Lexi_qnum; } else { errcode = 0; }
-  printf("\nExited on: %d\n",temp);
-  printf("Flushing:\n");
+/*  printf("\nExited on: %d\n",temp); */
+/*  printf("Flushing:\n"); */
   flush_delayed();
   /* fclose(Input_stream[0]);*/ /*The Lexer handles closing this*/
   /* print_symb_stat(); */
@@ -232,7 +232,7 @@ int append_message(struct dyn_string *dy
 void start_delayed(){ delay=1; }
 void end_delayed(){ delay=0; }
 
-void add_dealyed(char *format, ...) {
+void add_delayed(char *format, ...) {
     va_list ap;
 
     va_start(ap,format);
@@ -241,7 +241,7 @@ void add_dealyed(char *format, ...) {
 
 void flush_delayed()
 {
-  printf(dyn_delayed.str);
+  if (dyn_delayed.str) fputs(dyn_delayed.str,stdout);
   dyn_free();dyn_init();
   delay=0;
 }
@@ -263,7 +263,9 @@ void end_mode()
   case MODE_COMMENT: send("</comment>\n"); break;
   case MODE_BLOCK: send("</block>\n"); break;
   case MODE_SCRIPT: send("</script>\n"); break;
-  case MODE_OUTTEXT: send("</outtext>\n"); break;
+  case MODE_OUTTEXT: send("<endouttext />\n"); break;
+  case MODE_ANSWER: send("\n"); break;
+  case MODE_HINT: send("<endouttext />\n</hintpart>\n</hintgroup>\n"); break;
   case MODE_NONE: break;
   }
   mode=MODE_NONE;
@@ -276,8 +278,10 @@ void start_mode(int newmode,char* args)
   switch (newmode) {
   case MODE_COMMENT: send("<comment>\n"); break;
   case MODE_BLOCK: send("<block %s>\n",args); break;
-  case MODE_SCRIPT: send("<script>\n"); break;
-  case MODE_OUTTEXT: send("<outtext>\n"); break;
+  case MODE_SCRIPT: send("<script type=\"loncapa/perl\">\n"); break;
+  case MODE_OUTTEXT: send("<startouttext />\n"); break;
+  case MODE_ANSWER: send("\n"); break;
+  case MODE_HINT: send("<hintgroup>\n<hintpart on=\"default\">\n<startouttext />\n"); break;
   case MODE_NONE: break;
   }
   mode=newmode;