--- loncom/homework/CAPA-converter/capaLexerDef.flex	2001/11/29 18:43:55	1.13
+++ loncom/homework/CAPA-converter/capaLexerDef.flex	2002/01/04 19:52:12	1.16
@@ -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.16 2002/01/04 19:52:12 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)                       */
@@ -123,6 +150,8 @@ int           IFcount;
 WhileLoop_t   WhileStack[MAX_FUNC_NEST];   /* <-- perhaps we can use linked list */
 int           While_idx, Wcount;
 int           sccount;		           /* Semi-colon count for MAP and RMAP  */
+int           HINTflag=0;
+int           EXPflag=0;
 
 #ifdef  USE_DYNAMIC_SYMBOLS
 Symbol       *SymbList_p;
@@ -400,10 +429,20 @@ EndLine    ([\r][\n]|[\n])
 				   send("<PRE>\n");
                                  }
 ^{Spaces}"/HIN"{Alpha}*{Spaces}  { LLDBUG_PRL1("[HIN]"); 
-                                   start_mode(MODE_HINT, "");
+                               /*    start_mode(MODE_HINT, "");*/
+                                   if (!HINTflag) {
+                                     start_streams(HINT_DEST,1);
+                                     HINTflag=-1;
+                                   }
+                                   change_destination(HINT_DEST);
 				   BEGIN S_HINT; 
                                  }
-^{Spaces}"/EXP"{Alpha}*{Spaces}  { start_mode(MODE_BLOCK,"condition=&explanation");
+^{Spaces}"/EXP"{Alpha}*{Spaces}  { 
+                                   if (!EXPflag) {
+                                     start_streams(EXP_DEST,1);
+                                     EXPflag=-1;
+                                   }
+                                   change_destination(EXP_DEST);
                                    LLDBUG_PRL1("[EXP]"); Current_char_p = String_buf;  BEGIN S_EXPLAIN; }
 ^{Spaces}"/IMP"{Alpha}*{Space}+  { LLDBUG_PRL1("[IMP]"); BEGIN S_IMPORT; end_mode(); }
 ^{Spaces}"/END"                  { LLDBUG_PRL1("[END]");  
@@ -489,11 +528,12 @@ EndLine    ([\r][\n]|[\n])
                                 LLDBUG_PRL2("[IF <IFcount=%d>]",IFcount);
 				BEGIN S_TRUE_FALSE_STMT;
 				if ( IFcount == 1) {
- 				  start_streams(2);
-				  watch_mode[1]=1;
+ 				  start_streams(DEFAULT_DEST, 2);
+                                  change_destination(DEFAULT_DEST);
+				  watch_mode[current_dest][1]=1;
 				}
-				end_mode_stream(0);
-				start_mode_stream(1,MODE_SCRIPT,NULL);
+				end_mode_stream(DEFAULT_DEST, 0);
+				start_mode_stream(DEFAULT_DEST,1,MODE_SCRIPT,NULL);
 				for(i=1;i<IFcount;i++) {send("\t",NULL);}
 				send_stream(0,"<block condition=\"",NULL);
 				send_stream(1,"if (",NULL);
@@ -502,7 +542,7 @@ EndLine    ([\r][\n]|[\n])
 			       }
 ^{Spaces}"/ELSE"([^\n])*      { int i;
 				LLDBUG_PRL2("[ELSE <IFcount=%d>]\n",IFcount);
-				end_mode_stream(0);
+				end_mode_stream(DEFAULT_DEST,0);
 				for(i=1;i<IFcount;i++) {send("\t",NULL);}
  				send_stream(0,
                                       "</block>\n<block condition=\"!(%s)\">",
@@ -511,16 +551,17 @@ EndLine    ([\r][\n]|[\n])
                               }
 ^{Spaces}"/ENDIF"([^\n])*     { int i;
 				IFcount--;
-				end_mode_stream(0);
+				end_mode_stream(DEFAULT_DEST,0);
 				for(i=0;i<IFcount;i++) {send("\t",NULL);}
 				send_stream(0,"</block>");
 				send_stream(1,"}");
 				if (IFcount == 0) {
-				  if (watch_mode[1]) {
-				    end_streams(1);
+				  if (watch_mode[current_dest][1]) {
+				    end_streams(DEFAULT_DEST,1);
  				  } else {
-				    end_streams(0);
+				    end_streams(DEFAULT_DEST,0);
 				  }
+                                  change_destination(DEFAULT_DEST);
 				}
 				delete_cache();
 				LLDBUG_PRL2("[ENDIF <IFcount=%d>]\n",IFcount); 
@@ -671,12 +712,14 @@ EndLine    ([\r][\n]|[\n])
 <S_HINT>{
 {EndLine}                     {  LLDBUG_PR1("[CR hint]");
                                  send("\n"); 
+                                 change_destination(DEFAULT_DEST);
                                  BEGIN S_TEXT;
                               }
 }
 <S_EXPLAIN>{
 {EndLine}                     {  LLDBUG_PR1("[CR explain]");
                                  send("\n"); 
+                                 change_destination(DEFAULT_DEST);
                                  BEGIN S_TEXT;
                               }
 }
@@ -773,11 +816,11 @@ EndLine    ([\r][\n]|[\n])
                                dosend=2;
                              }
 
-[Ss][Tt][Rr]                 { LLDBUG_PR1("[STR]"); send("\" str=\""); dosend=1; }
+[Ss][Tt][Rr]                 { LLDBUG_PR1("[STR]"); send("\" type=\""); 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]             |
-[Uu][Nn][Ii][Tt][Ss]         { LLDBUG_PR1("[UNIT]"); send("\" units=\""); dosend=1;}
+[Uu][Nn][Ii][Tt][Ss]         { LLDBUG_PR1("[UNIT]"); send("\" unit=\""); dosend=1;}
 
 [Ee][Xx][Tt][Ee][Rr][Nn][Aa][Ll]  { LLDBUG_PR1("[EXTERNAL]"); dosend=0; }
 [Aa][Nn][Ss][Bb][Oo][Xx]     { LLDBUG_PR1("[SHOW_ANS_BOX]"); dosend=0; }
@@ -800,7 +843,22 @@ EndLine    ([\r][\n]|[\n])
 			       dosend=1;
 			       flush_delayed();
 			       if (firstparam!=1) send("\" />\n");
-			       send("\t<textline />\n</numericalresponse>\n");
+			       send("\t<textline />\n");
+                         /* Fill in Hints */ 
+			       if ( !is_dest_empty(HINT_DEST) ) {
+			         send("<hintgroup>\n\t<hintpart on=\"default\">\n\t<startouttext />");
+                                 end_streams(HINT_DEST,0);
+                                 HINTflag=0;
+                                 send("\t<endouttext />\n\t</hintpart>\n</hintgroup>\n");
+			       }
+			       send("\n</numericalresponse>\n");
+
+			       if ( !is_dest_empty(EXP_DEST) ) {
+			         send("<postanswerdate>\n\t<startouttext />\n");
+                                 end_streams(EXP_DEST,0);
+                                 EXPflag=0;
+                                 send("\t<endouttext />\n</postanswerdate>\n");
+                               }
                              }
 }