--- capa/capa51/pProj/capaFunction.c	2000/02/22 18:19:02	1.5
+++ capa/capa51/pProj/capaFunction.c	2000/06/30 21:36:16	1.7
@@ -1,3 +1,20 @@
+/* definition of all capa functions
+   Copyright (C) 1992-2000 Michigan State University
+
+   The CAPA system is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The CAPA system 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the CAPA system; see the file COPYING.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /* =||>>================================================================<<||= */
 /* 45678901234567890123456789012345678901234567890123456789012345678901234567 */
@@ -32,6 +49,11 @@ extern int         Current_line[MAX_OPEN
 extern int         Func_idx;
 extern Symbol      FuncStack[MAX_FUNC_NEST];
 
+#ifdef TTH
+extern int textohtmldyn(char*,char**,char**,int);
+char *tth_err;
+#endif
+
 /* --------------------------------------------------------------------------- */
 int
 match_function(func, argc) char *func; int argc;
@@ -43,7 +65,7 @@ match_function(func, argc) char *func; i
   if( !strcmp(func,"random_poisson") )        return ((argc==4)? RANDOM_POISSON_F : MIS_ARG_COUNT);
   if( !strcmp(func,"random_exponential") )    return ((argc==4)? RANDOM_EXPONENTIAL_F : MIS_ARG_COUNT);
   if( !strcmp(func,"random_chi") )            return ((argc==4)? RANDOM_CHI_F : MIS_ARG_COUNT);
-  if( !strcmp(func,"random_noncentral_chi") )  return ((argc==4)? RANDOM_NONCENTRAL_CHI_F : MIS_ARG_COUNT);
+  if( !strcmp(func,"random_noncentral_chi") )  return ((argc==5)? RANDOM_NONCENTRAL_CHI_F : MIS_ARG_COUNT);
   if( !strcmp(func,"choose") )         return (CHOOSE_F);
   if( !strcmp(func,"tex") )            return (((argc==2)? TEX_F: MIS_ARG_COUNT));
   if( !strcmp(func,"var_in_tex") )     return (VAR_IN_TEX_F);
@@ -784,6 +806,7 @@ ArgNode_t  *argp;
                 case RANDOM_NORMAL_F: 
                 case RANDOM_BETA_F:  
                 case RANDOM_GAMMA_F:  /* two-parameter functions */
+                case RANDOM_NONCENTRAL_CHI_F:
                        { errCode = 0;
                          switch( FIRST_ARGTYPE(argp) ) { /* parameter two */
                            case I_VAR: case I_CONSTANT:
@@ -875,7 +898,7 @@ ArgNode_t  *argp;
                                          break;
                                    case IDENTIFIER:
                                          tmp_int = free_array(FIFTH_ARGNAME(argp));
-                                         r_p = gen_random_by_selector(FIFTH_ARGSTR(argp),sel,tmp_str,item_cnt,para1,para2);
+                                         r_p = gen_random_by_selector(FIFTH_ARGNAME(argp),sel,tmp_str,item_cnt,para1,para2);
                                          capa_mfree((char *)resultp);
                                          resultp = r_p;
                                          break;
@@ -889,15 +912,14 @@ ArgNode_t  *argp;
                      break;
                 case RANDOM_POISSON_F:
                 case RANDOM_EXPONENTIAL_F:
-                case RANDOM_CHI_F:
-                case RANDOM_NONCENTRAL_CHI_F: /* one parameter functions */
+                case RANDOM_CHI_F: /* one parameter functions */
                        { errCode = 0;
                          switch( FIRST_ARGTYPE(argp) ) { /* parameter one */
                            case I_VAR: case I_CONSTANT:
-                                  para2 = (float)FIRST_ARGINT(argp);
+                                  para1 = (float)FIRST_ARGINT(argp);
                                 break;
                            case R_VAR: case R_CONSTANT: 
-                                  para2 = (float)FIRST_ARGREAL(argp);
+                                  para1 = (float)FIRST_ARGREAL(argp);
                                 break;
                            case S_VAR: case S_CONSTANT: 
                            case IDENTIFIER:
@@ -965,7 +987,7 @@ ArgNode_t  *argp;
                                          break;
                                    case IDENTIFIER:
                                          tmp_int = free_array(FOURTH_ARGNAME(argp));
-                                         r_p = gen_random_by_selector(FOURTH_ARGSTR(argp),sel,tmp_str,item_cnt,para1,para2);
+                                         r_p = gen_random_by_selector(FOURTH_ARGNAME(argp),sel,tmp_str,item_cnt,para1,para2);
                                          capa_mfree((char *)resultp);
                                          resultp = r_p;
                                          break;
@@ -1269,6 +1291,29 @@ ArgNode_t  *argp;
                 }
                 break;
     case TEX_F: { if (Parsemode_f != TeX_MODE) {
+#ifdef TTH
+#define CHARLEN 1024*1024
+		     {
+		       char *html;
+		       if ( (Parsemode_f==HTML_MODE) && 
+			    ((SECOND_ARGTYPE(argp) == S_VAR) || 
+			     (SECOND_ARGTYPE(argp) == S_CONSTANT))
+			    ) {
+		       printf("Hi There %s\n",SECOND_ARGSTR(argp));
+		       resultp->s_type = SECOND_ARGTYPE(argp);
+			 if(tth_err) { free(tth_err); tth_err=NULL; }
+			 textohtmldyn(SECOND_ARGSTR(argp),&html,&tth_err,CHARLEN);
+			 if(html) {
+			   resultp->s_str=strsave(html);
+			   capa_mfree(html);
+			 } else {
+			   resultp->s_str=strsave("");
+			 }
+			 break;
+		       }
+		     }
+#undef CHARLEN
+#endif
                      resultp->s_type =  FIRST_ARGTYPE(argp);
                      switch(FIRST_ARGTYPE(argp)) {
                       case I_VAR: