--- loncom/homework/CAPA-converter/capaLexerDef.flex	2000/07/06 21:06:22	1.4
+++ loncom/homework/CAPA-converter/capaLexerDef.flex	2001/01/30 21:03:25	1.7
@@ -382,7 +382,7 @@ EndLine    ([\r][\n]|[\n])
 
 <S_COMMENT>{
 {EndLine}{Spaces}"//"[^\n]*$ {LLDBUG_PRL2("[COMMENT<%s>]\n",yytext); 
-			      send("# %s",&yytext[2]);
+			      send("# %s\n",&yytext[2]);
                              }
 [^\n]*{EndLine}      {
                        send("\n"); BEGIN S_TEXT;
@@ -699,7 +699,7 @@ EndLine    ([\r][\n]|[\n])
 }
 
 <S_IMPORT>{
-{FileName}{Space}*             { end_mode();send("<import>%s</import>\n",yytext); BEGIN S_SKIP; }
+{FileName}{Space}*             { end_mode();send("<import>/res/capa/%s</import>\n",yytext); BEGIN S_SKIP; }
 {Identifier}{Space}*           { end_mode();send("<import>$%s</import>\n",yytext);  BEGIN S_SKIP; }
 }
 
@@ -738,23 +738,23 @@ EndLine    ([\r][\n]|[\n])
                              }
 
 [Pp][Cc][Rr]                 |
-[Hh][Gg][Rr]                 { if (firstparam) firstparam=0; else add_delayed("\">\n\t");
-                               add_delayed("<param type=\"hgr\" value=\"on|off\" default=\""); 
+[Hh][Gg][Rr]                 { if (firstparam) firstparam=0; else add_delayed("\"></responseparam>\n\t");
+                               add_delayed("<responseparam type=\"hgr\" value=\"on|off\" default=\""); 
                                dosend=2;
                              }
 [Tt][Oo][Ll]                 { LLDBUG_PR2("[tol(%s)]",yytext);
-                               if (firstparam) firstparam=0; else add_delayed("\">\n\t");
-			       add_delayed("<param type=\"tol\" value=\"tolerance\" default=\""); 
+                               if (firstparam) firstparam=0; else add_delayed("\"></responseparam>\n\t");
+			       add_delayed("<responseparam type=\"tol\" value=\"tolerance\" default=\""); 
                                dosend=2;
                              }
 [Ss][Ii][Gg]                 { 
                                LLDBUG_PR2("[SIG(%s)]",yytext); 
-                               if (firstparam) firstparam=0; else add_delayed("\">\n\t");
-			       add_delayed("<param type=\"sig\" value=\"int,range,0-12\" default=\""); 
+                               if (firstparam) firstparam=0; else add_delayed("\"></responseparam>\n\t");
+			       add_delayed("<responseparam type=\"sig\" value=\"int,range,0-12\" default=\""); 
                                dosend=2;
                              }
 
-[Ss][Tt][Rr]                 { LLDBUG_PR1("[STR]"); send("\" str="); dosend=1; }
+[Ss][Tt][Rr]                 { LLDBUG_PR1("[STR]"); send("\" str=\""); dosend=1; }
 [Ee][Vv][Aa][Ll]             |
 [Ee][Vv][Aa][Ll][Uu][Aa][Tt][Ee] { LLDBUG_PR1("[EVAL]");send("\" eval="); dosend=1;}
 [Uu][Nn][Ii][Tt]             |
@@ -996,12 +996,12 @@ EndLine    ([\r][\n]|[\n])
 }
 
 <S_MAP>{
-[;,]                         { LLDBUG_PR2("[%c]",yytext[0]); return(yytext[0]);  }
+[;,]                         { LLDBUG_PR2("[%c]",yytext[0]); send("%c",yytext[0]);  }
 [\)]                         { LLDBUG_PR1("[) in MAP]"); Pcount--; 
                                if(Pcount==0) {
                                    BEGIN S_SKIP; 
                                }
-                               return(yytext[0]); 
+                               send("%c",yytext[0]); 
                              }
 }