--- loncom/homework/CAPA-converter/capaLexerDef.flex	2000/10/25 20:26:57	1.5
+++ loncom/homework/CAPA-converter/capaLexerDef.flex	2001/07/09 04:01:53	1.8
@@ -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;
@@ -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]             |
@@ -837,7 +837,7 @@ EndLine    ([\r][\n]|[\n])
 <S_VARIABLE,S_TRUE_FALSE_STMT,S_MAP,S_LET>{
 [\"]                      { LLDBUG_PR1("[TF,V,LET,MAP str\" ]"); 
                             Current_char_p = String_buf; 
-			    send("\"");
+			    send("'");
                             yy_push_state(S_STRING);
                           }
 }
@@ -870,7 +870,7 @@ EndLine    ([\r][\n]|[\n])
                              end_delayed();
                              send("&format(");
                              flush_delayed();
-                             send(",\"%s\")",yytext+1);
+                             send(",'%s')",yytext+1);
                            }
 <S_ANSWER>[:]{Number}+[EeFf]   { 
                              if (dosend) send("\" format=\"%s",yytext+1);
@@ -931,7 +931,7 @@ EndLine    ([\r][\n]|[\n])
 [\\][\"]            { /**Current_char_p++ = '"';*/ send("\\\"");  }
 [\\]{Space}*[\n]    { LLDBUG_PR2("[\\CR continue in S_STRING](%s)",yytext); /* continuation on next line */ }                       
 [\"]                { /* end of a string constant --   */
-                      send("\"");
+                      send("'");
 		      yy_pop_state();
 		    }
 {EndLine}           { /* check for termination of string constant */