--- loncom/homework/CAPA-converter/capaLexerDef.flex	2001/11/18 09:49:43	1.10
+++ loncom/homework/CAPA-converter/capaLexerDef.flex	2001/11/21 18:48:05	1.11
@@ -688,19 +688,24 @@ EndLine    ([\r][\n]|[\n])
 }
 
 <S_IMPORT>{
-{FileName}{Space}*             {
+{FileName}{Space}*             { char *endquote;
                                  end_mode();
 				 start_mode(MODE_IMPORT,NULL);
-                                 send("%s/%s",import_prefix,yytext);
-			         end_mode();
-                                 BEGIN S_SKIP; 
+				 endquote = strrchr(yytext,'\"');
+                                 *endquote = '\0';
+                                 if (yytext[1] == '/') {
+                                    send("%s%s",import_prefix,&yytext[1]);
+                                 } else {
+                                    send("%s",&yytext[1]);
+                                 }
                                }
 {Identifier}{Space}*           { end_mode();
 				 start_mode(MODE_IMPORT,NULL);
 				 send("$%s",yytext);
-				 end_mode();
-				 BEGIN S_SKIP;
 			       }
+{Space}+                       { }
+{EndLine}                      {end_mode(); BEGIN S_TEXT;}
+
 }
 
 <S_ANSWER>{