--- loncom/homework/CAPA-converter/capaLexerDef.flex	2001/11/21 18:48:05	1.11
+++ loncom/homework/CAPA-converter/capaLexerDef.flex	2001/12/04 15:17:57	1.14
@@ -1,3 +1,30 @@
+/* The LearningOnline Network with CAPA
+ * CAPA lexer dfinition, heavily modified to become a LON-CAPA convertor 
+ * $Id: capaLexerDef.flex,v 1.14 2001/12/04 15:17:57 albertel Exp $
+ *
+ * Copyright Michigan State University Board of Trustees
+ *
+ * This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+ *
+ * LON-CAPA is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * LON-CAPA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LON-CAPA; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * /home/httpd/html/adm/gpl.txt
+ *
+ * http://www.lon-capa.org/
+ */
+
 /*------------------------------------------------------------------------*/
 /*         capaLexerDef.flex   created by Isaac Tsai Jul 15 1996          */
 /*                             added /END(variable)                       */
@@ -691,6 +718,7 @@ EndLine    ([\r][\n]|[\n])
 {FileName}{Space}*             { char *endquote;
                                  end_mode();
 				 start_mode(MODE_IMPORT,NULL);
+				 /* Get rid of leading and trailing quotes */
 				 endquote = strrchr(yytext,'\"');
                                  *endquote = '\0';
                                  if (yytext[1] == '/') {
@@ -698,14 +726,15 @@ EndLine    ([\r][\n]|[\n])
                                  } else {
                                     send("%s",&yytext[1]);
                                  }
+				 end_mode();
+				 BEGIN S_SKIP;
                                }
 {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>{
@@ -935,6 +964,7 @@ EndLine    ([\r][\n]|[\n])
 			 BEGIN S_ECHO;
                       }
                     }
+[%]                 {send("%%");}
 {Operator}          { LLDBUG_PR2("[Op(%c) in VAR,TF_STMT,LET]",yytext[0]); send(yytext); }
 }
 
@@ -993,6 +1023,9 @@ EndLine    ([\r][\n]|[\n])
                       send("'");
 		      yy_pop_state();
 		    }
+[%]                 { /*Escape percent signs so that vasprintf doesn't choke */
+                      send("%%");
+                    }
 {EndLine}           { /* check for termination of string constant */
                       char warn_msg[WARN_MSG_LENGTH];